wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化文件上传

Browse Source
This commit is contained in:
不做码农 2022-05-28 19:17:07 +08:00
parent 693da23f20
commit 40e09d4796
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ZR.Admin.WebApi/Controllers/CommonController.cs
View File

@ -1,6 +1,7 @@
using Infrastructure; using Infrastructure;
using Infrastructure.Attribute; using Infrastructure.Attribute;
using Infrastructure.Enums; using Infrastructure.Enums;
using Infrastructure.Extensions;
using Infrastructure.Model; using Infrastructure.Model;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -94,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers
[HttpPost()] [HttpPost()]
[Verify] [Verify]
[ActionPermissionFilter(Permission = "common")] [ActionPermissionFilter(Permission = "common")]
public async Task<IActionResult> UploadFile([FromForm(Name = "file")] IFormFile formFile, string? fileName = "", string? fileDir = "uploads", StoreType storeType = StoreType.LOCAL) public async Task<IActionResult> UploadFile([FromForm(Name = "file")] IFormFile formFile, string? fileName = "", string? fileDir = "", StoreType storeType = StoreType.LOCAL)
{ {
if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空"); if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空");
SysFile file = new(); SysFile file = new();
@ -109,8 +110,12 @@ namespace ZR.Admin.WebApi.Controllers
switch (storeType) switch (storeType)
{ {
case StoreType.LOCAL: case StoreType.LOCAL:
file = await SysFileService.SaveFileToLocal(WebHostEnvironment.WebRootPath, fileName, fileDir, HttpContext.GetName(), formFile); string savePath = AppSettings.App(new string[] { "Upload", "localSavePath" });
if (savePath.IsEmpty())
{
savePath = Path.Combine(WebHostEnvironment.WebRootPath, "uploads");
}
file = await SysFileService.SaveFileToLocal(savePath, fileName, fileDir, HttpContext.GetName(), formFile);
break; break;
case StoreType.ALIYUN: case StoreType.ALIYUN:
if ((fileSize / 1024) > MaxContentLength) if ((fileSize / 1024) > MaxContentLength)

3
ZR.Admin.WebApi/appsettings.json
View File

@ -20,7 +20,8 @@
}, },
"DemoMode": false, //是否演示模式 "DemoMode": false, //是否演示模式
"Upload": { "Upload": {
"UploadUrl": "http://localhost:8888" "UploadUrl": "http://localhost:8888",
"localSavePath": "" //本地上传文件存储目录/home/website/uploads
}, },
//阿里云存储配置 //阿里云存储配置
"ALIYUN_OSS": { "ALIYUN_OSS": {

11
ZR.Service/System/SysFileService.cs
View File

@ -34,12 +34,17 @@ namespace ZR.Service.System
/// <summary> /// <summary>
/// 存储本地 /// 存储本地
/// </summary> /// </summary>
/// <param name="fileDir">存储文件夹</param>
/// <param name="rootPath">存储根目录</param>
/// <param name="fileName">自定文件名</param>
/// <param name="formFile">上传的文件流</param>
/// <param name="userName"></param>
/// <returns></returns> /// <returns></returns>
public async Task<SysFile> SaveFileToLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile) public async Task<SysFile> SaveFileToLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile)
{ {
string fileExt = Path.GetExtension(formFile.FileName); string fileExt = Path.GetExtension(formFile.FileName);
fileName = (fileName.IsEmpty() ? HashFileName() : fileName) + fileExt; fileName = (fileName.IsEmpty() ? HashFileName() : fileName) + fileExt;
fileDir = fileDir.IsEmpty() ? "uploads" : fileDir;
string filePath = GetdirPath(fileDir); string filePath = GetdirPath(fileDir);
string finalFilePath = Path.Combine(rootPath, filePath, fileName); string finalFilePath = Path.Combine(rootPath, filePath, fileName);
double fileSize = Math.Round(formFile.Length / 1024.0, 2); double fileSize = Math.Round(formFile.Length / 1024.0, 2);
@ -51,7 +56,7 @@ namespace ZR.Service.System
using (var stream = new FileStream(finalFilePath, FileMode.Create)) using (var stream = new FileStream(finalFilePath, FileMode.Create))
{ {
await formFile.CopyToAsync(stream);//await 不能少 await formFile.CopyToAsync(stream);
} }
string uploadUrl = SysConfigService.GetSysConfigByKey("sys.file.uploadUrl")?.ConfigValue ?? OptionsSetting.Upload.UploadUrl; string uploadUrl = SysConfigService.GetSysConfigByKey("sys.file.uploadUrl")?.ConfigValue ?? OptionsSetting.Upload.UploadUrl;
string accessPath = string.Concat(uploadUrl, "/", filePath.Replace("\\", "/"), "/", fileName); string accessPath = string.Concat(uploadUrl, "/", filePath.Replace("\\", "/"), "/", fileName);
@ -59,7 +64,7 @@ namespace ZR.Service.System
{ {
StoreType = (int)Infrastructure.Enums.StoreType.LOCAL, StoreType = (int)Infrastructure.Enums.StoreType.LOCAL,
FileType = formFile.ContentType, FileType = formFile.ContentType,
FileUrl = finalFilePath, FileUrl = finalFilePath.Replace("\\", "/"),
AccessUrl = accessPath AccessUrl = accessPath
}; };
file.Id = await InsertFile(file); file.Id = await InsertFile(file);