mirror of
https://github.com/201206030/novel-plus.git
synced 2025-06-24 04:46:37 +00:00
修复性别修改问题
This commit is contained in:
@ -101,7 +101,9 @@ public class UserController extends BaseController {
|
||||
token = jwtTokenUtil.refreshToken(token);
|
||||
Map<String, Object> data = new HashMap<>(2);
|
||||
data.put("token", token);
|
||||
data.put("username", jwtTokenUtil.getUserDetailsFromToken(token).getUsername());
|
||||
UserDetails userDetail = jwtTokenUtil.getUserDetailsFromToken(token);
|
||||
data.put("username", userDetail.getUsername());
|
||||
data.put("nickName", userDetail.getNickName());
|
||||
return ResultBean.ok(data);
|
||||
|
||||
} else {
|
||||
|
@ -11,4 +11,6 @@ public class UserDetails {
|
||||
private Long id;
|
||||
|
||||
private String username;
|
||||
|
||||
private String nickName;
|
||||
}
|
||||
|
@ -86,13 +86,14 @@ public class UserServiceImpl implements UserService {
|
||||
UserDetails userDetails = new UserDetails();
|
||||
userDetails.setId(id);
|
||||
userDetails.setUsername(entity.getUsername());
|
||||
userDetails.setNickName(entity.getNickName());
|
||||
return userDetails;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDetails login(UserForm form) {
|
||||
//根据用户名密码查询记录
|
||||
SelectStatementProvider selectStatement = select(id, username)
|
||||
SelectStatementProvider selectStatement = select(id, username,nickName)
|
||||
.from(user)
|
||||
.where(username, isEqualTo(form.getUsername()))
|
||||
.and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name())))
|
||||
@ -104,7 +105,9 @@ public class UserServiceImpl implements UserService {
|
||||
}
|
||||
//生成UserDetail对象并返回
|
||||
UserDetails userDetails = new UserDetails();
|
||||
userDetails.setId(users.get(0).getId());
|
||||
User user = users.get(0);
|
||||
userDetails.setId(user.getId());
|
||||
userDetails.setNickName(user.getNickName());
|
||||
userDetails.setUsername(form.getUsername());
|
||||
return userDetails;
|
||||
}
|
||||
|
Reference in New Issue
Block a user