From 1722f3b123312534d7af55c444ac83b3cbd4f04b Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 6 Aug 2020 22:05:15 +0800 Subject: [PATCH 01/25] =?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-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e08b6b333..ef6ebe858c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.108 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.110 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 855ab4abfa8538b0dd82bf8c6d24810f23912b0f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 15:29:33 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=8D=87=E7=BA=A7heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 05632f1c83..bcd4e0312c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.43 ports: - "8111:8111" network_mode: host # 使用现有网络 From 5e87a8119ac3b0368a7431067ce32b5a1e878fba Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 17:34:17 +0800 Subject: [PATCH 03/25] =?UTF-8?q?third=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 fcbc9c9d3b..8cec25c031 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.108 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.109 ports: - "8110:8110" network_mode: host # 使用现有网络 From 74231a53df482a89119f68ac436f0b533852d509 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 17:58:07 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=8D=87=E7=BA=A7heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bcd4e0312c..09d2f0cb8c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.44 ports: - "8111:8111" network_mode: host # 使用现有网络 From 5cd90f1f61c144d08f2580b229f21ee2d63aefe3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 18:14:49 +0800 Subject: [PATCH 05/25] =?UTF-8?q?third=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 8cec25c031..b7a9019551 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.109 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.110 ports: - "8110:8110" network_mode: host # 使用现有网络 From d6079049539742da73966744d3f2ea4de714a792 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 20:30:18 +0800 Subject: [PATCH 06/25] =?UTF-8?q?third=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 b7a9019551..3b0f2f6dce 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.110 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.111 ports: - "8110:8110" network_mode: host # 使用现有网络 From abf61bae2b7ae9b9ff360db789ad5f5e71cd4016 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 7 Aug 2020 21:10:42 +0800 Subject: [PATCH 07/25] =?UTF-8?q?third=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 3b0f2f6dce..4ac75d7f47 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.111 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.112 ports: - "8110:8110" network_mode: host # 使用现有网络 From 3be86e62dc496e4927557a5b4fbbd836faffc12f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 08:54:19 +0800 Subject: [PATCH 08/25] =?UTF-8?q?third=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 4ac75d7f47..89c433ff75 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.112 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.113 ports: - "8110:8110" network_mode: host # 使用现有网络 From 8eac7f0843eb4939bede34a882f7f27ee85a552f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 09:13:43 +0800 Subject: [PATCH 09/25] =?UTF-8?q?third=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 --- .../src/main/java/com/epmet/service/impl/WarrantServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 262de84cdd..cd0b6295ca 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -337,7 +337,6 @@ public class WarrantServiceImpl implements WarrantService { sb.append(""); // sb.append(""); // sb.append(""); - sb.append(""); sb.append(""); String replyMsg = sb.toString(); From 1194f4dd9202a14aa92d33f5250bb49635973f22 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 09:28:02 +0800 Subject: [PATCH 10/25] =?UTF-8?q?third=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 89c433ff75..9e1747ef7b 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.113 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.114 ports: - "8110:8110" network_mode: host # 使用现有网络 From 4475c64f4b92cb90578e80086280878caa36d4ef Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 8 Aug 2020 10:15:42 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart=EF=BC=8Cpoint?= 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 1f8607180a..581b0b1ff6 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.34 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.37 ports: - "8112:8112" network_mode: host # 使用现有网络 From c67ad99e909a84849cd6891b5f2d19f3b0a9fc3c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 Aug 2020 10:41:59 +0800 Subject: [PATCH 12/25] =?UTF-8?q?third=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 9e1747ef7b..d74f653fb5 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.114 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.115 ports: - "8110:8110" network_mode: host # 使用现有网络 From 4f27a0634bd7e779bb0526611f6e9c5cae5ff811 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 09:16:02 +0800 Subject: [PATCH 13/25] =?UTF-8?q?third=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 d74f653fb5..82c1fe929a 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.115 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.116 ports: - "8110:8110" network_mode: host # 使用现有网络 From ce907f7d38bdd36bd8601926e6d270ee213add07 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Aug 2020 10:42:46 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=9Agroup=E3=80=81heart+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bd1df2562d..c37ef4ba9f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.46 ports: - "8111:8111" network_mode: host # 使用现有网络 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 8ba5a78e5e..4a3f1102bd 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.63 ports: - "8095:8095" network_mode: host # 使用现有网络 From 41164547b0683f10b81f6c5c1c40ff6ba7f41118 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Aug 2020 11:13:12 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E6=9C=8D=EF=BC=9Agroup?= =?UTF-8?q?64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a3f1102bd..958f1feb9d 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.63 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.64 ports: - "8095:8095" network_mode: host # 使用现有网络 From 00840caa25b3cf43dc8d9f0ecf17fdbdec1ba6d5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 13:59:05 +0800 Subject: [PATCH 16/25] =?UTF-8?q?third=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 82c1fe929a..13de395b05 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.116 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.117 ports: - "8110:8110" network_mode: host # 使用现有网络 From f315eb02d306b748e9218565833dfd8fb561aa59 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 14:17:22 +0800 Subject: [PATCH 17/25] robot --- .../java/com/epmet/constant/ModuleConstant.java | 1 + .../epmet/service/impl/WarrantServiceImpl.java | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index 17bb891ece..de55530200 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -94,6 +94,7 @@ public interface ModuleConstant { String WE_APP_AUDIT = "weapp_audit"; String TO_USER_NAME = "ToUserName"; String FROM_USER_NAME = "FromUserName"; + String RESI = "resi"; /** * 微信模推送给第三方平台方 Content固定格式 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 3e8994ae50..19b6d0d8a5 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -3,12 +3,8 @@ package com.epmet.service.impl; import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.config.utils.IOUtils; -import com.dingtalk.api.DefaultDingTalkClient; -import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; -import com.dingtalk.api.response.OapiRobotSendResponse; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.dto.form.DingTalkTextMsg; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; @@ -28,10 +24,6 @@ import com.epmet.mpaes.WXXmlToMapUtil; import com.epmet.redis.RedisThird; import com.epmet.service.WarrantService; import com.epmet.wxapi.constant.WxMaCodeConstant; -import com.fasterxml.jackson.core.JsonEncoding; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.taobao.api.ApiException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -152,7 +144,7 @@ public class WarrantServiceImpl implements WarrantService { codeAuditRecord.setAuthAppId(authAppId); codeAuditRecord.setTemplateId(templateId); String customerName = paCustomerDao.selectCustomerName(customerId); - String client = this.getClient(clientType); + String client = clientType.equals(ModuleConstant.RESI) ? "居民端" : "工作端"; //插入 代码审核 记录 log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); @@ -276,11 +268,6 @@ public class WarrantServiceImpl implements WarrantService { return new Result().error(); } - public String getClient(String clientType){ - String result = clientType == "resi" ? "居民端" : "工作端"; - return result; - } - /** * 方法描述: 类型为event的时候，拼接 * @param request From 188e1522e24e61a8993c4ee2368ff9696a424cf1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 10 Aug 2020 14:34:40 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E9=A1=B6=E7=BA=A7=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E5=BE=80?= =?UTF-8?q?=E4=B8=8B=E5=90=B9=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 69a1d4ec87..9e059be1bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,8 +581,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -594,7 +597,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent->{ + parentList.forEach(parent -> { AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -603,7 +606,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); + List subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : ":") + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList; From dd516a09aeb8f4537ff827d64aad059ac3622764 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Aug 2020 14:38:39 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef6ebe858c..ce054f1ebf 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.110 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.113 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 5831da78b521c12ad721f0b38e8bd715ff2b84e5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 10 Aug 2020 14:38:40 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=ACbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 042e4aeb80..0fc6ceba38 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.39 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.40 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 283a6616be..79ff122454 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 @@ - 0.3.39 + 0.3.40 gov-project com.epmet From ca22f5f5a2cf7f1bc085c321049372832deeaff4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 14:50:03 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E9=92=89=E9=92=89=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8F=90=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/HttpClientManager.java | 28 +++++++++++++++++ .../service/impl/WarrantServiceImpl.java | 30 ++----------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java index 8777143097..0c6c4cb9ae 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java @@ -240,6 +240,34 @@ public class HttpClientManager { return new Result().error(); } + /** + * @Desc 发送钉钉消息 content需为 OapiRobotSendRequest 设定msgType格式，根据相应的格式填写 标题 内容 + * @param content OapiRobotSendRequest转换为String + * @param url webhook地址 + * @param secret 加签串 + * @author zxc + */ + public Result sendDingMsg(String content,String url,String secret) { + Long timestamp = System.currentTimeMillis(); + try { + String stringToSign = timestamp + "\n" + secret; + Mac mac = Mac.getInstance("HmacSHA256"); + mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256")); + byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8")); + String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); + log.info("sign为："+sign); + url = url.concat("×tamp=" + timestamp + "&sign=" + sign); + log.info("发送url："+url); + Result stringResult = HttpClientManager.getInstance().sendPostByJSON(url, content); + log.info("robot发送消息结果为："+stringResult.getData()); + return stringResult; + } catch (Exception e) { + e.printStackTrace(); + } + return new Result().error(); + } + + /** * desc: 发送get请求 * param:url, params diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 19b6d0d8a5..85b15f296d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -163,7 +163,7 @@ public class WarrantServiceImpl implements WarrantService { break; } log.info("开始寻找机器人发送消息"); - this.dingDingRobot(reason,codeResult,customerName,client); + this.dingDingRobot(reason,event,customerName,client); log.info("已找到robot，并发送消息......"); String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); @@ -193,7 +193,6 @@ public class WarrantServiceImpl implements WarrantService { PrintWriter pw = response.getWriter();//需在5秒内返回空串表明暂时不回复，然后再立即使用客服消息接口发送消息回复粉丝 pw.write(""); pw.flush(); - log.info(String.format(ThirdRunTimeInfoConstant.TEXT_MESSAGE_LOG_INFO,content,content.split(ThirdRedisKeyConstant.COLON)[NumConstant.ONE],fromUserName,toUserName)); //接下来客服API再回复一次消息 String[] split = content.split(ThirdRedisKeyConstant.COLON); @@ -239,34 +238,9 @@ public class WarrantServiceImpl implements WarrantService { log.info("robot需要发送的内容为："+markdown.getText()); String url = "https://oapi.dingtalk.com/robot/send?access_token=2438902efbcc15909deb7076963c5cbe2d6fdbfdb9d66750faab2f2cce6eb09f"; String secret = "SECe3c785dd254659608667a4a623acc5a0395636143411617f6e36838b48941e74"; - this.sendCodeMsg(request,url,secret); + HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret); } -// public static void main(String[] args) { -// WarrantServiceImpl w = new WarrantServiceImpl(); -// w.dingDingRobot("审核失败","weapp_audit_fail","机器人测试","居民端"); -// } - public Result sendCodeMsg(OapiRobotSendRequest request,String url,String secret) { - Long timestamp = System.currentTimeMillis(); - try { - String stringToSign = timestamp + "\n" + secret; - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8")); - String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); - log.info("sign为："+sign); - url = url.concat("×tamp=" + timestamp + "&sign=" + sign); - log.info("发送url："+url); - String requestString = JSON.toJSONString(request); - log.info("发送内容："+requestString); - Result stringResult = HttpClientManager.getInstance().sendPostByJSON(url, requestString); - log.info("robot发送消息结果为："+stringResult.getData()); - return stringResult; - } catch (Exception e) { - e.printStackTrace(); - } - return new Result().error(); - } /** * 方法描述: 类型为event的时候，拼接 From b5389ff31e1345b34155699d82aea9d2337c9cbb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Aug 2020 14:51:20 +0800 Subject: [PATCH 22/25] =?UTF-8?q?third=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-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index c6a1deb762..cd45213e85 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.117 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.118 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index b3f78ca43d..3148452b15 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 @@ 4.0.0 - 0.0.117 + 0.0.118 com.epmet From 2bf1dc87f608ba6bf3daaec849a5563cf73bee9a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Aug 2020 15:02:46 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/LatestActInfoServiceImpl.java | 5 +++++ .../java/com/epmet/service/impl/WorkActDraftServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/WorkActServiceImpl.java | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java index 069c4f91c7..3ff7ce31bf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -105,6 +106,10 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl Date: Mon, 10 Aug 2020 16:07:34 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/CodeCommonFormDTO.java | 1 + .../dto/result/CodeVersionInfoResultDTO.java | 6 +- .../com/epmet/controller/CodeController.java | 12 ++ .../java/com/epmet/dao/CodeCustomerDao.java | 5 +- .../epmet/service/CodeCustomerService.java | 22 +- .../java/com/epmet/service/CodeService.java | 36 ++++ .../service/impl/CodeCustomerServiceImpl.java | 15 +- .../epmet/service/impl/CodeServiceImpl.java | 189 ++++++++++++------ .../epmet/wxapi/service/WxMaCodeService.java | 9 + .../service/impl/WxMaCodeServiceImpl.java | 18 +- .../main/resources/mapper/CodeCustomerDao.xml | 15 +- 11 files changed, 260 insertions(+), 68 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java index 2806aa1145..9f7f31bcac 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java @@ -20,6 +20,7 @@ public class CodeCommonFormDTO implements Serializable { * 代码ID */ private String codeId; + private String grayPercentage; private String path; private Integer page = 1; private Integer limit = 999; diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java index 03853d654b..b1b367c457 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java @@ -10,7 +10,6 @@ import java.io.Serializable; * @dscription * @date 2020/8/7 14:00 */ -@NoArgsConstructor @Data public class CodeVersionInfoResultDTO implements Serializable { @@ -28,7 +27,6 @@ public class CodeVersionInfoResultDTO implements Serializable { */ private ReleaseBean release; - @NoArgsConstructor @Data public static class CommitBean { private String codeId; @@ -50,7 +48,6 @@ public class CodeVersionInfoResultDTO implements Serializable { private String modelId; } - @NoArgsConstructor @Data public static class AuditBean { private String codeId; @@ -76,7 +73,6 @@ public class CodeVersionInfoResultDTO implements Serializable { private String status; } - @NoArgsConstructor @Data public static class ReleaseBean { private String codeId; @@ -107,6 +103,6 @@ public class CodeVersionInfoResultDTO implements Serializable { /** * */ - private int grayPercentage; + private Integer grayPercentage; } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index b7b7ca6ed6..b03a808edf 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -214,5 +214,17 @@ public class CodeController { return new Result().ok(pageData); } + @PostMapping("version") + public Result version(@RequestBody CustomerClientFormDTO formDTO) { + CodeVersionInfoResultDTO result = codeService.version(formDTO); + return new Result().ok(result); + } + + @PostMapping("speedupaudit") + public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) { + codeService.speedUpAudit(formDTO); + return new Result<>(); + } + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java index 0b1916a56a..7ff7c5114e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java @@ -73,6 +73,8 @@ public interface CodeCustomerDao extends BaseDao { */ void deleteCode(@Param("customerId") String customerId, @Param("clientType") String clientType); + void deleteCommitCode(@Param("customerId") String customerId, @Param("clientType") String clientType); + /** * 获取审核中代码列表 * @@ -92,7 +94,8 @@ public interface CodeCustomerDao extends BaseDao { * @author zhaoqifeng * @date 2020/7/31 15:54 */ - CodeCustomerDTO selectUploadCodeByCustomer(@Param("customerId") String customerId, @Param("clientType") String clientType); + CodeCustomerDTO selectUploadCodeByCustomer(@Param("codeId") String codeId, @Param("customerId") String customerId, + @Param("clientType") String clientType); /** diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java index fcbddcd665..f115eabba7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java @@ -120,7 +120,7 @@ public interface CodeCustomerService extends BaseService { * @param clientType * @return com.epmet.dto.CodeCustomerDTO */ - CodeCustomerDTO getUploadCodeByCustomer(String customerId, String clientType); + CodeCustomerDTO getUploadCodeByCustomer(String codeId, String customerId, String clientType); /** * 删除旧代码记录 @@ -132,6 +132,16 @@ public interface CodeCustomerService extends BaseService { */ void deleteCode(String customerId, String clientType); + /** + * 删除旧上传记录 + * @author zhaoqifeng + * @date 2020/8/10 11:09 + * @param customerId + * @param clientType + * @return void + */ + void deleteCommitCode(String customerId, String clientType); + /** * 开发版 * @author zhaoqifeng @@ -161,4 +171,14 @@ public interface CodeCustomerService extends BaseService { * @return com.epmet.dto.CodeCustomerDTO */ CodeCustomerDTO getReleaseInfo(String customerId, String clientType); + + /** + * 版本回退 + * @author zhaoqifeng + * @date 2020/8/10 15:50 + * @param customerId + * @param clientType + * @return void + */ + void revertCodeRelease(String customerId, String clientType); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java index a2fb76a0d7..ae2240010c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java @@ -163,4 +163,40 @@ public interface CodeService { */ PageData getCustomerList(UploadListFormDTO formDTO); + /** + * 加急审核 + * @author zhaoqifeng + * @date 2020/8/10 14:57 + * @param formDTO + * @return void + */ + void speedUpAudit(CodeCommonFormDTO formDTO); + + /** + * 分阶段发布 + * @author zhaoqifeng + * @date 2020/8/10 15:29 + * @param formDTO + * @return void + */ + void grayRelease(CodeCommonFormDTO formDTO); + + /** + * 取消分阶段发布 + * @author zhaoqifeng + * @date 2020/8/10 15:29 + * @param formDTO + * @return void + */ + void revertGrayRelease(CodeCommonFormDTO formDTO); + + /** + * 版本退回 + * @author zhaoqifeng + * @date 2020/8/10 15:31 + * @param formDTO + * @return void + */ + void revertCodeRelease(CodeCommonFormDTO formDTO); + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java index cc3b41531d..02de9c657a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java @@ -120,8 +120,8 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request); - if (wxAuditResult.success()) { - WxMaAuditStatusResult result = wxAuditResult.getData(); - if (result.getStatus() == NumConstant.ZERO) { - audit.setStatus(CodeConstant.AUDIT_SUCCESS); - auditResult.setResult(CodeConstant.AUDIT_SUCCESS); - saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_SUCCESS - , "审核成功"); - } else if (result.getStatus() == NumConstant.ONE) { - audit.setStatus(CodeConstant.AUDIT_FAILED); - auditResult.setResult(CodeConstant.AUDIT_FAILED); - auditResult.setReason(result.getReason()); - auditResult.setScreenShot(result.getScreenshot()); - saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_FAILED, - result.getReason()); - } else if (result.getStatus() == NumConstant.FOUR) { - audit.setStatus(CodeConstant.DELAY); - auditResult.setResult(CodeConstant.DELAY); - auditResult.setReason(result.getReason()); - saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_DELAY, - result.getReason()); + if(null != audit) { + CodeVersionInfoResultDTO.AuditBean auditBean = new CodeVersionInfoResultDTO.AuditBean(); + auditBean.setCodeId(audit.getId()); + auditBean.setVersion(audit.getUserVersion()); + auditBean.setCodeInfo(audit.getUserDesc()); + if (CodeConstant.AUDITING.equals(audit.getStatus())) { + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + //获取审核结果信息 + CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId()); + //调用微信API获取最新审核状态 + WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq(); + request.setAuditId(auditResult.getAuditId()); + WxResult wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request); + if (wxAuditResult.success()) { + WxMaAuditStatusResult result = wxAuditResult.getData(); + if (result.getStatus() == NumConstant.ZERO) { + audit.setStatus(CodeConstant.AUDIT_SUCCESS); + auditResult.setResult(CodeConstant.AUDIT_SUCCESS); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_SUCCESS + , "审核成功"); + } else if (result.getStatus() == NumConstant.ONE) { + audit.setStatus(CodeConstant.AUDIT_FAILED); + auditResult.setResult(CodeConstant.AUDIT_FAILED); + auditResult.setReason(result.getReason()); + auditResult.setScreenShot(result.getScreenshot()); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_FAILED, + result.getReason()); + } else if (result.getStatus() == NumConstant.FOUR) { + audit.setStatus(CodeConstant.DELAY); + auditResult.setResult(CodeConstant.DELAY); + auditResult.setReason(result.getReason()); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_DELAY, + result.getReason()); + } + codeCustomerService.update(audit); + codeAuditResultService.update(auditResult); } - codeCustomerService.update(audit); - codeAuditResultService.update(auditResult); } + auditBean.setStatus(audit.getStatus()); + auditBean.setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); + auditBean.setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); + resultDTO.setAudit(auditBean); } - resultDTO.getAudit().setStatus(audit.getStatus()); - resultDTO.getAudit().setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); - resultDTO.getAudit().setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); //线上版本 CodeCustomerDTO release = codeCustomerService.getReleaseInfo(formDTO.getCustomerId(), formDTO.getClientType()); - resultDTO.getRelease().setCodeId(release.getId()); - resultDTO.getRelease().setCodeInfo(release.getUserDesc()); - resultDTO.getRelease().setCommitTime(DateUtils.format(release.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); - resultDTO.getRelease().setAuditTime(DateUtils.format(release.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); - resultDTO.getRelease().setReleaseTime(DateUtils.format(release.getReleaseTime(), DateUtils.DATE_TIME_PATTERN)); - resultDTO.getRelease().setReleaseType(release.getReleaseType()); - resultDTO.getRelease().setGrayPercentage(release.getGaryPercentage()); - resultDTO.getRelease().setVersion(release.getUserVersion()); + if(null != release) { + CodeVersionInfoResultDTO.ReleaseBean releaseBean = new CodeVersionInfoResultDTO.ReleaseBean(); + releaseBean.setCodeId(release.getId()); + releaseBean.setCodeInfo(release.getUserDesc()); + releaseBean.setCommitTime(DateUtils.format(release.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); + releaseBean.setAuditTime(DateUtils.format(release.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); + releaseBean.setReleaseTime(DateUtils.format(release.getReleaseTime(), DateUtils.DATE_TIME_PATTERN)); + releaseBean.setReleaseType(release.getReleaseType()); + releaseBean.setGrayPercentage(release.getGaryPercentage()); + releaseBean.setVersion(release.getUserVersion()); + resultDTO.setRelease(releaseBean); + } + return resultDTO; } @@ -245,7 +257,16 @@ public class CodeServiceImpl implements CodeService { if (null == authInfo) { throw new RenException("未授权"); } - + //获取上传代码信息 + CodeCustomerDTO uploadCode = codeCustomerService.getUploadCodeByCustomer(formDTO.getCodeId(), codeCustomerDTO.getCustomerId(), + codeCustomerDTO.getClientType()); + if (null != uploadCode) { + if (CodeConstant.AUDITING.equals(uploadCode.getStatus())) { + throw new RenException("已经有正在审核的版本"); + } else { + codeCustomerService.deleteById(uploadCode.getId()); + } + } //调用微信API上提交审核 WxMaCodeSubmitAuditRequest request = new WxMaCodeSubmitAuditRequest(); request.setVersionDesc(formDTO.getVersionDesc()); @@ -292,6 +313,7 @@ public class CodeServiceImpl implements CodeService { } //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.AUDITING); + codeCustomerDTO.setAuditTime(new Date()); codeCustomerService.update(codeCustomerDTO); saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, "审核中"); @@ -370,6 +392,9 @@ public class CodeServiceImpl implements CodeService { //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.RELEASE_SUCCESS); + codeCustomerDTO.setReleaseTime(new Date()); + codeCustomerDTO.setReleaseType("total"); + codeCustomerDTO.setGaryPercentage(NumConstant.ZERO); codeCustomerService.update(codeCustomerDTO); saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_RELEASE, "发布成功"); @@ -467,7 +492,6 @@ public class CodeServiceImpl implements CodeService { public PageData history(CodeCommonFormDTO formDTO) { PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); //获取上传代码信息 -// CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); List list = codeOperationHistoryService.getHistoryList(formDTO.getCodeId()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); @@ -553,6 +577,57 @@ public class CodeServiceImpl implements CodeService { return paCustomerService.getCustomerList(formDTO); } + @Override + public void speedUpAudit(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + //获取审核结果信息 + CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId()); + //调用微信API 加急审核 + WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq(); + speedRequest.setAuditId(codeAuditResultDTO.getAuditId()); + WxResult wxSpeedResult = wxMaCodeService.speedUpAudit(authInfo.getAuthorizerAccessToken(), speedRequest); + if (!wxSpeedResult.success()) { + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg()); + throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg()); + } + } + + @Override + public void grayRelease(CodeCommonFormDTO formDTO) { + + } + + @Override + public void revertGrayRelease(CodeCommonFormDTO formDTO) { + + } + + @Override + public void revertCodeRelease(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + WxResult wxSpeedResult = wxMaCodeService.revertCodeRelease(authInfo.getAuthorizerAccessToken()); + if (!wxSpeedResult.success()) { + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg()); + throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg()); + } + codeCustomerService.revertCodeRelease(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + codeCustomerService.deleteById(codeCustomerDTO.getId()); + } + private void saveOperation(String customerId, String clientType, String codeId, String version, String operation, String describe) { CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO(); operationDTO.setCustomerId(customerId); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java index 28212e5674..df405b12e9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java @@ -191,4 +191,13 @@ public interface WxMaCodeService { * @date 2020/8/6 14:07 */ WxResult getAccountBasicInfo(String accessToken); + + /** + * 版本退回 + * @author zhaoqifeng + * @date 2020/8/10 15:41 + * @param accessToken + * @return com.epmet.wxapi.result.WxResult + */ + WxResult revertCodeRelease(String accessToken); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index e91b31cee6..4711ac11b7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -293,7 +293,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { public WxResult getWeAppSupportVersion(String accessToken) { WxResult result = new WxResult<>(); String url = WxMaCodeConstant.GET_SUPPORT_VERSION_URL + "?" + "access_token=" + accessToken; - Result statusResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + Result statusResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}"); if (!statusResult.success()) { result.setErrorCode(statusResult.getCode()); result.setErrorMsg(statusResult.getMsg()); @@ -367,6 +367,22 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return result; } + @Override + public WxResult revertCodeRelease(String accessToken) { + WxResult result = new WxResult(); + String url = WxMaCodeConstant.REVERT_CODE_RELEASE_URL + "?" + "access_token=" + accessToken; + Result setVersionResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + if (!setVersionResult.success()) { + result.setErrorCode(setVersionResult.getCode()); + result.setErrorMsg(setVersionResult.getMsg()); + return result; + } + JSONObject jsonObject = JSONObject.parseObject(setVersionResult.getData()); + result.setErrorCode(jsonObject.getInteger(ERR_CODE)); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + return result; + } + private String toJson(Object object) { GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.setPrettyPrinting(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml index 4ef32234ef..366e15e889 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml @@ -21,6 +21,15 @@ + + UPDATE code_customer + SET + DEL_FLAG = '1' + WHERE CUSTOMER_ID = #{customerId} + AND CLIENT_TYPE = #{clientType} + AND STATUS = 'unaudited' + AND DEL_FLAG = '0' + @@ -116,8 +128,9 @@ FROM code_customer WHERE CUSTOMER_ID = #{customerId} AND CLIENT_TYPE = #{clientType} - AND STATUS = 'unaudited' AND DEL_FLAG = '0' + ORDER BY COMMIT_TIME DESC + LIMIT 1