Merge pull request #1016 from colinin/fix-oss-empty-stream

fix(oss-management): 对空文件流抛出错误提示
colinin · Oct 10, 2024 · 2e64f96 · 2e64f96
2 parents 639e592 + 6499a44
commit 2e64f96
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/...ent/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs b/...ent/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using System.Web;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Content;
 using Volo.Abp.Features;
@@ -103,6 +104,10 @@ public async virtual Task<IRemoteStreamContent> GetAsync(GetPublicFileInput inpu
 
         var ossContainer = OssContainerFactory.Create();
         var ossObject = await ossContainer.GetObjectAsync(ossObjectRequest);
+        if (ossObject == null || ossObject.Content.IsNullOrEmpty())
+        {
+            throw new BusinessException(code: OssManagementErrorCodes.ObjectNotFound);
+        }
 
         return new RemoteStreamContent(ossObject.Content);
     }

diff --git a/.../LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/PrivateFileAppService.cs b/.../LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/PrivateFileAppService.cs
@@ -4,8 +4,10 @@
 using Microsoft.Extensions.Caching.Distributed;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using System.Web;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Caching;
 using Volo.Abp.Content;
@@ -61,6 +63,10 @@ public override async Task<IRemoteStreamContent> GetAsync(GetPublicFileInput inp
 
         var ossContainer = OssContainerFactory.Create();
         var ossObject = await ossContainer.GetObjectAsync(ossObjectRequest);
+        if (ossObject == null || ossObject.Content.IsNullOrEmpty())
+        {
+            throw new BusinessException(code: OssManagementErrorCodes.ObjectNotFound);
+        }
 
         return new RemoteStreamContent(ossObject.Content);
     }

diff --git a/.../LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/StaticFilesAppService.cs b/.../LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/StaticFilesAppService.cs
@@ -1,7 +1,9 @@
 using LINGYUN.Abp.Features.LimitValidation;
 using LINGYUN.Abp.OssManagement.Features;
+using System.IO;
 using System.Threading.Tasks;
 using System.Web;
+using Volo.Abp;
 using Volo.Abp.Content;
 using Volo.Abp.Features;
 
@@ -35,6 +37,10 @@ public async virtual Task<IRemoteStreamContent> GetAsync(GetStaticFileInput inpu
 
         var ossContainer = OssContainerFactory.Create();
         var ossObject = await ossContainer.GetObjectAsync(ossObjectRequest);
+        if (ossObject == null || ossObject.Content.IsNullOrEmpty())
+        {
+            throw new BusinessException(code: OssManagementErrorCodes.ObjectNotFound);
+        }
 
         return new RemoteStreamContent(ossObject.Content, ossObject.Name);
     }