diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs index c601ca5549..a759479910 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs @@ -30,12 +30,12 @@ public class AbpBackgroundJobsRabbitMqModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - AsyncHelper.RunSync(() => StartJobQueueManagerAsync(context)); + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - AsyncHelper.RunSync(() => StopJobQueueManagerAsync(context)); + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); } private async static Task StartJobQueueManagerAsync(ApplicationInitializationContext context) diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs index 47a165ca83..6c09a80f73 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs @@ -30,10 +30,6 @@ public class AbpBackgroundJobsModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; - if (options.IsJobExecutionEnabled) - { - AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync()); - } + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } } diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs index 07586b461b..ff72cf138c 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs @@ -52,16 +52,6 @@ public class AbpBackgroundWorkersQuartzModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var quartzBackgroundWorkerOptions = context.ServiceProvider.GetRequiredService>().Value; - if (quartzBackgroundWorkerOptions.IsAutoRegisterEnabled) - { - var backgroundWorkerManager = context.ServiceProvider.GetRequiredService(); - var works = context.ServiceProvider.GetServices().Where(x => x.AutoRegister); - - foreach (var work in works) - { - AsyncHelper.RunSync(() => backgroundWorkerManager.AddAsync(work)); - } - } + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } } diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs index 32341f101e..12e24c8f81 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs @@ -35,27 +35,11 @@ public class AbpBackgroundWorkersModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; - if (options.IsEnabled) - { - AsyncHelper.RunSync( - () => context.ServiceProvider - .GetRequiredService() - .StartAsync() - ); - } + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; - if (options.IsEnabled) - { - AsyncHelper.RunSync( - () => context.ServiceProvider - .GetRequiredService() - .StopAsync() - ); - } + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); } } diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs index b4a873dcd4..30e2a9e5b0 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs @@ -40,8 +40,7 @@ public class AbpEventBusModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync()); - AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync()); + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } private static void AddEventHandlers(IServiceCollection services) diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs index db790a717d..10e09444c5 100644 --- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs +++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs @@ -81,18 +81,11 @@ public class AbpQuartzModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; - - _scheduler = context.ServiceProvider.GetRequiredService(); - - AsyncHelper.RunSync(() => options.StartSchedulerFactory.Invoke(_scheduler)); + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } public override void OnApplicationShutdown(ApplicationShutdownContext context) { - if (_scheduler.IsStarted) - { - AsyncHelper.RunSync(() => _scheduler.Shutdown()); - } + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); } } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs index d6c7a3a0a6..14919379fe 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs @@ -80,14 +80,7 @@ namespace Volo.Docs public override void OnApplicationInitialization(ApplicationInitializationContext context) { - using (var scope = context.ServiceProvider.CreateScope()) - { - if (scope.ServiceProvider.GetRequiredService>().Value.Enable) - { - var documentFullSearch = scope.ServiceProvider.GetRequiredService(); - AsyncHelper.RunSync(() => documentFullSearch.CreateIndexIfNeededAsync()); - } - } + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } } } diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs index 1f8fb93e4b..96ab4abd89 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs @@ -150,15 +150,6 @@ public class AbpIdentityServerDomainModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; - if (options.IsCleanupEnabled) - { - AsyncHelper.RunSync(() => context.ServiceProvider - .GetRequiredService() - .AddAsync( - context.ServiceProvider - .GetRequiredService() - )); - } + AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); } }