201206030/novel-plus
1
0
Fork 0
mirror of https://github.com/201206030/novel-plus.git synced 2025-04-27 01:30:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/xiongxyang/novel-plus into develop

Browse Source
This commit is contained in:
phacks 2020-05-16 11:46:11 +08:00
commit fe80c21812
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
View File

@ -101,7 +101,9 @@ public class UserController extends BaseController {
token = jwtTokenUtil.refreshToken(token); token = jwtTokenUtil.refreshToken(token);
Map<String, Object> data = new HashMap<>(2); Map<String, Object> data = new HashMap<>(2);
data.put("token", token); 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); return ResultBean.ok(data);
} else { } else {

2
novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
View File

@ -11,4 +11,6 @@ public class UserDetails {
private Long id; private Long id;
private String username; private String username;
private String nickName;
} }

7
novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
View File

@ -86,13 +86,14 @@ public class UserServiceImpl implements UserService {
UserDetails userDetails = new UserDetails(); UserDetails userDetails = new UserDetails();
userDetails.setId(id); userDetails.setId(id);
userDetails.setUsername(entity.getUsername()); userDetails.setUsername(entity.getUsername());
userDetails.setNickName(entity.getNickName());
return userDetails; return userDetails;
} }
@Override @Override
public UserDetails login(UserForm form) { public UserDetails login(UserForm form) {
//根据用户名密码查询记录 //根据用户名密码查询记录
SelectStatementProvider selectStatement = select(id, username) SelectStatementProvider selectStatement = select(id, username,nickName)
.from(user) .from(user)
.where(username, isEqualTo(form.getUsername())) .where(username, isEqualTo(form.getUsername()))
.and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name()))) .and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name())))
@ -104,7 +105,9 @@ public class UserServiceImpl implements UserService {
} }
//生成UserDetail对象并返回 //生成UserDetail对象并返回
UserDetails userDetails = new UserDetails(); 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()); userDetails.setUsername(form.getUsername());
return userDetails; return userDetails;
} }

2
novel-front/src/main/resources/static/javascript/common.js
View File

@ -65,7 +65,7 @@ if(!token){
success: function(data){ success: function(data){
if(data.code == 200){ if(data.code == 200){
$(".user_link").html("<i class=\"line mr20\">|</i>" + $(".user_link").html("<i class=\"line mr20\">|</i>" +
"<a href=\"/user/userinfo.html\" class=\"mr15\">"+data.data.username+"</a>" + "<a href=\"/user/userinfo.html\" class=\"mr15\">"+data.data.nickName+"</a>" +
"<a href=\"javascript:logout()\" >退出</a>"); "<a href=\"javascript:logout()\" >退出</a>");
; ;
if("/user/login.html" == window.location.pathname){ if("/user/login.html" == window.location.pathname){

2
novel-front/src/main/resources/templates/user/set_sex.html
View File

@ -59,7 +59,7 @@
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
if (data.code == 200) { if (data.code == 200) {
if(data.data.userSex === 0){ if(data.data.userSex === '0'){
$("input[name=sex]").eq(0).attr("checked",true); $("input[name=sex]").eq(0).attr("checked",true);
} }

4
novel-front/src/main/resources/templates/user/setup.html
View File

@ -59,9 +59,9 @@
}else{ }else{
$("#my_name").html(data.data.username+"<em class=\"ml10\">[修改]</em>"); $("#my_name").html(data.data.username+"<em class=\"ml10\">[修改]</em>");
} }
if(data.data.userSex === 0){ if(data.data.userSex === '0'){
$("#my_sex").html("男<em class=\"ml10\">[修改]</em>"); $("#my_sex").html("男<em class=\"ml10\">[修改]</em>");
}else if(data.data.userSex === 1){ }else if(data.data.userSex === '1'){
$("#my_sex").html("女<em class=\"ml10\">[修改]</em>"); $("#my_sex").html("女<em class=\"ml10\">[修改]</em>");
}else{ }else{
$("#my_sex").html("请选择"); $("#my_sex").html("请选择");