Browse Source
Merge pull request #341 from colinin/4.4
fix(oss): when oss is created, the directory is created if the data is empty
pull/364/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
21 additions and
2 deletions
-
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/FileAppServiceBase.cs
-
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
|
|
|
@ -24,6 +24,7 @@ namespace LINGYUN.Abp.OssManagement |
|
|
|
_ossContainerFactory = ossContainerFactory; |
|
|
|
} |
|
|
|
|
|
|
|
[RequiresFeature(AbpOssManagementFeatureNames.OssObject.UploadFile)] |
|
|
|
public virtual async Task UploadAsync(UploadFileChunkInput input) |
|
|
|
{ |
|
|
|
await _fileUploader.UploadAsync( |
|
|
|
|
|
|
|
@ -1,6 +1,8 @@ |
|
|
|
using LINGYUN.Abp.OssManagement.Permissions; |
|
|
|
using Microsoft.AspNetCore.Authorization; |
|
|
|
using System.IO; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using System.Web; |
|
|
|
|
|
|
|
namespace LINGYUN.Abp.OssManagement |
|
|
|
{ |
|
|
|
@ -20,11 +22,27 @@ namespace LINGYUN.Abp.OssManagement |
|
|
|
|
|
|
|
[Authorize(AbpOssManagementPermissions.OssObject.Create)] |
|
|
|
public virtual async Task<OssObjectDto> CreateAsync(CreateOssObjectInput input) |
|
|
|
{ |
|
|
|
// 内容为空时建立目录
|
|
|
|
if (input.Content.IsNullOrEmpty()) |
|
|
|
{ |
|
|
|
var oss = CreateOssContainer(); |
|
|
|
var request = new CreateOssObjectRequest( |
|
|
|
HttpUtility.UrlDecode(input.Bucket), |
|
|
|
HttpUtility.UrlDecode(input.Object), |
|
|
|
input.Content, |
|
|
|
HttpUtility.UrlDecode(input.Path)); |
|
|
|
var ossObject = await oss.CreateObjectAsync(request); |
|
|
|
|
|
|
|
return ObjectMapper.Map<OssObject, OssObjectDto>(ossObject); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
var ossObject = await Merger.MergeAsync(input); |
|
|
|
|
|
|
|
return ObjectMapper.Map<OssObject, OssObjectDto>(ossObject); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
[Authorize(AbpOssManagementPermissions.OssObject.Delete)] |
|
|
|
public virtual async Task BulkDeleteAsync(BulkDeleteOssObjectInput input) |
|
|
|
|