From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 054f98a..e3026af 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
@@ -111,6 +111,7 @@
LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setCommunityId(loginUser.getCommunityId());
return loginReturnVO;
}
@@ -235,7 +236,6 @@
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
loginReturnVO.setUserId(loginUser.getUserId());
- loginReturnVO.setCommunityId(loginUser.getCommunityId());
return loginReturnVO;
}
@@ -256,4 +256,22 @@
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
}
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginXQDP(String account, String password){
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", 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