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 | 62 +++++-------------------------
1 files changed, 11 insertions(+), 51 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 3b19e57..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,11 +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.interceptor.PlusWebInvokeTimeInterceptor;
+import com.yomahub.tlog.web.interceptor.TLogWebInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
@@ -15,10 +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;
-import java.util.List;
-
/**
* 閫氱敤閰嶇疆
*
@@ -27,47 +19,12 @@
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
- // 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@Override
public void addInterceptors(InterceptorRegistry registry) {
- List<String> urlPath = Arrays.asList(
- "/login",
- "/logout",
- "/captchaImage",
- "/*.html",
- "/**/*.html",
- "/**/*.css",
- "/**/*.js",
- "/profile/**",
- "/common/download**",
- "/common/download/resource**",
- "/swagger-ui.html",
- "/swagger-resources/**",
- "/webjars/**",
- "/*/api-docs",
- "/druid/**",
- "/actuator",
- "/actuator/**"
- );
- // 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
- registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
- // 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
- SaRouter.match(
- //鑾峰彇鎵�鏈夌殑
- Collections.singletonList("/**"),
- //鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
- urlPath,
- () -> {
- 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("/**");
+ // 鍏ㄥ眬閾捐矾璺熻釜鎷︽埅鍣�
+ registry.addInterceptor(new TLogWebInterceptor());
+ // 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
+ registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
}
@Override
@@ -79,7 +36,6 @@
*/
@Bean
public CorsFilter corsFilter() {
- UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 璁剧疆璁块棶婧愬湴鍧�
@@ -88,8 +44,12 @@
config.addAllowedHeader("*");
// 璁剧疆璁块棶婧愯姹傛柟娉�
config.addAllowedMethod("*");
- // 瀵规帴鍙ｉ厤缃法鍩熻缃�
+ // 鏈夋晥鏈� 1800绉�
+ config.setMaxAge(1800L);
+ // 娣诲姞鏄犲皠璺緞锛屾嫤鎴竴鍒囪姹�
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config);
+ // 杩斿洖鏂扮殑CorsFilter
return new CorsFilter(source);
}
}
--
Gitblit v1.9.3