diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java index ad49efd0034183a42d0293437a546335680050be..29b4c7209674b5ffd64c6853e9f81fb38ad7b4ba 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java @@ -20,6 +20,7 @@ import com.pig4cloud.pig.auth.support.CustomeOAuth2AccessTokenGenerator; import com.pig4cloud.pig.auth.support.core.CustomeOAuth2TokenCustomizer; import com.pig4cloud.pig.auth.support.core.FormIdentityLoginConfigurer; import com.pig4cloud.pig.auth.support.core.PigDaoAuthenticationProvider; +import com.pig4cloud.pig.auth.support.filter.AuthSecurityConfigProperties; import com.pig4cloud.pig.auth.support.filter.PasswordDecoderFilter; import com.pig4cloud.pig.auth.support.filter.ValidateCodeFilter; import com.pig4cloud.pig.auth.support.handler.PigAuthenticationFailureEventHandler; @@ -67,9 +68,7 @@ public class AuthorizationServerConfiguration { private final OAuth2AuthorizationService authorizationService; - private final PasswordDecoderFilter passwordDecoderFilter; - - private final ValidateCodeFilter validateCodeFilter; + private final AuthSecurityConfigProperties authSecurityConfigProperties; /** * Authorization Server 配置,仅对 /oauth2/** 的请求有效 @@ -85,9 +84,9 @@ public class AuthorizationServerConfiguration { OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer(); // 增加验证码过滤器 - http.addFilterBefore(validateCodeFilter, UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new ValidateCodeFilter(authSecurityConfigProperties), UsernamePasswordAuthenticationFilter.class); // 增加密码解密过滤器 - http.addFilterBefore(passwordDecoderFilter, UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new PasswordDecoderFilter(authSecurityConfigProperties), UsernamePasswordAuthenticationFilter.class); http.with(authorizationServerConfigurer.tokenEndpoint((tokenEndpoint) -> {// 个性化认证授权端点 tokenEndpoint.accessTokenRequestConverter(accessTokenRequestConverter()) // 注入自定义的授权认证Converter diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/PasswordDecoderFilter.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/PasswordDecoderFilter.java index 299affdda2b39b90678f78411acf0b89deb8f119..8789a0c10f1ba29a3c14be92d58d1fedad9001b5 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/PasswordDecoderFilter.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/PasswordDecoderFilter.java @@ -30,7 +30,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; import javax.crypto.spec.IvParameterSpec; @@ -43,7 +42,6 @@ import java.util.Map; * @date 2019 /2/1 密码解密工具类 */ @Slf4j -@Component @RequiredArgsConstructor public class PasswordDecoderFilter extends OncePerRequestFilter { diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/ValidateCodeFilter.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/ValidateCodeFilter.java index 1eb5dd1bc4922ad34d3143799077d3f76de75a5a..7bb29dd7cd742087b4da8942bd644a5713b09e53 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/ValidateCodeFilter.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/ValidateCodeFilter.java @@ -22,7 +22,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; -import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; @@ -35,7 +34,6 @@ import java.util.Optional; * 登录前置处理器: 前端密码传输密文解密,验证码处理 */ @Slf4j -@Component @RequiredArgsConstructor public class ValidateCodeFilter extends OncePerRequestFilter {