|
|
@ -720,7 +720,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol |
|
|
|
@Override |
|
|
|
public ResiDingAppLoginResDTO resiLoginDing(ResiDingAppLoginFormDTO formDTO) { |
|
|
|
//获取用户手机号
|
|
|
|
log.info("钉钉居民端应用登录入参:"+ JSON.toJSONString(formDTO)); |
|
|
|
log.info("1、钉钉居民端应用登录入参:"+ JSON.toJSONString(formDTO)); |
|
|
|
ResiDingAppLoginResDTO resDTO= null; |
|
|
|
try { |
|
|
|
resDTO = new ResiDingAppLoginResDTO(); |
|
|
@ -739,12 +739,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol |
|
|
|
//1、获取用户手机号
|
|
|
|
String clientId = formDTO.getClientId(); |
|
|
|
DingTalkResult<AccessTokenResult> userAccessToken = dingTalkClientToken.getUserAccessToken(formDTO.getAuthCode(), clientId, DingMiniAppEnum.getEnum(clientId).getSuiteSecret()); |
|
|
|
log.info("resiLoginDing userAccessToken:{}",JSON.toJSONString(userAccessToken)); |
|
|
|
log.info("2、resiLoginDing userAccessToken:{}",JSON.toJSONString(userAccessToken)); |
|
|
|
if (!userAccessToken.success() || null == userAccessToken.getData()) { |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用微信api异常:" + JSON.toJSONString(userAccessToken), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); |
|
|
|
} |
|
|
|
DingTalkResult<UserBaseInfo> me = dingTalkClientUser.getUserInfo("me", userAccessToken.getData().getAccessToken()); |
|
|
|
log.info("resiLoginDing me:{}",JSON.toJSONString(me)); |
|
|
|
log.info("3、resiLoginDing me:{}",JSON.toJSONString(me)); |
|
|
|
resDTO.setExtInfo(JSON.toJSONString(me.getData())); |
|
|
|
|
|
|
|
// 2、调用userfeign接口获取userId、注册网格相关信息 todo
|
|
|
@ -752,6 +752,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol |
|
|
|
dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId()); |
|
|
|
Result<DingLoginResiResDTO> loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO); |
|
|
|
if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) { |
|
|
|
//临时打个日志
|
|
|
|
log.error(String.format("resilogin-ding获取epmetUserId异常,入参:%s,user服务返参:%s", JSON.toJSONString(formDTO), JSON.toJSONString(loginResiResDTOResult))); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取epmetUserId异常:" + JSON.toJSONString(loginResiResDTOResult), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); |
|
|
|
} |
|
|
|
DingLoginResiResDTO resiResDTO=loginResiResDTOResult.getData(); |
|
|
|