From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
index 632957d..5cbba06 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -108,9 +109,13 @@
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ ComActVO comActVO = loginUser.getComActVO();
LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setCommunityId(loginUser.getCommunityId());
+ loginReturnVO.setLat(comActVO.getLat());
+ loginReturnVO.setLng(comActVO.getLng());
return loginReturnVO;
}
@@ -273,4 +278,22 @@
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
}
+
+ /**
+ * 微商业街用户登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginMcsUser(String account, String password) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11", password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
}
--
Gitblit v1.7.1