From dd38916f72fda246b0d3bb66d69ff681b63b1e48 Mon Sep 17 00:00:00 2001 From: cl Date: Thu, 29 Jul 2021 14:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E7=BB=99=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yami/shop/api/security/YamiUserServiceImpl.java | 4 ++-- .../shop/security/exception/UsernameNotFoundException.java | 2 +- .../yami/shop/security/handler/LoginAuthFailedHandler.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java index 1275bdb..b78804a 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java @@ -138,10 +138,10 @@ public class YamiUserServiceImpl implements YamiUserDetailsService { if (user == null) { throw new UsernameNotFoundException("用户不存在"); } - String paramPassword = passwordEncoder.encode(loginPassword); + if (!passwordEncoder.matches(loginPassword, user.getLoginPassword())) { // 原密码不正确 - throw new YamiShopBindException("密码不正确"); + throw new UsernameNotFoundException("密码不正确"); } String name = StrUtil.isBlank(user.getRealName()) ? user.getNickName() : user.getRealName(); YamiUser yamiUser = new YamiUser(user.getUserId(), loginPassword, user.getStatus() == 1); diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java index 1920729..2fbbf5f 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java @@ -10,7 +10,7 @@ package com.yami.shop.security.exception; -public class UsernameNotFoundException extends YamiAuth2Exception { +public class UsernameNotFoundException extends BaseYamiAuth2Exception { public UsernameNotFoundException(String msg) { super(msg); diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java index 943f096..c8707d6 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java @@ -45,10 +45,10 @@ public class LoginAuthFailedHandler implements AuthenticationFailureHandler { BaseYamiAuth2Exception auth2Exception = (BaseYamiAuth2Exception) exception; response.setCharacterEncoding(CharsetUtil.UTF_8); - response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setStatus(auth2Exception.getHttpErrorCode()); PrintWriter printWriter = response.getWriter(); printWriter.append(auth2Exception.getMessage()); } -} \ No newline at end of file +}