From 409a9526b95d2e045541f818c5dbde5d45c57dd1 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 6 Jul 2020 10:23:19 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96ip?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/commons/tools/utils/IpUtils.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
index 9ed1317906..c2fb803764 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
@@ -49,6 +49,12 @@ public class IpUtils {
 			if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
 				ip = request.getRemoteAddr();
 			}
+			//对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+			if (ip != null && ip.length() > 15) { //"***.***.***.***".length() = 15
+				if (ip.indexOf(",") > 0) {
+					ip = ip.substring(0, ip.indexOf(","));
+				}
+			}
 		} catch (Exception e) {
 			logger.error("IpUtils ERROR ", e);
 		}
@@ -58,6 +64,7 @@ public class IpUtils {
 
 	/**
 	 * desc:获取本地Ip
+	 *
 	 * @return
 	 */
 	public static String getServerIp() {

From 56474a47731df1f1f11b758de98a04f1acfd01ec Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 6 Jul 2020 10:25:40 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=83=A8=E7=BD=B2scan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 a61c5f93a7..b126ac38fa 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.14
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.15
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
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 93286925a6..7d48c23497 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.15
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
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 a969f89828..697b1b1830 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.15
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index d5768cbe79..fa024e9424 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
          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.14</version>
+    <version>0.3.15</version>
     <artifactId>epmet-openapi-scan</artifactId>
     <packaging>jar</packaging>
 

From faf1334be0ab9c5928204247021251b284e50332 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 6 Jul 2020 10:44:28 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=91=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 548eb53128..db34280061 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -88,7 +88,8 @@
                  FROM
                      project_staff ps
                          INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                         AND pp.OPERATION != 'created'
+                         AND (pp.OPERATION != 'created'
+                         OR (pp.OPERATION = 'created' AND pp.STAFF_ID != #{userId}))
                  WHERE
                      ps.DEL_FLAG = '0'
                    AND ps.STAFF_ID = #{userId}

From b29388ea7f45041b4ceaa9e3f7eab108015a62ca Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 6 Jul 2020 10:45:28 +0800
Subject: [PATCH 04/11] =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 01ed21f5e3..9ea5c548d6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -113,7 +113,7 @@
             )
         ) a
         ORDER BY
-            a.projectTotal DESC
+            a.projectTotal DESC, a.type ASC
     </select>
 
     <select id="selectSubGrid" resultType="com.epmet.project.dto.result.ProjectSubGridResultDTO">

From 8b9120a2977ab63ad445f18bf104329f86a43c96 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 6 Jul 2020 10:50:39 +0800
Subject: [PATCH 05/11] =?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

---
 .../data-report-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/data-report/data-report-server/pom.xml             | 2 +-
 .../gov-project-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/gov-project/gov-project-server/pom.xml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 a65c03c0e5..0aadc7d5d7 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.26
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.27
     ports:
       - "8109:8109"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index e621e928e6..7f96938c28 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-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">
 
-    <version>0.3.26</version>
+    <version>0.3.27</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>
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 102eb5fccc..9e943276d9 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.37
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index d4ea02c9c2..72a2d4b2b0 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-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">
-    <version>0.3.36</version>
+    <version>0.3.37</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

From 584e9cefa51364ae23bf36061fb7682133c3c6ec Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 6 Jul 2020 10:52:20 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/commons/tools/utils/IpUtils.java  | 4 ++++
 .../epmet-openapi-scan/deploy/docker-compose-dev.yml          | 2 +-
 .../epmet-openapi-scan/deploy/docker-compose-prod.yml         | 2 +-
 .../epmet-openapi-scan/deploy/docker-compose-test.yml         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
index c2fb803764..271a4a477b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java
@@ -34,6 +34,7 @@ public class IpUtils {
 		String ip = null;
 		try {
 			ip = request.getHeader("x-forwarded-for");
+			logger.warn("x-forwarded-for:"+ip);
 			if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
 				ip = request.getHeader("Proxy-Client-IP");
 			}
@@ -46,6 +47,9 @@ public class IpUtils {
 			if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
 				ip = request.getHeader("HTTP_X_FORWARDED_FOR");
 			}
+			if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+				ip = request.getHeader("X-Real-IP");
+			}
 			if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
 				ip = request.getRemoteAddr();
 			}
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 b126ac38fa..4c00e37218 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.15
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.16
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
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 7d48c23497..2ad59ed51e 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.16
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
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 697b1b1830..4e531e43a8 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.16
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络

From d680f02f4e7f54b067d32c4600ba72cb69342632 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 6 Jul 2020 10:55:25 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-openapi/epmet-openapi-scan/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index fa024e9424..41f7844d34 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
          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.15</version>
+    <version>0.3.16</version>
     <artifactId>epmet-openapi-scan</artifactId>
     <packaging>jar</packaging>
 

From 957b35703786a2f9fed53c69d137d06dafa1fc93 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Jul 2020 12:19:59 +0800
Subject: [PATCH 08/11] =?UTF-8?q?message=E6=9C=8D=E5=8A=A1=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/SysSmsServiceImpl.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
index 7f6d02fa40..2c254701d2 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
@@ -70,16 +70,19 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
 
     @Override
     public void send(SysSmsDTO sysSmsDTO) {
+        logger.info(String.format("发送短信接口(/message/sms/send)入参:%s", JSON.toJSONString(sysSmsDTO)));
         LinkedHashMap<String, String> map;
         try {
             map = JSON.parseObject(sysSmsDTO.getParams(), LinkedHashMap.class);
         }catch (Exception e){
+            logger.error(String.format("发送短信异常,ErrorCode:%s,异常%s",ErrorCode.JSON_FORMAT_ERROR,e.getMessage()));
             throw new RenException(ErrorCode.JSON_FORMAT_ERROR);
         }
 
         //短信服务
         AbstractSmsService service = SmsFactory.build();
         if(service == null){
+            logger.error("发送短信异常,ErrorCode:%s,异常AbstractSmsService is null",ModuleErrorCode.SMS_CONFIG);
             throw new RenException(ModuleErrorCode.SMS_CONFIG);
         }
         //发送短信
@@ -162,13 +165,15 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
             sysSmsDTO.setMobile(formDTO.getMobile());
             sysSmsDTO.setParams(paramJson);
             sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode());
-            Result result = epmetMessageOpenFeignClient.send(sysSmsDTO);
+            this.send(sysSmsDTO);
+            data.setCode(codeStr);
+            /*Result result = epmetMessageOpenFeignClient.send(sysSmsDTO);
             if (result != null && result.success()) {
                 data.setCode(codeStr);
             } else {
                 logger.error(String.format("短信验证码发送失败,手机号:%s。code:%d,msg:%s", formDTO.getMobile(), result.getCode(), result.getMsg()));
                 throw new RenException(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode());
-            }
+            }*/
         } catch (Exception e) {
             e.printStackTrace();
             logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", formDTO.getMobile(), e.getMessage()));

From 30b2ead73422aaf98f831893784f9f25c9596bfc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Jul 2020 12:32:18 +0800
Subject: [PATCH 09/11] =?UTF-8?q?message=E6=9C=8D=E5=8A=A1+1=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 4b6d9423cc..8d318e5d3f 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.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.25
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index d1a59df41f..e48a0d177e 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.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

From 8d5c5dba2fb2c009034176dc2b35e6b61978283e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Jul 2020 12:36:45 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=91=E5=B8=83=EF=BC=9Amessage=E6=9C=8D=E5=8A=A1+1?=
 =?UTF-8?q?=E3=80=81govproject+1=E3=80=81datareport+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-report-server/deploy/docker-compose-test.yml           | 2 +-
 .../epmet-message-server/deploy/docker-compose-test.yml         | 2 +-
 .../gov-project-server/deploy/docker-compose-test.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 21a12306c3..715150fa90 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.27
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
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 198236f1c6..739e063a0a 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.25
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络
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 da9e6907c3..d5b4d6936d 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.37
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

From 1bea98d7dc071745fa0fe2e1505fd96c25a309d0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Jul 2020 12:43:03 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9Amessage=E6=9C=8D=E5=8A=A1+1=E3=80=81?=
 =?UTF-8?q?govproject+1=E3=80=81datareport+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-report-server/deploy/docker-compose-prod.yml           | 2 +-
 .../epmet-message-server/deploy/docker-compose-prod.yml         | 2 +-
 .../gov-project-server/deploy/docker-compose-prod.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 1286ff191d..3dc6b38133 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.27
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
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 fe6a7d5541..94e253c048 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.25
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络
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 dea3399282..d2443e2430 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
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.37
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络