From a0fef83bf311b3326dc06c3e526faac786dde6a6 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Fri, 18 Apr 2025 13:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96token=20=E5=AF=BC=E8=87=B4=E7=9A=84=20httpRequest?=
 =?UTF-8?q?=E4=B8=BAnull.=20=E5=87=BA=E7=8E=B0=E7=9A=84=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hd/common/permission/util/RedisPermissionUtils.java  | 3 ++-
 .../evotech/hd/common/permission/util/SpringUtil.java    | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/RedisPermissionUtils.java b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/RedisPermissionUtils.java
index 55c4651..7d2887c 100644
--- a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/RedisPermissionUtils.java
+++ b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/RedisPermissionUtils.java
@@ -116,7 +116,8 @@ public class RedisPermissionUtils {
      * @return
      */
     private static String getRedisStringValue(String key) {
-        return String.valueOf(getRedisObjectValue(key));
+        Object obj = getRedisObjectValue(key);
+        return ObjectUtils.isEmpty(obj) ? "" : String.valueOf(obj);
     }
 
     /***
diff --git a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
index 8a53e3b..aa22d7f 100644
--- a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
+++ b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
@@ -42,9 +42,12 @@ public class SpringUtil implements ApplicationContextAware {
     }
 
     public static String getToken() {
-        String authorization = getRequest().getHeader(HDConstant.AUTHORIZATION_KEY);
-        if (StringUtils.hasLength(authorization) && authorization.contains(HDConstant.JWT_PREFIX)) {
-            return authorization.substring(HDConstant.JWT_PREFIX.length());
+        HttpServletRequest request = getRequest();
+        if(request != null){
+            String authorization = request.getHeader(HDConstant.AUTHORIZATION_KEY);
+            if (StringUtils.hasLength(authorization) && authorization.contains(HDConstant.JWT_PREFIX)) {
+                return authorization.substring(HDConstant.JWT_PREFIX.length());
+            }
         }
         return null;
     }