From 5206cc98dfb657471a539566cb732bb45ed390e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Aug 2020 16:47:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index c3d4efaca1..fd7b3a0072 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -193,6 +193,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 13 Aug 2020 16:52:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CodeController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 01014d7564..cdaa2a6742 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 @@ -232,11 +232,24 @@ public class CodeController { return new Result().ok(result); } + /** + * 版本回退 + * @author zhaoqifeng + * @date 2020/8/13 16:51 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ @PostMapping("speedupaudit") public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) { codeService.speedUpAudit(formDTO); return new Result<>(); } + @PostMapping("revertcoderelease") + public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) { + codeService.revertCodeRelease(formDTO); + return new Result<>(); + } + } From abf62739693d6e2cf8044969cb4aa3e2edc710bf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 16:53:42 +0800 Subject: [PATCH 3/5] =?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 4bd3602a2f..6bc39da836 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.125 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126 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 9bf16b4e2d..f8a5371837 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.125 + 0.0.126 com.epmet From b24045f383a72f1010db0825c5e8c92d6106a710 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 16:56:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=BB=8Euser=5Fcustomer=E6=9F=A5=E8=AF=A2(=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A[=E9=9D=9E=E9=A6=96=E6=AC=A1]=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id)=E6=94=B9=E6=88=90=E4=BB=8Eregister=5Frela?= =?UTF-8?q?tion=E6=9F=A5=E8=AF=A2(=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id=E4=BB=A5=E5=8F=8A[=E9=9D=9E=E9=A6=96?= =?UTF-8?q?=E6=AC=A1]=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/GridLatestServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/GridLatestDao.xml | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) 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 051666a7cc..46bd30dfff 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 @@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) { - - List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); List allData = new LinkedList<>(); - if(null == userIds || userIds.isEmpty()){ - return allData; - } + List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); + if(null == userIds) userIds = new LinkedList<>(); CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO(); customerParam.setCustomerId(customerUserFormDTO.getCustomerId()); Result> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam); @@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl From 4cf31f07c8176129c279aabba6f2c73c6150966b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 17:05:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20+=201?= 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 | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 614297ad11..60fb75bf2c 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.115 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116 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 c97c10d46f..a1575aa794 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.115 + 0.3.116 com.epmet epmet-user