From e2de22bdce173a951083a81d0065c69d8e5e9832 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 18:26:08 +0800
Subject: [PATCH] update 优化 代码生成常量 关于 BO VO 注释
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 7f0a629..dc7821e 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,5 +1,12 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -9,52 +16,59 @@
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+
+import java.util.Arrays;
+import java.util.Collections;
/**
* 閫氱敤閰嶇疆
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Configuration
-public class ResourcesConfig implements WebMvcConfigurer
-{
+public class ResourcesConfig implements WebMvcConfigurer {
+
@Autowired
- private RepeatSubmitInterceptor repeatSubmitInterceptor;
+ private SecurityProperties securityProperties;
+ // 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@Override
- public void addResourceHandlers(ResourceHandlerRegistry registry)
- {
- /** 鏈湴鏂囦欢涓婁紶璺緞 */
- registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
-
- /** swagger閰嶇疆 */
- registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+ public void addInterceptors(InterceptorRegistry registry) {
+ // 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
+ registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
+ // 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
+ SaRouter.match(
+ //鑾峰彇鎵�鏈夌殑
+ Collections.singletonList("/**"),
+ //鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
+ Arrays.asList(securityProperties.getExcludes()),
+ () -> {
+ 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
- public void addInterceptors(InterceptorRegistry registry)
- {
- registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
}
/**
* 璺ㄥ煙閰嶇疆
*/
@Bean
- public CorsFilter corsFilter()
- {
+ public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 璁剧疆璁块棶婧愬湴鍧�
- config.addAllowedOrigin("*");
+ config.addAllowedOriginPattern("*");
// 璁剧疆璁块棶婧愯姹傚ご
config.addAllowedHeader("*");
// 璁剧疆璁块棶婧愯姹傛柟娉�
@@ -63,4 +77,4 @@
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3