From bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 15 八月 2022 09:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 1bf7908..65221b9 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);
@@ -148,7 +148,7 @@
/**
* 大数据统计平台（区、街道、社区三层登陆接口）
- *
+ *
* @param account
* 账户
* @param password
@@ -300,4 +300,37 @@
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) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20", 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