浏览代码

token续期调整到后端&默认有效期延长

RuoYi 4 年之前
父节点
当前提交
0e21fab978

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -90,7 +90,7 @@ public class Constants
     /**
     /**
      * 令牌有效期(分钟)
      * 令牌有效期(分钟)
      */
      */
-    public final static long TOKEN_EXPIRE = 30;
+    public final static long TOKEN_EXPIRE = 720;
 
 
     /**
     /**
      * 参数管理 cache key
      * 参数管理 cache key

+ 16 - 1
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java

@@ -18,8 +18,10 @@ import org.springframework.web.server.ServerWebExchange;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
 import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Mono;
 
 
@@ -32,6 +34,8 @@ import reactor.core.publisher.Mono;
 public class AuthFilter implements GlobalFilter, Ordered
 public class AuthFilter implements GlobalFilter, Ordered
 {
 {
     private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
     private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
+    
+    private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60;
 
 
     // 排除过滤的 uri 地址,nacos自行添加
     // 排除过滤的 uri 地址,nacos自行添加
     @Autowired
     @Autowired
@@ -39,6 +43,9 @@ public class AuthFilter implements GlobalFilter, Ordered
 
 
     @Resource(name = "stringRedisTemplate")
     @Resource(name = "stringRedisTemplate")
     private ValueOperations<String, String> sops;
     private ValueOperations<String, String> sops;
+    
+    @Autowired
+    private RedisService redisService;
 
 
     @Override
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
@@ -54,7 +61,7 @@ public class AuthFilter implements GlobalFilter, Ordered
         {
         {
             return setUnauthorizedResponse(exchange, "令牌不能为空");
             return setUnauthorizedResponse(exchange, "令牌不能为空");
         }
         }
-        String userStr = sops.get(CacheConstants.LOGIN_TOKEN_KEY + token);
+        String userStr = sops.get(getTokenKey(token));
         if (StringUtils.isNull(userStr))
         if (StringUtils.isNull(userStr))
         {
         {
             return setUnauthorizedResponse(exchange, "登录状态已过期");
             return setUnauthorizedResponse(exchange, "登录状态已过期");
@@ -66,6 +73,9 @@ public class AuthFilter implements GlobalFilter, Ordered
         {
         {
             return setUnauthorizedResponse(exchange, "令牌验证失败");
             return setUnauthorizedResponse(exchange, "令牌验证失败");
         }
         }
+        
+        // 设置过期时间
+        redisService.expire(getTokenKey(token), EXPIRE_TIME);
         // 设置用户信息到请求
         // 设置用户信息到请求
         ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(CacheConstants.DETAILS_USER_ID, userid)
         ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(CacheConstants.DETAILS_USER_ID, userid)
                 .header(CacheConstants.DETAILS_USERNAME, username).build();
                 .header(CacheConstants.DETAILS_USERNAME, username).build();
@@ -88,6 +98,11 @@ public class AuthFilter implements GlobalFilter, Ordered
         }));
         }));
     }
     }
 
 
+    private String getTokenKey(String token)
+    {
+        return CacheConstants.LOGIN_TOKEN_KEY + token;
+    }
+
     /**
     /**
      * 获取请求token
      * 获取请求token
      */
      */

+ 0 - 28
ruoyi-ui/src/views/index.vue

@@ -35,7 +35,6 @@ import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
 import RaddarChart from './dashboard/RaddarChart'
 import PieChart from './dashboard/PieChart'
 import PieChart from './dashboard/PieChart'
 import BarChart from './dashboard/BarChart'
 import BarChart from './dashboard/BarChart'
-import { getToken, getExpiresIn, setExpiresIn } from '@/utils/auth'
 
 
 const lineChartData = {
 const lineChartData = {
   newVisitis: {
   newVisitis: {
@@ -67,39 +66,12 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      //刷新token锁
-      refreshLock: false,
-      //刷新token的时间
-      refreshTime: '',
       lineChartData: lineChartData.newVisitis
       lineChartData: lineChartData.newVisitis
     }
     }
   },
   },
-  created() {
-    this.refreshToken()
-  },
   methods: {
   methods: {
     handleSetLineChartData(type) {
     handleSetLineChartData(type) {
       this.lineChartData = lineChartData[type]
       this.lineChartData = lineChartData[type]
-    },
-    // 实时检测刷新token
-    refreshToken() {
-      this.refreshTime = setInterval(() => {
-        if (null === getToken()) {
-          return;
-        }
-        const expires_in = getExpiresIn();
-        if (expires_in <= 1200 && !this.refreshLock) {
-          this.refreshLock = true
-          this.$store
-            .dispatch('RefreshToken')
-            .catch(() => {
-              clearInterval(this.refreshTime)
-            });
-          this.refreshLock = false
-        }
-        this.$store.commit("SET_EXPIRES_IN", expires_in - 10);
-        setExpiresIn(expires_in - 10);
-      }, 10000);
     }
     }
   }
   }
 }
 }