更新 security 包下的包名和类名

manager/src/main/java/cn/reghao/devops/manager/rbac/security/UsernamePasswordException.java

@@ -1,13 +0,0 @@
-package cn.reghao.devops.manager.rbac.security;
-
-import org.springframework.security.core.AuthenticationException;
-
-/**
- * @author reghao
- * @date 2020-10-09 22:26:09
- */
-public class UsernamePasswordException extends AuthenticationException {
-    public UsernamePasswordException(String msg) {
-        super(msg);
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/rbac/security/exceptioin/AccountLoginException.java

@@ -0,0 +1,13 @@
+package cn.reghao.devops.manager.rbac.security.exceptioin;
+
+import org.springframework.security.core.AuthenticationException;
+
+/**
+ * @author reghao
+ * @date 2020-10-09 22:26:09
+ */
+public class AccountLoginException extends AuthenticationException {
+    public AccountLoginException(String msg) {
+        super(msg);
+    }
+}

manager/src/main/java/cn/reghao/devops/manager/rbac/security/LoginRedirectFilter.java → manager/src/main/java/cn/reghao/devops/manager/rbac/security/filter/LoginRedirectFilter.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security;
+package cn.reghao.devops.manager.rbac.security.filter;
 
 import cn.reghao.devops.manager.rbac.UserContext;
 import cn.reghao.devops.manager.rbac.model.po.User;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/UsernamePasswordAuthProvider.java → manager/src/main/java/cn/reghao/devops/manager/rbac/security/form/AccountAuthProvider.java

@@ -1,5 +1,6 @@
-package cn.reghao.devops.manager.rbac.security;
+package cn.reghao.devops.manager.rbac.security.form;
 
+import cn.reghao.devops.manager.rbac.security.exceptioin.AccountLoginException;
 import cn.reghao.jutil.jdk.security.Cryptor;
 import cn.reghao.jutil.jdk.security.Md5Cryptor;
 import cn.reghao.devops.manager.rbac.model.po.User;
@@ -16,11 +17,11 @@ import java.security.NoSuchAlgorithmException;
  * @author reghao
  * @date 2019-04-09 09:07:40
  */
-public class UsernamePasswordAuthProvider implements AuthenticationProvider {
+public class AccountAuthProvider implements AuthenticationProvider {
     private final UserDetailsServiceImpl userDetailsService;
     private final Cryptor cryptor;
 
-    public UsernamePasswordAuthProvider(UserDetailsServiceImpl userDetailsService)
+    public AccountAuthProvider(UserDetailsServiceImpl userDetailsService)
             throws NoSuchAlgorithmException {
         this.userDetailsService = userDetailsService;
         this.cryptor = new Md5Cryptor();
@@ -36,8 +37,8 @@ public class UsernamePasswordAuthProvider implements AuthenticationProvider {
         User user = (User) userDetailsService.loadUserByUsername(username);
         String encryptedPwd = cryptor.encrypt(password + user.getSalt());
         if (!user.getPassword().equals(encryptedPwd)) {
-            // TODO 禁用 DaoAuthenticationProvider，当前 provider 认证失败后即返回给前端
-            throw new UsernamePasswordException("用户名/密码错误");
+            String errMsg = "账号或密码不正确";
+            throw new AccountLoginException(errMsg);
         }
 
         return new UsernamePasswordAuthenticationToken(user, password, user.getAuthorities());

manager/src/main/java/cn/reghao/devops/manager/rbac/security/UserDetailsServiceImpl.java → manager/src/main/java/cn/reghao/devops/manager/rbac/security/form/UserDetailsServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security;
+package cn.reghao.devops.manager.rbac.security.form;
 
 import cn.reghao.devops.manager.rbac.model.po.User;
 import cn.reghao.devops.manager.rbac.service.UserService;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/WebAuthFailureHandlerImpl.java → manager/src/main/java/cn/reghao/devops/manager/rbac/security/handler/WebAuthFailureHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security;
+package cn.reghao.devops.manager.rbac.security.handler;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/WebAuthSuccessHandlerImpl.java → manager/src/main/java/cn/reghao/devops/manager/rbac/security/handler/WebAuthSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security;
+package cn.reghao.devops.manager.rbac.security.handler;
 
 import cn.reghao.jutil.jdk.result.WebBody;
 import org.springframework.security.core.Authentication;