From 2547f33867bb8906cc666612ea9f1fe0b0075312 Mon Sep 17 00:00:00 2001
From: 188633308 <188633308@qq.com>
Date: Sun, 25 Apr 2021 20:35:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6id,=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=85=81=E8=AE=B8=E5=8C=BF=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/File/ISysFileService.cs           |  8 +++----
 Api/Ewide.Core/Service/File/SysFileService.cs | 22 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Api/Ewide.Core/Service/File/ISysFileService.cs b/Api/Ewide.Core/Service/File/ISysFileService.cs
index 6d50a4a..642d789 100644
--- a/Api/Ewide.Core/Service/File/ISysFileService.cs
+++ b/Api/Ewide.Core/Service/File/ISysFileService.cs
@@ -13,9 +13,9 @@ namespace Ewide.Core.Service
         Task<List<SysFile>> GetFileInfoList([FromQuery] FileOutput input);
         Task<IActionResult> PreviewFileInfo([FromQuery] QueryFileInoInput input);
         Task<dynamic> QueryFileInfoPageList([FromQuery] FileInput input);
-        Task UploadFileAvatar(IFormFile file);
-        Task UploadFileDefault(IFormFile file);
-        Task UploadFileDocument(IFormFile file);
-        Task UploadFileShop(IFormFile file);
+        Task<string> UploadFileAvatar(IFormFile file);
+        Task<string> UploadFileDefault(IFormFile file);
+        Task<string> UploadFileDocument(IFormFile file);
+        Task<string> UploadFileShop(IFormFile file);
     }
 }
\ No newline at end of file
diff --git a/Api/Ewide.Core/Service/File/SysFileService.cs b/Api/Ewide.Core/Service/File/SysFileService.cs
index 4ce74c9..8990b55 100644
--- a/Api/Ewide.Core/Service/File/SysFileService.cs
+++ b/Api/Ewide.Core/Service/File/SysFileService.cs
@@ -6,6 +6,7 @@ using Furion.DynamicApiController;
 using Furion.FriendlyException;
 using Furion.Snowflake;
 using Mapster;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -105,6 +106,7 @@ namespace Ewide.Core.Service
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet("/sysFileInfo/preview")]
+        [AllowAnonymous]
         public async Task<IActionResult> PreviewFileInfo([FromQuery] QueryFileInoInput input)
         {
             return await DownloadFileInfo(input);
@@ -116,9 +118,9 @@ namespace Ewide.Core.Service
         /// <param name="file"></param>
         /// <returns></returns>
         [HttpPost("/sysFileInfo/upload")]
-        public async Task UploadFileDefault(IFormFile file)
+        public async Task<string> UploadFileDefault(IFormFile file)
         {
-            await UploadFile(file, _configuration["UploadFile:Default:path"]);
+            return await UploadFile(file, _configuration["UploadFile:Default:path"]);
         }
 
         /// <summary>
@@ -140,9 +142,9 @@ namespace Ewide.Core.Service
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
-        public async Task UploadFileAvatar(IFormFile file)
+        public async Task<string> UploadFileAvatar(IFormFile file)
         {
-            await UploadFile(file, _configuration["UploadFile:Avatar:path"]);
+            return await UploadFile(file, _configuration["UploadFile:Avatar:path"]);
         }
 
         /// <summary>
@@ -150,9 +152,9 @@ namespace Ewide.Core.Service
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
-        public async Task UploadFileDocument(IFormFile file)
+        public async Task<string> UploadFileDocument(IFormFile file)
         {
-            await UploadFile(file, _configuration["UploadFile:Document:path"]);
+            return await  UploadFile(file, _configuration["UploadFile:Document:path"]);
         }
 
         /// <summary>
@@ -160,9 +162,9 @@ namespace Ewide.Core.Service
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
-        public async Task UploadFileShop(IFormFile file)
+        public async Task<string> UploadFileShop(IFormFile file)
         {
-            await UploadFile(file, _configuration["UploadFile:Shop:path"]);
+            return await UploadFile(file, _configuration["UploadFile:Shop:path"]);
         }
 
         /// <summary>
@@ -171,7 +173,7 @@ namespace Ewide.Core.Service
         /// <param name="file"></param>
         /// <param name="pathType"></param>
         /// <returns></returns>
-        private static async Task UploadFile(IFormFile file, string pathType)
+        private static async Task<string> UploadFile(IFormFile file, string pathType)
         {
             var fileId = Guid.NewGuid().ToString();
 
@@ -200,6 +202,8 @@ namespace Ewide.Core.Service
                 FileSizeKb = fileSizeKb
             };
             await sysFileInfo.InsertAsync();
+
+            return fileId;
         }
     }
 }