From 4a49e0679773cb4c7e747fcc782406b2b8e45331 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Sep 2022 12:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ThirdLoginServiceImpl.java     | 8 +++++---
 .../com/epmet/service/impl/UserBaseInfoServiceImpl.java   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index 2c1bb6a8a8..116b2dcff4 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -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();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 37e2562cac..8d715873b7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -596,6 +596,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 result.setGridId(registerRelation.getGridId());
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(registerRelation.getGridId());
                 if (null == gridInfo) {
+                    logger.error(String.format("user服务dingResiLogin接口异常,查询网格信息返回空，接口入参：%s", JSON.toJSONString(formDTO)));
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息失败", "获取网格信息失败");
                 }
                 result.setGridName(gridInfo.getGridNamePath());