From e24e87b546bba550588d0e7423e32d38f3410e25 Mon Sep 17 00:00:00 2001
From: xxy <773861846@qq.com>
Date: Sat, 16 May 2020 03:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=A7=E5=88=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/java2nb/novel/controller/UserController.java  | 4 +++-
 .../main/java/com/java2nb/novel/core/bean/UserDetails.java | 2 ++
 .../com/java2nb/novel/service/impl/UserServiceImpl.java    | 7 +++++--
 novel-front/src/main/resources/static/javascript/common.js | 2 +-
 novel-front/src/main/resources/templates/user/set_sex.html | 2 +-
 novel-front/src/main/resources/templates/user/setup.html   | 4 ++--
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
index f9101f2..887e8c5 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@@ -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 {
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java b/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
index 161eaac..04775cc 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
@@ -11,4 +11,6 @@ public class UserDetails {
     private Long id;
 
     private String username;
+
+    private String nickName;
 }
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
index 2914cd8..8c86b46 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@@ -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;
     }
diff --git a/novel-front/src/main/resources/static/javascript/common.js b/novel-front/src/main/resources/static/javascript/common.js
index 0a75196..e844637 100644
--- a/novel-front/src/main/resources/static/javascript/common.js
+++ b/novel-front/src/main/resources/static/javascript/common.js
@@ -65,7 +65,7 @@ if(!token){
         success: function(data){
             if(data.code == 200){
                 $(".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>");
                 ;
                 if("/user/login.html" == window.location.pathname){
diff --git a/novel-front/src/main/resources/templates/user/set_sex.html b/novel-front/src/main/resources/templates/user/set_sex.html
index 188ec03..ff1643d 100644
--- a/novel-front/src/main/resources/templates/user/set_sex.html
+++ b/novel-front/src/main/resources/templates/user/set_sex.html
@@ -59,7 +59,7 @@
         dataType: "json",
         success: function (data) {
             if (data.code == 200) {
-                if(data.data.userSex === 0){
+                if(data.data.userSex === '0'){
                     $("input[name=sex]").eq(0).attr("checked",true);
                 }
 
diff --git a/novel-front/src/main/resources/templates/user/setup.html b/novel-front/src/main/resources/templates/user/setup.html
index 8df2025..dddb4c6 100644
--- a/novel-front/src/main/resources/templates/user/setup.html
+++ b/novel-front/src/main/resources/templates/user/setup.html
@@ -59,9 +59,9 @@
                 }else{
                     $("#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>");
-                }else if(data.data.userSex === 1){
+                }else if(data.data.userSex === '1'){
                     $("#my_sex").html("女<em class=\"ml10\">[修改]</em>");
                 }else{
                     $("#my_sex").html("请选择");