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 | 262 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 204 insertions(+), 58 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 f7b19ea..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
@@ -1,11 +1,11 @@
package com.panzhihua.auth.service.impl;
-import com.panzhihua.auth.service.LoginService;
-import com.panzhihua.common.constants.TokenConstant;
-import com.panzhihua.common.model.vos.LoginReturnVO;
-import com.panzhihua.common.utlis.JWTTokenUtil;
-import com.panzhihua.common.constants.UserConstants;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import java.util.concurrent.TimeUnit;
+
+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;
@@ -14,8 +14,16 @@
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.concurrent.TimeUnit;
+import com.panzhihua.auth.service.LoginService;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+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
@@ -33,18 +41,19 @@
/**
* 微信小程序登录
*
- * @param openId 微信标识
+ * @param openId
+ * 微信标识
* @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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1"+"_"+appId, UserConstants.PASSWORD));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
@@ -53,31 +62,34 @@
/**
* 小程序用户登出
*
- * @param token 登录用户token
+ * @param token
+ * 登录用户token
*/
@Override
public void logoutApplets(String token) {
ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
- token= token.replaceAll(TokenConstant.TOKEN_PRE,"");
- valueOperations.set(UserConstants.LOGOUT_TOKEN+token,token, TokenConstant.EXPIRETIME, TimeUnit.MINUTES);
+ token = token.replaceAll(TokenConstant.TOKEN_PRE, "");
+ valueOperations.set(UserConstants.LOGOUT_TOKEN + token, token, TokenConstant.EXPIRETIME, TimeUnit.MINUTES);
}
/**
* 运营后台登录
*
- * @param account 账户
- * @param password 密码
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
@@ -86,40 +98,50 @@
/**
* 社区后台登录
*
- * @param account 账户
- * @param password 密码
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3"+"_"+appId, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ 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;
}
/**
* 商家后台登录
*
- * @param account 账户
- * @param password 密码
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
@@ -127,21 +149,24 @@
/**
* 大数据统计平台（区、街道、社区三层登陆接口）
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @author manailin
* @return 登录结果
* @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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
@@ -150,40 +175,161 @@
/**
* 商家后台登录
*
- * @param account 账户
- * @param password 密码
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
@Override
- public LoginReturnVO 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));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
String token = JWTTokenUtil.generateToken(loginUser);
String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnsVO loginReturnVO = new LoginReturnsVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setUserId(loginUser.getUserId());
return loginReturnVO;
}
/**
* 商家后台登录
*
- * @param account 账户
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginGridBackstage(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7"+"_"+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 loginCgBackage(String account, String password,String appid){
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9"+"_"+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 LoginReturnsVO loginAlarmApp(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnsVO loginReturnVO = new LoginReturnsVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setUserId(loginUser.getUserId());
+ return loginReturnVO;
+ }
+
+ /**
+ * 便民服务商家后台登录
+ * @param account 账户
* @param password 密码
* @return 登录结果
*/
@Override
- public LoginReturnVO loginGridBackstage(String account, String password) {
- Authentication authentication = null;
- authentication = authenticationManager
- .authenticate(new UsernamePasswordAuthenticationToken(account+"_7", password));
- LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ 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);
- LoginReturnVO loginReturnVO=new LoginReturnVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ 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);
+ 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);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ 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);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setToken(token);
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
--
Gitblit v1.7.1