From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 36 +-----------------------------------
1 files changed, 1 insertions(+), 35 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 6200634..f43ecab 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -1,15 +1,7 @@
package com.ruoyi.framework.config;
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-import cn.dev33.satoken.router.SaRouter;
-import cn.dev33.satoken.stp.StpUtil;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.properties.SecurityProperties;
-import com.ruoyi.framework.Interceptor.PlusWebInvokeTimeInterceptor;
+import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor;
import com.yomahub.tlog.web.interceptor.TLogWebInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
@@ -19,9 +11,6 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import java.util.Arrays;
-import java.util.Collections;
-
/**
* 閫氱敤閰嶇疆
*
@@ -30,35 +19,12 @@
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
- @Autowired
- private SecurityProperties securityProperties;
-
- // 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 鍏ㄥ眬閾捐矾璺熻釜鎷︽埅鍣�
registry.addInterceptor(new TLogWebInterceptor());
// 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
- // 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
- registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
- // 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
- SaRouter
- // 鑾峰彇鎵�鏈夌殑
- .match(Collections.singletonList("/**"))
- // 鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
- .notMatch(Arrays.asList(securityProperties.getExcludes()))
- .check(() -> {
- Long userId = SecurityUtils.getUserId();
- if(StringUtils.isNotNull(userId) ) {
- long tokenTimeout = StpUtil.getTokenTimeout();
- long tokenActivityTimeout = StpUtil.getTokenActivityTimeout();
- System.out.println("鍓╀綑鏈夋晥鏃堕棿: " + tokenTimeout);
- System.out.println("涓存椂鏈夋晥鏃堕棿: " + tokenActivityTimeout);
- }
- });
- })).addPathPatterns("/**");
- registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
}
@Override
--
Gitblit v1.9.3