From 17a5c8be3b1fcbe835cd38935d35a7ae8faa45e3 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 30 Apr 2020 17:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-admin/epdc-admin-server/pom.xml      | 25 ++++++++---------
 .../epdc-api/epdc-api-server/pom.xml          | 27 ++++++++++---------
 .../epdc-events/epdc-events-server/pom.xml    | 25 ++++++++---------
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index db4d8b4e..3ab9a174 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -156,12 +156,14 @@
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-                <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+
+                <!--居民端小程序配置-->
+                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
@@ -191,15 +193,14 @@
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-                <!--小程序配置-->
-                <!--                <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>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
-                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
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 3b31ad0d..11cb1c21 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
@@ -166,17 +166,20 @@
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
+
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
                 <wx.mp.configs.token>111</wx.mp.configs.token>
                 <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+
+                <!--居民端小程序配置-->
+                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
+
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
             </properties>
         </profile>
 
@@ -202,20 +205,20 @@
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
+
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
                 <wx.mp.configs.token>111</wx.mp.configs.token>
                 <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
-                <!--小程序配置-->
-                <!--                <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>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
+
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
-                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
             </properties>
         </profile>
 
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 c4e1e45a..efdf0006 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
@@ -165,12 +165,14 @@
 
                 <docker.tag>dev</docker.tag>
 
-                <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+                <!--居民端小程序配置-->
+                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
+
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -204,15 +206,14 @@
 
                 <docker.tag>test</docker.tag>
 
-                <!--小程序配置-->
-<!--                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
-<!--                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
+                <!--居民端小程序配置-->
+                <wx.ma.appId>wx6dcf544cdae7d4ec</wx.ma.appId>
+                <wx.ma.secret>9e0882274ad3821400370312a56a8470</wx.ma.secret>
 
-                <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
-                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
-                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
+                <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>