From 40b01e9d801219a19d28c336ebece5458bc1bec6 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 8 Nov 2022 11:24:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E9=80=9A=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=94=A8=E6=88=B7=E5=B0=B1=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?;acces=5Ftoken=E4=BB=8Eredis=E5=8F=96=E5=87=BA=E5=B8=A6?=
 =?UTF-8?q?=E5=8F=8C=E5=BC=95=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java    | 4 ++++
 .../src/main/java/com/epmet/service/impl/SdtServiceImpl.java  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 58c60d8b95..49dc626942 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
@@ -1178,6 +1178,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         SdtStaffInfoResult staffInfo = getResultDataOrThrowsException(thirdOpenFeignClient.getUserInfoByAuthCode(authCode, customerId), ServiceConstant.EPMET_THIRD_SERVER,
                 EpmetErrorCode.SERVER_ERROR.getCode(), "获取山东通用户基础信息失败", null);
 
+        if (staffInfo == null) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取山东通用户基础信息返回null，流程终止");
+        }
+
         // 2.获取用户详细信息
         SdtStaffDetailResult staffDetail = getResultDataOrThrowsException(thirdOpenFeignClient.getUserDetailByUserId(staffInfo.getUserId(), customerId), ServiceConstant.EPMET_THIRD_SERVER,
                 EpmetErrorCode.SERVER_ERROR.getCode(), "获取山东通用户详细信息失败", null);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
index 5b463f352f..e81438f08b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
@@ -135,7 +135,7 @@ public class SdtServiceImpl implements SdtService {
         String key = RedisKeys.getSdtAccessToken(customerId);
         String accessToken = redisUtils.getString(key);
         if (StringUtils.isNotBlank(accessToken)) {
-            return accessToken;
+            return accessToken.replaceAll("\"", "");
         }
 
         // db中查询

From 2c16314143cc994842d2fe0c3085e6ec1d1069ca Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 8 Nov 2022 11:30:09 +0800
Subject: [PATCH 2/2] sdt

---
 .../main/java/com/epmet/service/impl/SdtServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
index e81438f08b..b5dca9bc0d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
@@ -148,7 +148,10 @@ public class SdtServiceImpl implements SdtService {
         accessToken = sdtAppInfoEntity.getAccessToken();
         Date expiresAt = sdtAppInfoEntity.getExpiresAt();
 
-        Long expireIn = getExpireIn(expiresAt);
+        Long expireIn = -1l;
+        if (expiresAt != null) {
+            expireIn = getExpireIn(expiresAt);
+        }
 
         if (StringUtils.isNotBlank(accessToken) && expireIn > 0) {
             // 没过期，可以用
@@ -185,6 +188,9 @@ public class SdtServiceImpl implements SdtService {
         HashMap<String, Object> params = new HashMap<>();
         params.put("access_token", getCachedAccessToken(customerId));
         params.put("code", authCode);
+
+        log.info("【山东通】获取用户信息，code:{}, access_token:{}", authCode, getCachedAccessToken(customerId));
+
         Result<String> sdtResult = HttpClientManager.getInstance().sendGet(sdtAppInfoEntity.getApiAddress() + API_GET_USER_INFO_URL, params);
         if (!sdtResult.success()) {
             // http状态判断