From 52dce2acdfa0296c3f6f4875f14a0299f999f899 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 29 Dec 2023 17:46:28 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BD=BF=E7=94=A8=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=AD=94=E6=B3=95=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E5=BF=83=E6=A8=A1=E5=9D=97=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=89=8D=E7=BC=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/satoken/autoconfigure/SaTokenAutoConfiguration.java | 3 ++- .../core/autoconfigure/cors/CorsAutoConfiguration.java | 4 ++-- .../starter/core/autoconfigure/cors/CorsProperties.java | 2 +- .../core/autoconfigure/threadpool/AsyncAutoConfiguration.java | 2 +- .../autoconfigure/threadpool/ThreadPoolAutoConfiguration.java | 2 +- .../core/autoconfigure/threadpool/ThreadPoolProperties.java | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java index 33bc2ae8..22737645 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java @@ -35,6 +35,7 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.core.handler.GeneralPropertySourceFactory; /** @@ -56,7 +57,7 @@ public class SaTokenAutoConfiguration implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验 - registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())).addPathPatterns("/**") + registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())).addPathPatterns(StringConstants.PATH_PATTERN) .excludePathPatterns(properties.getSecurity().getExcludes()); } diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java index 2d581af5..4ecacd79 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java @@ -39,7 +39,7 @@ import top.charles7c.continew.starter.core.constant.StringConstants; @Lazy @AutoConfiguration @ConditionalOnWebApplication -@ConditionalOnProperty(prefix = "cors", name = "enabled", havingValue = "true") +@ConditionalOnProperty(prefix = "continew-starter.cors", name = "enabled", havingValue = "true") @EnableConfigurationProperties(CorsProperties.class) public class CorsAutoConfiguration { @@ -68,7 +68,7 @@ public class CorsAutoConfiguration { properties.getExposedHeaders().forEach(config::addExposedHeader); // 添加映射路径，拦截一切请求 UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", config); + source.registerCorsConfiguration(StringConstants.PATH_PATTERN, config); CorsFilter corsFilter = new CorsFilter(source); log.info("[ContiNew Starter] - Auto Configuration 'CorsFilter' completed initialization."); return corsFilter; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsProperties.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsProperties.java index 7e993913..74ea4869 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsProperties.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsProperties.java @@ -31,7 +31,7 @@ import java.util.List; * @since 1.0.0 */ @Data -@ConfigurationProperties(prefix = "cors") +@ConfigurationProperties(prefix = "continew-starter.cors") public class CorsProperties { /** diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java index 801dea8f..08f12a92 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java @@ -42,7 +42,7 @@ import java.util.concurrent.ScheduledExecutorService; @Lazy @AutoConfiguration @RequiredArgsConstructor -@ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") +@ConditionalOnProperty(prefix = "continew-starter.thread-pool", name = "enabled", havingValue = "true") @EnableAsync(proxyTargetClass = true) public class AsyncAutoConfiguration implements AsyncConfigurer { diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java index b438a03f..e88a4e5f 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java @@ -42,7 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor; @Slf4j @Lazy @AutoConfiguration -@ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") +@ConditionalOnProperty(prefix = "continew-starter.thread-pool", name = "enabled", havingValue = "true") @EnableConfigurationProperties(ThreadPoolProperties.class) public class ThreadPoolAutoConfiguration { diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java index 62e8037f..557cb682 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 1.0.0 */ @Data -@ConfigurationProperties(prefix = "thread-pool") +@ConfigurationProperties(prefix = "continew-starter.thread-pool") public class ThreadPoolProperties { /**