diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/AuthenticationFailHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java similarity index 89% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/AuthenticationFailHandler.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java index 6ca6e7c1..c2c7b26d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/AuthenticationFailHandler.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.handler; +package net.lab1024.smartadmin.service.common.security; import com.alibaba.fastjson.JSONObject; import net.lab1024.smartadmin.service.common.codeconst.LoginResponseCodeConst; @@ -15,8 +15,7 @@ import java.io.IOException; /** * 认证失败处理 */ -@Component -public class AuthenticationFailHandler implements AuthenticationEntryPoint { +public class SmartSecurityAuthenticationFailHandler implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java index c7ddbebc..db055ee9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.config; import net.lab1024.smartadmin.service.filter.SmartSecurityTokenFilter; import net.lab1024.smartadmin.service.common.security.SmartSecurityUrlMatchers; -import net.lab1024.smartadmin.service.handler.AuthenticationFailHandler; +import net.lab1024.smartadmin.service.common.security.SmartSecurityAuthenticationFailHandler; import net.lab1024.smartadmin.service.module.system.login.EmployeeLoginTokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -31,11 +31,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Value("${access-control-allow-origin}") private String accessControlAllowOrigin; - /** - * 认证失败处理类 - */ - @Autowired - private AuthenticationFailHandler authenticationFailHandler; /** * url */ @@ -74,7 +69,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { // CSRF禁用,因为不使用session .csrf().disable() // 认证失败处理类 - .exceptionHandling().authenticationEntryPoint(authenticationFailHandler).and() + .exceptionHandling().authenticationEntryPoint(new SmartSecurityAuthenticationFailHandler()).and() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() // 过滤请求 .authorizeRequests();