From 3672f8e373b3b9c0a04110f45993bdaa0619e272 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 13 Sep 2024 13:34:23 +0800 Subject: [PATCH] =?UTF-8?q?add:=201.=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E7=A7=9F=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 9 +----- .../src/main/resources/application-test.yml | 14 +-------- .../src/main/resources/application-test.yml | 30 ++----------------- .../src/main/resources/application-test.yml | 9 +----- .../src/main/resources/application-test.yml | 12 -------- .../src/main/resources/application-test.yml | 14 +-------- 6 files changed, 6 insertions(+), 82 deletions(-) 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 7508cbc1c..2ca7983eb 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml @@ -25,11 +25,4 @@ 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} - 695224: - url: ${blade.datasource.aftersales.695224.url} - username: ${blade.datasource.aftersales.695224.username} - password: ${blade.datasource.aftersales.695224.password} + diff --git a/blade-service/logpm-business/src/main/resources/application-test.yml b/blade-service/logpm-business/src/main/resources/application-test.yml index 77e21d981..75004f829 100644 --- a/blade-service/logpm-business/src/main/resources/application-test.yml +++ b/blade-service/logpm-business/src/main/resources/application-test.yml @@ -25,19 +25,7 @@ spring: url: ${blade.datasource.business.master.url} username: ${blade.datasource.business.master.username} password: ${blade.datasource.business.master.password} - 627683: - url: ${blade.datasource.business.627683.url} - username: ${blade.datasource.business.627683.username} - password: ${blade.datasource.business.627683.password} - 645789: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.business.645789.url} - username: ${blade.datasource.business.645789.username} - password: ${blade.datasource.business.645789.password} + #rabbitmq配置 rabbitmq: host: 192.168.2.110 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 cd0503369..b81fd7839 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -60,30 +60,4 @@ spring: url: ${blade.datasource.distribution.master.url} username: ${blade.datasource.distribution.master.username} password: ${blade.datasource.distribution.master.password} - 627683: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.distribution.627683.url} - username: ${blade.datasource.distribution.627683.username} - password: ${blade.datasource.distribution.627683.password} - 695224: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.distribution.695224.url} - username: ${blade.datasource.distribution.695224.username} - password: ${blade.datasource.distribution.695224.password} - 645789: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.distribution.645789.url} - username: ${blade.datasource.distribution.645789.username} - password: ${blade.datasource.distribution.645789.password} + 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 ed72a5140..ea213d24f 100644 --- a/blade-service/logpm-statisticsdata/src/main/resources/application-test.yml +++ b/blade-service/logpm-statisticsdata/src/main/resources/application-test.yml @@ -51,11 +51,4 @@ 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} - 695224: - url: ${blade.datasource.statisticsdata.695224.url} - username: ${blade.datasource.statisticsdata.695224.username} - password: ${blade.datasource.statisticsdata.695224.password} + 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 93370deb3..3e7aa4ed7 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-test.yml @@ -51,15 +51,3 @@ 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} - 695224: - url: ${blade.datasource.trunkline.695224.url} - username: ${blade.datasource.trunkline.695224.username} - password: ${blade.datasource.trunkline.695224.password} - 645789: - url: ${blade.datasource.trunkline.645789.url} - username: ${blade.datasource.trunkline.645789.username} - password: ${blade.datasource.trunkline.645789.password} 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 50b981cdf..7fd069bf6 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,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: dynamic: druid: @@ -25,18 +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} - 695224: - url: ${blade.datasource.warehouse.695224.url} - username: ${blade.datasource.warehouse.695224.username} - password: ${blade.datasource.warehouse.695224.password} - 645789: - url: ${blade.datasource.warehouse.645789.url} - username: ${blade.datasource.warehouse.645789.username} - password: ${blade.datasource.warehouse.645789.password} #rabbitmq配置 rabbitmq: host: 192.168.2.110