取消后缀m4a限制，新增接口不验证格式

src/FileStorage.Host/Controllers/FileController.cs

@@ -27,13 +27,32 @@ namespace FileStorage.Host.Controllers
             _fileStorage = fileStorage;
             _uow = uow;
         }
+        /// <summary>
+        /// 内部调用，不限制文件格式
+        /// </summary>
+        /// <param name="fileData"></param>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        [HttpPost("uploadinside")]
+        public async Task<IActionResult> UploadInside(IFormFile fileData, string source)
+        {
+            var file = await _fileStorage.UploadAsync(fileData.FileName, fileData.Length, "", fileData.OpenReadStream(), source ?? string.Empty, false);
+            var Path = await _fileStorage.GetFileUrlIndefinitelyAsync(file.Id, source ?? string.Empty);
+            return Ok(new { Id = file.Id, fileName = file.FileName, Path = Path });
+        }
 
+        /// <summary>
+        /// 限制文件格式
+        /// </summary>
+        /// <param name="fileData"></param>
+        /// <param name="source"></param>
+        /// <returns></returns>
         [HttpPost("upload")]
-        public async Task<IActionResult> Upload(IFormFile fileData,string source)
+        public async Task<IActionResult> Upload(IFormFile fileData, string source)
         {
-            var file = await _fileStorage.UploadAsync(fileData.FileName, fileData.Length, "", fileData.OpenReadStream(), source ?? string.Empty);
-            var Path = await  _fileStorage.GetFileUrlIndefinitelyAsync(file.Id, source ?? string.Empty);
-			return Ok(new { Id = file.Id, fileName = file.FileName,Path = Path });
+            var file = await _fileStorage.UploadAsync(fileData.FileName, fileData.Length, "", fileData.OpenReadStream(), source ?? string.Empty, true);
+            var Path = await _fileStorage.GetFileUrlIndefinitelyAsync(file.Id, source ?? string.Empty);
+            return Ok(new { Id = file.Id, fileName = file.FileName, Path = Path });
         }
 
         [HttpGet("getfileurl")]
@@ -64,11 +83,11 @@ namespace FileStorage.Host.Controllers
         [HttpGet("file_path")]
         public async Task<IActionResult> GetFilePath([FromQuery] UploadGetDto dto)
         {
-	        var uri = await _fileStorage.GetFilePathAsync(dto.Id, dto.Source ?? string.Empty);
-	        return Ok(new { Path = uri });
+            var uri = await _fileStorage.GetFilePathAsync(dto.Id, dto.Source ?? string.Empty);
+            return Ok(new { Path = uri });
         }
 
-		[HttpGet("createdb")]
+        [HttpGet("createdb")]
         public Task CreateDb()
         {
             var db = _uow.Db;
@@ -87,9 +106,9 @@ namespace FileStorage.Host.Controllers
         /// <returns></returns>
         [AllowAnonymous]
         [HttpGet("files")]
-        public async Task Files(string id,string expires,string clientid,string signature)
+        public async Task Files(string id, string expires, string clientid, string signature)
         {
-            var fullPath = await _fileStorage.GetFilePath(id,expires,clientid,signature);
+            var fullPath = await _fileStorage.GetFilePath(id, expires, clientid, signature);
             await HttpContext.Response.SendFileAsync(fullPath);
         }
 
@@ -105,8 +124,8 @@ namespace FileStorage.Host.Controllers
         [HttpGet("files_indefinitely")]
         public async Task FilesIndefinitely(string id, string expires, string clientid, string signature)
         {
-	        var fullPath = await _fileStorage.GetFilePathIndefinitely(id, expires, clientid, signature);
-	        await HttpContext.Response.SendFileAsync(fullPath);
+            var fullPath = await _fileStorage.GetFilePathIndefinitely(id, expires, clientid, signature);
+            await HttpContext.Response.SendFileAsync(fullPath);
         }
 
         [HttpGet("test")]
@@ -115,5 +134,5 @@ namespace FileStorage.Host.Controllers
         {
             return DateTime.Now.ToString();
         }
-	}
+    }
 }

src/FileStorage/DefaultFileStorage.cs

@@ -12,7 +12,7 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
     private readonly IFileMetadataRepository _fileMetadataRepository;
     private readonly IOptionsSnapshot<StorageConfiguration> _fileUploadOptions;
 
-    public DefaultFileStorage(IFileMetadataRepository fileMetadataRepository,IOptionsSnapshot<StorageConfiguration> optionsSnapshot)
+    public DefaultFileStorage(IFileMetadataRepository fileMetadataRepository, IOptionsSnapshot<StorageConfiguration> optionsSnapshot)
     {
         _fileMetadataRepository = fileMetadataRepository;
         _fileUploadOptions = optionsSnapshot;
@@ -26,8 +26,9 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
     /// <param name="extraInfo"></param>
     /// <param name="fileData"></param>
     /// <param name="client"></param>
+    /// <param name="isVerification">是否验证文件格式</param>
     /// <returns></returns>
-    public async Task<FileMetadata> UploadAsync(string fileName, long length, string extraInfo, Stream fileData, string client)
+    public async Task<FileMetadata> UploadAsync(string fileName, long length, string extraInfo, Stream fileData, string client, bool? isVerification)
     {
         if (fileName == null)
         {
@@ -35,7 +36,7 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
         }
         fileName = fileName.Replace("<", "").Replace(">", "").Replace(" ", "");
 
-        var rv = UploadLoca(fileName, length, extraInfo, fileData,client);
+        var rv = UploadLoca(fileName, length, extraInfo, fileData, client, isVerification);
         if (!string.IsNullOrEmpty(rv))
         {
             FileMetadata fileModel = new FileMetadata();
@@ -59,9 +60,9 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
         return null;
     }
 
-    public async Task<Uri> GetFileUrlAsync(string id,string clientId)
+    public async Task<Uri> GetFileUrlAsync(string id, string clientId)
     {
-        var fileMetadata = await _fileMetadataRepository.GetAsync(x=>x.Id== id && x.Client== clientId);
+        var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
         if (fileMetadata != null)
         {
             long sTime = (long)(DateTime.Now.AddHours(1).ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
@@ -75,34 +76,34 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
 
     public async Task<Uri> GetFileUrlIndefinitelyAsync(string id, string clientId)
     {
-	    var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
-	    if (fileMetadata != null)
-	    {
-		    long sTime = (long)(DateTime.Now.AddHours(1).ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
-		    string encryptText = clientId + "|" + sTime + "|" + id;
-		    var signatureText = DESExtensions.Encrypt(encryptText);
-		    return new Uri("/file/files_indefinitely?id=" + id + "&expires=" + sTime + "&clientid=" + clientId + "&signature=" + signatureText);
-	    }
-	    throw new UserFriendlyException("无权限访问");
+        var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
+        if (fileMetadata != null)
+        {
+            long sTime = (long)(DateTime.Now.AddHours(1).ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
+            string encryptText = clientId + "|" + sTime + "|" + id;
+            var signatureText = DESExtensions.Encrypt(encryptText);
+            return new Uri("/file/files_indefinitely?id=" + id + "&expires=" + sTime + "&clientid=" + clientId + "&signature=" + signatureText);
+        }
+        throw new UserFriendlyException("无权限访问");
     }
 
-	public (Stream stream, string contentType,string fileName) DownLoadFile(string id,string clientId)
+    public (Stream stream, string contentType, string fileName) DownLoadFile(string id, string clientId)
     {
-        var fileMetadata = _fileMetadataRepository.Get(x=>x.Id == id && x.Client == clientId);
-        if (fileMetadata!=null)
+        var fileMetadata = _fileMetadataRepository.Get(x => x.Id == id && x.Client == clientId);
+        if (fileMetadata != null)
         {
             string filePath = Path.Combine(Directory.GetCurrentDirectory(), fileMetadata.Path);
-            var contentType =  TaskGetFileContentTypeAsync(fileMetadata.Path);
+            var contentType = TaskGetFileContentTypeAsync(fileMetadata.Path);
             var stream = File.OpenRead(filePath);
-            return (stream,contentType,fileMetadata.FileName);
+            return (stream, contentType, fileMetadata.FileName);
         }
         throw new UserFriendlyException("无权限访问");
     }
 
     public async Task<bool> DelFileAsync(string id, string clientId)
     {
-        var fileMetadata = await _fileMetadataRepository.GetAsync(x=>x.Id == id && x.Client == clientId);
-        if (fileMetadata!=null)
+        var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
+        if (fileMetadata != null)
         {
             string filePath = Path.Combine(Directory.GetCurrentDirectory(), fileMetadata.Path);
             await _fileMetadataRepository.RemoveAsync(id);
@@ -114,17 +115,17 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
 
     public async Task<string> GetFilePathAsync(string id, string clientId)
     {
-	    var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
-	    return fileMetadata?.Path!;
+        var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
+        return fileMetadata?.Path!;
     }
 
-	public async Task<string> GetFilePath(string id, string expires, string clientId, string signature)
+    public async Task<string> GetFilePath(string id, string expires, string clientId, string signature)
     {
         string decryptText = DESExtensions.Decrypt(signature);
         if (!string.IsNullOrEmpty(decryptText))
         {
             string[] paramData = decryptText.Split('|');
-            
+
             if (id != paramData[2] || clientId != paramData[0] || expires != paramData[1])
                 throw UserFriendlyException.SameMessage("参数不合法");
 
@@ -141,27 +142,27 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
     }
 
 
-	public async Task<string> GetFilePathIndefinitely(string id, string expires, string clientId, string signature)
-	{
-		string decryptText = DESExtensions.Decrypt(signature);
-		if (!string.IsNullOrEmpty(decryptText))
-		{
-			string[] paramData = decryptText.Split('|');
+    public async Task<string> GetFilePathIndefinitely(string id, string expires, string clientId, string signature)
+    {
+        string decryptText = DESExtensions.Decrypt(signature);
+        if (!string.IsNullOrEmpty(decryptText))
+        {
+            string[] paramData = decryptText.Split('|');
 
-			if (id != paramData[2] || clientId != paramData[0] || expires != paramData[1])
-				throw UserFriendlyException.SameMessage("参数不合法");
+            if (id != paramData[2] || clientId != paramData[0] || expires != paramData[1])
+                throw UserFriendlyException.SameMessage("参数不合法");
 
-			var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
-			if (fileMetadata == null)
-				throw UserFriendlyException.SameMessage("无权限访问");
+            var fileMetadata = await _fileMetadataRepository.GetAsync(x => x.Id == id && x.Client == clientId);
+            if (fileMetadata == null)
+                throw UserFriendlyException.SameMessage("无权限访问");
 
-			return GetFullPath(fileMetadata.Path);
-		}
-		throw UserFriendlyException.SameMessage("无权限访问");
-	}
+            return GetFullPath(fileMetadata.Path);
+        }
+        throw UserFriendlyException.SameMessage("无权限访问");
+    }
 
 
-	private string TaskGetFileContentTypeAsync(string fileName)
+    private string TaskGetFileContentTypeAsync(string fileName)
     {
         string suffix = Path.GetExtension(fileName);
         var provider = new FileExtensionContentTypeProvider();
@@ -170,7 +171,7 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
     }
 
 
-    private string UploadLoca(string fileName, long length, string extraInfo, Stream fileData,string client)
+    private string UploadLoca(string fileName, long length, string extraInfo, Stream fileData, string client, bool? isVerification)
     {
         var settings = _fileUploadOptions.Value.Local;
         string groupDir = "";
@@ -184,7 +185,7 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
         }
         string sub = DateTime.Now.ToString("yyyyMMdd");
 
-        groupDir = Path.Combine(groupDir,client, sub);
+        groupDir = Path.Combine(groupDir, client, sub);
 
         string pathHeader = groupDir;
 
@@ -198,34 +199,38 @@ public class DefaultFileStorage : IFileStorage, IScopeDependency
         if (!string.IsNullOrEmpty(fileName))
         {
             var dotPos = fileName.LastIndexOf('.');
-            if (dotPos==0)
+            if (dotPos == 0)
             {
                 throw UserFriendlyException.SameMessage("文件没有格式，请重新上传文件");
             }
             ext = fileName.Substring(dotPos + 1);
         }
-        //TODO验证文件格式
-        var extList = new List<string>();
-        extList.Add("txt");
-        extList.Add("xls");
-        extList.Add("xlsx");
-        extList.Add("jpg");
-        extList.Add("jpeg");
-        extList.Add("png");
-        extList.Add("doc");
-        extList.Add("docx");
-        extList.Add("rar");
-        extList.Add("pdf");
-        extList.Add("mp3");
-        extList.Add("zip");
-        extList.Add("wmv");
-        extList.Add("mp4");
-        extList.Add("svg");
-        extList.Add("avi");
-        extList.Add("m4a");
-        if (!extList.Contains(ext))
-        {
-            throw UserFriendlyException.SameMessage("文件格式不正确，只能上传【doc,rar,jpg,pdf,mp3,xls,xlsx,zip,docx,wmv,mp4.png,svg,avijpeg.m4a.txt】格式文件");
+        if (isVerification.HasValue && isVerification == true)
+        {
+            //TODO验证文件格式
+            var extList = new List<string>();
+            extList.Add("txt");
+            extList.Add("xls");
+            extList.Add("xlsx");
+            extList.Add("jpg");
+            extList.Add("jpeg");
+            extList.Add("png");
+            extList.Add("doc");
+            extList.Add("docx");
+            extList.Add("rar");
+            extList.Add("pdf");
+            extList.Add("mp3");
+            extList.Add("zip");
+            extList.Add("wmv");
+            extList.Add("mp4");
+            extList.Add("svg");
+            extList.Add("avi");
+            //extList.Add("m4a");
+            if (!extList.Contains(ext))
+            {
+                // throw UserFriendlyException.SameMessage("文件格式不正确，只能上传【doc,rar,jpg,pdf,mp3,xls,xlsx,zip,docx,wmv,mp4.png,svg,avijpeg.m4a.txt】格式文件");
+                throw UserFriendlyException.SameMessage("文件格式不正确，只能上传【doc,rar,jpg,pdf,mp3,xls,xlsx,zip,docx,wmv,mp4.png,svg,avi,jpeg,txt】格式文件");
+            }
         }
         var filename = $"{Guid.NewGuid().ToString().Replace("-", string.Empty)}.{ext}";
         var fullPath = Path.Combine(fulldir, filename);

src/FileStorage/IFileStorage.cs

@@ -3,7 +3,17 @@
     public interface IFileStorage
     {
 
-	    Task<FileMetadata> UploadAsync(string fileName, long length, string extraInfo, Stream fileData, string client);
+        /// <summary>
+        /// 本地上传
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="length"></param>
+        /// <param name="extraInfo"></param>
+        /// <param name="fileData"></param>
+        /// <param name="client"></param>
+        /// <param name="isVerification">是否验证文件格式</param>
+        /// <returns></returns>
+        Task<FileMetadata> UploadAsync(string fileName, long length, string extraInfo, Stream fileData, string client, bool? isVerification);
 
         Task<Uri> GetFileUrlAsync(string id, string clientId);