From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 a2c4935..9de87c6 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
@@ -15,6 +15,7 @@
import com.panzhihua.auth.config.MyAESUtil;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.AES;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -35,6 +36,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.user.UserService;
+import static java.util.Objects.nonNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 登录认证
@@ -47,6 +50,8 @@
private UserService userService;
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private CommunityService communityService;
private static String LOGIN_FAIL="LOGIN_FAIL_";
@@ -99,9 +104,11 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
- if (r1.getCode()== Constants.SUCCESS){
- loginUserInfoVO.setType(13);
+ if (nonNull(loginUserInfoVO.getPhone())){
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+ if (r1.getCode()== Constants.SUCCESS){
+ loginUserInfoVO.setType(13);
+ }
}
return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
}
@@ -133,9 +140,11 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
- if (r1.getCode()== Constants.SUCCESS){
- loginUserInfoVO.setType(13);
+ if (nonNull(loginUserInfoVO.getPhone())){
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+ if (r1.getCode() == Constants.SUCCESS){
+ loginUserInfoVO.setType(13);
+ }
}
return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
--
Gitblit v1.7.1