diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml index ef5f66ad4..9f3311f25 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring: name: epdc-api-server # 环境 dev|test|prod profiles: - active: dev + active: @spring.profiles.active@ messages: encoding: UTF-8 basename: i18n/messages,i18n/messages_common diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml index b3b7878f1..cfd80c920 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml @@ -23,6 +23,8 @@ server: context-path: /job spring: + main: + allow-bean-definition-overriding: true application: name: epdc-job-server # 环境 dev|test|prod diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml index 018f200ac..b50a3ddb2 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml @@ -144,7 +144,7 @@ test - 9070 + 9078 2 47.104.224.45 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml index 7025db4bf..715f9e7f9 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml @@ -4,6 +4,8 @@ server: context-path: /points spring: + main: + allow-bean-definition-overriding: true application: name: epdc-points-server # 环境 dev|test|prod