From 6a7ad96fa399c98e9462a2ee8e3c2dafd1cbab44 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 26 Dec 2022 23:23:33 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/config/WebMvcConfiguration.java | 19 +++++-- .../config/properties/CorsProperties.java | 52 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 15 +++++- .../src/main/resources/application-prod.yml | 13 ++++- 4 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CorsProperties.java 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 d09b69eb..49fb31e1 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 @@ -18,6 +18,8 @@ package top.charles7c.cnadmin.common.config; import java.util.concurrent.TimeUnit; +import lombok.RequiredArgsConstructor; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.CacheControl; @@ -28,6 +30,8 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import top.charles7c.cnadmin.common.config.properties.CorsProperties; + /** * Web MVC 配置 * @@ -36,8 +40,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; */ @EnableWebMvc @Configuration +@RequiredArgsConstructor public class WebMvcConfiguration implements WebMvcConfigurer { + private final CorsProperties corsProperties; + /** * 静态资源处理器配置 */ @@ -54,13 +61,17 @@ public class WebMvcConfiguration implements WebMvcConfigurer { @Bean public CorsFilter corsFilter() { CorsConfiguration config = new CorsConfiguration(); + // 配置为 true 后则必须配置允许跨域的域名，且不允许配置为 * config.setAllowCredentials(true); + // 设置跨域允许时间 config.setMaxAge(1800L); - // 允许跨域配置 - config.addAllowedOriginPattern("*"); - config.addAllowedHeader("*"); - config.addAllowedMethod("*"); + // 配置允许跨域的域名 + corsProperties.getAllowedOrigins().forEach(config::addAllowedOrigin); + // 配置允许跨域的请求方式 + corsProperties.getAllowedMethods().forEach(config::addAllowedMethod); + // 配置允许跨域的请求头 + corsProperties.getAllowedHeaders().forEach(config::addAllowedHeader); // 添加映射路径，拦截一切请求 UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CorsProperties.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CorsProperties.java new file mode 100644 index 00000000..33321236 --- /dev/null +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CorsProperties.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package top.charles7c.cnadmin.common.config.properties; + +import java.util.ArrayList; +import java.util.List; + +import lombok.Data; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 跨域配置属性 + * + * @author Charles7c + * @since 2022/12/26 22:56 + */ +@Data +@Component +@ConfigurationProperties(prefix = "cors") +public class CorsProperties { + + /** + * 允许跨域的域名 + */ + private List allowedOrigins = new ArrayList<>(); + + /** + * 允许跨域的请求方式 + */ + private List allowedMethods = new ArrayList<>(); + + /** + * 允许跨域的请求头 + */ + private List allowedHeaders = new ArrayList<>(); +} diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml index d829d74f..8266790b 100644 --- a/continew-admin-webapi/src/main/resources/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/application-dev.yml @@ -104,4 +104,17 @@ captcha: --- ### 接口文档配置 springdoc: swagger-ui: - enabled: true \ No newline at end of file + enabled: true + +--- ### 跨域配置 +cors: + # 配置允许跨域的域名 + allowedOrigins: + - http://127.0.0.1:5173 + - http://localhost:5173 + - http://cnadmin.charles7c.top + - https://cnadmin.charles7c.top + # 配置允许跨域的请求方式 + allowedMethods: '*' + # 配置允许跨域的请求头 + allowedHeaders: '*' diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml index c4b0c0fe..405675df 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/application-prod.yml @@ -92,4 +92,15 @@ captcha: --- ### 接口文档配置 springdoc: swagger-ui: - enabled: false \ No newline at end of file + enabled: false + +--- ### 跨域配置 +cors: + # 配置允许跨域的域名 + allowedOrigins: + - http://cnadmin.charles7c.top + - https://cnadmin.charles7c.top + # 配置允许跨域的请求方式 + allowedMethods: '*' + # 配置允许跨域的请求头 + allowedHeaders: '*'