From 35f746dc613ffe30201a3749f8fddf19ab033728 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 14 Aug 2020 14:01:08 +0800
Subject: [PATCH 01/17] 130:commonservice+1

---
 .../common-service-server/deploy/docker-compose-dev.yml       | 2 +-
 .../epmet-common-service/common-service-server/pom.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
index 6ec4d2651e..18920f1ad9 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.9
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index cbf701780f..87e59c2c83 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>
@@ -107,7 +107,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
                 <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>

From ed3393a847c91ecc035932aa64d656e6365a9294 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 14 Aug 2020 16:04:57 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/ComponentVerifyTicketServiceImpl.java  | 4 ++--
 .../main/java/com/epmet/service/impl/WarrantServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/CustomerMpDao.xml               | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index 7377950f1f..a214963743 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -725,8 +725,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
             log.error("授权完成发送钉钉消息失败，原因：未查询到客户信息，客户Id->" + customerId);
             return null;
         }
-        String secret = "SEC68536dfc393790a35cb08e9bc531dad0c654cf84bb53b76667fa7a7f2cbed829";
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=c3d34eac31acde342d37a01ac1792beac5b17b2890b4f5015e2759546fed1331";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
         //2.拼接钉钉消息内容并发送
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index 8e1d2bfcc7..f75d0c7c4b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -254,8 +254,8 @@ public class WarrantServiceImpl implements WarrantService {
         }
         request.setMarkdown(markdown);
         log.info("robot需要发送的内容为："+markdown.getText());
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=2438902efbcc15909deb7076963c5cbe2d6fdbfdb9d66750faab2f2cce6eb09f";
-        String secret = "SECe3c785dd254659608667a4a623acc5a0395636143411617f6e36838b48941e74";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
         HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret);
     }
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
index 6291b43941..f6ca2c513d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
@@ -42,7 +42,8 @@
     <!-- 修改小程序授权的状态 -->
     <update id="updateAuthorizationFlag">
         UPDATE customer_mp
-            SET authorization_flag = 0
+            SET authorization_flag = 0,
+                app_id = ''
         WHERE
             app_id = #{authAppId}
     </update>

From 51e67611f8cec956a47feae3019f9fa3480eba37 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 14 Aug 2020 17:30:43 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java | 1 +
 .../src/main/java/com/epmet/service/impl/WarrantServiceImpl.java | 1 +
 .../src/main/resources/mapper/CustomerMpDao.xml                  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index a214963743..a23d9ac77f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -727,6 +727,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         }
         String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
         String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
+
         //2.拼接钉钉消息内容并发送
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index f75d0c7c4b..96324eed23 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -257,6 +257,7 @@ public class WarrantServiceImpl implements WarrantService {
         String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
         String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
         HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret);
+
     }
 
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
index f6ca2c513d..85a6aaea0c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
@@ -48,6 +48,7 @@
             app_id = #{authAppId}
     </update>
 
+
     <!-- 根据 客户Id和授权方AppId查询clientType -->
     <select id="selectClientTypeByCustomerIdAndAuthId" resultType="java.lang.String">
         SELECT

From 53635864a7471c31b501fbb1f13a6a0cb928c908 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 14 Aug 2020 17:53:59 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E9=83=A8=E7=BD=B2third?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-dev.yml            | 2 +-
 .../epmet-third-server/deploy/docker-compose-test.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index 09c911c908..f745b5cfd0 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.129
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.131
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
index c1416cc71c..e368b27eda 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.128
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.131
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 1192cb671b..491700fcb5 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.129</version>
+    <version>0.0.130</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From 89811dcc3c8b75d22c4a33342fdb8fd239ba3d93 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 14 Aug 2020 18:00:33 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E9=83=A8=E7=BD=B2third?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 491700fcb5..c0586fac7e 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.130</version>
+    <version>0.0.131</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From d0be0542ea36f8b79bb6d86026f531dce21f30c7 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 14 Aug 2020 18:01:18 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=8D=87=E7=BA=A7third?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 491700fcb5..c0586fac7e 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.130</version>
+    <version>0.0.131</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From 5117d8421870559d64345c2be9c2d341918f4075 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 14 Aug 2020 18:28:18 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BF=E8=81=94?=
 =?UTF-8?q?=E4=BA=91=20=E6=AD=A3=E5=BC=8F=E6=B6=88=E6=81=AF=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-common-service/common-service-server/pom.xml      | 6 +++---
 epmet-module/epmet-heart/epmet-heart-server/pom.xml         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index 87e59c2c83..a46a1332ee 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -188,10 +188,10 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <!--亿联云消息网关配置-->
-                <elink.mq.host>https://epmet-dev.elinkservice.cn/estos/</elink.mq.host>
+                <elink.mq.host>https://estos.elinkservice.cn:7519/estos/</elink.mq.host>
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
-                <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
-                <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
+                <elink.mq.appId>202008141820598348026098a1b5dd0bc63a1e2418e275d1b</elink.mq.appId>
+                <elink.mq.token>7ce17f65826539ff3e8616dccd4b70fc</elink.mq.token>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index f13e5cefd5..7744437e89 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -222,10 +222,10 @@
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--亿联云消息网关配置-->
-                <elink.mq.host>https://epmet-cloud.elinkservice.cn/estos/</elink.mq.host>
+                <elink.mq.host>https://estos.elinkservice.cn:7519/estos/</elink.mq.host>
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
-                <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
-                <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
+                <elink.mq.appId>202008141820598348026098a1b5dd0bc63a1e2418e275d1b</elink.mq.appId>
+                <elink.mq.token>7ce17f65826539ff3e8616dccd4b70fc</elink.mq.token>
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>

From ff8f1eef5d13c1eec86e4c186a7cb52e95d62344 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 14 Aug 2020 19:23:14 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=8D=87=E7=BA=A7heart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 .../epmet-heart-server/deploy/docker-compose-prod.yml           | 2 +-
 .../epmet-heart-server/deploy/docker-compose-test.yml           | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index e931198209..4d32065b75 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.51
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.52
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
index aecde65c37..044248ebe9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.52
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
index 1ae61f1f30..a5cef7fb1f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.51
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.52
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 7744437e89..a9c0439d2b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.51</version>
+    <version>0.0.52</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

From 43abf705990a572e2aa86d5c62f5ee208f2a48a6 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 17 Aug 2020 14:53:58 +0800
Subject: [PATCH 09/17] =?UTF-8?q?resi-group=20=20=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-dev.yml  | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 44921cae4f..82c760eeb0 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.64
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.65
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 1e66ca7900..f93bd8bc88 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.64</version>
+    <version>0.3.65</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

From 9c343e42bc6b8148de504730c0aa22cc65231338 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 17 Aug 2020 16:08:57 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E9=83=A8=E7=BD=B2gateWay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/deploy/docker-compose-dev.yml | 2 +-
 epmet-gateway/pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index 894f42b3d7..de78c36557 100644
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.30
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.31
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index d6d74e1b5b..b8996a9f75 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.30</version>
+    <version>0.3.31</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

From 0fd867815fd77d66c80ff866aa4b8212b545d948 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 17 Aug 2020 16:58:05 +0800
Subject: [PATCH 11/17] =?UTF-8?q?enterGrid=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8E=BB=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7Id=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E5=AE=A2=E6=88=B7=E7=89=88=E6=9C=AC(=E5=85=9A?=
 =?UTF-8?q?=E7=BE=A4e=E4=BA=8B=E9=80=9A)=EF=BC=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E5=A4=9A=E4=B8=AA=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=AA=E8=83=BD=E6=B3=A8=E5=86=8C=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=EF=BC=8C=E5=8D=95=E5=AE=A2=E6=88=B7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC(=E4=B8=8D=E5=90=8CappId)=EF=BC=8C=E5=90=8C=E6=A0=B7?=
 =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E8=B4=A6=E6=88=B7=E5=9C=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=98=AF=E4=B8=8D=E5=90=8C=E7=9A=84=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=9B=A0=E6=AD=A4=E4=B9=9F=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8CcustomerId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-user-server/src/main/resources/mapper/UserRoleDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index 5ec9e5a268..6e8d2244db 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -35,7 +35,7 @@
             AND
             ur.USER_ID = #{userId}
             AND
-            ur.CUSTOMER_ID = #{customerId}
+        /*    ur.CUSTOMER_ID = #{customerId}*/
             <if test='null != gridId and "" != gridId'>
                 AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>

From dcf8e83e7592716e42240a69ab537f73a03d79bc Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 17 Aug 2020 17:04:37 +0800
Subject: [PATCH 12/17] user +1   -> 117

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +-
 epmet-user/epmet-user-server/pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 60fb75bf2c..8555b3ea46 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.117
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index a1575aa794..c92fe0c949 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.116</version>
+    <version>0.3.117</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 032463eabe06c654960bb574f7cc4e4af2508139 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 18 Aug 2020 00:47:35 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E9=9B=86=E7=BE=A4=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=B7=E6=B1=82=E8=AE=A4=E8=AF=81=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=E5=92=8C=E6=8B=A6=E6=88=AA=E5=99=A8=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/annotation/ExternalRequestAuth.java | 32 +++++++++++++++++
 .../aspect/ExternalRequestAuthAspect.java     | 35 +++++++++++++++++++
 .../com/epmet/controller/TestController.java  | 10 +++++-
 .../java/com/epmet/service/TestService.java   |  7 ++++
 .../epmet/service/impl/TestServiceImpl.java   | 16 +++++++++
 5 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java
new file mode 100644
index 0000000000..0cf03c25b7
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 http://www.renren.io
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.epmet.commons.tools.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 需要认证的外部请求
+ * @Author wxz
+ * @Description
+ * @Date 2020/4/23 16:17
+ **/
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExternalRequestAuth {
+
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java
new file mode 100644
index 0000000000..fa9156f8f3
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java
@@ -0,0 +1,35 @@
+package com.epmet.commons.tools.aspect;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 外部请求认证切面
+ */
+@Aspect
+@Component
+public class ExternalRequestAuthAspect {
+
+    /**
+     * 拦截加了ExternalRequestAuth注解的方法
+     * @param point
+     * @throws Throwable
+     */
+    @Before("@annotation(com.epmet.commons.tools.annotation.ExternalRequestAuth)")
+    public void before(JoinPoint point) throws Throwable {
+        System.out.println("切面执行了");
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) requestAttributes;
+        HttpServletRequest request = sra.getRequest();
+        String token = request.getHeader("token");
+        System.out.println("token:" + token);
+    }
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java
index 438f105eab..b8ab2dbda6 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java
@@ -1,5 +1,8 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.ExternalRequestAuth;
+import com.epmet.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,9 +12,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("test")
 public class TestController {
 
+    @Autowired
+    private TestService testService;
+
+    @ExternalRequestAuth
     @GetMapping("test")
     public void test() {
-        System.out.println(666);
+        System.out.println("TestController -> test()");
+        testService.test();
     }
 
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java
new file mode 100644
index 0000000000..587690221c
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java
@@ -0,0 +1,7 @@
+package com.epmet.service;
+
+public interface TestService {
+
+    void test();
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
new file mode 100644
index 0000000000..99ba370525
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
@@ -0,0 +1,16 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.annotation.ExternalRequestAuth;
+import com.epmet.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TestServiceImpl implements TestService {
+
+    @ExternalRequestAuth
+    @Override
+    public void test() {
+        System.out.println("TestService -> test()");
+    }
+}

From 40669bca4999a1bbe6fc27822d2bb81c78cd533d Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 18 Aug 2020 09:19:05 +0800
Subject: [PATCH 14/17] =?UTF-8?q?resi-group=20=E7=89=88=E6=9C=AC=E5=8F=B7+?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-dev.yml  | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 82c760eeb0..29a259a5d2 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.65
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.66
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index f93bd8bc88..eaef30f6e7 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.65</version>
+    <version>0.3.66</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

From 7a31fc276cec88515dae89438706067bb409a50c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 18 Aug 2020 09:29:10 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E8=BA=AB=E4=BB=BD=E4=BF=A1=E6=81=AF=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-user-server/src/main/resources/mapper/UserRoleDao.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index 6e8d2244db..803fa40621 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -34,8 +34,6 @@
             ur.DEL_FLAG = 0
             AND
             ur.USER_ID = #{userId}
-            AND
-        /*    ur.CUSTOMER_ID = #{customerId}*/
             <if test='null != gridId and "" != gridId'>
                 AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>

From 4f9d8639c42e54fdd4799fcf8b7711ace0189fe0 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 18 Aug 2020 09:32:33 +0800
Subject: [PATCH 16/17] user    +1    118

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +-
 epmet-user/epmet-user-server/pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 8555b3ea46..15c0789d48 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.117
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.118
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index c92fe0c949..0d7cdfa705 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.117</version>
+    <version>0.3.118</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 2cccd03131b5cbe783d32cc049e0c7f9fef110af Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 18 Aug 2020 10:09:20 +0800
Subject: [PATCH 17/17] =?UTF-8?q?user=20=E5=8D=87=E7=BA=A7=20=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5130=20=20=20=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B0=20118?=
 =?UTF-8?q?=20=20=20=20=20=20=20[test.yml]=20group=E5=8D=87=E7=BA=A7=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5130=20=20=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=88=B0=2066=20=20=20=20=20=20=20=20[test.yml]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index 72a6a10442..f88d341ad0 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.64
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.66
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index 51d4f40331..0dfe4fac89 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.118
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络