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

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

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,7 +25,7 @@ spring:
           url: ${blade.datasource.aftersales.master.url}
           username: ${blade.datasource.aftersales.master.username}
           password: ${blade.datasource.aftersales.master.password}
-        slave:
-          url: ${blade.datasource.aftersales.slave.url}
-          username: ${blade.datasource.aftersales.slave.username}
-          password: ${blade.datasource.aftersales.slave.password}
+        627683:
+          url: ${blade.datasource.aftersales.627683.url}
+          username: ${blade.datasource.aftersales.627683.username}
+          password: ${blade.datasource.aftersales.627683.password}

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

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,7 +25,7 @@ spring:
           url: ${blade.datasource.aftersales.master.url}
           username: ${blade.datasource.aftersales.master.username}
           password: ${blade.datasource.aftersales.master.password}
-        slave:
-          url: ${blade.datasource.aftersales.slave.url}
-          username: ${blade.datasource.aftersales.slave.username}
-          password: ${blade.datasource.aftersales.slave.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-dev.yml

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

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

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

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -33,15 +33,15 @@ spring:
           url: ${blade.datasource.basicdata.master.url}
           username: ${blade.datasource.basicdata.master.username}
           password: ${blade.datasource.basicdata.master.password}
-        slave:
+        627683:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.basicdata.slave.url}
-          username: ${blade.datasource.basicdata.slave.username}
-          password: ${blade.datasource.basicdata.slave.password}
+          url: ${blade.datasource.basicdata.627683.url}
+          username: ${blade.datasource.basicdata.627683.username}
+          password: ${blade.datasource.basicdata.627683.password}
 
 xxl:
   job:

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

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,10 @@ spring:
           url: ${blade.datasource.distribution.master.url}
           username: ${blade.datasource.distribution.master.username}
           password: ${blade.datasource.distribution.master.password}
-        slave:
-          url: ${blade.datasource.distribution.slave.url}
-          username: ${blade.datasource.distribution.slave.username}
-          password: ${blade.datasource.distribution.slave.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-distribution/src/main/resources/application-test.yml

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -60,14 +60,14 @@ spring:
           url: ${blade.datasource.factory.master.url}
           username: ${blade.datasource.factory.master.username}
           password: ${blade.datasource.factory.master.password}
-        slave:
+        627683:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+          url: ${blade.datasource.factory.627683.url}
+          username: ${blade.datasource.factory.627683.username}
+          password: ${blade.datasource.factory.627683.password}
 
 

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,10 @@ spring:
           url: ${blade.datasource.factory.master.url}
           username: ${blade.datasource.factory.master.username}
           password: ${blade.datasource.factory.master.password}
-        slave:
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+        627683:
+          url: ${blade.datasource.factory.627683.url}
+          username: ${blade.datasource.factory.627683.username}
+          password: ${blade.datasource.factory.627683.password}
   #rabbitmq配置
   rabbitmq:
     host: 172.16.128.145

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,10 @@ spring:
           url: ${blade.datasource.factory.master.url}
           username: ${blade.datasource.factory.master.username}
           password: ${blade.datasource.factory.master.password}
-        slave:
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+        627683:
+          url: ${blade.datasource.factory.627683.url}
+          username: ${blade.datasource.factory.627683.username}
+          password: ${blade.datasource.factory.627683.password}
   #rabbitmq配置
   rabbitmq:
     host: 192.168.2.110

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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

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

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:

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

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

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

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

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

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

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

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

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

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

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

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

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -60,12 +60,12 @@ spring:
           url: ${blade.datasource.trunkline.master.url}
           username: ${blade.datasource.trunkline.master.username}
           password: ${blade.datasource.trunkline.master.password}
-        slave:
+        627683:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.trunkline.slave.url}
-          username: ${blade.datasource.trunkline.slave.username}
-          password: ${blade.datasource.trunkline.slave.password}
+          url: ${blade.datasource.trunkline.627683.url}
+          username: ${blade.datasource.trunkline.627683.username}
+          password: ${blade.datasource.trunkline.627683.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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,10 @@ spring:
           url: ${blade.datasource.trunkline.master.url}
           username: ${blade.datasource.trunkline.master.username}
           password: ${blade.datasource.trunkline.master.password}
-        slave:
-          url: ${blade.datasource.trunkline.slave.url}
-          username: ${blade.datasource.trunkline.slave.username}
-          password: ${blade.datasource.trunkline.slave.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

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

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

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -59,15 +59,15 @@ spring:
           url: ${blade.datasource.warehouse.master.url}
           username: ${blade.datasource.warehouse.master.username}
           password: ${blade.datasource.warehouse.master.password}
-        slave:
+        627683:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.warehouse.slave.url}
-          username: ${blade.datasource.warehouse.slave.username}
-          password: ${blade.datasource.warehouse.slave.password}
+          url: ${blade.datasource.warehouse.627683.url}
+          username: ${blade.datasource.warehouse.627683.username}
+          password: ${blade.datasource.warehouse.627683.password}
 xxl:
   job:
     accessToken: ''

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
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
   datasource:
     dynamic:
       druid:
@@ -25,10 +25,10 @@ spring:
           url: ${blade.datasource.warehouse.master.url}
           username: ${blade.datasource.warehouse.master.username}
           password: ${blade.datasource.warehouse.master.password}
-        slave:
-          url: ${blade.datasource.warehouse.slave.url}
-          username: ${blade.datasource.warehouse.slave.username}
-          password: ${blade.datasource.warehouse.slave.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-warehouse/src/main/resources/application-test.yml

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

blade-service/pom.xml

@@ -63,10 +63,10 @@
             <artifactId>blade-starter-metrics</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springblade</groupId>-->
-<!--            <artifactId>blade-starter-transaction</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>