From f585992c6f14c20a034c302970b7f46839099c08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 六月 2021 19:41:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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..c3cdc94 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
@@ -15,7 +15,7 @@
/**
* 閫氱敤閰嶇疆
- *
+ *
* @author ruoyi
*/
@Configuration
@@ -29,10 +29,6 @@
{
/** 鏈湴鏂囦欢涓婁紶璺緞 */
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/");
}
/**
@@ -54,7 +50,7 @@
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 璁剧疆璁块棶婧愬湴鍧�
- config.addAllowedOrigin("*");
+ config.addAllowedOriginPattern("*");
// 璁剧疆璁块棶婧愯姹傚ご
config.addAllowedHeader("*");
// 璁剧疆璁块棶婧愯姹傛柟娉�
@@ -63,4 +59,4 @@
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3