Merge pull request #1435 from colinin/fix-compilation

fix: Fix some compilation errors

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<SecurityLogInfo> 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(
+        await IdentitySecurityLogRepository.InsertManyAsync(
-                securityLogs,
+            securityLogs,
-                false,
+            false,
-                cancellationToken);
+            cancellationToken);
-
-            await uow.CompleteAsync();
-        }
     }
 
+    [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),
-            await IdentitySecurityLogRepository.InsertAsync(
+            false,
-                new IdentitySecurityLog(GuidGenerator, securityLogInfo),
+            cancellationToken);
-                false,
-                cancellationToken);
-            await uow.CompleteAsync();
-        }
     }
 }

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<AbpAuditLoggingIPLocationOptions> options,
         IIPLocationResolver iPLocationResolver,
         IOptionsMonitor<AbpAuditLoggingOptions> loggingOptions,
+        IAuditLogWriter auditLogWriter,
         IAuditLogQueue auditLogQueue,
         ILogger<AuditingStore> logger)
-        : base(loggingOptions, auditLogQueue, logger)
+        : base(loggingOptions, auditLogWriter, auditLogQueue, logger)
     {
         _options = options.CurrentValue;
         _iPLocationResolver = iPLocationResolver;

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<AbpSecurityLogOptions> securityLogOptions,
         IOptionsMonitor<AbpAuditLoggingOptions> loggingOptions,
+        ISecurityLogWriter securityLogWriter,
         ISecurityLogQueue securityLogQueue,
         ILogger<SecurityLogStore> logger) 
-        : base(securityLogOptions, loggingOptions, securityLogQueue, logger)
+        : base(securityLogOptions, loggingOptions, securityLogWriter, securityLogQueue, logger)
     {
         _options = options.CurrentValue;
         _iPLocationResolver = iPLocationResolver;