From 6bccd77a093e74efcea85612a47999687ab77ca0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 24 十二月 2024 15:57:59 +0800
Subject: [PATCH] 花城 处理密码错误 回显不一致2

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
index 0f8ac5c..92473f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
@@ -95,7 +95,7 @@
             // 我们还要判断密码是否正确,这里我们的密码使用BCryptPasswordEncoder进行加密的
             if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
                 lockLogin(flag,userName);
-                throw new BadCredentialsException("密码不正确");
+                throw new BadCredentialsException("账号或密码错误");
             }
             // 还可以加一些其他信息的判断,比如用户账号已停用等判断
             if (loginUserInfoVO.getStatus().intValue() == 2) {
@@ -109,10 +109,6 @@
                 if (r1.getCode()== Constants.SUCCESS){
                     loginUserInfoVO.setType(13);
                 }
-                R r2 = userService.propertyCheck(loginUserInfoVO.getPhone());
-                if (r2.getCode() == Constants.SUCCESS){
-                    loginUserInfoVO.setPropertyId((Long)r2.getData());
-                }
             }
             return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
         }
@@ -120,7 +116,7 @@
             // 查询用户是否存在
             R<LoginUserInfoVO> r = userService.getUserInfo(userName);
             if (r.getCode() != 200) {
-                throw new UsernameNotFoundException("该账号不存在");
+                throw new UsernameNotFoundException("账号或密码错误");
             }
             LoginUserInfoVO loginUserInfoVO = r.getData();
             List<GrantedAuthority> grantedAuthorityList = new ArrayList<>();
@@ -131,11 +127,11 @@
                 });
             }
             if (ObjectUtils.isEmpty(loginUserInfoVO.getAccount())) {
-                throw new UsernameNotFoundException("该账号不存在");
+                throw new UsernameNotFoundException("账号或密码错误");
             }
             // 我们还要判断密码是否正确,这里我们的密码使用BCryptPasswordEncoder进行加密的
             if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
-                throw new BadCredentialsException("密码不正确");
+                throw new BadCredentialsException("账号或密码错误");
             }
             // 还可以加一些其他信息的判断,比如用户账号已停用等判断
             if (loginUserInfoVO.getStatus().intValue() == 2) {

--
Gitblit v1.7.1