diff --git a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java index fda7a4bf..55ecb88d 100644 --- a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java +++ b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java @@ -23,7 +23,6 @@ import org.springframework.security.authentication.AuthenticationManager; 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.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import javax.servlet.http.HttpSession; @@ -62,6 +61,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { private AccessControlProperties accessControlProperties; @Autowired private HttpSession httpSession; + @Autowired + private PasswordEncoder passwordEncoder; @Override protected void configure(HttpSecurity http) throws Exception { @@ -131,7 +132,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { private void addUserAuthenticationFilter(HttpSecurity http, LoginFailureHandler loginFailureHandler) throws Exception { UserSecurityConfig userSecurityConfig = new UserSecurityConfig(); userSecurityConfig.setUserDetailService(userDetailService); - userSecurityConfig.setPasswordEncoder(passwordEncoder()); + userSecurityConfig.setPasswordEncoder(passwordEncoder); userSecurityConfig.setLoginProcessUrl(baseProperties.getLoginProcess()); userSecurityConfig.setLoginFailureHandler(loginFailureHandler); userSecurityConfig.setUserLoginService(userLoginService); @@ -147,11 +148,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.apply(userSecurityConfig); } - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } - @Bean @Override public AuthenticationManager authenticationManagerBean() throws Exception {