分片上传

master
xiaochanghai 11 months ago
parent fa91694469
commit 07114673a2
  1. 11
      Tiobon.Core.Api/Controllers/FileController.cs
  2. 8
      Tiobon.Core.Api/Tiobon.Core.xml
  3. 7
      Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs
  4. 13
      Tiobon.Core.Model/ViewModels/Extend/ChunkUpload.cs
  5. 76
      Tiobon.Core.Services/Ghre/Ghre_AttachmentServices.cs
  6. 8
      Tiobon.Core/Tiobon.Core.xml

@ -209,17 +209,12 @@ public class FileController : BaseApiController
/// <summary>
/// 分片上传
/// </summary>
/// <param name="file"></param>
/// <param name="fileName"></param>
/// <param name="chunkIndex"></param>
/// <param name="totalChunks"></param>
/// <param name="id"></param>
/// <param name="upload"></param>
/// <returns></returns>
[HttpPost("UploadLarge")]
public async Task<IActionResult> UploadLargeAsync(IFormFile file, string fileName, int chunkIndex, int totalChunks, string id)
public async Task<ServiceResult<FileUploadResult>> UploadLargeAsync([FromForm] ChunkUpload upload)
{
dynamic obj = await _ghre_AttachmentServices.UploadVideoAsync(file, fileName, chunkIndex, totalChunks, id);
return Ok(obj);
return await _ghre_AttachmentServices.UploadVideoAsync(upload);
}
#endregion

@ -377,15 +377,11 @@
<param name="Id">主键ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.FileController.UploadLargeAsync(Microsoft.AspNetCore.Http.IFormFile,System.String,System.Int32,System.Int32,System.String)">
<member name="M:Tiobon.Core.Controllers.FileController.UploadLargeAsync(Tiobon.Core.Model.ChunkUpload)">
<summary>
分片上传
</summary>
<param name="file"></param>
<param name="fileName"></param>
<param name="chunkIndex"></param>
<param name="totalChunks"></param>
<param name="id"></param>
<param name="upload"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Controllers.LoginController">

@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Http;
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model;
using Tiobon.Core.Model.Models;
using Tiobon.Core.Model.ViewModels;
namespace Tiobon.Core.IServices
{
@ -9,7 +10,7 @@ namespace Tiobon.Core.IServices
/// </summary>
public interface IGhre_AttachmentServices :IBaseServices<Ghre_Attachment, Ghre_AttachmentDto, InsertGhre_AttachmentInput, EditGhre_AttachmentInput>
{
Task<dynamic> UploadVideoAsync(IFormFile file, string fileName, int chunkIndex, int totalChunks, string id);
Task<ServiceResult<FileUploadResult>> UploadVideoAsync(ChunkUpload upload);
}
}

@ -0,0 +1,13 @@
using Microsoft.AspNetCore.Http;
namespace Tiobon.Core.Model;
public class ChunkUpload
{
public IFormFile file { get; set; }
public string fileName { get; set; } = null;
public int chunkIndex { get; set; }
public int totalChunks { get; set; }
public string id { get; set; } = null;
}

@ -3,9 +3,14 @@ using Tiobon.Core.IServices;
using Tiobon.Core.Model.Models;
using Tiobon.Core.Services.BASE;
using Tiobon.Core.IRepository.Base;
using Microsoft.AspNetCore.Http;
using System.Dynamic;
using SqlSugar;
using Tiobon.Core.Model;
using Tiobon.Core.DataAccess;
using NPOI.HPSF;
using SharpCompress.Common;
using Tiobon.Core.Common;
using Tiobon.Core.Model.ViewModels;
namespace Tiobon.Core.Services
{
@ -21,37 +26,62 @@ namespace Tiobon.Core.Services
base.BaseDal = dal;
}
public async Task<dynamic> UploadVideoAsync(IFormFile file, string fileName, int chunkIndex, int totalChunks, string id)
public async Task<ServiceResult<FileUploadResult>> UploadVideoAsync(ChunkUpload upload)
{
dynamic obj = new ExpandoObject();
string status = "error";
string message = string.Empty;
string pathHeader = string.Empty;
string url = string.Empty;
try
{
var path = $"{$"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}upload{Path.DirectorySeparatorChar}{id}{Path.DirectorySeparatorChar}"}";
var file = upload.file;
var path = $"{$"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}upload{Path.DirectorySeparatorChar}{upload.id}{Path.DirectorySeparatorChar}"}";
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
using (var stream = File.Create(path + $"{chunkIndex}"))
using (var stream = File.Create(path + $"{upload.chunkIndex}"))
{
await file.CopyToAsync(stream);
}
if (chunkIndex == totalChunks - 1)
await FileMerge(id, ".mp4", SnowFlakeSingle.Instance.NextId());
if (upload.chunkIndex == upload.totalChunks - 1)
{
var id = SnowFlakeSingle.Instance.NextId();
await FileMerge(upload.id, ".mp4", id);
using var _context = ContextFactory.CreateContext();
status = "ok";
var ext = string.Empty;
if (string.IsNullOrEmpty(file.FileName) == false)
{
var dotPos = upload.fileName.LastIndexOf('.');
ext = upload.fileName.Substring(dotPos + 1);
}
catch (Exception E)
var filePath = $"/files/upload/{id}.{ext}";
var fileAttachment = new Ghre_Attachment();
fileAttachment.Id = SnowFlakeSingle.Instance.NextId();
fileAttachment.AttachmentNo = upload.file.FileName;
fileAttachment.AttachFileName = upload.file.FileName;
fileAttachment.CreateBy = App.User.ID;
fileAttachment.CreateTime = DateTime.Now;
fileAttachment.AttachmentName = upload.fileName;
fileAttachment.AttachFileExtension = ext;
fileAttachment.AttachFileSize = upload.file.Length;
fileAttachment.PhysicsPath = filePath;
fileAttachment.RelativePath = filePath;
fileAttachment.FileURL = filePath;
fileAttachment.ThumbnailPath = filePath;
fileAttachment.AttachmentType = upload.file.ContentType;
//url = fileName + "." + ext;
_context.Add(fileAttachment);
_context.SaveChanges();
return ServiceResult<FileUploadResult>.OprateSuccess("", new FileUploadResult()
{
message = E.Message;
Id = fileAttachment.Id,
AttachFileExtension = fileAttachment.AttachFileExtension,
AttachFileName = fileAttachment.AttachFileName,
AttachmentName = fileAttachment.AttachmentName,
AttachmentNo = fileAttachment.AttachmentNo,
FileURL = fileAttachment.FileURL,
PhysicsPath = fileAttachment.PhysicsPath,
RelativePath = fileAttachment.RelativePath,
ThumbnailPath = fileAttachment.ThumbnailPath,
AttachFileSize = fileAttachment.AttachFileSize,
});
}
obj.url = url;
obj.status = status;
obj.message = message;
return obj;
return ServiceResult<FileUploadResult>.OprateSuccess("", null);
}
public static async Task<object> FileMerge(string lastModified, string fileExts, long NewfileName)
@ -60,7 +90,7 @@ namespace Tiobon.Core.Services
bool ok = false;
try
{
string wwwroot = $"{Directory.GetCurrentDirectory()}/wwwroot/";
string wwwroot = $"{Directory.GetCurrentDirectory()}/wwwroot/files/upload/";
var temporary = Path.Combine(wwwroot, lastModified);//临时文件夹
//fileName = Request.Form["fileName"];//文件名
string fileExt = fileExts;//获取文件后缀
@ -69,7 +99,7 @@ namespace Tiobon.Core.Services
if (!di.Exists)
di.Create();
var finalPath = Path.Combine(wwwroot + lastModified + "/", NewfileName + fileExt);//最终的文件名(demo中保存的是它上传时候的文件名,实际操作肯定不能这样)
var finalPath = Path.Combine(wwwroot, NewfileName + fileExt);//最终的文件名(demo中保存的是它上传时候的文件名,实际操作肯定不能这样)
var fs = new FileStream(finalPath, FileMode.Create);
foreach (var part in files.OrderBy(x => x.Length).ThenBy(x => x))//排一下序,保证从0-N Write
{

@ -377,15 +377,11 @@
<param name="Id">主键ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.FileController.UploadLargeAsync(Microsoft.AspNetCore.Http.IFormFile,System.String,System.Int32,System.Int32,System.String)">
<member name="M:Tiobon.Core.Controllers.FileController.UploadLargeAsync(Tiobon.Core.Model.ChunkUpload)">
<summary>
分片上传
</summary>
<param name="file"></param>
<param name="fileName"></param>
<param name="chunkIndex"></param>
<param name="totalChunks"></param>
<param name="id"></param>
<param name="upload"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Controllers.LoginController">

Loading…
Cancel
Save