From 25b114aae7e9efb2bc54cca8a5875237bc3da694 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 18 五月 2020 14:27:15 +0800
Subject: [PATCH] 支持是否需要设置token属性,自定义返回码消息。

---
 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
index fd8eee2..8b0b38e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
@@ -59,7 +59,18 @@
     @PutMapping
     public AjaxResult updateProfile(@RequestBody SysUser user)
     {
-        return toAjax(userService.updateUserProfile(user));
+        if (userService.updateUserProfile(user) > 0)
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
+            loginUser.getUser().setNickName(user.getNickName());
+            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getUser().setEmail(user.getEmail());
+            loginUser.getUser().setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠$悊鍛�");
     }
 
     /**
@@ -80,7 +91,14 @@
         {
             return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
         }
-        return toAjax(userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)));
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠$悊鍛�");
     }
 
     /**
@@ -98,6 +116,9 @@
             {
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("imgUrl", avatar);
+                // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
                 return ajax;
             }
         }

--
Gitblit v1.9.3