From 2103731f104c4b98ef596be50ff1dd972b4f6000 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 10 六月 2021 09:44:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 f10ea2d..005f032 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,7 +1,11 @@
package com.ruoyi.framework.config;
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.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -11,7 +15,7 @@
/**
* 閫氱敤閰嶇疆
- *
+ *
* @author ruoyi
*/
@Configuration
@@ -27,8 +31,7 @@
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/");
+ registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
}
/**
@@ -39,4 +42,24 @@
{
registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
}
-}
\ No newline at end of file
+
+ /**
+ * 璺ㄥ煙閰嶇疆
+ */
+ @Bean
+ public CorsFilter corsFilter()
+ {
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true);
+ // 璁剧疆璁块棶婧愬湴鍧�
+ config.addAllowedOrigin("*");
+ // 璁剧疆璁块棶婧愯姹傚ご
+ config.addAllowedHeader("*");
+ // 璁剧疆璁块棶婧愯姹傛柟娉�
+ config.addAllowedMethod("*");
+ // 瀵规帴鍙ｉ厤缃法鍩熻缃�
+ source.registerCorsConfiguration("/**", config);
+ return new CorsFilter(source);
+ }
+}
--
Gitblit v1.9.3