From 14bef4f8fbb80ff2fa10678fdb18b6c6a2b2b554 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 11 Aug 2020 17:31:22 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-test.yml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 21fe7bc177..c192babb90 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.119
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.121
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

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

---
 .../epmet-point-server/deploy/docker-compose-test.yml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
index 581b0b1ff6..3d6224ee4d 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.38
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

From b3e254433b76213fabe68c6b63833ed0976ea82a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 12 Aug 2020 17:28:27 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-test.yml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c192babb90..848d81f6f3 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.121
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.123
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From 0e45a343cbb2c82ab405e6b47e3d8ab4a668196e Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 12 Aug 2020 17:54:22 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=BF=87=E5=BF=97=E6=84=BF=E8=80=85=E7=9A=84=E9=99=8C=E7=94=9F?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserWechatDao.xml                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 5120737f88..98a5c58075 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -91,6 +91,7 @@
     </select>
 
     <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
+    <!-- 不显示没有认证过志愿者的陌生人，以Surname判断是否注册志愿者 -->
     <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
         SELECT
         wechat.USER_ID,
@@ -104,6 +105,7 @@
         WHERE
             wechat.DEL_FLAG = '0'
             AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME <![CDATA[ <> ]]> '')
+            AND (base.SURNAME IS NOT NULL OR base.SURNAME <![CDATA[ <> ]]> '')
             <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
                 wechat.USER_ID = #{item}
             </foreach>

From 6c852ac6ae4ab4a7b68864de738c143aeb5f0803 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 12 Aug 2020 22:54:50 +0800
Subject: [PATCH 05/10] =?UTF-8?q?docker=E5=A2=9E=E5=8A=A0restart=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 3 ++-
 epmet-user/epmet-user-server/pom.xml                       | 2 +-
 2 files changed, 3 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 c4678d66cd..100b22ed13 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.113
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.114
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 6b4dbb7a3d..cf9a483277 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.113</version>
+    <version>0.3.114</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From a8ef533f92c22c2843b15dc61e81dc50eeaf1ff0 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 12 Aug 2020 23:08:11 +0800
Subject: [PATCH 06/10] =?UTF-8?q?docker=E5=A2=9E=E5=8A=A0restart=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml           | 3 ++-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml            | 2 +-
 .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml   | 3 ++-
 epmet-module/epmet-job/epmet-job-server/pom.xml                | 2 +-
 .../epmet-point-server/deploy/docker-compose-dev.yml           | 3 ++-
 epmet-module/epmet-point/epmet-point-server/pom.xml            | 2 +-
 .../epmet-third-server/deploy/docker-compose-dev.yml           | 3 ++-
 epmet-module/epmet-third/epmet-third-server/pom.xml            | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml     | 3 ++-
 epmet-module/oper-crm/oper-crm-server/pom.xml                  | 2 +-
 10 files changed, 15 insertions(+), 10 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 bef16fbcd9..b06037a0ba 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.47
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.48
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index c027771de8..9a7c7f559c 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.47</version>
+    <version>0.0.48</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
index 8c9ba33c2d..eb9aa984f8 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.25
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index e1e049d0d1..c6d3a7a333 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-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.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
index b6e8d3f329..615c0d0b94 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.39
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.40
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml
index e5cf1cc84f..08c9720eee 100644
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@@ -3,7 +3,7 @@
          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.39</version>
+    <version>0.0.40</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>
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 15b06dbbb3..250b240692 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.123
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.124
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 10d75a3848..6149dc735d 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.123</version>
+    <version>0.0.124</version>
 
     <parent>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
index e35c7ad0a8..108c608acc 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.65
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.66
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 075a098902..4ae4fb79aa 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-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>oper-crm</artifactId>

From 6349521c01e4d2829f0c37391d03b043423bd280 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 12 Aug 2020 23:33:59 +0800
Subject: [PATCH 07/10] =?UTF-8?q?docker=E5=A2=9E=E5=8A=A0restart=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml   | 1 +
 epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml  | 1 +
 epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml  | 1 +
 epmet-auth/deploy/docker-compose-dev.yml                       | 1 +
 epmet-auth/deploy/docker-compose-prod.yml                      | 1 +
 epmet-auth/deploy/docker-compose-test.yml                      | 1 +
 epmet-gateway/deploy/docker-compose-dev.yml                    | 1 +
 epmet-gateway/deploy/docker-compose-prod.yml                   | 1 +
 epmet-gateway/deploy/docker-compose-test.yml                   | 1 +
 .../data-report-server/deploy/docker-compose-dev.yml           | 1 +
 .../data-report-server/deploy/docker-compose-prod.yml          | 1 +
 .../data-report-server/deploy/docker-compose-test.yml          | 1 +
 .../data-statistical-server/deploy/docker-compose-dev.yml      | 1 +
 .../data-statistical-server/deploy/docker-compose-prod.yml     | 1 +
 .../data-statistical-server/deploy/docker-compose-test.yml     | 1 +
 .../epmet-activiti-server/deploy/docker-compose-dev.yml        | 1 +
 .../epmet-activiti-server/deploy/docker-compose-prod.yml       | 1 +
 .../epmet-activiti-server/deploy/docker-compose-test.yml       | 1 +
 .../common-service-server/deploy/docker-compose-dev.yml        | 3 ++-
 .../common-service-server/deploy/docker-compose-prod.yml       | 1 +
 .../common-service-server/deploy/docker-compose-test.yml       | 1 +
 .../epmet-common-service/common-service-server/pom.xml         | 2 +-
 .../epmet-heart-server/deploy/docker-compose-prod.yml          | 1 +
 .../epmet-heart-server/deploy/docker-compose-test.yml          | 1 +
 .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml  | 1 +
 .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml  | 1 +
 .../epmet-message-server/deploy/docker-compose-dev.yml         | 3 ++-
 .../epmet-message-server/deploy/docker-compose-prod.yml        | 1 +
 .../epmet-message-server/deploy/docker-compose-test.yml        | 1 +
 epmet-module/epmet-message/epmet-message-server/pom.xml        | 2 +-
 .../epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml   | 3 ++-
 .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml  | 1 +
 .../epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml  | 1 +
 epmet-module/epmet-oss/epmet-oss-server/pom.xml                | 2 +-
 .../epmet-point-server/deploy/docker-compose-prod.yml          | 1 +
 .../epmet-point-server/deploy/docker-compose-test.yml          | 1 +
 .../epmet-third-server/deploy/docker-compose-prod.yml          | 1 +
 .../epmet-third-server/deploy/docker-compose-test.yml          | 1 +
 .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 1 +
 .../gov-access-server/deploy/docker-compose-prod.yml           | 1 +
 .../gov-access-server/deploy/docker-compose-test.yml           | 1 +
 .../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml     | 1 +
 .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml    | 1 +
 .../gov-grid/gov-grid-server/deploy/docker-compose-test.yml    | 1 +
 .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml   | 1 +
 .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml  | 1 +
 .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml  | 1 +
 .../gov-mine/gov-mine-server/deploy/docker-compose-dev.yml     | 1 +
 .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml    | 1 +
 .../gov-mine/gov-mine-server/deploy/docker-compose-test.yml    | 1 +
 .../gov-org/gov-org-server/deploy/docker-compose-dev.yml       | 1 +
 .../gov-org/gov-org-server/deploy/docker-compose-prod.yml      | 1 +
 .../gov-org/gov-org-server/deploy/docker-compose-test.yml      | 1 +
 .../gov-project-server/deploy/docker-compose-dev.yml           | 1 +
 .../gov-project-server/deploy/docker-compose-prod.yml          | 1 +
 .../gov-project-server/deploy/docker-compose-test.yml          | 1 +
 .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml   | 1 +
 .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml  | 1 +
 .../gov-voice/gov-voice-server/deploy/docker-compose-test.yml  | 1 +
 .../oper-access-server/deploy/docker-compose-dev.yml           | 1 +
 .../oper-access-server/deploy/docker-compose-prod.yml          | 1 +
 .../oper-access-server/deploy/docker-compose-test.yml          | 1 +
 .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml    | 1 +
 .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml    | 1 +
 .../oper-customize-server/deploy/docker-compose-dev.yml        | 3 ++-
 .../oper-customize-server/deploy/docker-compose-prod.yml       | 1 +
 .../oper-customize-server/deploy/docker-compose-test.yml       | 1 +
 epmet-module/oper-customize/oper-customize-server/pom.xml      | 2 +-
 .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 1 +
 .../resi-group-server/deploy/docker-compose-prod.yml           | 1 +
 .../resi-group-server/deploy/docker-compose-test.yml           | 1 +
 .../resi-guide/resi-guide-server/deploy/docker-compose-dev.yml | 1 +
 .../resi-guide-server/deploy/docker-compose-prod.yml           | 1 +
 .../resi-guide-server/deploy/docker-compose-test.yml           | 1 +
 .../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml   | 1 +
 .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml  | 1 +
 .../resi-hall/resi-hall-server/deploy/docker-compose-test.yml  | 1 +
 .../resi-home/resi-home-server/deploy/docker-compose-dev.yml   | 1 +
 .../resi-home/resi-home-server/deploy/docker-compose-prod.yml  | 1 +
 .../resi-home/resi-home-server/deploy/docker-compose-test.yml  | 1 +
 .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml   | 1 +
 .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml  | 1 +
 .../resi-mine/resi-mine-server/deploy/docker-compose-test.yml  | 1 +
 .../resi-partymember-server/deploy/docker-compose-dev.yml      | 1 +
 .../resi-partymember-server/deploy/docker-compose-prod.yml     | 1 +
 .../resi-partymember-server/deploy/docker-compose-test.yml     | 1 +
 .../resi-voice/resi-voice-server/deploy/docker-compose-dev.yml | 1 +
 .../resi-voice-server/deploy/docker-compose-prod.yml           | 1 +
 .../resi-voice-server/deploy/docker-compose-test.yml           | 1 +
 epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 1 +
 .../epmet-openapi-scan/deploy/docker-compose-prod.yml          | 1 +
 .../epmet-openapi-scan/deploy/docker-compose-test.yml          | 1 +
 epmet-user/epmet-user-server/deploy/docker-compose-prod.yml    | 1 +
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml    | 1 +
 94 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
index 1680c643c1..1b77c09bda 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
index 374839cc03..e5d93e9ac3 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
index 4be6cb1aca..6ae49f3aa3 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index ea19dc5393..c26333a04a 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml
index 03952c3511..a73bb97f30 100644
--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/epmet-auth/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml
index 3f4980855e..bfc9acc44b 100644
--- a/epmet-auth/deploy/docker-compose-test.yml
+++ b/epmet-auth/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index c15a722894..894f42b3d7 100644
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml
index cec8fb60da..44d4d7b7b6 100644
--- a/epmet-gateway/deploy/docker-compose-prod.yml
+++ b/epmet-gateway/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml
index 0dffa528b7..57a4913b0e 100644
--- a/epmet-gateway/deploy/docker-compose-test.yml
+++ b/epmet-gateway/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index 0aadc7d5d7..116fd812c5 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
index 3dc6b38133..ad6ed50dc2 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
index 715150fa90..9a3f62f01c 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index d507e12a9f..0d7479b1ec 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
index 9d233f5d09..029e37c343 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
index 9fd06da22f..2e5a7af0e8 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
index f3b9c04a2e..8c5dcd8823 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
index 6d6c5f0207..ce9db6deb1 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
index f312b829c2..aea13ac662 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 35de411d07..6ec4d2651e 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.7
+    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.8
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
index 9cebc2aeae..548d86d6f9 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
index ff123e8c38..80cb75cbb5 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 8c65ae7e4a..cbf701780f 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.7</version>
+    <version>0.3.8</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>
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 48b1d7310e..aecde65c37 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
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 d9ce495c67..22ff6e5924 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
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
index c7fb684c71..6b4899de0d 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
index 2749306424..5c02cae59e 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
index 5c8fea6fb7..6edefa45a8 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.27
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.28
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
index 94e253c048..b270804c81 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
index 110a88c288..bbda7e873c 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index ab4397473b..9240c470c1 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-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.27</version>
+    <version>0.3.28</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
index 058634f3f1..2a5fc11a89 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.25
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络
@@ -11,6 +11,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
index 8cd0498d63..0042119b7d 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
@@ -11,6 +11,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
index 6978f9d660..4dc76991bb 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
@@ -11,6 +11,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 5947b835d9..482d0a206c 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-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.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
index 31c7258001..0edc524aed 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
index 3d6224ee4d..023a87492b 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index 357f06133b..75dee17ae1 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 848d81f6f3..4efc51d87e 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
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index a16550345f..0f0fd6fe31 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
index ae2e609aa4..4f95fcde7b 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
index 197b6e3b6d..2bbc8ec394 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 6a66266814..d3ff3abf31 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
index bbbc29a957..f842a906c8 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index 06dfa3894a..dfc9a03899 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
index 58a75a2195..1195217951 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
index 312e064441..dd8ce37dfa 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index 54760eca82..fc86765bf1 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index cb7563abee..9fce06f6fd 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
index 3c271777ce..118dbc254a 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
index d6a47aeee8..3e88d5d67c 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index c8e1e6f1eb..c682941726 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
index 20789835a5..616e2f98ce 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index a7c713d4f3..f2be2009e9 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
index 0fc6ceba38..32758e7186 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
index 215ddefc6a..50ef5a1ac9 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index d00c633082..3a8c39669b 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
index 1c7018c56e..a188027a21 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
index 8fcad365f2..53fded4c6b 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
index 5c68cbb0c9..f1de18f7ed 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
index b365a8c396..d3dfe53760 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
index 3eae39e167..8552999645 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
index d745ffa6a3..97fcbe7dbb 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
index 7aae0788ea..a03b8a39cf 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
index ca375b4fc1..a2ceb4d72e 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
index 406908df87..21d31ea187 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.25
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.26
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
index 8a7f48fc8e..0d2125ec84 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
index b8ab5e096e..459037c1e6 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 88da5bc668..d6ce7700ad 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-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.25</version>
+    <version>0.3.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
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 f4e9dddd42..44921cae4f 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
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
index ed45553393..1a09240300 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 958f1feb9d..72a6a10442 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
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
index 2f01ce302b..f65e0d6954 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
index 09ef818670..14f7d5d7da 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
index 581215f95a..2f769d6a98 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
index 8695480ce3..4ded433cc3 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
index f52dcce499..5effa21314 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
index 47de90e238..7727b4788c 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
index 56c98a5821..fa06f9f3c3 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
index 08d04c6446..e4dbbe5a60 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
index 04653c1db0..3374b39296 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
index a1d0961bc1..420beafcf5 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
index 747bc89d12..f48d279c90 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
index 52cf5df96b..f5643beb81 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 522e015aa9..80b020b242 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
index 6c50e9281d..21e9579a03 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
index 99f585a927..6770043a38 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
index 373c575fc9..7a023873b2 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
index 5edd63ceb7..a32d313f2d 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
index d6183761f9..187294fb94 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index a9f630c5e0..1e20c49e26 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
index 41652ae4d5..693ba1cb4c 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index 20bfb7607a..4c9bbec505 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index b60aee05bd..30a65e8b8a 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
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 ce054f1ebf..f8317563ea 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

From 1ba2504daa7797c7bea0bfe672c200f748e0f719 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 13 Aug 2020 13:26:33 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=A8=E5=AE=A2=E6=88=B7=E3=80=81=E5=8D=95=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/CommonCustomerFormDTO.java | 27 +++++++++++++++++++
 .../feign/EpmetHeartOpenFeignClient.java      | 16 +++++++++++
 .../EpmetHeartOpenFeignClientFallback.java    | 18 +++++++++++++
 .../controller/ResiVolunteerController.java   | 16 +++++++++++
 .../java/com/epmet/dao/VolunteerInfoDao.java  | 11 ++++++++
 .../epmet/service/VolunteerInfoService.java   | 10 +++++++
 .../impl/VolunteerInfoServiceImpl.java        | 13 +++++++++
 .../resources/mapper/VolunteerInfoDao.xml     |  9 +++++++
 epmet-user/epmet-user-server/pom.xml          |  6 +++++
 .../service/impl/GridLatestServiceImpl.java   | 14 ++++++++++
 .../main/resources/mapper/GridLatestDao.xml   | 11 ++++----
 .../src/main/resources/mapper/UserRoleDao.xml |  2 ++
 12 files changed, 148 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java
new file mode 100644
index 0000000000..42daeb6be4
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommonCustomerFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CommonCustomerFormDTO
+ * @Auth wangc
+ * @Date 2020-08-13 10:03
+ */
+@Data
+public class CommonCustomerFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8141450443229290083L;
+
+    public interface CustomerIdGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空" , groups = CustomerIdGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
index 85a0f088e0..acfd546f9f 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
@@ -1,8 +1,14 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -12,4 +18,14 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class)
 public interface EpmetHeartOpenFeignClient {
+
+    /**
+     * @Description 根据客户Id查询志愿者用户Id集合
+     * @param customerFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:22
+     **/
+    @PostMapping("/heart/resi/volunteer/volunteeruserids")
+    Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
index 0dc4701b4b..7208b30d92 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
@@ -1,8 +1,14 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -11,4 +17,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignClient {
+
+    /**
+     * @Description 根据客户Id查询志愿者用户Id集合
+     * @param customerFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:22
+     **/
+    @Override
+    public Result<List<String>> volunteerUserIds(CommonCustomerFormDTO customerFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "volunteerUserIds", customerFormDTO);
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
index d1f471a31a..37021ac616 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
@@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@@ -31,6 +32,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * 居民端-志愿者相关api
@@ -86,4 +89,17 @@ public class ResiVolunteerController {
         volunteerInfoService.sendSmsCode(formDTO);
         return new Result();
     }
+
+    /**
+     * @Description 根据客户Id查询志愿者用户Id集合
+     * @param customerFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:22
+     **/
+    @PostMapping("volunteeruserids")
+    public Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO){
+        ValidatorUtils.validateEntity(customerFormDTO,CommonCustomerFormDTO.CustomerIdGroup.class);
+        return new Result<List<String>>().ok(volunteerInfoService.selectVolunteerIds(customerFormDTO));
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
index 7b557dbaa1..ab0b65bf9c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
@@ -23,6 +23,8 @@ import com.epmet.entity.VolunteerInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 志愿者信息
  *
@@ -63,4 +65,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @Date 14:33 2020-07-23l
      **/
     VolunteerInfoDTO selectVolunteerInfoByUserId(@Param("userId") String userId);
+
+    /**
+     * @Description 查询一个客户下的所有志愿者
+     * @param customerId
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:06
+    **/
+    List<String> selectVolunteerIds(@Param("customerId")String customerId);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
index ede27b72a8..f09a8ad650 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.VolunteerInfoDTO;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@@ -68,4 +69,13 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @Date 09:19 2020-08-10
      **/
     void sendSmsCode(ResiSendSmsCodeFormDTO formDTO);
+
+    /**
+     * @Description 根据客户Id查询志愿者用户Id集合
+     * @param customerFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:22
+    **/
+    List<String> selectVolunteerIds(CommonCustomerFormDTO customerFormDTO);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 3f4574cacd..494bab03c5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dao.VolunteerInfoDao;
 import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.SendVerificationCodeFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
@@ -178,6 +179,18 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
     }
 
+    /**
+     * @Description 根据客户Id查询志愿者用户Id集合
+     * @param customerFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.08.13 10:22
+     **/
+    @Override
+    public List<String> selectVolunteerIds(CommonCustomerFormDTO customerFormDTO) {
+        return baseDao.selectVolunteerIds(customerFormDTO.getCustomerId());
+    }
+
     /**
      * 保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
      * 过期时长为30分钟
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 9f9f3ae44e..a457c72cf7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -64,4 +64,13 @@
         WHERE DEL_FLAG = '0'
         AND USER_ID = #{userId}
     </select>
+
+    <!-- 查询一个客户下的所有志愿者用户Id -->
+    <select id="selectVolunteerIds" resultType="java.util.List">
+        SELECT
+          USER_ID
+        FROM volunteer_info
+        WHERE DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 6b4dbb7a3d..6599bb2c8e 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -94,6 +94,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-heart-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index fbeac02c2b..051666a7cc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.dao.GridLatestDao;
 import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.LatestGridInfoFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
@@ -36,6 +37,7 @@ import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.redis.GridLatestRedis;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.service.GridLatestService;
@@ -49,6 +51,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 最近访问网格表 记录用户访问网格的最近一次记录，对同一网格只记录一条记录，同一网格每次只更新最近一次访问的时间
@@ -67,6 +70,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
     private UserBaseInfoRedis userBaseInfoRedis;
     @Autowired
     private UserWechatDao userWechatDao;
+    @Autowired
+    private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
+
 
     @Override
     public PageData<GridLatestDTO> page(Map<String, Object> params) {
@@ -184,11 +190,19 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
+
         List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
         List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
         if(null == userIds || userIds.isEmpty()){
             return allData;
         }
+        CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
+        customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
+        Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
+        if(volunteer.success() && null != volunteer.getData() && !volunteer.getData().isEmpty()){
+            userIds.addAll(volunteer.getData());
+            userIds = userIds.stream().distinct().collect(Collectors.toList());
+        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
         if(null == allData || allData.isEmpty()){
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index 9a628f87f9..a649f1b540 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -85,13 +85,14 @@
 
     <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
     <select id="selectAllUserByCustomerId" resultType="string">
-        SELECT DISTINCT
-            customer_user_id
+        SELECT
+            *
         FROM
-            grid_latest
+            USER_CUSTOMER
         WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
+            DEL_FLAG = '0'
+            AND IS_REGISTER = '1'
+            AND CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="selectLatestGridInfo" resultType="com.epmet.dto.result.LatestGridInfoResultDTO">
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 803fa40621..5ec9e5a268 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,6 +34,8 @@
             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 844f572a2971a329d25899073c6292a7cbe45c43 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 13 Aug 2020 13:39:59 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85userId=E6=96=B9=E6=B3=95=E6=9B=B4=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ResiVolunteerController.java | 2 +-
 .../src/main/java/com/epmet/service/VolunteerInfoService.java   | 2 +-
 .../java/com/epmet/service/impl/VolunteerInfoServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/VolunteerInfoDao.xml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
index 37021ac616..4f31298977 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
@@ -100,6 +100,6 @@ public class ResiVolunteerController {
     @PostMapping("volunteeruserids")
     public Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO){
         ValidatorUtils.validateEntity(customerFormDTO,CommonCustomerFormDTO.CustomerIdGroup.class);
-        return new Result<List<String>>().ok(volunteerInfoService.selectVolunteerIds(customerFormDTO));
+        return new Result<List<String>>().ok(volunteerInfoService.getVolunteerIds(customerFormDTO));
     }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
index f09a8ad650..398d48aa5b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
@@ -77,5 +77,5 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @author wangc
      * @date 2020.08.13 10:22
     **/
-    List<String> selectVolunteerIds(CommonCustomerFormDTO customerFormDTO);
+    List<String> getVolunteerIds(CommonCustomerFormDTO customerFormDTO);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 494bab03c5..ef2da6193b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -187,7 +187,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      * @date 2020.08.13 10:22
      **/
     @Override
-    public List<String> selectVolunteerIds(CommonCustomerFormDTO customerFormDTO) {
+    public List<String> getVolunteerIds(CommonCustomerFormDTO customerFormDTO) {
         return baseDao.selectVolunteerIds(customerFormDTO.getCustomerId());
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
index a457c72cf7..e98b820d72 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -66,7 +66,7 @@
     </select>
 
     <!-- 查询一个客户下的所有志愿者用户Id -->
-    <select id="selectVolunteerIds" resultType="java.util.List">
+    <select id="selectVolunteerIds" resultType="string">
         SELECT
           USER_ID
         FROM volunteer_info

From b28cde0b0fce94a2db70936d047501b8bb6e0fbc Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 13 Aug 2020 13:51:00 +0800
Subject: [PATCH 10/10] heart +1        user +1

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-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 b06037a0ba..40f1e509f5 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.48
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49
     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 9a7c7f559c..a2185d6b09 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.48</version>
+    <version>0.0.49</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
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 100b22ed13..614297ad11 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.114
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.115
     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 3a3ae82237..c97c10d46f 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.114</version>
+    <version>0.3.115</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>