From 20265a287301b45ff7bb7de6a197b8110feaa853 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 15 七月 2021 17:38:37 +0800
Subject: [PATCH] 修改bug以及app端登录如果未绑定网格提示接口、首页左上角网格选择接口
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..c3baf9c 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
@@ -3,6 +3,7 @@
import com.panzhihua.auth.service.LoginService;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -155,16 +156,17 @@
* @return 登录结果
*/
@Override
- public LoginReturnVO loginGridApp(String account, String password) {
+ public LoginReturnsVO loginGridApp(String account, String password) {
Authentication authentication = null;
authentication = authenticationManager
.authenticate(new UsernamePasswordAuthenticationToken(account+"_6", 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;
}
@@ -188,4 +190,5 @@
loginReturnVO.setRefreshToken(refeshToken);
return loginReturnVO;
}
+
}
--
Gitblit v1.7.1