Merge pull request #403 from colinin/4.4.2

fix(oss): 需要判断Stream非空

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(
+            input.Bucket = GetCurrentBucket();
-                new UploadFileChunkInput
+            input.Path = GetCurrentPath(HttpUtility.UrlDecode(input.Path));
-                {
+            await FileUploader.UploadAsync(input);
-                    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))
-                });
         }
 
         [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");
             }

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");
             }

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(