From 0947c349e79d437dfb056bb2c622cba478c882f0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 15:40:56 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 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 e3026af..1bf7908 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;
@@ -20,6 +21,8 @@
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
+
+import static java.util.Objects.nonNull;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -78,10 +81,10 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginAppletsBackStage(String account, String password) {
+ public LoginReturnVO loginAppletsBackStage(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -101,17 +104,22 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginCommunityBackage(String account, String password) {
+ public LoginReturnVO loginCommunityBackage(String account, String password,String appId) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3"+"_"+appId, password));
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());
+ if (nonNull(comActVO)) {
+ loginReturnVO.setLat(comActVO.getLat());
+ loginReturnVO.setLng(comActVO.getLng());
+ }
return loginReturnVO;
}
@@ -125,10 +133,10 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginShopBackStage(String account, String password) {
+ public LoginReturnVO loginShopBackStage(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -150,10 +158,10 @@
* @date 2021-5-13 10:56
*/
@Override
- public LoginReturnVO loginBigDataBackStage(String account, String password) {
+ public LoginReturnVO loginBigDataBackStage(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -173,10 +181,10 @@
* @return 登录结果
*/
@Override
- public LoginReturnsVO loginGridApp(String account, String password) {
+ public LoginReturnsVO loginGridApp(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -197,10 +205,10 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginGridBackstage(String account, String password) {
+ public LoginReturnVO loginGridBackstage(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -211,10 +219,10 @@
}
@Override
- public LoginReturnVO loginCgBackage(String account, String password){
+ public LoginReturnVO loginCgBackage(String account, String password,String appid){
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -225,10 +233,10 @@
}
@Override
- public LoginReturnsVO loginAlarmApp(String account, String password) {
+ public LoginReturnsVO loginAlarmApp(String account, String password,String appid) {
Authentication authentication = null;
authentication =
- authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password));
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -246,8 +254,8 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginMerchantBackStage(String account, String password) {
- Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password));
+ public LoginReturnVO loginMerchantBackStage(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -264,8 +272,26 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginXQDP(String account, String password){
- Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password));
+ public LoginReturnVO loginXQDP(String account, String password,String appid){
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15"+"_"+appid, 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;
+ }
+
+ /**
+ * 微商业街用户登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginMcsUser(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
--
Gitblit v1.7.1