From 5ced7e05f592ba23f585fc5a2b43ea8695ac0ff8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 28 五月 2022 22:30:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
index 54f373b..a07494b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
@@ -2,10 +2,10 @@
import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-import cn.dev33.satoken.jwt.StpLogicJwtForStyle;
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
-import cn.hutool.core.util.ObjectUtil;
+import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.framework.config.properties.SecurityProperties;
import lombok.RequiredArgsConstructor;
@@ -43,15 +43,17 @@
.match("/**")
// 鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
.notMatch(securityProperties.getExcludes())
+ // 瀵规湭鎺掗櫎鐨勮矾寰勮繘琛屾鏌�
.check(() -> {
- Long userId = LoginHelper.getUserId();
- if (ObjectUtil.isNotNull(userId)) {
- // 鏈夋晥鐜囧奖鍝� 鐢ㄤ簬涓存椂娴嬭瘯
- // if (log.isDebugEnabled()) {
- // log.debug("鍓╀綑鏈夋晥鏃堕棿: {}", StpUtil.getTokenTimeout());
- // log.debug("涓存椂鏈夋晥鏃堕棿: {}", StpUtil.getTokenActivityTimeout());
- // }
- }
+ // 妫�鏌ユ槸鍚︾櫥褰� 鏄惁鏈塼oken
+ StpUtil.checkLogin();
+
+ // 鏈夋晥鐜囧奖鍝� 鐢ㄤ簬涓存椂娴嬭瘯
+ // if (log.isDebugEnabled()) {
+ // log.debug("鍓╀綑鏈夋晥鏃堕棿: {}", StpUtil.getTokenTimeout());
+ // log.debug("涓存椂鏈夋晥鏃堕棿: {}", StpUtil.getTokenActivityTimeout());
+ // }
+
});
}) {
@SuppressWarnings("all")
@@ -65,8 +67,8 @@
@Bean
public StpLogic getStpLogicJwt() {
- // Sa-Token 鏁村悎 jwt (Style妯″紡)
- return new StpLogicJwtForStyle();
+ // Sa-Token 鏁村悎 jwt (绠�鍗曟ā寮�)
+ return new StpLogicJwtForSimple();
}
}
--
Gitblit v1.9.3