From e258f2097a10dd9a1b68a6fcc21338048d9dc572 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Thu, 8 Sep 2022 10:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdd/admin/service/user/impl/UserServiceImpl.java   |  2 +-
 .../com/mdd/front/controller/UploadController.java     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java
index 6ee26f52..e27b4e5f 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java
@@ -121,8 +121,8 @@ public class UserServiceImpl implements IUserService {
         BeanUtils.copyProperties(user, vo);
 
         vo.setSex(user.getSex());
-        vo.setChannel(ClientEnum.getMsgByCode(user.getChannel()));
         vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar()));
+        vo.setChannel(ClientEnum.getMsgByCode(user.getChannel()));
         vo.setLastLoginTime(TimeUtil.timestampToDate(user.getLastLoginTime()));
         vo.setCreateTime(TimeUtil.timestampToDate(user.getCreateTime()));
         return vo;
diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java
index e5516d1f..9784f1ae 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java
@@ -3,6 +3,7 @@ package com.mdd.front.controller;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.enums.AlbumEnum;
 import com.mdd.common.plugin.storage.StorageDriver;
+import com.mdd.common.utils.StringUtil;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,6 +29,8 @@ public class UploadController {
      */
     @PostMapping("/image")
     public Object image(HttpServletRequest request) {
+
+        System.out.println(request.getParameter("dir"));
         MultipartFile multipartFile;
         try {
             multipartFile = ((MultipartRequest) request).getFile("file");
@@ -39,8 +42,13 @@ public class UploadController {
             return AjaxResult.failed("请选择上传图片");
         }
 
+        String folder = "image";
+        if (StringUtil.isNotEmpty(request.getParameter("dir"))) {
+            folder += "/" + request.getParameter("dir");
+        }
+
         StorageDriver storageDriver = new StorageDriver();
-        Map<String, Object> map = storageDriver.upload(multipartFile, "image", AlbumEnum.IMAGE.getCode());
+        Map<String, Object> map = storageDriver.upload(multipartFile, folder, AlbumEnum.IMAGE.getCode());
         return AjaxResult.success(map);
     }