From 6ab575cd49944863419fe884b3771d9ded558c15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 21 十月 2021 15:59:34 +0800
Subject: [PATCH] update 优化处理过期方法 采用新写法
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 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 5224b14..049f2e1 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
@@ -6,6 +6,8 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
@@ -17,7 +19,6 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
/**
* 閫氱敤閰嶇疆
@@ -27,35 +28,21 @@
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
+ @Autowired
+ private SecurityProperties securityProperties;
+
// 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@Override
public void addInterceptors(InterceptorRegistry registry) {
- List<String> urlPath = Arrays.asList(
- "/login",
- "/logout",
- "/register",
- "/captchaImage",
- "/*.html",
- "/**/*.html",
- "/**/*.css",
- "/**/*.js",
- "/doc.html",
- "/swagger-resources/**",
- "/webjars/**",
- "/*/api-docs",
- "/druid/**",
- "/actuator",
- "/actuator/**"
- );
// 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
// 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
- SaRouter.match(
- //鑾峰彇鎵�鏈夌殑
- Collections.singletonList("/**"),
- //鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
- urlPath,
- () -> {
+ SaRouter
+ // 鑾峰彇鎵�鏈夌殑
+ .match(Collections.singletonList("/**"))
+ // 鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
+ .notMatch(Arrays.asList(securityProperties.getExcludes()))
+ .check(() -> {
Long userId = SecurityUtils.getUserId();
if(StringUtils.isNotNull(userId) ) {
long tokenTimeout = StpUtil.getTokenTimeout();
--
Gitblit v1.9.3