diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java index d91d6d5..033ad59 100644 --- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java +++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java @@ -6,7 +6,7 @@ public class UserVo { //用户id - private String userId; + private Long userId; //用户手机号 private String phonenumber; diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java index b188269..56414d5 100644 --- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java +++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java @@ -115,6 +115,8 @@ public class SysLoginService recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); Long userId = user.getUserId(); R userVoR = remoteUserService.selectUserVo(userId); + userVoR.getData().setPhonenumber(user.getPhonenumber()); + userVoR.getData().setUserId(userId); userInfo.setUserVo(userVoR.getData()); return userInfo; } diff --git a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java index ef431d2..739a381 100644 --- a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java +++ b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java @@ -67,6 +67,7 @@ public class TokenService Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("expires_in", expireTime); + rspMap.put("user",loginUser.getUserVo()); return rspMap; } diff --git a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml index ba5d764..9689440 100644 --- a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +