From 0ddec0aca638e2b8fc80b1cc52b285e69b9656d3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 18:12:13 +0800 Subject: [PATCH] =?UTF-8?q?httpclient=E8=B0=83=E7=94=A8=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=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()); } + } }