From a00f4f81a4946f466260a1ed2d0897b4babbfaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Tue, 18 Feb 2025 19:41:57 +0800 Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0=20Spring=20Se?= =?UTF-8?q?curity=20=E9=85=8D=E7=BD=AE=E5=B9=B6=E5=BC=95=E5=85=A5=20Lazy?= =?UTF-8?q?=20=E6=B3=A8=E8=A7=A3=20(jdk17-dev)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `AuthorizationServerConfiguration` 中移除 `DelegatingAuthenticationConverter` 的重复导入，并调整其位置。在 `PigxResourceServerConfiguration` 中引入 `@Lazy` 注解优化依赖注入，同时将 `PrePostTemplateDefaults` 替换为 `AnnotationTemplateExpressionDefaults`。 --- .../auth/config/AuthorizationServerConfiguration.java | 2 +- .../component/PigxResourceServerConfiguration.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java index 518877ed8..232cfd298 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java @@ -47,7 +47,6 @@ import org.springframework.security.oauth2.server.authorization.settings.Authori import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator; import org.springframework.security.oauth2.server.authorization.token.OAuth2RefreshTokenGenerator; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenGenerator; -import org.springframework.security.oauth2.server.authorization.web.authentication.DelegatingAuthenticationConverter; import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2AuthorizationCodeAuthenticationConverter; import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2AuthorizationCodeRequestAuthenticationConverter; import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2ClientCredentialsAuthenticationConverter; @@ -55,6 +54,7 @@ import org.springframework.security.web.DefaultSecurityFilterChain; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.AuthenticationConverter; import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import org.springframework.security.web.authentication.DelegatingAuthenticationConverter; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java index fdd4f1569..57d70a2cd 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.security.component; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Lazy; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.security.authorization.method.PrePostTemplateDefaults; @@ -27,6 +28,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; +import org.springframework.security.core.annotation.AnnotationTemplateExpressionDefaults; import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -45,10 +47,11 @@ public class PigxResourceServerConfiguration { protected final ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint; - private final PermitAllUrlProperties permitAllUrl; - private final OpaqueTokenIntrospector customOpaqueTokenIntrospector; + @Lazy + private final PermitAllUrlProperties permitAllUrl; + @Bean @Order(Ordered.HIGHEST_PRECEDENCE) SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { @@ -77,7 +80,7 @@ public class PigxResourceServerConfiguration { * @return {@link PrePostTemplateDefaults } */ @Bean - PrePostTemplateDefaults prePostTemplateDefaults() { - return new PrePostTemplateDefaults(); + AnnotationTemplateExpressionDefaults prePostTemplateDefaults() { + return new AnnotationTemplateExpressionDefaults(); } }