org.springframework.boot
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 48141744..6d678451 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
@@ -22,20 +22,15 @@ 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;
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-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.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;
import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
import top.charles7c.cnadmin.common.constant.StringConsts;
@@ -50,7 +45,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
@RequiredArgsConstructor
public class WebMvcConfiguration implements WebMvcConfigurer {
- private final CorsProperties corsProperties;
private final LocalStorageProperties localStorageProperties;
private final MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter;
@@ -72,36 +66,6 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
.setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());
}
- /**
- * 跨域配置
- */
- @Bean
- public CorsFilter corsFilter() {
- CorsConfiguration config = new CorsConfiguration();
- // 设置跨域允许时间
- config.setMaxAge(1800L);
-
- // 配置允许跨域的域名
- 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);
- // 配置允许跨域的请求头
- corsProperties.getAllowedHeaders().forEach(config::addAllowedHeader);
- // 配置允许跨域的响应头
- corsProperties.getExposedHeaders().forEach(config::addExposedHeader);
-
- // 添加映射路径，拦截一切请求
- UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
- source.registerCorsConfiguration("/**", config);
- return new CorsFilter(source);
- }
-
/**
* 解决 Jackson2ObjectMapperBuilderCustomizer 配置不生效的问题
*
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
deleted file mode 100644
index 219d9abd..00000000
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CorsProperties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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<>();
-
- /**
- * 允许跨域的响应头
- */
- private List exposedHeaders = new ArrayList<>();
-}
diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml
index 4b20bab8..02a7cc94 100644
--- a/continew-admin-webapi/src/main/resources/config/application-dev.yml
+++ b/continew-admin-webapi/src/main/resources/config/application-dev.yml
@@ -231,11 +231,12 @@ local-storage:
--- ### 跨域配置
cors:
+ enabled: true
# 配置允许跨域的域名
- allowedOrigins: '*'
+ allowed-origins: '*'
# 配置允许跨域的请求方式
- allowedMethods: '*'
+ allowed-methods: '*'
# 配置允许跨域的请求头
- allowedHeaders: '*'
+ allowed-headers: '*'
# 配置允许跨域的响应头
- exposedHeaders: '*'
\ No newline at end of file
+ exposed-headers: '*'
\ No newline at end of file
diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml
index 09c99c3f..c4078fad 100644
--- a/continew-admin-webapi/src/main/resources/config/application-prod.yml
+++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml
@@ -230,12 +230,13 @@ local-storage:
--- ### 跨域配置
cors:
+ enabled: true
# 配置允许跨域的域名
- allowedOrigins:
+ allowed-origins:
- ${project.url}
# 配置允许跨域的请求方式
- allowedMethods: '*'
+ allowed-methods: '*'
# 配置允许跨域的请求头
- allowedHeaders: '*'
+ allowed-headers: '*'
# 配置允许跨域的响应头
- exposedHeaders: '*'
+ exposed-headers: '*'
diff --git a/pom.xml b/pom.xml
index fc7b4d68..20c667bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
+
+ top.charles7c.continew
+ continew-starter
+ 1.0.0-SNAPSHOT
+
top.charles7c.continew
continew-admin
@@ -21,14 +26,8 @@
continew-admin-common
-
- org.springframework.boot
- spring-boot-starter-parent
- 3.1.5
-
-
-
+ 2.1.0-SNAPSHOT
1.37.0
@@ -46,10 +45,8 @@
1.6.2
5.8.22
-
- 2.1.0-SNAPSHOT
+
2.40.0
- UTF-8
@@ -211,18 +208,6 @@
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
-
-
- cn.hutool
- hutool-all
-
-
org.projectlombok
@@ -274,6 +259,15 @@
true
+
+ sonatype-nexus-snapshots
+ Sonatype Nexus Snapshots
+ https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+ always
+ true
+
+