From 8591a247300fe24e582f46c321e60e3c10c5edb3 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 23 Mar 2023 19:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=85=8D=E7=BD=AE=E5=85=81=E8=AE=B8=E8=B7=A8=E5=9F=9F?=
 =?UTF-8?q?=E7=9A=84=E5=85=B7=E4=BD=93=E5=9F=9F=E5=90=8D=E6=88=96=20*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/common/config/WebMvcConfiguration.java    | 11 ++++++++---
 .../cnadmin/common/constant/StringConsts.java         |  5 +++++
 .../src/main/resources/application-dev.yml            |  6 +-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java
index 659d084a..82a2cec4 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java
@@ -36,6 +36,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import top.charles7c.cnadmin.common.config.properties.CorsProperties;
 import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
+import top.charles7c.cnadmin.common.constant.StringConsts;
 
 /**
  * Web MVC 配置
@@ -75,13 +76,17 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     @Bean
     public CorsFilter corsFilter() {
         CorsConfiguration config = new CorsConfiguration();
-        // 配置为 true 后则必须配置允许跨域的域名，且不允许配置为 *
-        config.setAllowCredentials(true);
         // 设置跨域允许时间
         config.setMaxAge(1800L);
 
         // 配置允许跨域的域名
-        corsProperties.getAllowedOrigins().forEach(config::addAllowedOrigin);
+        if (corsProperties.getAllowedOrigins().contains(StringConsts.ASTERISK)) {
+            config.addAllowedOriginPattern(StringConsts.ASTERISK);
+        } else {
+            // 配置为 true 后则必须配置允许跨域的域名，且不允许配置为 *
+            config.setAllowCredentials(true);
+            corsProperties.getAllowedOrigins().forEach(config::addAllowedOrigin);
+        }
         // 配置允许跨域的请求方式
         corsProperties.getAllowedMethods().forEach(config::addAllowedMethod);
         // 配置允许跨域的请求头
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java
index e3cdffbe..13a1010c 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java
@@ -40,6 +40,11 @@ public class StringConsts implements StrPool {
      */
     public static final String SEMICOLON = ";";
 
+    /**
+     * 星号
+     */
+    public static final String ASTERISK = "*";
+
     /**
      * 中文逗号
      */
diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml
index 2431302e..f6b5d3fb 100644
--- a/continew-admin-webapi/src/main/resources/application-dev.yml
+++ b/continew-admin-webapi/src/main/resources/application-dev.yml
@@ -176,11 +176,7 @@ local-storage:
 --- ### 跨域配置
 cors:
   # 配置允许跨域的域名
-  allowedOrigins:
-    - http://127.0.0.1:5173
-    - http://localhost:5173
-    - http://cnadmin.charles7c.top
-    - https://cnadmin.charles7c.top
+  allowedOrigins: '*'
   # 配置允许跨域的请求方式
   allowedMethods: '*'
   # 配置允许跨域的请求头