From 47977d3cf1ee7251372630e2984cd2b2f6f78c8d Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 27 Aug 2021 18:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan  |  2 +-
 epdc-cloud-commons-yushan |  2 +-
 epdc-cloud-events/pom.xml | 31 ++++++++++++++++---------------
 epdc-cloud-parent-yushan  |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index f44c880..a87f857 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit f44c8804c072a0eaecd2186f371bc2a43d83f3b4
+Subproject commit a87f857cb65f7fc7a32937c714ae520c79f3a67c
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 14ba011..235f56d 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 14ba01162799b397ec4cae757f29790fc88df9cb
+Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155
diff --git a/epdc-cloud-events/pom.xml b/epdc-cloud-events/pom.xml
index 7d89706..f7281dd 100644
--- a/epdc-cloud-events/pom.xml
+++ b/epdc-cloud-events/pom.xml
@@ -181,10 +181,16 @@
 
                 <server.port>9066</server.port>
 
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
+
+                <!-- nacos -->
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -192,11 +198,6 @@
                 <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip></nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
-
                 <!--党群e家小程序配置-->
                 <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
                 <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
@@ -224,10 +225,10 @@
 
                 <server.port>17023</server.port>
 
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -235,9 +236,9 @@
                 <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip></nacos.ip>
+                <nacos.ip>115.29.142.202</nacos.ip>
                 <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
 
                 <!--党群e家小程序配置-->
diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan
index 7d5b870..db92131 160000
--- a/epdc-cloud-parent-yushan
+++ b/epdc-cloud-parent-yushan
@@ -1 +1 @@
-Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
+Subproject commit db9213163f8005cba05ad21334bebb72484174b7