From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 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 c3cdc94..f4e2b5f 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,6 +1,7 @@
package com.ruoyi.framework.config;
-import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -9,54 +10,46 @@
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;
/**
* 閫氱敤閰嶇疆
*
- * @author ruoyi
+ * @author Lion Li
*/
@Configuration
-public class ResourcesConfig implements WebMvcConfigurer
-{
- @Autowired
- private RepeatSubmitInterceptor repeatSubmitInterceptor;
+public class ResourcesConfig implements WebMvcConfigurer {
@Override
- public void addResourceHandlers(ResourceHandlerRegistry registry)
- {
- /** 鏈湴鏂囦欢涓婁紶璺緞 */
- registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
}
- /**
- * 鑷畾涔夋嫤鎴鍒�
- */
@Override
- public void addInterceptors(InterceptorRegistry registry)
- {
- registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+ public void addInterceptors(InterceptorRegistry registry) {
+ // 鍏ㄥ眬閾捐矾璺熻釜鎷︽埅鍣�
+ registry.addInterceptor(new TLogWebInterceptor());
+ // 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
+ registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
}
/**
* 璺ㄥ煙閰嶇疆
*/
@Bean
- public CorsFilter corsFilter()
- {
- UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ public CorsFilter corsFilter() {
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 璁剧疆璁块棶婧愬湴鍧�
- config.addAllowedOriginPattern("*");
+ config.addAllowedOriginPattern("*");
// 璁剧疆璁块棶婧愯姹傚ご
config.addAllowedHeader("*");
// 璁剧疆璁块棶婧愯姹傛柟娉�
config.addAllowedMethod("*");
- // 瀵规帴鍙ｉ厤缃法鍩熻缃�
+ // 鏈夋晥鏈� 1800绉�
+ config.setMaxAge(1800L);
+ // 娣诲姞鏄犲皠璺緞锛屾嫤鎴竴鍒囪姹�
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config);
+ // 杩斿洖鏂扮殑CorsFilter
return new CorsFilter(source);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3