From a6024ac722d75126d6b5a5d515f7e62e5955547e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 06 六月 2024 11:33:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish

---
 ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index d300c05..6cbbec4 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -62,7 +62,7 @@
         String userkey2 = JwtUtils.getUserKey2(claims);
         boolean islogin = redisService.hasKey(getTokenKey(userkey));
         boolean islogin1 = redisService.hasKey(getTokenKey(userkey1));
-        boolean islogin2 = redisService.hasKey(getTokenKey(userkey2));
+        boolean islogin2 = redisService.hasKey(getTokenKeyStudy(userkey2));
         if (!islogin && !islogin1 && !islogin2) {
             return unauthorizedResponse(exchange, "登录状态已过期");
         }
@@ -72,13 +72,13 @@
             return unauthorizedResponse(exchange, "令牌验证失败");
         }
 
-        if (org.springframework.util.StringUtils.hasLength(userkey)){
+        if (org.springframework.util.StringUtils.hasLength(userkey)) {
             addHeader(mutate, SecurityConstants.USER_KEY, userkey);
         }
-        if (org.springframework.util.StringUtils.hasLength(userkey1)){
+        if (org.springframework.util.StringUtils.hasLength(userkey1)) {
             addHeader(mutate, SecurityConstants.USER_PARENT_KEY, userkey1);
         }
-        if (org.springframework.util.StringUtils.hasLength(userkey2)){
+        if (org.springframework.util.StringUtils.hasLength(userkey2)) {
             addHeader(mutate, SecurityConstants.USER_STUDY_KEY, userkey2);
         }
         // 设置用户信息到请求
@@ -115,6 +115,13 @@
     }
 
     /**
+     * 获取学习端缓存key
+     */
+    private String getTokenKeyStudy(String token) {
+        return CacheConstants.LOGIN_TOKEN_KEY_STUDY + token;
+    }
+
+    /**
      * 获取请求token
      */
     private String getToken(ServerHttpRequest request) {

--
Gitblit v1.7.1