diff --git a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml b/blade-service/logpm-aftersales/src/main/resources/application-dev.yml
index 320f33260..beb3f9567 100644
--- a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml
index 9f5fbf7c4..ca7979c43 100644
--- a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml
+++ b/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}
diff --git a/blade-service/logpm-aftersales/src/main/resources/application-test.yml b/blade-service/logpm-aftersales/src/main/resources/application-test.yml
index cf7bcafb9..83532be50 100644
--- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml
+++ b/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}
diff --git a/blade-service/logpm-basic/src/main/resources/application-dev.yml b/blade-service/logpm-basic/src/main/resources/application-dev.yml
index 3ff547cac..3c754ca3c 100644
--- a/blade-service/logpm-basic/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-basic/src/main/resources/application-prod.yml b/blade-service/logpm-basic/src/main/resources/application-prod.yml
index 3ff547cac..3c754ca3c 100644
--- a/blade-service/logpm-basic/src/main/resources/application-prod.yml
+++ b/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}
diff --git a/blade-service/logpm-basic/src/main/resources/application-test.yml b/blade-service/logpm-basic/src/main/resources/application-test.yml
index 3ce9c0d67..cd3e38478 100644
--- a/blade-service/logpm-basic/src/main/resources/application-test.yml
+++ b/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}
diff --git a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml b/blade-service/logpm-basicdata/src/main/resources/application-dev.yml
index bea4f60a6..286f929f9 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-basicdata/src/main/resources/application-prod.yml b/blade-service/logpm-basicdata/src/main/resources/application-prod.yml
index 40f040c5b..90c3fea3d 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-basicdata/src/main/resources/application-test.yml b/blade-service/logpm-basicdata/src/main/resources/application-test.yml
index 0235f16a8..dcbd1006f 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-data-sharing/src/main/resources/application-dev.yml b/blade-service/logpm-data-sharing/src/main/resources/application-dev.yml
index 9bbdaad39..0c19d3fc0 100644
--- a/blade-service/logpm-data-sharing/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-data-sharing/src/main/resources/application-prod.yml b/blade-service/logpm-data-sharing/src/main/resources/application-prod.yml
index 77068f345..eaca04452 100644
--- a/blade-service/logpm-data-sharing/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-data-sharing/src/main/resources/application-test.yml b/blade-service/logpm-data-sharing/src/main/resources/application-test.yml
index 77068f345..eaca04452 100644
--- a/blade-service/logpm-data-sharing/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml
index a4b50cf30..29e7ed167 100644
--- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-distribution/src/main/resources/application-prod.yml b/blade-service/logpm-distribution/src/main/resources/application-prod.yml
index 1406c5b7a..0056973f3 100644
--- a/blade-service/logpm-distribution/src/main/resources/application-prod.yml
+++ b/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
diff --git a/blade-service/logpm-distribution/src/main/resources/application-test.yml b/blade-service/logpm-distribution/src/main/resources/application-test.yml
index c65175203..0da4c60f5 100644
--- a/blade-service/logpm-distribution/src/main/resources/application-test.yml
+++ b/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}
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml
index 8273125b2..617a0c5de 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml
index 3db9ae091..2c57bcc0c 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml
index 58ff342c4..6b951cc09 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml
index 47a28f0bb..6b1351188 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-prod.yml
index 2a370f7a4..4d0394921 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-test.yml
index 56c1acf30..608ff9bcd 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-dev.yml
index a967994de..618fe53f8 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-prod.yml
index 7e3b5ee7b..5a3241f3e 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-test.yml
index d93c5428d..866eaee96 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-dev.yml
index 95564e752..93eef4be6 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-prod.yml
index 0e0097a07..196090042 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-test.yml
index 007097f2f..aa4bdc640 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-dev.yml
index 907f98e91..a7d893991 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-prod.yml
index a0c859ad1..8409c79c3 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-test.yml
index d776d194a..18f2aad8f 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-factory/src/main/resources/application-dev.yml b/blade-service/logpm-factory/src/main/resources/application-dev.yml
index 457330ce2..ec7b1d9ce 100644
--- a/blade-service/logpm-factory/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-factory/src/main/resources/application-prod.yml b/blade-service/logpm-factory/src/main/resources/application-prod.yml
index 195d18c4c..4a8010913 100644
--- a/blade-service/logpm-factory/src/main/resources/application-prod.yml
+++ b/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
diff --git a/blade-service/logpm-factory/src/main/resources/application-test.yml b/blade-service/logpm-factory/src/main/resources/application-test.yml
index 1481bd319..348d9dd38 100644
--- a/blade-service/logpm-factory/src/main/resources/application-test.yml
+++ b/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
diff --git a/blade-service/logpm-old-project/src/main/resources/application-dev.yml b/blade-service/logpm-old-project/src/main/resources/application-dev.yml
index 6e8304334..68d1f4215 100644
--- a/blade-service/logpm-old-project/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-old-project/src/main/resources/application-prod.yml b/blade-service/logpm-old-project/src/main/resources/application-prod.yml
index de13ec368..9683de684 100644
--- a/blade-service/logpm-old-project/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-old-project/src/main/resources/application-test.yml b/blade-service/logpm-old-project/src/main/resources/application-test.yml
index 44749792d..a23a700dc 100644
--- a/blade-service/logpm-old-project/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-patch/src/main/resources/application-dev.yml b/blade-service/logpm-patch/src/main/resources/application-dev.yml
index 36a4e5360..1667e1d95 100644
--- a/blade-service/logpm-patch/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-patch/src/main/resources/application-prod.yml b/blade-service/logpm-patch/src/main/resources/application-prod.yml
index 3de00a5c8..74ceef769 100644
--- a/blade-service/logpm-patch/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-patch/src/main/resources/application-test.yml b/blade-service/logpm-patch/src/main/resources/application-test.yml
index 51d73fdf2..dc2ff6b68 100644
--- a/blade-service/logpm-patch/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-report/src/main/resources/application-dev.yml b/blade-service/logpm-report/src/main/resources/application-dev.yml
index cdf523b40..0c51019e8 100644
--- a/blade-service/logpm-report/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-report/src/main/resources/application-prod.yml b/blade-service/logpm-report/src/main/resources/application-prod.yml
index 3db9ae091..2c57bcc0c 100644
--- a/blade-service/logpm-report/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-report/src/main/resources/application-test.yml b/blade-service/logpm-report/src/main/resources/application-test.yml
index 3db9ae091..2c57bcc0c 100644
--- a/blade-service/logpm-report/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml b/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml
index ffd7f1130..a04bb4b70 100644
--- a/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml b/blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml
index a0ca7ca85..51c437b87 100644
--- a/blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml
+++ b/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:
diff --git a/blade-service/logpm-statisticsdata/src/main/resources/application-test.yml b/blade-service/logpm-statisticsdata/src/main/resources/application-test.yml
index 2a6bc8bfd..81733b6ee 100644
--- a/blade-service/logpm-statisticsdata/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-supervise/src/main/resources/application-dev.yml b/blade-service/logpm-supervise/src/main/resources/application-dev.yml
index ea38e3d37..c095b463d 100644
--- a/blade-service/logpm-supervise/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-supervise/src/main/resources/application-prod.yml b/blade-service/logpm-supervise/src/main/resources/application-prod.yml
index b520eea1a..f252686c7 100644
--- a/blade-service/logpm-supervise/src/main/resources/application-prod.yml
+++ b/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}
diff --git a/blade-service/logpm-supervise/src/main/resources/application-test.yml b/blade-service/logpm-supervise/src/main/resources/application-test.yml
index ea38e3d37..52e792bb7 100644
--- a/blade-service/logpm-supervise/src/main/resources/application-test.yml
+++ b/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:
diff --git a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml
index befc8a180..6ec67e900 100644
--- a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml
+++ b/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}
diff --git a/blade-service/logpm-trunkline/src/main/resources/application-prod.yml b/blade-service/logpm-trunkline/src/main/resources/application-prod.yml
index b0a067516..d0205f177 100644
--- a/blade-service/logpm-trunkline/src/main/resources/application-prod.yml
+++ b/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
diff --git a/blade-service/logpm-trunkline/src/main/resources/application-test.yml b/blade-service/logpm-trunkline/src/main/resources/application-test.yml
index fd764eb95..df38e2d45 100644
--- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml
+++ b/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}
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
index 8f88cdad8..80196d2e9 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
+++ b/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: ''
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-prod.yml b/blade-service/logpm-warehouse/src/main/resources/application-prod.yml
index 71e9f4a80..653470065 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-prod.yml
+++ b/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
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-test.yml b/blade-service/logpm-warehouse/src/main/resources/application-test.yml
index 28a10b0df..01c2ba312 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-test.yml
+++ b/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
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index 744e5d260..20439db5b 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -63,10 +63,10 @@
blade-starter-metrics
-
-
-
-
+
+ org.springblade
+ blade-starter-transaction
+
org.springblade
blade-starter-tenant