Browse Source
Merge pull request #309 from colinin/4.4
fix bug: OssManagement FileSystem OssContainer
pull/364/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
544 additions and
540 deletions
-
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN/Abp/OssManagement/FileSystem/FileSystemOssContainer.cs
|
|
@ -439,7 +439,9 @@ namespace LINGYUN.Abp.OssManagement.FileSystem |
|
|
var copyFileSystemNames = fileSystemNames; |
|
|
var copyFileSystemNames = fileSystemNames; |
|
|
if (markIndex > 0) |
|
|
if (markIndex > 0) |
|
|
{ |
|
|
{ |
|
|
copyFileSystemNames = fileSystemNames[(markIndex+1)..]; |
|
|
// fix: 翻页查询数组可能引起下标越界
|
|
|
|
|
|
// copyFileSystemNames = fileSystemNames[(markIndex+1)..];
|
|
|
|
|
|
copyFileSystemNames = fileSystemNames[markIndex..]; |
|
|
} |
|
|
} |
|
|
// 截取指定数量的Oss对象
|
|
|
// 截取指定数量的Oss对象
|
|
|
int maxResultCount = request.MaxKeys ?? 10; |
|
|
int maxResultCount = request.MaxKeys ?? 10; |
|
|
@ -521,6 +523,8 @@ namespace LINGYUN.Abp.OssManagement.FileSystem |
|
|
} |
|
|
} |
|
|
if (!blobName.IsNullOrWhiteSpace()) |
|
|
if (!blobName.IsNullOrWhiteSpace()) |
|
|
{ |
|
|
{ |
|
|
|
|
|
// fix: If the user passes /, the disk root directory is retrieved
|
|
|
|
|
|
blobName = blobName.Equals("/") ? "./" : blobName; |
|
|
blobPath = Path.Combine(blobPath, blobName); |
|
|
blobPath = Path.Combine(blobPath, blobName); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
