diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EfCoreSecurityLogWriter.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EfCoreSecurityLogWriter.cs index d9b27a0f5..c617aa49d 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EfCoreSecurityLogWriter.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EfCoreSecurityLogWriter.cs @@ -14,44 +14,34 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore; public class EfCoreSecurityLogWriter : ISecurityLogWriter, ITransientDependency { protected IIdentitySecurityLogRepository IdentitySecurityLogRepository { get; } - protected IUnitOfWorkManager UnitOfWorkManager { get; } protected IGuidGenerator GuidGenerator { get; } public EfCoreSecurityLogWriter( IIdentitySecurityLogRepository identitySecurityLogRepository, - IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator) { IdentitySecurityLogRepository = identitySecurityLogRepository; - UnitOfWorkManager = unitOfWorkManager; GuidGenerator = guidGenerator; } + [UnitOfWork] public async virtual Task BulkWriteAsync(IEnumerable securityLogInfos, CancellationToken cancellationToken = default) { - using (var uow = UnitOfWorkManager.Begin(requiresNew: true)) - { - var securityLogs = securityLogInfos.Select(securityLogInfo => + var securityLogs = securityLogInfos.Select(securityLogInfo => new IdentitySecurityLog(GuidGenerator, securityLogInfo)); - await IdentitySecurityLogRepository.InsertManyAsync( - securityLogs, - false, - cancellationToken); - - await uow.CompleteAsync(); - } + await IdentitySecurityLogRepository.InsertManyAsync( + securityLogs, + false, + cancellationToken); } + [UnitOfWork] public async virtual Task WriteAsync(SecurityLogInfo securityLogInfo, CancellationToken cancellationToken = default) { - using (var uow = UnitOfWorkManager.Begin(requiresNew: true)) - { - await IdentitySecurityLogRepository.InsertAsync( - new IdentitySecurityLog(GuidGenerator, securityLogInfo), - false, - cancellationToken); - await uow.CompleteAsync(); - } + await IdentitySecurityLogRepository.InsertAsync( + new IdentitySecurityLog(GuidGenerator, securityLogInfo), + false, + cancellationToken); } } diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationAuditingStore.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationAuditingStore.cs index 18545ca72..06bbb7861 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationAuditingStore.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationAuditingStore.cs @@ -14,9 +14,10 @@ public class IPLocationAuditingStore : AuditingStore IOptionsMonitor options, IIPLocationResolver iPLocationResolver, IOptionsMonitor loggingOptions, + IAuditLogWriter auditLogWriter, IAuditLogQueue auditLogQueue, ILogger logger) - : base(loggingOptions, auditLogQueue, logger) + : base(loggingOptions, auditLogWriter, auditLogQueue, logger) { _options = options.CurrentValue; _iPLocationResolver = iPLocationResolver; diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationSecurityLogStore.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationSecurityLogStore.cs index c961d782f..86e0a2b4d 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationSecurityLogStore.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.IP.Location/LINGYUN/Abp/AuditLogging/IP/Location/IPLocationSecurityLogStore.cs @@ -16,9 +16,10 @@ public class IPLocationSecurityLogStore : SecurityLogStore IIPLocationResolver iPLocationResolver, IOptionsMonitor securityLogOptions, IOptionsMonitor loggingOptions, + ISecurityLogWriter securityLogWriter, ISecurityLogQueue securityLogQueue, ILogger logger) - : base(securityLogOptions, loggingOptions, securityLogQueue, logger) + : base(securityLogOptions, loggingOptions, securityLogWriter, securityLogQueue, logger) { _options = options.CurrentValue; _iPLocationResolver = iPLocationResolver;