From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/util/TokenUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/TokenUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/TokenUtil.java
index b86182f..a5ebf2d 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/TokenUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/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