From d9886066f3052e1d969a91474f2fb7cd14ae07c1 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Sat, 23 May 2020 18:50:46 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?=
 =?UTF-8?q?=20v2.5=20beta=20=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=E8=A3=81?=
 =?UTF-8?q?=E5=89=AA=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新详情：https://www.ydyno.com/archives/1225.html
---
 .../java/me/zhengjie/modules/system/rest/UserController.java | 5 ++---
 .../java/me/zhengjie/modules/system/service/UserService.java | 4 +++-
 .../modules/system/service/impl/UserServiceImpl.java         | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
index f2671255..f84e7611 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
@@ -168,9 +168,8 @@ public class UserController {
 
     @ApiOperation("修改头像")
     @PostMapping(value = "/updateAvatar")
-    public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile file){
-        userService.updateAvatar(file);
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar){
+        return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
     }
 
     @Log("修改邮箱")
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
index 2a2863f4..dfe1bd4a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
@@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -73,8 +74,9 @@ public interface UserService {
     /**
      * 修改头像
      * @param file 文件
+     * @return /
      */
-    void updateAvatar(MultipartFile file);
+    Map<String, String> updateAvatar(MultipartFile file);
 
     /**
      * 修改邮箱
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
index 70a48673..206da00c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
@@ -167,7 +167,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateAvatar(MultipartFile multipartFile) {
+    public Map<String, String> updateAvatar(MultipartFile multipartFile) {
         User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername());
         String oldPath = user.getAvatarPath();
         File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar());
@@ -178,6 +178,7 @@ public class UserServiceImpl implements UserService {
             FileUtil.del(oldPath);
         }
         redisUtils.del("user::username:" + user.getUsername());
+        return new HashMap<String,String>(){{put("avatar",file.getName());}};
     }
 
     @Override