account 模块和 myblog 项目对齐

manager/src/main/java/cn/reghao/devops/manager/account/security/encoder/Sha256PasswordEncoder.java

@@ -1,30 +0,0 @@
-package cn.reghao.devops.manager.account.security.encoder;
-
-import cn.reghao.jutil.jdk.security.Sha256Cryptor;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-import java.security.NoSuchAlgorithmException;
-
-/**
- * @author reghao
- * @date 2019-03-26 14:46:57
- */
-public class Sha256PasswordEncoder implements PasswordEncoder {
-    private final Sha256Cryptor sha256Cryptor;
-
-    public Sha256PasswordEncoder() throws NoSuchAlgorithmException {
-        this.sha256Cryptor = new Sha256Cryptor();
-    }
-
-    @Override
-    public String encode(CharSequence rawPassword) {
-        // rawPassword 带盐值
-        return sha256Cryptor.encrypt(rawPassword.toString());
-    }
-
-    @Override
-    public boolean matches(CharSequence rawPassword, String encodedPassword) {
-        String password = sha256Cryptor.encrypt(rawPassword.toString());
-        return encodedPassword.equals(password);
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/account/security/form/AccountAuthFilter.java

@@ -55,7 +55,6 @@ public class AccountAuthFilter extends AbstractAuthenticationProcessingFilter {
         String rememberMeStr = map.get("rememberMe");
         boolean rememberMe = false;
 
-        //AccountLoginDto userLoginDto = (AccountLoginDto) ServletUtil.getBody(request, AccountLoginDto.class);
         AccountLoginDto userLoginDto = new AccountLoginDto(username, password, rememberMe);
         AccountAuthToken preAuthToken = accountAuthService.getPreAuthentication(userLoginDto);
         // 调用 UserAuthProvider.authenticate()

manager/src/main/java/cn/reghao/devops/manager/account/security/form/AccountAuthProvider.java

@@ -32,16 +32,6 @@ public class AccountAuthProvider implements AuthenticationProvider {
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
         AccountAuthToken preAuthToken = (AccountAuthToken) authentication;
         AccountAuthToken authToken = accountAuthService.authByPassword(preAuthToken);
-
-        /*int loginType = preAuthToken.getLoginType();
-        if (loginType == LoginType.mobileCode.getValue()) {
-            authToken = accountAuthService.authByVerifyCode(preAuthToken);
-        } else if (loginType == LoginType.usernamePassword.getValue()) {
-        } else if (loginType == LoginType.thirdParty.getValue()) {
-            authToken = accountAuthService.authByThirdParty(preAuthToken);
-        } else {
-            throw new DisabledException("登录类型错误");
-        }*/
         return authToken;
     }
 

manager/src/main/java/cn/reghao/devops/manager/account/security/handler/AuthFailHandlerImpl.java

@@ -1,5 +1,6 @@
 package cn.reghao.devops.manager.account.security.handler;
 
+import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
@@ -9,6 +10,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.PrintWriter;
 
 /**
  * 认证失败后的处理
@@ -21,11 +23,20 @@ public class AuthFailHandlerImpl implements AuthenticationFailureHandler {
     @Override
     public void onAuthenticationFailure(HttpServletRequest request,
                                         HttpServletResponse response,
-                                        AuthenticationException exception)
-            throws IOException, ServletException {
+                                        AuthenticationException exception) throws IOException, ServletException {
+        String errMsg = exception.getMessage();
 
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
         response.setContentType("text/html;charset=utf-8");
         response.getWriter().write(exception.getMessage());
     }
+
+    public void loginFailed(HttpServletResponse response, String errMsg) throws IOException {
+        String retJson = WebResult.failWithMsg(errMsg);
+        response.setStatus(HttpServletResponse.SC_OK);
+        //response.setContentType("application/json; charset=utf-8");
+        response.setContentType("text/html;charset=utf-8");
+        PrintWriter printWriter = response.getWriter();
+        printWriter.write(retJson);
+    }
 }

manager/src/main/java/cn/reghao/devops/manager/account/security/handler/LogoutSuccessHandlerImpl.java

@@ -1,6 +1,5 @@
 package cn.reghao.devops.manager.account.security.handler;
 
-import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import org.springframework.stereotype.Component;
@@ -9,7 +8,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
 
 /**
  * 账号注销成功后的处理, 使用此类后不再调用 logoutSuccessUrl, 在此类中直接返回给客户端
@@ -24,9 +22,6 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
     public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication auth)
             throws IOException, ServletException {
         String redirectPath = "/login";
-        String retJson = WebResult.success(redirectPath);
-        response.setContentType("application/json; charset=utf-8");
-        PrintWriter printWriter = response.getWriter();
-        printWriter.write(retJson);
+        response.sendRedirect(redirectPath);
     }
 }