From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 22 ++++++++++++++++------
1 files changed, 16 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 d52071f..0f8ac5c 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
@@ -36,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: 登录认证
@@ -102,9 +104,15 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = communityService.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);
+ }
+ R r2 = userService.propertyCheck(loginUserInfoVO.getPhone());
+ if (r2.getCode() == Constants.SUCCESS){
+ loginUserInfoVO.setPropertyId((Long)r2.getData());
+ }
}
return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
}
@@ -136,9 +144,11 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = communityService.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