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; }