From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/util/TokenUtil.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/TokenUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/TokenUtil.java
index 5e5a53d..66d5232 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/TokenUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/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,7 +14,9 @@
     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);

--
Gitblit v1.7.1