bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:ebf0973264efdf7a632b18855af0969cf65f598f
Branches Tags
bonus:dev
bonus:master
..
compare: bonus:23d202eec026eb2049a525325c1606d28231ac9a
Branches Tags
bonus:dev
bonus:master

No commits in common. "ebf0973264efdf7a632b18855af0969cf65f598f" and "23d202eec026eb2049a525325c1606d28231ac9a" have entirely different histories.
ebf0973264 ... 23d202eec0

4 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
View File

@ -6,7 +6,7 @@ public class UserVo {
//用户id //用户id
private Long userId; private String userId;
//用户手机号 //用户手机号
private String phonenumber; private String phonenumber;

2
zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
View File

@ -115,8 +115,6 @@ public class SysLoginService
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
Long userId = user.getUserId(); Long userId = user.getUserId();
R<UserVo> userVoR = remoteUserService.selectUserVo(userId); R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
userVoR.getData().setPhonenumber(user.getPhonenumber());
userVoR.getData().setUserId(userId);
userInfo.setUserVo(userVoR.getData()); userInfo.setUserVo(userVoR.getData());
return userInfo; return userInfo;
} }

1
zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
View File

@ -67,7 +67,6 @@ public class TokenService
Map<String, Object> rspMap = new HashMap<String, Object>(); Map<String, Object> rspMap = new HashMap<String, Object>();
rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("access_token", JwtUtils.createToken(claimsMap));
rspMap.put("expires_in", expireTime); rspMap.put("expires_in", expireTime);
rspMap.put("user",loginUser.getUserVo());
return rspMap; return rspMap;
} }