From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/util/TokenUtil.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/TokenUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/TokenUtil.java
index a3a9866..5fe0c21 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/util/TokenUtil.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/TokenUtil.java
@@ -2,6 +2,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -12,20 +14,22 @@
     private RedisUtil redisUtil;
 
 
-    public Integer getUserIdFormRedis(HttpServletRequest request) throws Exception {
+    public Integer getUserIdFormRedis() throws Exception {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = servletRequestAttributes.getRequest();
         String requestHeader = request.getHeader("Authorization");
         if (requestHeader != null && requestHeader.startsWith("Bearer ")) {
             requestHeader = requestHeader.substring(requestHeader.indexOf(" ") + 1);
             String key = null;
             int length = requestHeader.length();
-            if(length > 32){
+            if (length > 32) {
                 key = requestHeader.substring(length - 32);
-            }else{
+            } else {
                 key = requestHeader;
             }
             String value = redisUtil.getValue(key);
             return null != value ? Integer.valueOf(value) : null;
-        }else{
+        } else {
             return null;
         }
     }

--
Gitblit v1.7.1