From 3e00dd798500b24813c040f5dafb0698393cb1a1 Mon Sep 17 00:00:00 2001
From: OPGame <1242479791@qq.com>
Date: Wed, 11 Sep 2019 08:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/AdminAuthenticationProvider.java | 28 +++++++++----------
 .../MiniAppAuthenticationProvider.java        |  5 ----
 ...ractUserDetailsAuthenticationProvider.java |  4 ---
 .../provider/MpAuthenticationProvider.java    |  4 ---
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationProvider.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationProvider.java
index 8bb9cf0..d268575 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationProvider.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationProvider.java
@@ -41,20 +41,7 @@ public class AdminAuthenticationProvider extends AbstractUserDetailsAuthenticati
 
     @Override
     protected UserDetails retrieveUser(String username, Authentication authentication) throws BaseYamiAuth2Exception {
-        UserDetails user;
-        try {
-            user = yamiUserDetailsService.loadUserByUsername(username);
-        } catch (UsernameNotFoundExceptionBase var6) {
-            throw new UsernameNotFoundExceptionBase("账号或密码不正确");
-        }
-        if (!user.isEnabled()) {
-            throw new UsernameNotFoundExceptionBase("账号已被锁定,请联系管理员");
-        }
-        return user;
-    }
 
-    @Override
-    protected void additionalAuthenticationChecks(UserDetails sysUser, Authentication authentication) throws BaseYamiAuth2Exception {
         AdminAuthenticationToken adminAuthenticationToken = (AdminAuthenticationToken) authentication;
 
         String kaptchaKey = SecurityConstants.SPRING_SECURITY_RESTFUL_IMAGE_CODE + adminAuthenticationToken.getSessionUUID();
@@ -67,17 +54,28 @@ public class AdminAuthenticationProvider extends AbstractUserDetailsAuthenticati
             throw new ImageCodeNotMatchExceptionBase("验证码有误");
         }
 
+        UserDetails user;
+        try {
+            user = yamiUserDetailsService.loadUserByUsername(username);
+        } catch (UsernameNotFoundExceptionBase var6) {
+            throw new UsernameNotFoundExceptionBase("账号或密码不正确");
+        }
 
-
-        String encodedPassword = sysUser.getPassword();
+        String encodedPassword = user.getPassword();
         String rawPassword = authentication.getCredentials().toString();
 
         // 密码不正确
         if (!passwordEncoder.matches(rawPassword,encodedPassword)){
             throw new BadCredentialsExceptionBase("账号或密码不正确");
         }
+
+        if (!user.isEnabled()) {
+            throw new UsernameNotFoundExceptionBase("账号已被锁定,请联系管理员");
+        }
+        return user;
     }
 
+
     @Override
     protected Authentication createSuccessAuthentication(Authentication authentication, UserDetails user) {
         AdminAuthenticationToken result = new AdminAuthenticationToken(user, authentication.getCredentials());
diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationProvider.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationProvider.java
index 3ab82a7..f8d4c15 100644
--- a/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationProvider.java
+++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationProvider.java
@@ -41,11 +41,6 @@ public class MiniAppAuthenticationProvider extends AbstractUserDetailsAuthentica
 
     private final WxMaService wxMaService;
 
-    @Override
-    protected void additionalAuthenticationChecks(UserDetails var1, Authentication authentication) throws AuthenticationException {
-
-    }
-
     @Override
     protected Authentication createSuccessAuthentication(Authentication authentication, UserDetails user) {
         MiniAppAuthenticationToken result = new MiniAppAuthenticationToken(user, authentication.getCredentials());
diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java b/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java
index e81abc5..64c4463 100644
--- a/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java
+++ b/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java
@@ -28,8 +28,6 @@ public abstract class AbstractUserDetailsAuthenticationProvider implements Authe
 
 
 
-    protected abstract void additionalAuthenticationChecks(UserDetails var1, Authentication var2) throws AuthenticationException;
-
     @Override
     public final void afterPropertiesSet() {
     }
@@ -47,8 +45,6 @@ public abstract class AbstractUserDetailsAuthenticationProvider implements Authe
             throw var6;
         }
 
-        this.additionalAuthenticationChecks(user, authentication);
-
         return this.createSuccessAuthentication(authentication, user);
     }
 
diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java b/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java
index 6babf40..c7a4d38 100644
--- a/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java
+++ b/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java
@@ -45,10 +45,6 @@ public class MpAuthenticationProvider extends AbstractUserDetailsAuthenticationP
     private final WxMpService wxMpService;
 
 
-    @Override
-    protected void additionalAuthenticationChecks(UserDetails var1, Authentication authentication) throws AuthenticationException {
-
-    }
 
     @Override
     protected Authentication createSuccessAuthentication(Authentication authentication, UserDetails user) {