From 2d928646669fe6026c7d63f6b409d9b2790aa65e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 19 七月 2024 16:09:20 +0800
Subject: [PATCH] feat：设置部门管理员报错解决
---
src/main/java/com/mindskip/xzs/configuration/spring/mvc/WebMvcConfiguration.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/configuration/spring/mvc/WebMvcConfiguration.java b/src/main/java/com/mindskip/xzs/configuration/spring/mvc/WebMvcConfiguration.java
index 851fde6..7068633 100644
--- a/src/main/java/com/mindskip/xzs/configuration/spring/mvc/WebMvcConfiguration.java
+++ b/src/main/java/com/mindskip/xzs/configuration/spring/mvc/WebMvcConfiguration.java
@@ -1,11 +1,19 @@
package com.mindskip.xzs.configuration.spring.mvc;
+import com.mindskip.xzs.configuration.RuoYiConfig;
import com.mindskip.xzs.configuration.property.SystemConfig;
import com.mindskip.xzs.configuration.spring.wx.TokenHandlerInterceptor;
+import com.mindskip.xzs.utility.Constants;
+import lombok.RequiredArgsConstructor;
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;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.config.annotation.*;
+import java.io.File;
import java.util.List;
@@ -16,22 +24,13 @@
* @date 2021/12/25 9:45
*/
@Configuration
+@RequiredArgsConstructor
public class WebMvcConfiguration extends WebMvcConfigurationSupport {
private final TokenHandlerInterceptor tokenHandlerInterceptor;
private final SystemConfig systemConfig;
+ private final RuoYiConfig ruoYiConfig;
- /**
- * Instantiates a new Web mvc configuration.
- *
- * @param tokenHandlerInterceptor the token handler interceptor
- * @param systemConfig the system config
- */
- @Autowired
- public WebMvcConfiguration(TokenHandlerInterceptor tokenHandlerInterceptor, SystemConfig systemConfig) {
- this.tokenHandlerInterceptor = tokenHandlerInterceptor;
- this.systemConfig = systemConfig;
- }
@Override
public void addViewControllers(ViewControllerRegistry registry) {
@@ -42,8 +41,8 @@
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.addResourceHandler("/**")
- .addResourceLocations("classpath:/static/")
+ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
+ .addResourceLocations("file:" + ruoYiConfig.getUrl() + File.separator)
.setCachePeriod(31556926);
registry.addResourceHandler("swagger-ui.html")
.addResourceLocations("classpath:/META-INF/resources/");
@@ -62,14 +61,27 @@
super.addInterceptors(registry);
}
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**")
- .allowCredentials(true)
- .allowedMethods("*")
- .allowedOrigins("*")
- .allowedHeaders("*");
- super.addCorsMappings(registry);
+ /**
+ * 璺ㄥ煙閰嶇疆
+ */
+ @Bean
+ public CorsFilter corsFilter()
+ {
+ CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true);
+ // 璁剧疆璁块棶婧愬湴鍧�
+ config.addAllowedOrigin("*");
+ // 璁剧疆璁块棶婧愯姹傚ご
+ config.addAllowedHeader("*");
+ // 璁剧疆璁块棶婧愯姹傛柟娉�
+ config.addAllowedMethod("*");
+ // 鏈夋晥鏈� 1800绉�
+ config.setMaxAge(1800L);
+ // 娣诲姞鏄犲皠璺緞锛屾嫤鎴竴鍒囪姹�
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ source.registerCorsConfiguration("/**", config);
+ // 杩斿洖鏂扮殑CorsFilter
+ return new CorsFilter(source);
}
}
--
Gitblit v1.8.0