diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index f402978001..2be4349624 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /job spring: + main: + allow-bean-definition-overriding: true application: name: epmet-job-server #环境 dev|test|prod diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index f34d2325d4..f44a4099e0 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /message spring: + main: + allow-bean-definition-overriding: true application: name: epmet-message-server #环境 dev|test|prod diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 28570008ee..ea11cf21ef 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -92,12 +92,6 @@ fastdfs-client ${fastdfs.version} - - - io.github.openfeign - feign-httpclient - 10.3.0 - diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index ff736a728f..eb5ed56fda 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /oss spring: + main: + allow-bean-definition-overriding: true application: name: epmet-oss-server #环境 dev|test|prod diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml index cfe7b27b8a..9852c40609 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /oper/access spring: + main: + allow-bean-definition-overriding: true application: name: oper-access-server #环境 dev|test|prod diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index 5979925078..74241043ea 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /oper/crm spring: + main: + allow-bean-definition-overriding: true application: name: oper-crm-server #环境 dev|test|prod diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 4cbec67c8a..d64cf2db02 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /oper/customize spring: + main: + allow-bean-definition-overriding: true application: name: oper-customize-server #环境 dev|test|prod