From 3ad467d9ef6723b1cd59349e55ca0f254650e0b2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Jul 2020 15:38:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81bug?= =?UTF-8?q?=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/UserResiInfoServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) 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 5901ddd950..04b98c6cac 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 @@ -232,11 +232,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 17:53:32 +0800 Subject: [PATCH 2/9] user +1 --- 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 6873f49c49..5ae3265e56 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.97 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.98 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 a22c2747ff..8f7354b335 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.97 + 0.3.98 com.epmet epmet-user From cb186a0a751b2a1016d1b47acf56c9f50c744d04 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 18:03:41 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/UserBaseInfoDao.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java index 5bafec9228..d64d1d3809 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.result.ResiUserBaseInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserWechatResultDTO; From 0ddec0aca638e2b8fc80b1cc52b285e69b9656d3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 18:12:13 +0800 Subject: [PATCH 4/9] =?UTF-8?q?httpclient=E8=B0=83=E7=94=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PublicUserLoginServiceImpl.java | 25 ++++++++++++------- .../service/impl/CustomerServiceImpl.java | 14 ++++++++--- 2 files changed, 27 insertions(+), 12 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 73c3390b0d..dcb84869e7 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 @@ -162,13 +162,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { CheckPaUserFormDTO dto = new CheckPaUserFormDTO(); dto.setPhone(formDTO.getPhone()); dto.setSource(formDTO.getSource()); - String url = ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER; - Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)); + String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); if (!result.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), result.getCode(), result.getMsg())); throw new RenException(result.getCode()); } - CustomerUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), CustomerUserResultDTO.class); + Object RegisterResult = result.getData(); + JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); + CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class); //登陆 if (formDTO.getIsLogon() && null == resultDTO.getPaUserResult()) { throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode()); @@ -204,13 +207,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { CheckPaUserFormDTO dto = new CheckPaUserFormDTO(); dto.setPhone(formDTO.getPhone()); dto.setSource(formDTO.getSource()); - String url = ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER; - Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)); + String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); if (!result.success()) { logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg())); throw new RenException(result.getCode()); } - CustomerUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), CustomerUserResultDTO.class); + Object RegisterResult = result.getData(); + JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); + CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class); //2.用户不存在时不允许登陆 PaUserDTO userDTO = resultDTO.getPaUserResult(); @@ -247,9 +253,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { visited.setLogonUserId(tokenDTO.getUserId()); visited.setPhone(formDTO.getPhone()); visited.setSource(formDTO.getSource()); - String saveUserVisitedUrl = ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED; - Result visitedResult = HttpClientManager.getInstance().sendPostByJSON(saveUserVisitedUrl, JSON.toJSONString(visited)); - if(!visitedResult.success()){ + String data1 = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED, JSON.toJSONString(visited)).getData(); + JSONObject json = JSON.parseObject(data1); + Result visitedResult = ConvertUtils.mapToEntity(json, Result.class); + if (!visitedResult.success()) { logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION); } 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 9f2d59c47b..6a9bfb7f83 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 @@ -406,11 +406,16 @@ public class CustomerServiceImpl extends BaseServiceImpl thirdResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + String data = HttpClientManager.getInstance().sendPostByJSON(url, null).getData(); + JSONObject toResult = JSON.parseObject(data); + Result thirdResult = ConvertUtils.mapToEntity(toResult, Result.class); if (!thirdResult.success()) { throw new RenException(thirdResult.getCode(), thirdResult.getInternalMsg()); } - InitCustomerResultDTO initCustomer = JSONObject.parseObject(thirdResult.getData(), InitCustomerResultDTO.class); + Object RegisterResult = thirdResult.getData(); + JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); + InitCustomerResultDTO initCustomer = ConvertUtils.mapToEntity(jsonObject, InitCustomerResultDTO.class); + PaCustomerDTO paCustomer = initCustomer.getPaCustomer(); PaCustomerAgencyDTO paAgency = initCustomer.getPaAgency(); PaUserDTO paUser = initCustomer.getPaUser(); @@ -491,11 +496,14 @@ public class CustomerServiceImpl extends BaseServiceImpl customerResult = HttpClientManager.getInstance().sendPostByJSON(customerUrl, null); + String data1 = HttpClientManager.getInstance().sendPostByJSON(customerUrl, null).getData(); + JSONObject json = JSON.parseObject(data1); + Result customerResult = ConvertUtils.mapToEntity(json, Result.class); if (!customerResult.success()) { throw new RenException(customerResult.getCode(), customerResult.getInternalMsg()); } + } } From e5c3ea198143d33054099db0337ee1ebc22dade2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 18:15:39 +0800 Subject: [PATCH 5/9] =?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-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/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-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index a0cb5c97e9..e3ad61dcc8 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.58 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.59 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 9421eca9b1..68b4f14a67 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.58 + 0.3.59 com.epmet epmet-cloud 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 98161f536b..0e060259d8 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.56 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.57 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 b3df9a1166..6297620e47 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.56 + 0.3.57 com.epmet oper-crm From fb6277ab864fec7c421a1dbcf7c8027858cbb07b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 18:28:04 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Bug=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/controller/PaUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java index a0270dbe4b..14b533ebb4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserController.java @@ -112,7 +112,7 @@ public class PaUserController { * @Author sun * @Description 根据手机号查询公众号用户基本信息，校验用户是否存在 **/ - @PostMapping(value = "/checkpauser/{phone}") + @PostMapping(value = "/checkpauser") public Result checkPaUser(@RequestBody CheckPaUserFormDTO formDTO) { return new Result().ok(paUserService.checkPaUser(formDTO)); } From 728c95833da92f877adae8899a829d4eac333514 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 18:29:31 +0800 Subject: [PATCH 7/9] =?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 +- 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 1abc949f24..31edd74c55 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.81 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.82 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 624ea9926a..6aeb44ec0c 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.81 + 0.0.82 com.epmet From 26b858f40f8643eb758f7def74c3a4eb5b65d856 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 19:25:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=94=A8=E6=88=B7+1?= 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 5ae3265e56..90f551cb9a 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.98 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.99 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 8f7354b335..d828c44558 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.98 + 0.3.99 com.epmet epmet-user From df5af7b7f87a7cb8a6184bb29a390bd36d6d4063 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jul 2020 23:00:57 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7user?= 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 90f551cb9a..a52e06eea2 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.99 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.100 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 d828c44558..5289b621ee 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.99 + 0.3.100 com.epmet epmet-user