From 8413e44ab5ecd8d3212002be27f7c20b4760e407 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 17 Sep 2019 09:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml        | 4 ++--
 esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml  | 2 +-
 .../epdc-events-server/src/main/resources/application.yml     | 2 ++
 .../epdc-module/epdc-message/epdc-message-server/pom.xml      | 2 +-
 esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index ba0730e3c..289154d3c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -180,10 +180,10 @@
                 <spring.redis.password>elink888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://121.42.29.81:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://121.42.29.81:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 362bb4782..437efb4d6 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -142,7 +142,7 @@
                 <![CDATA[jdbc:mysql://121.42.29.81:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
             </spring.datasource.druid.url>
             <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-            <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+            <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
             <!-- nacos -->
             <nacos.register-enabled>true</nacos.register-enabled>
             <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index 2165c67fd..354f6aeac 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -4,6 +4,8 @@ server:
     context-path: /events
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epdc-events-server
   # 环境 dev|test|prod
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 22110dbbc..7d34b8541 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -170,7 +170,7 @@
                     <![CDATA[jdbc:mysql://121.42.29.81:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index b30390799..b368e2741 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -178,7 +178,7 @@
                     <![CDATA[jdbc:mysql://121.42.29.81:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>