From d2a06b5f7ce4e3665602ff36815275098f334c3d Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Thu, 24 Apr 2025 10:49:54 +0800
Subject: [PATCH] Improve Hangfire Initialization code

---
 .../Hangfire/AbpBackgroundJobsHangfireModule.cs      |  9 ++-------
 .../Hangfire/AbpBackgroundWorkersHangfireModule.cs   | 12 +++---------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpBackgroundJobsHangfireModule.cs b/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpBackgroundJobsHangfireModule.cs
index ee747e4611..345a69703f 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpBackgroundJobsHangfireModule.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpBackgroundJobsHangfireModule.cs
@@ -25,13 +25,8 @@ public class AbpBackgroundJobsHangfireModule : AbpModule
         if (!options.IsJobExecutionEnabled)
         {
             var hangfireOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpHangfireOptions>>().Value;
-            hangfireOptions.BackgroundJobServerFactory = CreateOnlyEnqueueJobServer;
+            context.ServiceProvider.GetRequiredService<JobStorage>();
+            hangfireOptions.BackgroundJobServerFactory = _ => null;
         }
     }
-
-    private BackgroundJobServer? CreateOnlyEnqueueJobServer(IServiceProvider serviceProvider)
-    {
-        serviceProvider.GetRequiredService<JobStorage>();
-        return null;
-    }
 }
diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
index 2577181143..433ac699d2 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs
@@ -1,5 +1,4 @@
-using System;
-using Hangfire;
+using Hangfire;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Hangfire;
@@ -23,17 +22,12 @@ public class AbpBackgroundWorkersHangfireModule : AbpModule
         if (!options.IsEnabled)
         {
             var hangfireOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpHangfireOptions>>().Value;
-            hangfireOptions.BackgroundJobServerFactory = CreateOnlyEnqueueJobServer;
+            context.ServiceProvider.GetRequiredService<JobStorage>();
+            hangfireOptions.BackgroundJobServerFactory = _ => null;
         }
         
         context.ServiceProvider
             .GetRequiredService<HangfireBackgroundWorkerManager>()
             .Initialize(); 
     }
-    
-    private BackgroundJobServer? CreateOnlyEnqueueJobServer(IServiceProvider serviceProvider)
-    {
-        serviceProvider.GetRequiredService<JobStorage>();
-        return null;
-    }
 }