From 93de43267e1663031fe5dc2f5ae40d128a182a76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 18 六月 2026 17:24:51 +0800
Subject: [PATCH] 新增智能电表、空调管理

---
 server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index b5a1acc..e277949 100644
--- a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -132,21 +132,29 @@
         try {
             //鐧诲嚭娴峰悍绯荤粺鏁版嵁
             LoginUserInfo loginUserInfo = this.getUserInfoByToken(token);
-            String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
-                    systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() +
-                    systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LOGIN_OUT_URL).getCode();
-            if(StringUtils.isNotBlank(loginUserInfo.getHkMenuToken())){
+            if (loginUserInfo != null && StringUtils.isNotBlank(loginUserInfo.getHkMenuToken())) {
+                String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
+                        systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() +
+                        systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LOGIN_OUT_URL).getCode();
                 log.info("璋冭捣娴峰悍閫�鍑虹櫥褰�=======================>"+url+"?token="+loginUserInfo.getHkMenuToken());
-//                this.hkLoginOut(url+"?token="+loginUserInfo.getHkMenuToken());
                 HttpsUtil.get(url+"?token="+loginUserInfo.getHkMenuToken(),true);
             }
-            redisTemplate.delete(Constants.REDIS_TOKEN_KEY+token);//鍒犻櫎鑰佺殑token
-            systemLoginService.cleanOpenid(loginUserInfo.getId());
+            invalidateToken(token);
+            if (loginUserInfo != null && !Constants.equalsInteger(loginUserInfo.getH5UserType(), LoginUserInfo.H5_USER_CUSTOMER)) {
+                systemLoginService.cleanOpenid(loginUserInfo.getId());
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    /** 浠呭け鏁� token锛屼笉娓呯悊 openid锛堝晢鎴� H5 閫�鍑虹敱涓氬姟灞傚崟鐙В缁� member锛� */
+    public void invalidateToken(String token) {
+        if (StringUtils.isNotBlank(token)) {
+            redisTemplate.delete(Constants.REDIS_TOKEN_KEY + token);
+        }
+    }
+
 
     public void hkLoginOut(String url){
         try {

--
Gitblit v1.9.3