From a39835ef6b27bb0779f268e412a7e01f3e189814 Mon Sep 17 00:00:00 2001
From: mzc5649 <13027087095@163.com>
Date: Thu, 8 Apr 2021 09:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E4=BF=AE=E6=94=B9uploa?=
 =?UTF-8?q?d=E7=9A=84=E8=BF=94=E5=9B=9EResult?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/controller/CommonController.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
index 2ab94a15..b99708a1 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
@@ -74,8 +74,8 @@ public class CommonController {
      * @return
      */
     @PostMapping(value = "/upload")
-    public Result<?> upload(HttpServletRequest request, HttpServletResponse response) {
-        Result<?> result = new Result<>();
+    public Result<OSSFile> upload(HttpServletRequest request, HttpServletResponse response) {
+        Result<OSSFile> result = new Result<>();
         String savePath = "";
         String bizPath = request.getParameter("biz");
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -92,8 +92,6 @@ public class CommonController {
             savePath = CommonUtils.upload(file, bizPath, uploadType);
         }
         if(oConvertUtils.isNotEmpty(savePath)){
-            result.setMessage(savePath);
-            result.setSuccess(true);
             //上传成功 进行数据库存储
             OSSFile ossFile = new OSSFile();
             String fileName = file.getOriginalFilename();
@@ -101,6 +99,9 @@ public class CommonController {
             ossFile.setFileName(fileName);
             ossFile.setUrl(savePath);
             ossFileService.save(ossFile);
+            result.setMessage(savePath);
+            result.setResult(ossFile);
+            result.setSuccess(true);
         }else {
             result.setMessage("上传失败！");
             result.setSuccess(false);