From 44127187247ab653f2bb2d542a2e08e8994774a5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:28:46 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..d52071f 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;
@@ -47,6 +48,8 @@
private UserService userService;
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private CommunityService communityService;
private static String LOGIN_FAIL="LOGIN_FAIL_";
@@ -99,7 +102,7 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
if (r1.getCode()== Constants.SUCCESS){
loginUserInfoVO.setType(13);
}
@@ -133,7 +136,7 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
if (r1.getCode()== Constants.SUCCESS){
loginUserInfoVO.setType(13);
}
--
Gitblit v1.7.1