From 2a0876b689ad97c58f79e9ca4637ae2dd43baa52 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 17 五月 2021 15:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/manailin_test' into test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 50dc16d..6769438 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
@@ -40,7 +40,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<>();
@@ -51,17 +51,18 @@
});
}
if (ObjectUtils.isEmpty(loginUserInfoVO.getAccount())) {
- throw new UsernameNotFoundException("用户名不存在");
+ throw new UsernameNotFoundException("该账号不存在");
}
// 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
-// throw new RuntimeException("顶顶顶顶");
throw new BadCredentialsException("密码不正确");
}
// 还可以加一些其他信息的判断，比如用户账号已停用等判断
if (loginUserInfoVO.getStatus().intValue()==2) {
throw new LockedException("该用户已被禁用");
}
+// 维护最后登录时间
+ userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
}
--
Gitblit v1.7.1