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/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