From 2a9932703a6f5ff43bda1f31de387c7b26e0b525 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 8 May 2020 13:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=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-admin/pom.xml  | 15 ++++++---------
 epdc-cloud-gateway-yushan |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml
index 81ee34c..9bdda78 100644
--- a/epdc-cloud-admin/pom.xml
+++ b/epdc-cloud-admin/pom.xml
@@ -218,24 +218,21 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.0.54</spring.redis.host>
+                <spring.redis.host>172.16.1.243</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>Elink833066</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.52:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.1.243:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace></nacos.namespace>
 
                 <spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
 
                 <!--党群e家小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
-                <!--先锋市北小程序配置-->
-                <!--                <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>-->
-                <!--                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>-->
+                <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
+                <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
                 <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
@@ -244,12 +241,12 @@
                 <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com: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>Elink@833066</spring.datasource.druid.password>
                 <!--RocketMQ-->
-                <rocketmq.name.server>172.16.0.52:9876;172.16.0.54:9876</rocketmq.name.server>
+                <rocketmq.name.server>172.16.1.242:9876;172.16.1.243:9876</rocketmq.name.server>
                 <rocketmq.producer.group>organizationGroup</rocketmq.producer.group>
             </properties>
         </profile>
diff --git a/epdc-cloud-gateway-yushan b/epdc-cloud-gateway-yushan
index 2930742..a7256c0 160000
--- a/epdc-cloud-gateway-yushan
+++ b/epdc-cloud-gateway-yushan
@@ -1 +1 @@
-Subproject commit 29307425ebc6c065fa5c2559dd4aa1013a8a7a77
+Subproject commit a7256c02e85ef3bc84dc845cd63b1d7021f706f1