From 0e21fab9785fcdb9e69513dedaf166673ca155e4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Sep 2020 12:44:05 +0800
Subject: [PATCH] token续期调整到后端&默认有效期延长
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 2 +-
ruoyi-ui/src/views/index.vue | 28 ----------------------------
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 17 ++++++++++++++++-
3 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 2cf6915..4225eaa 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -90,7 +90,7 @@
/**
* 令牌有效期（分钟）
*/
- public final static long TOKEN_EXPIRE = 30;
+ public final static long TOKEN_EXPIRE = 720;
/**
* 参数管理 cache key
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 03099dd..36c72d6 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
@@ -18,8 +18,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.utils.StringUtils;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
import reactor.core.publisher.Mono;
@@ -32,6 +34,8 @@
public class AuthFilter implements GlobalFilter, Ordered
{
private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
+
+ private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60;
// 排除过滤的 uri 地址，nacos自行添加
@Autowired
@@ -39,6 +43,9 @@
@Resource(name = "stringRedisTemplate")
private ValueOperations<String, String> sops;
+
+ @Autowired
+ private RedisService redisService;
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
@@ -54,7 +61,7 @@
{
return setUnauthorizedResponse(exchange, "令牌不能为空");
}
- String userStr = sops.get(CacheConstants.LOGIN_TOKEN_KEY + token);
+ String userStr = sops.get(getTokenKey(token));
if (StringUtils.isNull(userStr))
{
return setUnauthorizedResponse(exchange, "登录状态已过期");
@@ -66,6 +73,9 @@
{
return setUnauthorizedResponse(exchange, "令牌验证失败");
}
+
+ // 设置过期时间
+ redisService.expire(getTokenKey(token), EXPIRE_TIME);
// 设置用户信息到请求
ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(CacheConstants.DETAILS_USER_ID, userid)
.header(CacheConstants.DETAILS_USERNAME, username).build();
@@ -88,6 +98,11 @@
}));
}
+ private String getTokenKey(String token)
+ {
+ return CacheConstants.LOGIN_TOKEN_KEY + token;
+ }
+
/**
* 获取请求token
*/
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 57a4739..4828d88 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -35,7 +35,6 @@
import RaddarChart from './dashboard/RaddarChart'
import PieChart from './dashboard/PieChart'
import BarChart from './dashboard/BarChart'
-import { getToken, getExpiresIn, setExpiresIn } from '@/utils/auth'
const lineChartData = {
newVisitis: {
@@ -67,39 +66,12 @@
},
data() {
return {
- //刷新token锁
- refreshLock: false,
- //刷新token的时间
- refreshTime: '',
lineChartData: lineChartData.newVisitis
}
- },
- created() {
- this.refreshToken()
},
methods: {
handleSetLineChartData(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);
}
}
}
--
Gitblit v1.9.3