From 53674f52ce0679c78cd02676db84a2e078680a3a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 25 Mar 2021 21:27:04 +0800 Subject: [PATCH] Use sync API --- .../Volo/Abp/BlobStoring/Database/DatabaseBlob.cs | 6 ++++-- .../EntityFrameworkCore/EfCoreDatabaseBlobRepository.cs | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlob.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlob.cs index 2b089a8b21..20219391fa 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlob.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlob.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using System; +using Volo.Abp.Auditing; using Volo.Abp.Domain.Entities; using Volo.Abp.MultiTenancy; @@ -13,6 +14,7 @@ namespace Volo.Abp.BlobStoring.Database public virtual string Name { get; protected set; } + [DisableAuditing] public virtual byte[] Content { get; protected set; } public DatabaseBlob(Guid id, Guid containerId, [NotNull] string name, [NotNull] byte[] content, Guid? tenantId = null) @@ -32,7 +34,7 @@ namespace Volo.Abp.BlobStoring.Database protected virtual byte[] CheckContentLength(byte[] content) { Check.NotNull(content, nameof(content)); - + if (content.Length >= DatabaseBlobConsts.MaxContentLength) { throw new AbpException($"Blob content size cannot be more than {DatabaseBlobConsts.MaxContentLength} Bytes."); @@ -41,4 +43,4 @@ namespace Volo.Abp.BlobStoring.Database return content; } } -} \ No newline at end of file +} diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/EfCoreDatabaseBlobRepository.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/EfCoreDatabaseBlobRepository.cs index 2ae9331def..3aff095eed 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/EfCoreDatabaseBlobRepository.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/EfCoreDatabaseBlobRepository.cs @@ -1,5 +1,6 @@ using Microsoft.EntityFrameworkCore; using System; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; @@ -20,10 +21,9 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore string name, CancellationToken cancellationToken = default) { - return await (await GetDbSetAsync()) - .FirstOrDefaultAsync( - x => x.ContainerId == containerId && x.Name == name, - GetCancellationToken(cancellationToken) + return (await GetDbSetAsync()) + .FirstOrDefault( + x => x.ContainerId == containerId && x.Name == name ); }