From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 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 2d05482..83435b1 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
@@ -21,6 +21,9 @@
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import static java.util.Objects.nonNull;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -43,10 +46,10 @@
* @return jwt
*/
@Override
- public LoginReturnVO loginApplets(String openId) {
+ public LoginReturnVO loginApplets(String openId,String appId) {
Authentication authentication = null;
authentication = authenticationManager
- .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1", UserConstants.PASSWORD));
+ .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1"+"_"+appId, UserConstants.PASSWORD));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -79,10 +82,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);
@@ -102,10 +105,10 @@
* @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);
@@ -114,8 +117,10 @@
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
loginReturnVO.setCommunityId(loginUser.getCommunityId());
- loginReturnVO.setLat(comActVO.getLat());
- loginReturnVO.setLng(comActVO.getLng());
+ if (nonNull(comActVO)) {
+ loginReturnVO.setLat(comActVO.getLat());
+ loginReturnVO.setLng(comActVO.getLng());
+ }
return loginReturnVO;
}
@@ -129,10 +134,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);
@@ -154,10 +159,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);
@@ -177,10 +182,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);
@@ -201,10 +206,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);
@@ -215,10 +220,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);
@@ -229,10 +234,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);
@@ -250,8 +255,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);
@@ -268,8 +273,8 @@
* @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);
@@ -286,8 +291,20 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginMcsUser(String account, String password) {
- Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11", password));
+ 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);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ @Override
+ public LoginReturnVO tfLogin(String account, String password, String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_16"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -307,8 +324,8 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginBatteryUser(String account, String password) {
- Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20", password));
+ public LoginReturnVO loginBatteryUser(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20"+"_"+appid, password));
LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
--
Gitblit v1.7.1