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 |    2 +-
 1 files changed, 1 insertions(+), 1 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 c0f0817..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
@@ -50,7 +50,7 @@
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 璁剧疆璁块棶婧愬湴鍧�
-        config.addAllowedOrigin("*");
+		config.addAllowedOriginPattern("*");
         // 璁剧疆璁块棶婧愯姹傚ご
         config.addAllowedHeader("*");
         // 璁剧疆璁块棶婧愯姹傛柟娉�

--
Gitblit v1.9.3