项目配置

pom.xml

@@ -37,11 +37,11 @@
             <version>4.5.13</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.starcharge</groupId>
-            <artifactId>scit-api</artifactId>
-            <version>2.2.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.starcharge</groupId>-->
+<!--            <artifactId>scit-api</artifactId>-->
+<!--            <version>2.2.0</version>-->
+<!--        </dependency>-->
 
 
         <dependency>
@@ -55,7 +55,11 @@
             <artifactId>aliyun-java-sdk-core</artifactId>
             <version>4.4.4</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.ihidea</groupId>
+            <artifactId>frame.core</artifactId>
+            <version>2.2.2.20201022.082934-1</version>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
@@ -107,11 +111,11 @@
             <version>3.4.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-words</artifactId>
-            <version>15.8.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aspose</groupId>-->
+<!--            <artifactId>aspose-words</artifactId>-->
+<!--            <version>15.8.0</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 

src/main/java/com/boco/nbd/wios/flow/service/impl/OrderServiceImpl.java

@@ -1581,7 +1581,7 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper>
                 indexOne++;
             }
             blockPairBo.setExperiences(data);
-            pdfUtil.getWord(path, blockPairBo, fileName, response);
+          //  pdfUtil.getWord(path, blockPairBo, fileName, response);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/boco/nbd/wios/flow/util/ProcessUtil.java

@@ -50,7 +50,6 @@ import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.sl.usermodel.PictureData;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;

src/main/java/com/boco/nbd/wios/manage/entity/bo/Dictionary.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 

src/main/java/com/boco/nbd/wios/manage/entity/bo/OrderBo.java

 package com.boco.nbd.wios.manage.entity.bo;
 
 
+import com.ihidea.core.support.exception.ServiceException;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.util.StringUtils;
 

src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractItem.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 

src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPackPrice.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 

src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPrice.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;

src/main/java/com/boco/nbd/wios/manage/entity/common/bo/UploadFile.java

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.util.StringUtilsEx;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;

src/main/java/com/boco/nbd/wios/manage/mapper/def/AccountRoleMapper.java

@@ -3,6 +3,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 import com.boco.nbd.wios.manage.entity.bo.AccountRole;
 import com.boco.nbd.wios.manage.entity.bo.AccountRoleCriteria;
 
+import com.ihidea.core.base.CoreDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/boco/nbd/wios/manage/mapper/def/OemContractDao.java

@@ -5,6 +5,8 @@ import com.boco.nbd.wios.manage.entity.bo.OemContract;
 import com.boco.nbd.wios.manage.entity.bo.OemContractBo2;
 import com.boco.nbd.wios.manage.entity.bo.OemContractVo;
 import com.boco.nbd.wios.manage.entity.cams.enums.ContractStatus;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;

src/main/java/com/boco/nbd/wios/manage/mapper/def/OemDao.java

@@ -4,6 +4,7 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.Oem;
 import com.boco.nbd.wios.manage.entity.bo.OemBo;
 import com.boco.nbd.wios.manage.entity.bo.OemVo;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;

src/main/java/com/boco/nbd/wios/manage/mapper/def/OperateLogDao.java

@@ -7,6 +7,7 @@ import com.boco.nbd.wios.manage.entity.bo.OperateLog;
 import com.boco.nbd.wios.manage.entity.bo.OperateLogBo;
 import com.boco.nbd.wios.manage.entity.cams.enums.OperateLogType;
 import com.boco.nbd.wios.manage.entity.cams.enums.OrderStatus;
+import com.ihidea.core.support.session.SessionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;

src/main/java/com/boco/nbd/wios/manage/mapper/def/OrderDao.java

@@ -10,6 +10,9 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.*;
 import com.boco.nbd.wios.manage.entity.cams.enums.OrderStatus;
 import com.boco.nbd.wios.manage.entity.settlement.po.Invoice;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
 

src/main/java/com/boco/nbd/wios/manage/mapper/def/RegionDao.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 
 import com.boco.nbd.cams.core.constant.CamsConstant;
 import com.boco.nbd.wios.manage.entity.bo.Region;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/boco/nbd/wios/manage/mapper/def/ScoreSupplierDao.java

@@ -5,6 +5,7 @@ import com.boco.nbd.wios.manage.entity.bo.ScoreSupplier;
 import com.boco.nbd.wios.manage.entity.bo.ScoreSupplierDTO;
 import com.boco.nbd.wios.manage.entity.cams.enums.ScoreStatus;
 import com.boco.nbd.wios.manage.service.impl.TokenService;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/boco/nbd/wios/manage/mapper/def/SupplierContractDao.java

@@ -6,6 +6,8 @@ import com.boco.nbd.wios.manage.entity.bo.SupplierContract;
 import com.boco.nbd.wios.manage.entity.bo.SupplierContractBo;
 import com.boco.nbd.wios.manage.entity.bo.SupplierContractVo;
 import com.boco.nbd.wios.manage.entity.cams.enums.ContractStatus;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;

src/main/java/com/boco/nbd/wios/manage/mapper/def/SystemInfoDao.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 
 import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.SystemInfo;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;

src/main/java/com/boco/nbd/wios/manage/mapper/def/UploadFileDao.java

@@ -7,6 +7,7 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.cams.enums.UploadFileType;
 import com.boco.nbd.wios.manage.entity.common.bo.UploadFile;
 import com.boco.nbd.wios.manage.util.CommonUtils;
+import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/boco/nbd/wios/manage/service/impl/AccountService.java

@@ -15,9 +15,14 @@ import com.boco.nbd.wios.manage.util.NumberUtil;
 import com.boco.nbd.wios.manage.util.SpringContextUtil;
 import com.boco.nbd.wios.wx.utils.WeChatDecryptUtils;
 import com.boco.nbd.wios.wx.utils.WeChatSessionKeyUtils;
+import com.ihidea.component.api.json.MJSONResultEntity;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.orm.mybatis3.util.IbatisServiceUtils;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/com/boco/nbd/wios/manage/service/impl/CamsAccountService.java

@@ -5,6 +5,7 @@ import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.entity.bo.*;
 import com.boco.nbd.wios.manage.entity.cams.enums.AlarmType;
 import com.boco.nbd.wios.manage.mapper.def.*;
+import com.ihidea.core.support.exception.ServiceException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/boco/nbd/wios/manage/service/impl/DictionaryService.java

@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.service.impl;
 
 import com.boco.nbd.wios.manage.entity.bo.Dictionary;
 import com.boco.nbd.wios.manage.mapper.def.DictionaryDao;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/boco/nbd/wios/manage/service/impl/OrderScoreService.java

@@ -9,6 +9,8 @@ import com.boco.nbd.wios.manage.mapper.def.OperateLogDao;
 import com.boco.nbd.wios.manage.mapper.def.OrderDao;
 import com.boco.nbd.wios.manage.mapper.def.OrderScoreDao;
 
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java

@@ -34,6 +34,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ihidea.component.api.v2.BaseResponse;
+import com.ihidea.component.cache.redis.RedisClient;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
+import com.ihidea.core.util.JSONUtilsEx;
+import com.ihidea.core.util.StringUtilsEx;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;

src/main/java/com/boco/nbd/wios/manage/service/impl/PushService.java

@@ -2,6 +2,8 @@ package com.boco.nbd.wios.manage.service.impl;
 
 import com.boco.nbd.wios.manage.call.PushApi;
 import com.boco.nbd.wios.manage.entity.bo.OrderVo;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.util.JSONUtilsEx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/boco/nbd/wios/manage/service/impl/SecretPhoneService.java

@@ -6,6 +6,7 @@ import com.boco.nbd.wios.flow.entity.SecretPhone;
 import com.boco.nbd.wios.flow.util.PhoneNumProtectionUtil;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.mapper.def.SecretPhoneDao;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

src/main/java/com/boco/nbd/wios/manage/service/impl/TokenService.java

@@ -7,7 +7,6 @@ import com.ihidea.core.support.servlet.ServletHolderFilter;
 import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java

@@ -15,6 +15,14 @@ import com.boco.nbd.wios.manage.mapper.extdb.WarehouseLevenMapper;
 import com.boco.nbd.wios.manage.mapper.extdb.WarehouseMapper;
 import com.boco.nbd.wios.manage.mapper.extdb.WarehouseMapperEx;
 import com.boco.nbd.wios.manage.service.ISingleService;
+import com.ihidea.component.api.v2.BaseResponse;
+import com.ihidea.core.support.SpringContextLoader;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
+import com.ihidea.core.util.JSONUtilsEx;
+import com.ihidea.core.util.StringUtilsEx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;

src/main/java/com/boco/nbd/wios/microservice/Application.java

@@ -20,6 +20,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.*;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -39,6 +40,7 @@ import java.util.EventListener;
 @EnableConfigurationProperties(AliyunProperties.class)
 @EnableApiV2
 @EnableAsync
+@EnableTransactionManagement
 public class Application extends FrameworkMicroserviceApplication {
 
     public static void main(String[] args) {

src/main/resources/application.properties

@@ -4,4 +4,4 @@ cdn.image.url=
 # db:
 database=mysql
 # 配置到bootstrap.yml不生效
-spring.main.allow-bean-definition-overriding=true
+spring.main.allow-bean-definition-overriding=false

src/main/resources/application.yml

+server:
+  tomcat:
+    uri-encoding: UTF-8
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      force: true
+      enabled: true
+  profiles:
+    active: dev
+  application:
+    name: wios
+  main:
+    allow-bean-definition-overriding: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: ${mysql.url}
+    username: ${mysql.username}
+    password: ${mysql.password}
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: SELECT 'x'
+    queryTimeout: 5
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    # filters: stat,wall 
+    poolPreparedStatements: true
+    maxPoolPreparedStatementPerConnectionSize: 20
+    logSlowSql: true
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
+    proxyFilters: '#{@catDataSourceFilter}'
+mybatis:
+  mapper-locations: classpath*:com/**/mappers/**/*.xml
+  plugins: '#{@maybatisPlugin}'
+  configuration:
+    map-underscore-to-camel-case: true
+support:
+  limit:
+    pageSize: 10
+filestore:
+  enable:
+    suffix: true
+auth:
+  token:
+    validSeconds: 900
+    minaValidSeconds: 86400
+  ignoreUrls: /account/login,/account/logout,/mts/*,/enum/get,/export.do,/import.do,/api/account/sendCaptcha,/api/account/updatePasswodByCaptcha,/api/sap/materials/add
+  ignoreUrlPath: /ignore
+api:
+  v2:
+    compatible: true
+    log: false
+womc:
+  flowUrl: http://cams-wios-test-v2.camsnetec.co
+  orderUrl: http://cams-wios-test-v2.camsnetec.co
\ No newline at end of file

src/main/resources/bootstrap-dev.yml

@@ -7,17 +7,17 @@ spring:
     zhname: 开迈斯WIOS服务
   cloud:
     nacos:
-      discovery:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-      config:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#      discovery:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#      config:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
     config:
       enabled: false
   jta:

src/main/resources/bootstrap-test.yml

@@ -7,17 +7,17 @@ spring:
     zhname: 开迈斯WIOS服务
   cloud:
     nacos:
-      discovery:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-      config:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#      discovery:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#      config:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
     config:
       enabled: false
   jta:

src/main/resources/bootstrap.yml

@@ -7,19 +7,27 @@ spring:
     name: nbd-wios-manage
     zhname: 开迈斯WIOS服务
   cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#      config:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
+#    config:
+#      enabled: false
+
     nacos:
-      discovery:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
       config:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
-    config:
-      enabled: false
+        enabled: false
+        refresh-enabled: false
+      discovery:
+        enabled: false
+        instance-enabled: false
   jta:
     enabled: false
\ No newline at end of file

src/main/resources/config/application-boco.yml

+datasource:
+  def:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.12.1.17:3306/wios?useSSL=false&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+    username: root
+    password: Boco@123
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+  extdb:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.12.1.17:3306/warehouse?useSSL=false&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+    username: root
+    password: Boco@123
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+spring:
+  redis:
+    timeout: 10s
+    host: 10.12.1.17
+    port: 6379
+    password: Boco1234
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: 1000
+        max-idle: 100
+        min-idle: 0
+jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
+
+swagger:
+  enable: true    #系统默认为false
+  serviceUrl: http://127.0.0.1:30350
+  version: v2.0
+  basePackage: com.boco.nbd.cams.*.controller,com.boco.nbd.wios.*.controller,com.boco.nbd.wios.export
+  app:
+    title: 开迈斯WIOS服务
+    desc: 开迈斯WIOS服务
+
+#流程数据源配置
+activiti:
+  #是否采用业务数据源
+  useDefDataSource: true
+  #是否创建表
+  database-schema-update: true
+
+auth:
+  allowRepeatLogin: true
+
+support:
+  limit:
+    pageSize: 10
+
+api:
+  v2:
+    compatible: true
+    log: false
+
+url:
+  api:
+    wios: http://wios.api.dev.ccchong.com:8086
+    push: http://push-gateway.test.k8s.star-charge.com/mts
+    warehouse: http://wios-warehouse.dev.k8s.star-charge.com/
+    #warehouse: http://10.8.9.86:8056/
+    invoice: http://47.111.208.192:8028/mts
+  h5: http://wios.2ust.com
+  FILE_UPLOAD_DEFAULT_URL: https://oss-cams.oss-cn-hangzhou.aliyuncs.com/wios/
+
+appkey:
+  warehouse: MA1YDN61X
+  invoice: MA1YDN61X
+
+mina:
+  appId: wxcc364b1431128ad7
+  appSecret: 2cc67ec6811ccb7dbdd57c2eadb627a5
+
+weixin:
+  appId: wxe343c909cc459c6a
+  appSecret: d4624c36b6795d1d99dcf0547af5443d
+
+sms:
+  aliyun:
+    enable: true
+    weight: 1
+    endpoint: cn-hangzhou
+    access-key-id: LTAI5tFo5PHXPUEGP7zrbSGe
+    access-key-secret: jU3mM34HWPdPKLnao9aF1ZFURt5sj3
+    sign-name: FC100000118866049
+    templates:
+      appointmentUser: SMS_255885013
+      businessRefused: SMS_256115007
+      appointmentTimeConfirm: SMS_256040012
+      appointmentTimeNotify: SMS_256030017
+
+sap:
+  url: https://dev-user-vqgd2we1.it-cpi010-rt.cpi.cn40.apps.platform.sapcloud.cn
+  username: sb-ed7ae553-63c3-41cb-93e7-6d9eddd35998!b904|it-rt-dev-user-vqgd2we1!b39
+  password: 3bc40402-dd4b-4400-bf61-29db7a5e9968$Ly2NGHzyxV6QJ1rphkrmHAy6nBSflaLEcEFAQLCQSUI=
+
+# flowCode 流程标识,flowSuperGroupId:流程超级用户组(存在配置)
+flow:
+  flowCode: CamsOrder
+  flowSuperGroupId: 836764183768485111
\ No newline at end of file

target/classes/application.properties

@@ -4,4 +4,4 @@ cdn.image.url=
 # db:
 database=mysql
 # 配置到bootstrap.yml不生效
-spring.main.allow-bean-definition-overriding=true
+spring.main.allow-bean-definition-overriding=false

target/classes/bootstrap-dev.yml

@@ -7,17 +7,17 @@ spring:
     zhname: 开迈斯WIOS服务
   cloud:
     nacos:
-      discovery:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-      config:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#      discovery:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#      config:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
     config:
       enabled: false
   jta:

target/classes/bootstrap-test.yml

@@ -7,17 +7,17 @@ spring:
     zhname: 开迈斯WIOS服务
   cloud:
     nacos:
-      discovery:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-      config:
-        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#      discovery:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#      config:
+#        server-addr: ${nacos-server-addr}
+#        namespace: ${nacos-server-namespace}
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
     config:
       enabled: false
   jta:

target/classes/bootstrap.yml

@@ -7,19 +7,27 @@ spring:
     name: nbd-wios-manage
     zhname: 开迈斯WIOS服务
   cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#      config:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
+#    config:
+#      enabled: false
+
     nacos:
-      discovery:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
       config:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
-    config:
-      enabled: false
+        enabled: false
+        refresh-enabled: false
+      discovery:
+        enabled: false
+        instance-enabled: false
   jta:
     enabled: false
\ No newline at end of file