From 37035cbf276f2e907491c71ea99e011a8810ea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 1 May 2025 18:58:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=87=8D=E6=9E=84WebPriority?= =?UTF-8?q?Header=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将PriorityHeaderConfiguration重命名为PriorityHeaderInitBinder以明确用途 - 合并RestTemplate配置至新创建的WebCommonConfiguration类 - 在WebCommonConfiguration中统一管理Web相关Bean配置 - 添加ConditionalOnWebApplication条件注解确保Servlet环境 --- ...ion.java => PriorityHeaderInitBinder.java} | 2 +- ...ation.java => WebCommonConfiguration.java} | 33 +++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/{PriorityHeaderConfiguration.java => PriorityHeaderInitBinder.java} (94%) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/{RestTemplateConfiguration.java => WebCommonConfiguration.java} (55%) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderConfiguration.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderInitBinder.java similarity index 94% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderConfiguration.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderInitBinder.java index a62b2852d..51f587d5e 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderConfiguration.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/PriorityHeaderInitBinder.java @@ -11,7 +11,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ExtendedServletRequ * @date 2025/04/16 */ @ControllerAdvice -public class PriorityHeaderConfiguration { +public class PriorityHeaderInitBinder { /** * 初始化绑定器 diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/WebCommonConfiguration.java similarity index 55% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/WebCommonConfiguration.java index e87f95391..1b9988d5f 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/WebCommonConfiguration.java @@ -17,20 +17,41 @@ package com.pig4cloud.pigx.common.core.config; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; /** + * 通用Web配置类：提供RestTemplate的Bean配置 + * * @author lengleng - * @date 2018/8/16 RestTemplate + * @date 2025/05/01 */ @Configuration -public class RestTemplateConfiguration { +public class WebCommonConfiguration { - @Bean - public RestTemplate restTemplate() { - return new RestTemplate(); - } + /** + * 创建并配置RestTemplate的Bean方法 + * + * @return RestTemplate实例 + */ + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + /** + * 创建并返回{@link PriorityHeaderInitBinder}的Bean实例。 + * + * @return PriorityHeaderInitBinder的实例对象 + * @condition 当Web应用程序类型为SERVLET时条件成立 + * @see PriorityHeaderInitBinder + */ + @Bean + @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) + public PriorityHeaderInitBinder priorityHeaderInitBinder() { + return new PriorityHeaderInitBinder(); + } }