From 8f5a3ff2abcab3fa53463b284a762397c5d8947b Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 20 Jul 2021 16:39:58 +0800 Subject: [PATCH] Update MediaDescriptorAdminAppService. --- .../CreateMediaInputStream.cs | 23 ------------------- .../MediaDescriptorAdminAppService.cs | 8 +++---- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputStream.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputStream.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputStream.cs deleted file mode 100644 index 1c62622b68..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/CreateMediaInputStream.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.IO; -using Volo.Abp.Content; -using Volo.Abp.Validation; -using Volo.CmsKit.MediaDescriptors; - -namespace Volo.CmsKit.Admin.MediaDescriptors -{ - public class CreateMediaInputStream : RemoteStreamContent - { - [Required] - [DynamicStringLength(typeof(MediaDescriptorConsts), nameof(MediaDescriptorConsts.MaxEntityTypeLength))] - public string EntityType { get; set; } - - [Required] - [DynamicStringLength(typeof(MediaDescriptorConsts), nameof(MediaDescriptorConsts.MaxNameLength))] - public string Name { get; set; } - - public CreateMediaInputStream(Stream stream, string contentType) : base(stream, contentType) - { - } - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs index fa799cb65b..c9bdd6d18a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs @@ -18,7 +18,7 @@ namespace Volo.CmsKit.Admin.MediaDescriptors public MediaDescriptorAdminAppService( IBlobContainer mediaContainer, IMediaDescriptorRepository mediaDescriptorRepository, - MediaDescriptorManager mediaDescriptorManager, + MediaDescriptorManager mediaDescriptorManager, IMediaDescriptorDefinitionStore mediaDescriptorDefinitionStore) { MediaContainer = mediaContainer; @@ -34,11 +34,11 @@ namespace Volo.CmsKit.Admin.MediaDescriptors /* TODO: Shouldn't CreatePolicies be a dictionary and we check for inputStream.EntityType? */ await CheckAnyOfPoliciesAsync(definition.CreatePolicies); - using (var stream = inputStream.File.GetStream()) + using (var file = inputStream.File) { var newEntity = await MediaDescriptorManager.CreateAsync(entityType, inputStream.Name, inputStream.File.ContentType, inputStream.File.ContentLength ?? 0); - await MediaContainer.SaveAsync(newEntity.Id.ToString(), stream); + await MediaContainer.SaveAsync(newEntity.Id.ToString(), file.GetStream()); await MediaDescriptorRepository.InsertAsync(newEntity); return ObjectMapper.Map(newEntity); @@ -58,4 +58,4 @@ namespace Volo.CmsKit.Admin.MediaDescriptors await MediaDescriptorRepository.DeleteAsync(id); } } -} \ No newline at end of file +}