From 8a20f4d441894ad7cfa1093858809032856d0757 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Mon, 18 May 2020 10:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E6=B5=8B=E8=AF=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-websocket/Dockerfile |  2 +-
 epdc-cloud-websocket/pom.xml    | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/epdc-cloud-websocket/Dockerfile b/epdc-cloud-websocket/Dockerfile
index 9e1c30f..fc459b9 100644
--- a/epdc-cloud-websocket/Dockerfile
+++ b/epdc-cloud-websocket/Dockerfile
@@ -16,5 +16,5 @@ ENV DATAPATH /data
 # 挂载/data目录到主机
 VOLUME $DATAPATH
 # 启动容器时执行
-ENTRYPOINT java -jar -Xmx1024m $JAR_PATH
+ENTRYPOINT java -jar $JAR_CONFIG $JAR_PATH
 EXPOSE ${SERVER_PORT}
diff --git a/epdc-cloud-websocket/pom.xml b/epdc-cloud-websocket/pom.xml
index facc5f4..60a572a 100644
--- a/epdc-cloud-websocket/pom.xml
+++ b/epdc-cloud-websocket/pom.xml
@@ -161,7 +161,7 @@
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
 
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
@@ -196,19 +196,16 @@
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</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>wx50ebeb95943868cd</wx.ma.appId>
+                <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
             </properties>
         </profile>