From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 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 3787d73..28ea6fe 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
@@ -45,10 +45,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);
@@ -81,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);
@@ -104,10 +104,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);
@@ -133,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);
@@ -158,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);
@@ -181,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);
@@ -205,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);
@@ -219,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);
@@ -233,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);
@@ -254,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);
@@ -272,8 +272,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);
@@ -290,8 +290,8 @@
* @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);
--
Gitblit v1.7.1