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-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/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 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)); } 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 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()); } + } } 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..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.97 + 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 a22c2747ff..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.97 + 0.3.100 com.epmet epmet-user 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 6f219d961f..6fdd2f931f 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; 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 bf565610d5..3027355f35 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 @@ -154,7 +154,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl