From c9272148800dde25ce46e90ea144fb01a72125cd Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 24 Nov 2021 00:04:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(oss):=20=E9=9C=80=E8=A6=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=ADStream=E9=9D=9E=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Abp/OssManagement/FileAppServiceBase.cs    | 18 ++++--------------
 .../Abp/OssManagement/FileUploadMerger.cs      |  2 +-
 .../Abp/OssManagement/OssObjectAppService.cs   |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs
index e54350a43..d77d95e09 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs
@@ -32,19 +32,9 @@ namespace LINGYUN.Abp.OssManagement
         [RequiresFeature(AbpOssManagementFeatureNames.OssObject.UploadFile)]
         public virtual async Task UploadAsync(UploadFileChunkInput input)
         {
-            await FileUploader.UploadAsync(
-                new UploadFileChunkInput
-                {
-                    Bucket = GetCurrentBucket(),
-                    File = input.File,
-                    FileName = input.FileName,
-                    TotalSize = input.TotalSize,
-                    ChunkSize = input.ChunkSize,
-                    ChunkNumber = input.ChunkNumber,
-                    TotalChunks = input.TotalChunks,
-                    CurrentChunkSize = input.CurrentChunkSize,
-                    Path = GetCurrentPath(HttpUtility.UrlDecode(input.Path))
-                });
+            input.Bucket = GetCurrentBucket();
+            input.Path = GetCurrentPath(HttpUtility.UrlDecode(input.Path));
+            await FileUploader.UploadAsync(input);
         }
 
         [RequiresFeature(AbpOssManagementFeatureNames.OssObject.UploadFile)]
@@ -54,7 +44,7 @@ namespace LINGYUN.Abp.OssManagement
             LimitPolicy.Month)]
         public virtual async Task<OssObjectDto> UploadAsync(UploadFileInput input)
         {
-            if (!input.File.ContentLength.HasValue)
+            if (input.File == null || !input.File.ContentLength.HasValue)
             {
                 ThrowValidationException(L["FileNotBeNullOrEmpty"], "File");
             }
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileUploadMerger.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileUploadMerger.cs
index 1240d4fcf..6811e0eca 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileUploadMerger.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileUploadMerger.cs
@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.OssManagement
             LimitPolicy.Month)]
         public virtual async Task<OssObject> MergeAsync(CreateOssObjectInput input)
         {
-            if (!input.File.ContentLength.HasValue)
+            if (input.File == null || !input.File.ContentLength.HasValue)
             {
                 ThrowValidationException(_stringLocalizer["FileNotBeNullOrEmpty"], "File");
             }
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
index 17c59d715..ce395333f 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
@@ -24,7 +24,7 @@ namespace LINGYUN.Abp.OssManagement
         public virtual async Task<OssObjectDto> CreateAsync(CreateOssObjectInput input)
         {
             // 内容为空时建立目录
-            if (input.File.ContentLength.HasValue)
+            if (input.File == null || !input.File.ContentLength.HasValue)
             {
                 var oss = CreateOssContainer();
                 var request = new CreateOssObjectRequest(