From a05fb2db52d91733a7280d175497b9f8e25bd0ed Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 Mar 2021 18:23:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86token=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/auth/config/ShiroConfig.java | 3 ++- backend/src/main/java/io/dataease/auth/util/JWTUtils.java | 5 +++-- frontend/src/views/system/user/index.vue | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java index c8cdc9214f..4767cda249 100644 --- a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java +++ b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java @@ -53,7 +53,8 @@ public class ShiroConfig { /*filterMap.put("jwt", jwtFilter);*/ filterMap.put("logout", new F2CLogoutFilter()); factoryBean.setSecurityManager(securityManager); - factoryBean.setUnauthorizedUrl("/permissionMiss"); + factoryBean.setLoginUrl("/index.html"); + factoryBean.setUnauthorizedUrl("/index.html"); factoryBean.setFilterChainDefinitionMap(shiroService.loadFilterChainDefinitionMap()); factoryBean.setFilters(filterMap); return factoryBean; diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java index b43ae98bd3..7219376e10 100644 --- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java +++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java @@ -20,9 +20,9 @@ public class JWTUtils { // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token ) - private static final long EXPIRE_TIME = 1*60*1000/2; + private static final long EXPIRE_TIME = 5*60*1000; // 登录间隔时间10min 超过这个时间强制重新登录 - private static final long Login_Interval = 20*60*1000; + private static final long Login_Interval = 30*60*1000; /** @@ -81,6 +81,7 @@ public class JWTUtils { public static boolean loginExpire(String token){ Long now = System.currentTimeMillis(); Long lastOperateTime = tokenLastOperateTime(token); + if (lastOperateTime == null) return true; return now - lastOperateTime > Login_Interval; } diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index a6929a77a2..c999f3aa1f 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -14,7 +14,7 @@ - +