From 04f2c29b482e4f9191586985e5e7957a5bcd5559 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 16 Aug 2020 16:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/toesbieya/jxc/account/controller/AccountController.java | 3 +--
 .../java/cn/toesbieya/jxc/account/service/AccountService.java  | 2 +-
 .../java/cn/toesbieya/jxc/controller/AccountController.java    | 3 +--
 .../src/main/java/cn/toesbieya/jxc/service/AccountService.java | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
index 489e11b..494360c 100644
--- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
+++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
@@ -55,8 +55,7 @@ public class AccountController {
     public R updateAvatar(@RequestParam String key) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(key)) return R.fail("参数错误");
 
-        UserVo user = SessionUtil.get();
-        return service.updateAvatar(user, URLDecoder.decode(key, "utf-8"));
+        return service.updateAvatar(SessionUtil.get(), URLDecoder.decode(key, "utf-8"));
     }
 
     @GetMapping("validate")
diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
index dffa009..20dde4f 100644
--- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
+++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
@@ -215,7 +215,7 @@ public class AccountService {
             }
             user.setAvatar(avatar);
             SessionUtil.save(user);
-            return R.success("上传头像成功");
+            return R.success("上传头像成功", avatar);
         }
 
         //否则删除此次上传至云的头像
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
index 93cd249..e20f65a 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
@@ -54,8 +54,7 @@ public class AccountController {
     public R updateAvatar(@RequestParam String key) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(key)) return R.fail("参数错误");
 
-        UserVo user = SessionUtil.get();
-        return service.updateAvatar(user, URLDecoder.decode(key, "utf-8"));
+        return service.updateAvatar(SessionUtil.get(), URLDecoder.decode(key, "utf-8"));
     }
 
     @GetMapping("validate")
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
index 32c82da..cc879c7 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
@@ -204,7 +204,7 @@ public class AccountService {
             }
             user.setAvatar(avatar);
             SessionUtil.save(user);
-            return R.success("上传头像成功");
+            return R.success("上传头像成功", avatar);
         }
 
         //否则删除此次上传至云的头像