大屏接口修改
This commit is contained in:
parent
5b10a323ae
commit
edfe1dbd25
|
|
@ -6,7 +6,7 @@ public class UserVo {
|
||||||
|
|
||||||
|
|
||||||
//用户id
|
//用户id
|
||||||
private String userId;
|
private Long userId;
|
||||||
|
|
||||||
//用户手机号
|
//用户手机号
|
||||||
private String phonenumber;
|
private String phonenumber;
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,8 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
|
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
|
||||||
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
|
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
|
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
|
||||||
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
|
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue