From 47f0a650a49b4ce14cb7d7ab4ff658e5ce808a66 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 10 Oct 2024 17:44:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-prod.yml | 12 +----------- .../src/main/resources/application-prod.yml | 11 +---------- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-dev.yml | 12 +----------- .../src/main/resources/application-prod.yml | 12 +----------- .../src/main/resources/application-test.yml | 12 +----------- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 11 +---------- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-test.yml | 5 ----- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-dev.yml | 12 +----------- .../src/main/resources/application-prod.yml | 12 +----------- .../src/main/resources/application-test.yml | 10 ---------- .../src/main/resources/application-dev.yml | 9 --------- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-dev.yml | 10 ---------- .../src/main/resources/application-prod.yml | 12 +----------- .../src/main/resources/application-test.yml | 10 ---------- .../src/main/resources/application-prod.yml | 6 +----- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-prod.yml | 6 +----- 51 files changed, 46 insertions(+), 206 deletions(-) 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 ca7979c43..75ba62b14 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,7 +25,3 @@ spring: url: ${blade.datasource.aftersales.master.url} username: ${blade.datasource.aftersales.master.username} password: ${blade.datasource.aftersales.master.password} - 627683: - url: ${blade.datasource.aftersales.627683.url} - username: ${blade.datasource.aftersales.627683.username} - password: ${blade.datasource.aftersales.627683.password} 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 3c754ca3c..350c75398 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.basic.master.url} username: ${blade.datasource.basic.master.username} password: ${blade.datasource.basic.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basic.627683.url} - username: ${blade.datasource.basic.627683.username} - password: ${blade.datasource.basic.627683.password} - 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 1b9d1bd04..c4b11462f 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,12 +33,3 @@ spring: url: ${blade.datasource.basicdata.master.url} username: ${blade.datasource.basicdata.master.username} password: ${blade.datasource.basicdata.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basicdata.627683.url} - username: ${blade.datasource.basicdata.627683.username} - password: ${blade.datasource.basicdata.627683.password} diff --git a/blade-service/logpm-business/src/main/resources/application-prod.yml b/blade-service/logpm-business/src/main/resources/application-prod.yml index a39d32f64..59d2a8af6 100644 --- a/blade-service/logpm-business/src/main/resources/application-prod.yml +++ b/blade-service/logpm-business/src/main/resources/application-prod.yml @@ -12,7 +12,7 @@ server: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,10 +25,6 @@ spring: url: ${blade.datasource.warehouse.master.url} username: ${blade.datasource.warehouse.master.username} password: ${blade.datasource.warehouse.master.password} - 627683: - url: ${blade.datasource.warehouse.627683.url} - username: ${blade.datasource.warehouse.627683.username} - password: ${blade.datasource.warehouse.627683.password} #rabbitmq配置 rabbitmq: host: 172.16.128.145 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 0c19d3fc0..66b769ed7 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -35,13 +35,3 @@ spring: url: ${blade.datasource.datasharing.master.url} username: ${blade.datasource.datasharing.master.username} password: ${blade.datasource.datasharing.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.datasharing.slave.url} - username: ${blade.datasource.datasharing.slave.username} - password: ${blade.datasource.datasharing.slave.password} - 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 eaca04452..7d2003e79 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.datasharing.master.url} username: ${blade.datasource.datasharing.master.username} password: ${blade.datasource.datasharing.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.datasharing.slave.url} - username: ${blade.datasource.datasharing.slave.username} - password: ${blade.datasource.datasharing.slave.password} - 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 eaca04452..7d2003e79 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.datasharing.master.url} username: ${blade.datasource.datasharing.master.username} password: ${blade.datasource.datasharing.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.datasharing.slave.url} - username: ${blade.datasource.datasharing.slave.username} - password: ${blade.datasource.datasharing.slave.password} - 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 0056973f3..71ea1dd7a 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,10 +25,6 @@ spring: url: ${blade.datasource.distribution.master.url} username: ${blade.datasource.distribution.master.username} password: ${blade.datasource.distribution.master.password} - 627683: - url: ${blade.datasource.distribution.627683.url} - username: ${blade.datasource.distribution.627683.username} - password: ${blade.datasource.distribution.627683.password} #rabbitmq配置 rabbitmq: host: 172.16.128.145 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 64d569938..72a0b2748 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 924f6edba..6751d263e 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 5d1e3b74c..b2c0b57e8 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 f1b3fd486..14733ea80 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 27956ec48..a75bdb54e 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-dev.yml index d27167512..57691f1c9 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-dev.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-prod.yml index 28d6724a2..19fde2639 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-prod.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-prod.yml @@ -12,7 +12,7 @@ server: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-test.yml index b781b45f0..f3bffb5ed 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-test.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application-test.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-dev.yml index a4dd4d96f..26accd576 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-dev.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-prod.yml index 480928b7a..6271798c2 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-prod.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-prod.yml @@ -12,7 +12,7 @@ server: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-test.yml index 1ae39cacf..864f08290 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-test.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/resources/application-test.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-dev.yml index 6323282be..2378003a6 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-dev.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-prod.yml index c7f7d639c..04382aebe 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-prod.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-prod.yml @@ -12,7 +12,7 @@ server: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-test.yml index f28ff4273..5632763c0 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-test.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/resources/application-test.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: 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 ddf6d2ffe..29ec1605a 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 4e04b9630..a4c6e1961 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 3cbea6a0b..6885a349e 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 58c7ad0bc..1345afe7e 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 8cfdfb8b4..bfe83f088 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 83ba070d6..c5d8a449c 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 ee4d16179..bc65f684d 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 5f0af11dc..17c272625 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 389c6c785..8e9049264 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 ec7b1d9ce..9adfbd05c 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: 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 4a8010913..a19689fdf 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: 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 348d9dd38..802db2775 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: 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 68d1f4215..7c5671cef 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -34,12 +34,3 @@ spring: url: ${blade.datasource.oldproject.master.url} username: ${blade.datasource.oldproject.master.username} password: ${blade.datasource.oldproject.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.oldproject.slave.url} - username: ${blade.datasource.oldproject.slave.username} - password: ${blade.datasource.oldproject.slave.password} 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 9683de684..df3315737 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,7 +25,3 @@ spring: url: ${blade.datasource.oldproject.master.url} username: ${blade.datasource.oldproject.master.username} password: ${blade.datasource.oldproject.master.password} - slave: - url: ${blade.datasource.oldproject.slave.url} - username: ${blade.datasource.oldproject.slave.username} - password: ${blade.datasource.oldproject.slave.password} 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..70b9795b0 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 @@ -25,8 +25,3 @@ spring: url: ${blade.datasource.oldproject.master.url} username: ${blade.datasource.oldproject.master.username} password: ${blade.datasource.oldproject.master.password} - slave: - url: ${blade.datasource.oldproject.slave.url} - username: ${blade.datasource.oldproject.slave.username} - password: ${blade.datasource.oldproject.slave.password} - 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 5fa0b1f73..f7f34bc2d 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 74ceef769..3de00a5c8 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 dc2ff6b68..51d73fdf2 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure 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 8a0a09fee..a03d28249 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.627683.url} - username: ${blade.datasource.report.627683.username} - password: ${blade.datasource.report.627683.password} - 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 8a0a09fee..a03d28249 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.627683.url} - username: ${blade.datasource.report.627683.username} - password: ${blade.datasource.report.627683.password} - 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 64d061180..a03d28249 100644 --- a/blade-service/logpm-report/src/main/resources/application-test.yml +++ b/blade-service/logpm-report/src/main/resources/application-test.yml @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.627683.url} - username: ${blade.datasource.report.627683.username} - password: ${blade.datasource.report.627683.password} - 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 efbc91530..b5b264bf9 100644 --- a/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml +++ b/blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml @@ -60,12 +60,3 @@ spring: url: ${blade.datasource.statisticsdata.master.url} username: ${blade.datasource.statisticsdata.master.username} password: ${blade.datasource.statisticsdata.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.statisticsdata.627683.url} - username: ${blade.datasource.statisticsdata.627683.username} - password: ${blade.datasource.statisticsdata.627683.password} 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 2fffc1406..7b5c40309 100644 --- a/blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml +++ b/blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -51,7 +51,3 @@ spring: url: ${blade.datasource.statisticsdata.master.url} username: ${blade.datasource.statisticsdata.master.username} password: ${blade.datasource.statisticsdata.master.password} - 627683: - url: ${blade.datasource.statisticsdata.627683.url} - username: ${blade.datasource.statisticsdata.627683.username} - password: ${blade.datasource.statisticsdata.627683.password} 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 73cae6cd9..b5b2bf0d4 100644 --- a/blade-service/logpm-supervise/src/main/resources/application-dev.yml +++ b/blade-service/logpm-supervise/src/main/resources/application-dev.yml @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.supervise.master.url} username: ${blade.datasource.supervise.master.username} password: ${blade.datasource.supervise.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.supervise.627683.url} - username: ${blade.datasource.supervise.627683.username} - password: ${blade.datasource.supervise.627683.password} - 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 f252686c7..b4ddd31b7 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.basic.master.url} username: ${blade.datasource.basic.master.username} password: ${blade.datasource.basic.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.basic.627683.url} - username: ${blade.datasource.basic.627683.username} - password: ${blade.datasource.basic.627683.password} - 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..b5b2bf0d4 100644 --- a/blade-service/logpm-supervise/src/main/resources/application-test.yml +++ b/blade-service/logpm-supervise/src/main/resources/application-test.yml @@ -33,13 +33,3 @@ spring: url: ${blade.datasource.supervise.master.url} username: ${blade.datasource.supervise.master.username} password: ${blade.datasource.supervise.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.supervise.slave.url} - username: ${blade.datasource.supervise.slave.username} - password: ${blade.datasource.supervise.slave.password} - 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 d0205f177..b68a70290 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,10 +25,6 @@ spring: url: ${blade.datasource.trunkline.master.url} username: ${blade.datasource.trunkline.master.username} password: ${blade.datasource.trunkline.master.password} - 627683: - url: ${blade.datasource.trunkline.627683.url} - username: ${blade.datasource.trunkline.627683.username} - password: ${blade.datasource.trunkline.627683.password} #rabbitmq配置 rabbitmq: host: 172.16.128.145 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 3e7aa4ed7..d934a5aec 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-test.yml @@ -38,7 +38,7 @@ spring: mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: 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 653470065..5d2e4447f 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,10 +25,6 @@ spring: url: ${blade.datasource.warehouse.master.url} username: ${blade.datasource.warehouse.master.username} password: ${blade.datasource.warehouse.master.password} - 627683: - url: ${blade.datasource.warehouse.627683.url} - username: ${blade.datasource.warehouse.627683.username} - password: ${blade.datasource.warehouse.627683.password} #rabbitmq配置 rabbitmq: host: 172.16.128.145 From fb43a67341c5101c0b6c40958bf6181fc3cd85c4 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 10 Oct 2024 20:06:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E5=91=98=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E9=85=8D=E9=80=81=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 0b7dd548c..61f483cae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -10088,8 +10088,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl