From d83a24c19a3e8d8f61836ee76345f2ce845d7b15 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 4 Feb 2020 14:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-api/epdc-api-server/src/main/resources/application.yml | 2 +-
 .../epdc-job/epdc-job-server/src/main/resources/application.yml | 2 ++
 esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml    | 2 +-
 .../epdc-points-server/src/main/resources/application.yml       | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

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 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9070</server.port>
+                <server.port>9078</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
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