Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-aftersales/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,7 +25,3 @@ spring:
           url: ${blade.datasource.aftersales.master.url}
           username: ${blade.datasource.aftersales.master.username}
           password: ${blade.datasource.aftersales.master.password}
-        627683:
-          url: ${blade.datasource.aftersales.627683.url}
-          username: ${blade.datasource.aftersales.627683.username}
-          password: ${blade.datasource.aftersales.627683.password}

blade-service/logpm-basic/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.basic.master.url}
           username: ${blade.datasource.basic.master.username}
           password: ${blade.datasource.basic.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basic.627683.url}
-          username: ${blade.datasource.basic.627683.username}
-          password: ${blade.datasource.basic.627683.password}
-

blade-service/logpm-basicdata/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,12 +33,3 @@ spring:
           url: ${blade.datasource.basicdata.master.url}
           username: ${blade.datasource.basicdata.master.username}
           password: ${blade.datasource.basicdata.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basicdata.627683.url}
-          username: ${blade.datasource.basicdata.627683.username}
-          password: ${blade.datasource.basicdata.627683.password}

blade-service/logpm-business/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,6 @@ spring:
           url: ${blade.datasource.warehouse.master.url}
           username: ${blade.datasource.warehouse.master.username}
           password: ${blade.datasource.warehouse.master.password}
-        627683:
-          url: ${blade.datasource.warehouse.627683.url}
-          username: ${blade.datasource.warehouse.627683.username}
-          password: ${blade.datasource.warehouse.627683.password}
   #rabbitmq配置
   rabbitmq:
     host: 172.16.128.145

blade-service/logpm-data-sharing/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -35,13 +35,3 @@ spring:
           url: ${blade.datasource.datasharing.master.url}
           username: ${blade.datasource.datasharing.master.username}
           password: ${blade.datasource.datasharing.master.password}
-        slave:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.datasharing.slave.url}
-          username: ${blade.datasource.datasharing.slave.username}
-          password: ${blade.datasource.datasharing.slave.password}
-

blade-service/logpm-data-sharing/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.datasharing.master.url}
           username: ${blade.datasource.datasharing.master.username}
           password: ${blade.datasource.datasharing.master.password}
-        slave:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.datasharing.slave.url}
-          username: ${blade.datasource.datasharing.slave.username}
-          password: ${blade.datasource.datasharing.slave.password}
-

blade-service/logpm-data-sharing/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.datasharing.master.url}
           username: ${blade.datasource.datasharing.master.username}
           password: ${blade.datasource.datasharing.master.password}
-        slave:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.datasharing.slave.url}
-          username: ${blade.datasource.datasharing.slave.username}
-          password: ${blade.datasource.datasharing.slave.password}
-

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -10088,8 +10088,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectDriverInfoByDeliveryIdAndDriverId(driverArtery.getId(), deliveryListEntity.getId());
 			} else {
 				if (Objects.isNull(vehicleNub)) {
-					log.error("文员扫描未选择司机!!");
-					throw new CustomerException("文员扫描未选择司机");
+					log.error("文员操作未选择司机!!");
+					throw new CustomerException("文员操作未选择司机");
 				}
 				//默认为文员进行扫描，此时需要文员选择进行帮助扫描的司机
 				distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectDriverInfoByDeliveryIdAndVehicleNub(deliveryListEntity.getId(), vehicleNub);

blade-service/logpm-distribution/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,6 @@ spring:
           url: ${blade.datasource.distribution.master.url}
           username: ${blade.datasource.distribution.master.username}
           password: ${blade.datasource.distribution.master.password}
-        627683:
-          url: ${blade.datasource.distribution.627683.url}
-          username: ${blade.datasource.distribution.627683.username}
-          password: ${blade.datasource.distribution.627683.password}
   #rabbitmq配置
   rabbitmq:
     host: 172.16.128.145

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-dev.yml

@@ -40,7 +40,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-factory/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-old-project/src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -34,12 +34,3 @@ spring:
           url: ${blade.datasource.oldproject.master.url}
           username: ${blade.datasource.oldproject.master.username}
           password: ${blade.datasource.oldproject.master.password}
-        slave:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.oldproject.slave.url}
-          username: ${blade.datasource.oldproject.slave.username}
-          password: ${blade.datasource.oldproject.slave.password}

blade-service/logpm-old-project/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,7 +25,3 @@ spring:
           url: ${blade.datasource.oldproject.master.url}
           username: ${blade.datasource.oldproject.master.username}
           password: ${blade.datasource.oldproject.master.password}
-        slave:
-          url: ${blade.datasource.oldproject.slave.url}
-          username: ${blade.datasource.oldproject.slave.username}
-          password: ${blade.datasource.oldproject.slave.password}

blade-service/logpm-old-project/src/main/resources/application-test.yml

@@ -25,8 +25,3 @@ spring:
           url: ${blade.datasource.oldproject.master.url}
           username: ${blade.datasource.oldproject.master.username}
           password: ${blade.datasource.oldproject.master.password}
-        slave:
-          url: ${blade.datasource.oldproject.slave.url}
-          username: ${blade.datasource.oldproject.slave.username}
-          password: ${blade.datasource.oldproject.slave.password}
-

blade-service/logpm-patch/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-patch/src/main/resources/application-prod.yml

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-patch/src/main/resources/application-test.yml

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-report/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
           password: ${blade.datasource.report.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.report.627683.url}
-          username: ${blade.datasource.report.627683.username}
-          password: ${blade.datasource.report.627683.password}
-

blade-service/logpm-report/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
           password: ${blade.datasource.report.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.report.627683.url}
-          username: ${blade.datasource.report.627683.username}
-          password: ${blade.datasource.report.627683.password}
-

blade-service/logpm-report/src/main/resources/application-test.yml

@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
           password: ${blade.datasource.report.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.report.627683.url}
-          username: ${blade.datasource.report.627683.username}
-          password: ${blade.datasource.report.627683.password}
-

blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml

@@ -60,12 +60,3 @@ spring:
           url: ${blade.datasource.statisticsdata.master.url}
           username: ${blade.datasource.statisticsdata.master.username}
           password: ${blade.datasource.statisticsdata.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.statisticsdata.627683.url}
-          username: ${blade.datasource.statisticsdata.627683.username}
-          password: ${blade.datasource.statisticsdata.627683.password}

blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -51,7 +51,3 @@ spring:
           url: ${blade.datasource.statisticsdata.master.url}
           username: ${blade.datasource.statisticsdata.master.username}
           password: ${blade.datasource.statisticsdata.master.password}
-        627683:
-          url: ${blade.datasource.statisticsdata.627683.url}
-          username: ${blade.datasource.statisticsdata.627683.username}
-          password: ${blade.datasource.statisticsdata.627683.password}

blade-service/logpm-supervise/src/main/resources/application-dev.yml

@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.supervise.master.url}
           username: ${blade.datasource.supervise.master.username}
           password: ${blade.datasource.supervise.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.supervise.627683.url}
-          username: ${blade.datasource.supervise.627683.username}
-          password: ${blade.datasource.supervise.627683.password}
-

blade-service/logpm-supervise/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.basic.master.url}
           username: ${blade.datasource.basic.master.username}
           password: ${blade.datasource.basic.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basic.627683.url}
-          username: ${blade.datasource.basic.627683.username}
-          password: ${blade.datasource.basic.627683.password}
-

blade-service/logpm-supervise/src/main/resources/application-test.yml

@@ -33,13 +33,3 @@ spring:
           url: ${blade.datasource.supervise.master.url}
           username: ${blade.datasource.supervise.master.username}
           password: ${blade.datasource.supervise.master.password}
-        slave:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.supervise.slave.url}
-          username: ${blade.datasource.supervise.slave.username}
-          password: ${blade.datasource.supervise.slave.password}
-

blade-service/logpm-trunkline/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,6 @@ spring:
           url: ${blade.datasource.trunkline.master.url}
           username: ${blade.datasource.trunkline.master.username}
           password: ${blade.datasource.trunkline.master.password}
-        627683:
-          url: ${blade.datasource.trunkline.627683.url}
-          username: ${blade.datasource.trunkline.627683.username}
-          password: ${blade.datasource.trunkline.627683.password}
     #rabbitmq配置
   rabbitmq:
     host: 172.16.128.145

blade-service/logpm-trunkline/src/main/resources/application-test.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-warehouse/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,6 @@ spring:
           url: ${blade.datasource.warehouse.master.url}
           username: ${blade.datasource.warehouse.master.username}
           password: ${blade.datasource.warehouse.master.password}
-        627683:
-          url: ${blade.datasource.warehouse.627683.url}
-          username: ${blade.datasource.warehouse.627683.username}
-          password: ${blade.datasource.warehouse.627683.password}
   #rabbitmq配置
   rabbitmq:
     host: 172.16.128.145