diff --git a/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs b/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs index 694f807..8078e48 100644 --- a/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs +++ b/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs @@ -11,6 +11,8 @@ using JiShe.CollectBus.FreeSql; using System; using Volo.Abp.AspNetCore.Mvc.AntiForgery; using JiShe.CollectBus.FreeRedisProvider; +using JiShe.CollectBus.Workers; +using Volo.Abp.BackgroundWorkers.Hangfire; namespace JiShe.CollectBus; @@ -19,7 +21,7 @@ namespace JiShe.CollectBus; typeof(CollectBusApplicationContractsModule), typeof(AbpDddApplicationModule), typeof(AbpAutoMapperModule), - typeof(AbpBackgroundWorkersModule), + typeof(AbpBackgroundWorkersHangfireModule), typeof(FreeRedisProviderModule), typeof(CollectBusFreeSqlModule) )] @@ -40,7 +42,7 @@ public class CollectBusApplicationModule : AbpModule }); } - public override async Task OnApplicationInitializationAsync( + public override void OnApplicationInitialization( ApplicationInitializationContext context) { var assembly = Assembly.GetExecutingAssembly(); @@ -48,7 +50,7 @@ public class CollectBusApplicationModule : AbpModule foreach (var type in types) { - await context.AddBackgroundWorkerAsync(type); + context.AddBackgroundWorkerAsync(type); } } diff --git a/src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs b/src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs index bc1badc..e1c5510 100644 --- a/src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs +++ b/src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs @@ -1,8 +1,10 @@ using System.Threading; using System.Threading.Tasks; +using Hangfire; using Microsoft.Extensions.Logging; using Volo.Abp.BackgroundWorkers.Hangfire; using Volo.Abp.DependencyInjection; +using Volo.Abp.Uow; namespace JiShe.CollectBus.Workers { @@ -17,13 +19,18 @@ namespace JiShe.CollectBus.Workers public EpiCollectWorker(ILogger logger) { _logger = logger; + RecurringJobId = nameof(EpiCollectWorker); + CronExpression = Cron.Daily(); } public override Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken()) { - _logger.LogError("Executed MyLogWorker..!"); - return Task.CompletedTask; + using (var uow = LazyServiceProvider.LazyGetRequiredService().Begin()) + { + Logger.LogInformation("Executed MyLogWorker..!"); + return Task.CompletedTask; + } } } } diff --git a/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj b/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj index 8b0b7af..687269f 100644 --- a/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj +++ b/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj @@ -8,8 +8,11 @@ + + + @@ -24,8 +27,4 @@ - - - - diff --git a/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj b/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj index 0552858..a2747f4 100644 --- a/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj +++ b/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj @@ -20,7 +20,10 @@ + + + @@ -28,8 +31,4 @@ - - - - diff --git a/src/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs b/src/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs new file mode 100644 index 0000000..7fbbb41 --- /dev/null +++ b/src/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs @@ -0,0 +1,34 @@ +using System; +using Microsoft.Extensions.Logging; + +namespace JiShe.CollectBus.Loggers +{ + public static class LoggerExtensions + { + public static void LogInfoToMongo( + this ILogger logger, + EventId eventId, + Exception? exception, + string? message, + params object?[] args) + { + + } + + public static void LogInfoToMongo(this ILogger logger) + { + + } + + private static void Log( + this ILogger logger, + LogLevel logLevel, + EventId eventId, + string? message, + params object?[] args) + { + + } + } +} + \ No newline at end of file diff --git a/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj b/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj index ae1b120..7d4299b 100644 --- a/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj +++ b/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj @@ -26,4 +26,8 @@ + + + + diff --git a/src/JiShe.CollectBus.Host/Startup.cs b/src/JiShe.CollectBus.Host/Startup.cs index d5a0e4e..1f43bc8 100644 --- a/src/JiShe.CollectBus.Host/Startup.cs +++ b/src/JiShe.CollectBus.Host/Startup.cs @@ -39,6 +39,7 @@ namespace JiShe.CollectBus.Host public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime) { app.InitializeApplication(); + //await app.InitializeApplicationAsync(); } } }