From d6767b20dd428d37d745bddb23d8778453ac5cb4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 09:20:58 +0800 Subject: [PATCH 01/40] =?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-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- .../main/java/com/epmet/service/impl/PaCustomerServiceImpl.java | 2 ++ 3 files changed, 4 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 31edd74c55..2c6622be10 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.82 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.83 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 6aeb44ec0c..f62ed187f8 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.82 + 0.0.83 com.epmet diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 5404602aed..2652afb556 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -210,6 +210,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl Date: Fri, 31 Jul 2020 09:37:03 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=8E=88=E6=9D=83=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/AppLetAuthorizationController.java | 9 +++------ .../com/epmet/service/AppLetAuthorizationService.java | 2 +- .../service/impl/AppLetAuthorizationServiceImpl.java | 5 +++-- .../java/com/epmet/wxapi/constant/WxMaCodeConstant.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java index 0ef2d05e5a..64a4bb3376 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java @@ -10,10 +10,7 @@ import com.epmet.dto.form.RemoveBindFormDTO; import com.epmet.dto.result.GoToAuthResultDTO; import com.epmet.service.AppLetAuthorizationService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @Author zxc @@ -32,9 +29,9 @@ public class AppLetAuthorizationController { * @author zxc */ @PostMapping("gotoauth") - public Result goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO){ + public Result goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO, @RequestHeader("source")String source){ ValidatorUtils.validateEntity(formDTO); - GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO); + GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO,source); return new Result().ok(goToAuthResultDTO); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java index fd659764b9..0d00e16505 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java @@ -17,7 +17,7 @@ public interface AppLetAuthorizationService { * @param tokenDto * @author zxc */ - GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO); + GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO,String source); /** * @Description 将公众号/小程序从开放平台帐号下解绑 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java index dd50366b48..d64dab83c4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java @@ -55,12 +55,13 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic * @author zxc */ @Override - public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO) { + public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO,String source) { GoToAuthResultDTO result = new GoToAuthResultDTO(); String userId = tokenDto.getUserId(); //获取预授权码 String preAuthCode = componentVerifyTicketService.preAuthCode(); - String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType(); +// String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType(); + String redirectUrl = String.format(WxMaCodeConstant.WEB_URL,source,formDTO.getClientType()); String authUrl = String.format(WxMaCodeConstant.API_AUTH_REGISTER_URL, componentAppId, preAuthCode, redirectUrl); result.setUrl(authUrl); return result; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index 6d82fae8da..75ce684c49 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java @@ -33,7 +33,7 @@ public interface WxMaCodeConstant { /** * 前端地址 【授权之后的跳转的地址】 */ - String WEB_URL = "https://epmet-cloud.elinkservice.cn/third/mpweb/page/#/info?clientType="; + String WEB_URL = "https://epmet-cloud.elinkservice.cn/third/mpweb/page/%s/#/info?clientType=%s"; /** * 授权注册页面扫码授权 From 8de8cb3f28935521c98262cae286a44b99d9d677 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 09:39:05 +0800 Subject: [PATCH 03/40] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 2c6622be10..f6eb00cd8f 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.83 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.84 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 f62ed187f8..855d2ed49b 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.83 + 0.0.84 com.epmet From 7e380bf6b620b0a49a5a94e415e05b4f4709d50b Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 09:43:39 +0800 Subject: [PATCH 04/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=8E=88=E6=9D=83=E5=9B=9E?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/AppLetAuthorizationServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java index d64dab83c4..138d8e4dc7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java @@ -64,6 +64,7 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic String redirectUrl = String.format(WxMaCodeConstant.WEB_URL,source,formDTO.getClientType()); String authUrl = String.format(WxMaCodeConstant.API_AUTH_REGISTER_URL, componentAppId, preAuthCode, redirectUrl); result.setUrl(authUrl); + log.info("返回URL："+result.getUrl()); return result; } From 34b3317deb126b25cfcb982640ddce801f974b40 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 09:45:53 +0800 Subject: [PATCH 05/40] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 f6eb00cd8f..63b4a2ec31 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.84 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.85 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 855d2ed49b..8e6e21934c 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.84 + 0.0.85 com.epmet From f16d9991577152f75d14990d20af9ac1e9774a16 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 31 Jul 2020 09:52:51 +0800 Subject: [PATCH 06/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index b4dc44a7df..ff64fc7166 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.29 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 3944de1695..197c44b18b 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.29 com.epmet epmet-cloud From 70c9e944c8a68f5109924ffa97d3ad21d9c30712 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 10:02:25 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=8E=A5=E5=8F=A3bug?= =?UTF-8?q?=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/CustomerMpDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml index cf24463139..d7281d2a9f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml @@ -72,7 +72,7 @@ WHERE cm.del_flag = '0' AND pc.del_flag = '0' - AND pc.source = '#{source}' + AND pc.source = #{source} ORDER BY cm.customer_id ASC, cm.client ASC From e7092ef7d5955b8dbdfbf1171d5b129a0a0157dc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 10:04:49 +0800 Subject: [PATCH 08/40] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=8E=A5=E5=8F=A3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 63b4a2ec31..a975b43325 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.85 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.86 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 8e6e21934c..25cc8132d6 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.85 + 0.0.86 com.epmet From e974d2432b01d21cad9207bb110e92ac47bc51f3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 31 Jul 2020 10:10:23 +0800 Subject: [PATCH 09/40] =?UTF-8?q?=E9=83=A8=E7=BD=B2point?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 25f8ce6da6..2c18fed352 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.11 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.12 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 91d6b84a35..4e5db6ca07 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"> 4.0.0 - 0.0.11 + 0.0.12 epmet-point com.epmet From 229eafb509f2b20ab65f7d396dec496be04dc500 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 31 Jul 2020 10:23:46 +0800 Subject: [PATCH 10/40] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/CodeCustomerDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/form/UploadListFormDTO.java | 4 ++++ .../src/main/java/com/epmet/dao/CodeCustomerDao.java | 4 ++-- .../src/main/java/com/epmet/entity/CodeCustomerEntity.java | 5 +++++ .../src/main/java/com/epmet/service/CodeCustomerService.java | 2 +- .../java/com/epmet/service/impl/CodeCustomerServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/CodeServiceImpl.java | 3 ++- .../src/main/resources/mapper/CodeCustomerDao.xml | 3 ++- 8 files changed, 23 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java index 458176f17d..8e7de04d23 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java @@ -78,6 +78,11 @@ public class CodeCustomerDTO implements Serializable { */ private String userDesc; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java index 64a2b42e87..e41bfb5c75 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java @@ -43,4 +43,8 @@ public class UploadListFormDTO implements Serializable { * 页面条数 */ private Integer pageSize; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; } 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 60e77b7bcf..b84940828d 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 @@ -76,9 +76,9 @@ public interface CodeCustomerDao extends BaseDao { * 获取审核中代码列表 * @author zhaoqifeng * @date 2020/7/15 18:17 - * @param + * @param source * @return java.util.List */ - List selectAuditingCodeList(); + List selectAuditingCodeList(@Param("source") String source); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java index 3f84ef9a4a..af21992505 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java @@ -78,6 +78,11 @@ public class CodeCustomerEntity extends BaseEpmetEntity { */ private String userDesc; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed */ 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 588b428c5d..491d996c19 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 @@ -110,7 +110,7 @@ public interface CodeCustomerService extends BaseService { * @param * @return java.util.List */ - List getAuditingCodeList(); + List getAuditingCodeList(String source); /** * 删除旧代码记录 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 92c1b86a9c..84251ee7dd 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 @@ -115,8 +115,8 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl getAuditingCodeList() { - return baseDao.selectAuditingCodeList(); + public List getAuditingCodeList(String source) { + return baseDao.selectAuditingCodeList(source); } @Override diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 0410944f5a..6815a87804 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -152,6 +152,7 @@ public class CodeServiceImpl implements CodeService { //将上传信息存入表中 CodeCustomerDTO codeCustomerDTO = ConvertUtils.sourceToTarget(formDTO, CodeCustomerDTO.class); codeCustomerDTO.setCustomerName(paCustomerDTO.getCustomerName()); + codeCustomerDTO.setSource(paCustomerDTO.getSource()); codeCustomerDTO.setExtJson(extJson); codeCustomerDTO.setAppId(authInfo.getAuthorizerAppid()); codeCustomerDTO.setStatus(CodeConstant.UNAUDITED); @@ -162,7 +163,7 @@ public class CodeServiceImpl implements CodeService { @Override public PageData uploadList(UploadListFormDTO formDTO) { - List auditingList = codeCustomerService.getAuditingCodeList(); + List auditingList = codeCustomerService.getAuditingCodeList(formDTO.getSource()); if (null != auditingList && auditingList.size() > NumConstant.ZERO) { auditingList.forEach(code -> { //获取小程序调用令牌 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 55885fd96a..17ebecfc64 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 @@ -38,6 +38,7 @@ LEFT JOIN code_audit_result car ON cc.ID = car.CODE_ID AND car.DEL_FLAG = '0' WHERE cc.DEL_FLAG = '0' + AND cc.SOURCE = #{source} AND cc.CUSTOMER_ID = #{customerId} @@ -85,7 +86,7 @@ AND template_id = #{templateId} UPDATE code_customer From 1b8bc1354f1279f7690cff6b9a14f60c9a64c4d4 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 10:30:59 +0800 Subject: [PATCH 11/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=97=A5=E5=BF=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ComponentVerifyTicketServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index 51dc019d6c..a42e1a3140 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -125,7 +125,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe switch (infotype){ case ModuleConstant.TICKET_UNDERLINE_KEY: //接收票据 【component_verify_ticket】 String ComponentVerifyTicket = result.get(ModuleConstant.TICKET_KEY); - log.info(String.format(COMPONENT_VERIFY_TICKET)); + log.info(String.format(COMPONENT_VERIFY_TICKET,ComponentVerifyTicket)); // 缓存 ticket redisThird.setComponentVerifyTicket(ComponentVerifyTicket); // 存数据库 From 977c57dab09884e4e3e99de45414a4f187b0176f Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 10:34:29 +0800 Subject: [PATCH 12/40] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 a975b43325..399c699dda 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.86 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.87 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 25cc8132d6..629b3540b8 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.86 + 0.0.87 com.epmet From eb25e63b623797cbf5b3ce345feb91e4abaaebbd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 10:54:47 +0800 Subject: [PATCH 13/40] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=99=BB?= =?UTF-8?q?=E9=99=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PublicUserLoginServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index dcb84869e7..5f32f7d497 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -171,13 +171,14 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { } Object RegisterResult = result.getData(); JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); - CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class); + Map map = (Map)jsonObject.get("paUserResult"); + PaUserDTO userDTO = ConvertUtils.mapToEntity(map, PaUserDTO.class); //登陆 - if (formDTO.getIsLogon() && null == resultDTO.getPaUserResult()) { + if (formDTO.getIsLogon() && null == userDTO) { throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode()); } //注册 - if (!formDTO.getIsLogon() && null != resultDTO.getPaUserResult()) { + if (!formDTO.getIsLogon() && null != userDTO) { throw new RenException(EpmetErrorCode.MOBILE_USED.getCode()); } //3、发送短信验证码 @@ -216,10 +217,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { } Object RegisterResult = result.getData(); JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); - CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class); //2.用户不存在时不允许登陆 - PaUserDTO userDTO = resultDTO.getPaUserResult(); + Map map1 = (Map)jsonObject.get("paUserResult"); + PaUserDTO userDTO = ConvertUtils.mapToEntity(map1, PaUserDTO.class); if (null == userDTO || StringUtils.isBlank(userDTO.getId())) { throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode()); } @@ -236,13 +237,15 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { //4-1.生成token String token = this.generateGovWxmpToken(userDTO.getId()); //4-2.判断是否存在信息，给customerId赋值 - PaCustomerDTO customerDTO = resultDTO.getPaCustomerResult(); + Map map2 = (Map)jsonObject.get("paCustomerResult"); + PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class); String customerId = ""; if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) { customerId = customerDTO.getId(); } //4-3.token存入redis - PaUserWechatDTO wechatDTO = resultDTO.getPaUserWechatResult(); + Map map3 = (Map)jsonObject.get("PaUserWechatDTO"); + PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); String openid = wechatDTO.getWxOpenId(); String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId()); this.saveLatestGovTokenDto(customerId, userDTO.getId(), openid, unionId, token); From fb10dca8fea0d604dae4db0a08079420e6baf77d Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 10:59:27 +0800 Subject: [PATCH 14/40] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 399c699dda..9830078ec9 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.87 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.88 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 629b3540b8..8a22a75e8a 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.87 + 0.0.88 com.epmet From c32e281243b6910ce2db401fe96d74f2211a6736 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 11:14:21 +0800 Subject: [PATCH 15/40] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CustomerUserResultDTO.java | 6 +++--- .../com/epmet/dto/result/InitCustomerResultDTO.java | 6 +++--- .../com/epmet/service/impl/CustomerServiceImpl.java | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java index d0090c3fa7..b5ca4824b2 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java @@ -16,15 +16,15 @@ public class CustomerUserResultDTO implements Serializable { private static final long serialVersionUID = 5214475907074876716L; /** - * 用户信息 + * 用户信息 【别名不能随便修改 否则影响程序】 */ private PaUserDTO paUserResult; /** - * 用户对应的客户信息 + * 用户对应的客户信息 【别名不能随便修改 否则影响程序】 */ private PaCustomerDTO paCustomerResult; /** - * 用户对应的微信基本信息 + * 用户对应的微信基本信息 【别名不能随便修改 否则影响程序】 */ private PaUserWechatDTO paUserWechatResult; } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/InitCustomerResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/InitCustomerResultDTO.java index 3d46c4cebc..4423265b70 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/InitCustomerResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/InitCustomerResultDTO.java @@ -17,15 +17,15 @@ public class InitCustomerResultDTO implements Serializable { private static final long serialVersionUID = 3253989119352850315L; /** - * 注册客户信息 + * 注册客户信息 【别名不能随便修改 否则影响程序】 */ private PaCustomerDTO paCustomer; /** - * 注册客户组织信息 + * 注册客户组织信息 【别名不能随便修改 否则影响程序】 */ private PaCustomerAgencyDTO paAgency; /** - * 注册客户管理员信息 + * 注册客户管理员信息 【别名不能随便修改 否则影响程序】 */ private PaUserDTO paUser; diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 6a9bfb7f83..74e4dd8653 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -414,11 +414,12 @@ public class CustomerServiceImpl extends BaseServiceImpl map1 = (Map)jsonObject.get("paCustomer"); + PaCustomerDTO paCustomer = ConvertUtils.mapToEntity(map1, PaCustomerDTO.class); + Map map2 = (Map)jsonObject.get("paAgency"); + PaCustomerAgencyDTO paAgency = ConvertUtils.mapToEntity(map2, PaCustomerAgencyDTO.class); + Map map3 = (Map)jsonObject.get("paUser"); + PaUserDTO paUser = ConvertUtils.mapToEntity(map3, PaUserDTO.class); //2.校验当前客户是否已初始化，不存在则初始客户信息 CustomerEntity entity = baseDao.selectById(formDTO.getCustomerId()); From 13dc6925defd656e31ae14544279e3094a6c98c0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 31 Jul 2020 11:20:15 +0800 Subject: [PATCH 16/40] =?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-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 9830078ec9..e3bed82be5 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.88 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.89 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 8a22a75e8a..a2af66868e 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.88 + 0.0.89 com.epmet 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 0e060259d8..270b2e9325 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.57 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.58 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 6297620e47..5900ef04d9 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 @@ 4.0.0 - 0.3.57 + 0.3.58 com.epmet oper-crm From 5920b3f7ad33bebc571d38d1013342ff1e06c607 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 31 Jul 2020 12:41:53 +0800 Subject: [PATCH 17/40] =?UTF-8?q?=E9=83=A8=E7=BD=B2point=20heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-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 df911d5ab5..6497809101 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.18 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.19 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 af9cf135ba..119e6fe2a8 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 @@ 4.0.0 - 0.0.18 + 0.0.19 com.epmet epmet-heart 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 2c18fed352..3d45a6715b 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.12 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.13 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 4e5db6ca07..99a6073d4f 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"> 4.0.0 - 0.0.12 + 0.0.13 epmet-point com.epmet From 6ff0690ad0b405399925bc74aaf00e9497f998e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 31 Jul 2020 13:24:19 +0800 Subject: [PATCH 18/40] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 6497809101..5c8cd6a427 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.19 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.20 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 119e6fe2a8..65bc2961f6 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 @@ 4.0.0 - 0.0.19 + 0.0.20 com.epmet epmet-heart From 5c3c387b27b460049cf8e957246b5449bd281675 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 13:32:25 +0800 Subject: [PATCH 19/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=8E=88=E6=9D=83=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=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/MiniInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml index 8b210f2f94..cdd087f414 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml @@ -6,7 +6,7 @@ - SELECT LAST_INSERT_ID() AS id + SELECT id AS id from mini_info where del_flag = 0 and customer_id = #{customerId} and client_type = #{clientType} order by created_time desc limit 1 INSERT INTO mini_info ( ID, CUSTOMER_ID, CLIENT_TYPE, NICK_NAME, HEAD_IMG, SERVICE_TYPE_INFO, VERIFY_TYPE_INFO, USER_NAME, PRINCIPAL_NAME, SIGNATURE, QRCODE_URL, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) From 9a16947a7345b7f07b94c1c9c92c5f3a31089de6 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 13:34:46 +0800 Subject: [PATCH 20/40] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 e3bed82be5..af47d1216b 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.89 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.90 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 a2af66868e..f3d8ef90b5 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.89 + 0.0.90 com.epmet From bddc94711286dc97cbd614ffddde763a1be1ef7e Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 13:48:19 +0800 Subject: [PATCH 21/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=8E=88=E6=9D=83=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/BusinessInfoDao.java | 7 +++++++ .../main/java/com/epmet/dao/MiniCategoryInfoDao.java | 7 +++++++ .../src/main/java/com/epmet/dao/MiniInfoDao.java | 7 +++++++ .../main/java/com/epmet/dao/MiniNetworkInfoDao.java | 7 +++++++ .../impl/ComponentVerifyTicketServiceImpl.java | 5 +++++ .../src/main/resources/mapper/BusinessInfoDao.xml | 11 +++++++++++ .../src/main/resources/mapper/MiniCategoryInfoDao.xml | 11 +++++++++++ .../src/main/resources/mapper/MiniInfoDao.xml | 11 +++++++++++ .../src/main/resources/mapper/MiniNetworkInfoDao.xml | 11 +++++++++++ 9 files changed, 77 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java index 622f257d7b..1618c6ab10 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java @@ -41,4 +41,11 @@ public interface BusinessInfoDao extends BaseDao { */ void insertBusinessInfo(@Param("businessInfoList") List businessInfoList); + /** + * @Description 功能开通信息删除 + * @param + * @author zxc + */ + void deleteBusinessInfo(@Param("customerId")String customerId,@Param("clientType")String clientType); + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java index e233f5372b..438330ee82 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java @@ -41,4 +41,11 @@ public interface MiniCategoryInfoDao extends BaseDao { */ void insertCategoryInfo(@Param("miniCategoryInfoList") List miniCategoryInfoList); + /** + * @Description 小程序配置的类目信息删除 + * @param + * @author zxc + */ + void deleteCategoryInfo(@Param("customerId")String customerId,@Param("clientType")String clientType); + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java index 26e7dbf7e8..0d29f738df 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java @@ -40,6 +40,13 @@ public interface MiniInfoDao extends BaseDao { */ void insertMiniInfo(MiniInfoFormDTO formDTO); + /** + * @Description 删除小程序信息 + * @param formDTO + * @author zxc + */ + void deleteMiniInfo(MiniInfoFormDTO formDTO); + /** * @Description 根据原始ID查询 customerId 和 clientType * @param toUserName diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java index 361d4bb256..54c0538f53 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java @@ -41,4 +41,11 @@ public interface MiniNetworkInfoDao extends BaseDao { */ void insertNetworkInfo(@Param("networkInfoList") List networkInfoList); + /** + * @Description 小程序配置的合法域名信息删除 + * @param + * @author zxc + */ + void deleteNetworkInfo(@Param("customerId")String customerId,@Param("clientType")String clientType); + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index a42e1a3140..c54dd03a31 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -437,6 +437,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe miniInfoFormDTO.setCustomerId(customerId); miniInfoFormDTO.setClientType(clientType); //基础信息插入 + miniInfoDao.deleteMiniInfo(miniInfoFormDTO); miniInfoDao.insertMiniInfo(miniInfoFormDTO); String primaryId = miniInfoFormDTO.getId(); //todo 功能的开通状况信息插入 @@ -451,6 +452,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe businessInfoForm.setPrimaryId(primaryId); businessInfoList.add(businessInfoForm); }); + businessInfoDao.deleteBusinessInfo(customerId,clientType); businessInfoDao.insertBusinessInfo(businessInfoList); //todo 小程序配置的合法域名信息插入 Map miniProgramInfo = (Map) authorizerInfo.get(ModuleConstant.MINI_PROGRAM_INFO); @@ -465,6 +467,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe miniNetworkInfoForm.setPrimaryId(primaryId); networkInfoList.add(miniNetworkInfoForm); }); + miniNetworkInfoDao.deleteNetworkInfo(customerId,clientType); miniNetworkInfoDao.insertNetworkInfo(networkInfoList); //todo 小程序配置的类目信息插入 List categoryInfoList = new ArrayList<>(); @@ -481,6 +484,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe categoryInfoList.add(categoryInfo); }); }); + miniCategoryInfoDao.deleteCategoryInfo(customerId, clientType); miniCategoryInfoDao.insertCategoryInfo(categoryInfoList); } }else { @@ -501,6 +505,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe businessInfoForm.setPrimaryId(primaryId); businessInfoList.add(businessInfoForm); }); + businessInfoDao.deleteBusinessInfo(customerId,clientType); businessInfoDao.insertBusinessInfo(businessInfoList); } log.info("保存授权方基本信息结束"); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/BusinessInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/BusinessInfoDao.xml index ec69aa585a..b4a243981c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/BusinessInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/BusinessInfoDao.xml @@ -24,4 +24,15 @@ ) + + + + DELETE + FROM + business_info + WHERE + del_flag = 0 + AND customer_id = #{customerId} + AND client_type = #{clientType} + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniCategoryInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniCategoryInfoDao.xml index 49aacc185b..10960ee45b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniCategoryInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniCategoryInfoDao.xml @@ -24,4 +24,15 @@ ) + + + + DELETE + FROM + mini_category_info + WHERE + del_flag = 0 + AND customer_id = #{customerId} + AND client_type = #{clientType} + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml index cdd087f414..7a31b83279 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml @@ -32,6 +32,17 @@ ) + + + DELETE + FROM + mini_info + WHERE + del_flag = 0 + AND customer_id = #{customerId} + AND client_type = #{clientType} + + From 53ea8c8871f6cd839eed2c1bd7cd3546ed0ee112 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 14:50:24 +0800 Subject: [PATCH 31/40] =?UTF-8?q?map=E8=BD=ACDTO=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/utils/ConvertUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java index edc8633f02..93c653e178 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java @@ -62,6 +62,9 @@ public class ConvertUtils { } public static T mapToEntity(Map map, Class entity) { + if (null == map){ + return null; + } T t = null; try { t = entity.newInstance(); From a2f3f973172e4436fb49a476cb5eb5672f1e8ad4 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 14:54:28 +0800 Subject: [PATCH 32/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/PublicUserLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 44821fcbb7..cece305fd2 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -247,7 +247,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { customerId = customerDTO.getId(); } //4-3.token存入redis - Map map3 = (Map)jsonObject.get("PaUserWechatDTO"); + Map map3 = (Map)jsonObject.get("paUserWechatResult"); logger.info("map3的值："+map3); PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); String openid = wechatDTO.getWxOpenId(); From ee4be257bd712928afd257daf70509ee1c687839 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 14:55:49 +0800 Subject: [PATCH 33/40] =?UTF-8?q?epmet-auth=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 13ee9f0110..d9cb56b758 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.61 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.62 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index cef4340841..e434ae4f2e 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.61 + 0.3.62 com.epmet epmet-cloud From fa353933bf9ebd4f3bd55c908e19ae7e4060a4ff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 15:05:00 +0800 Subject: [PATCH 34/40] =?UTF-8?q?=E5=9B=9E=E9=A1=BE=E7=A8=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ResiActListController.java | 4 ++-- .../src/main/java/com/epmet/dao/ActSummaryDao.java | 8 +++++--- .../main/java/com/epmet/service/ActSummaryService.java | 4 ++-- .../com/epmet/service/impl/ActSummaryServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ActInfoDao.xml | 9 +++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 046a2c6854..9310d818b4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -192,12 +192,12 @@ public class ResiActListController { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong * @Date 13:39 2020-07-21 **/ @PostMapping("summary/list") - public Result summaryList(@RequestBody ResiActContentFormDTO formDto) { + public Result> summaryList(@RequestBody ResiActContentFormDTO formDto) { ValidatorUtils.validateEntity(formDto, ResiActContentFormDTO.AddUserInternalGroup.class); return actSummaryService.summaryList(formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java index cb4993d0b0..b9115a88d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSummaryDao.java @@ -23,6 +23,8 @@ import com.epmet.dto.result.resi.ResiActSummaryResultDTO; import com.epmet.entity.ActSummaryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 活动回顾表 * @@ -36,9 +38,9 @@ public interface ActSummaryDao extends BaseDao { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.dto.result.resi.ResiActSummaryResultDTO + * @return java.util.List * @Author zhangyong - * @Date 15:11 2020-07-22 + * @Date 15:03 2020-07-31 **/ - ResiActSummaryResultDTO selectListSummary(ResiActContentFormDTO formDto); + List selectListSummary(ResiActContentFormDTO formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java index 863626d44f..e32d66533b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActSummaryService.java @@ -100,9 +100,9 @@ public interface ActSummaryService extends BaseService { * 活动详情-已结束-回顾稿 * * @param formDto - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result> * @Author zhangyong * @Date 13:39 2020-07-21 **/ - Result summaryList(ResiActContentFormDTO formDto); + Result> summaryList(ResiActContentFormDTO formDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java index e3331cf7a1..9681011fd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java @@ -106,8 +106,8 @@ public class ActSummaryServiceImpl extends BaseServiceImpl summaryList(ResiActContentFormDTO formDto) { - return new Result().ok(baseDao.selectListSummary(formDto)); + public Result> summaryList(ResiActContentFormDTO formDto) { + return new Result>().ok(baseDao.selectListSummary(formDto)); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 7d8638836d..28b8d0c064 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -205,7 +205,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'auditing' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -230,7 +230,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'passed' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -255,7 +255,7 @@ AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} AND u.`STATUS` = 'refused' - AND ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束 + AND i.ACT_STATUS = 'published' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -279,7 +279,8 @@ WHERE i.DEL_FLAG = '0' AND u.DEL_FLAG = '0' AND u.USER_ID = #{userId} - AND NOW() -- 活动结束时间 < 当前时间, 活动已结束 + AND u.`STATUS` = 'passed' + AND i.ACT_STATUS = 'finished' ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} From 447e321cf5c61d5bcc1eed29025dbb0b3c3e2981 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 15:46:15 +0800 Subject: [PATCH 35/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E6=A6=9C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/HeartUserInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java index ce7167c259..5c1dfaea87 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java @@ -128,6 +128,8 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl> leaderboard(ResiActBaseFormDTO formDTO) { List resultDtoS = new ArrayList<>(); + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); // 获取排好序的 排行榜 List leaderboardList = baseDao.selectListLeaderboard(formDTO); if (leaderboardList.size() > NumConstant.ZERO){ From fafcb47a4e1bdba715bd61f9609d8d3fda8344f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 31 Jul 2020 15:51:04 +0800 Subject: [PATCH 36/40] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 01160456be..a0dc30909d 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.21 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.22 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 c98249795d..c2fb67327b 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 @@ 4.0.0 - 0.0.21 + 0.0.22 com.epmet epmet-heart From 6ba65ab7fd5836aec108805e08a640e802bba55f Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 16:21:19 +0800 Subject: [PATCH 37/40] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ActUserRelationServiceImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index f8c48c27a5..606727cc67 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -264,8 +264,12 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl Date: Fri, 31 Jul 2020 16:32:38 +0800 Subject: [PATCH 38/40] heart+1=>0.0.23 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 a0dc30909d..c4638c3b8c 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.22 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.23 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 c2fb67327b..84ac087e8d 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 @@ 4.0.0 - 0.0.22 + 0.0.23 com.epmet epmet-heart From 69940b4e8538b569540ee9338ec6dc56a5323f03 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 16:36:32 +0800 Subject: [PATCH 39/40] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8sql?= =?UTF-8?q?=20=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/ActInfoDao.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 28b8d0c064..d362229eba 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -125,7 +125,7 @@ WHERE i.DEL_FLAG = '0' -- 活动开始时间 > 当前时间 并且 报名截止时间 < 当前时间 报名已结束,活动未开始 未开始 AND ( ]]> NOW() AND NOW() ) - AND i.ACT_STATUS != 'canceled' + AND i.ACT_STATUS = 'published' AND i.CUSTOMER_ID = #{customerId} GROUP BY i.ID ORDER BY i.CREATED_TIME DESC @@ -150,9 +150,9 @@ LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' - -- 活动开始时间 <= 当前时间 并且活动结束时间 >= 当前时间 进行中 - AND ( NOW() AND = ]]> NOW() ) - AND i.ACT_STATUS != 'canceled' + -- 活动开始时间 <= 当前时间 进行中 + AND NOW() + AND i.ACT_STATUS = 'published' AND i.CUSTOMER_ID = #{customerId} GROUP BY i.ID ORDER BY i.CREATED_TIME DESC @@ -177,8 +177,7 @@ LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' - AND i.ACT_STATUS != 'canceled' - AND NOW() + AND i.ACT_STATUS = 'finished' AND i.CUSTOMER_ID = #{customerId} GROUP BY i.ID ORDER BY i.CREATED_TIME DESC From 71ee86f2d708a7f476e6c5f5c614cbd334856f6c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 31 Jul 2020 16:50:04 +0800 Subject: [PATCH 40/40] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ActUserRelationServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index 606727cc67..7b25b31eab 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -371,7 +371,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl