Merge pull request #1364 from colinin/remove-unnecessary-service-scope

feat(background-tasks): Remove unnecessary service scopes

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN/Abp/BackgroundTasks/Quartz/QuartzJobCreator.cs

@@ -38,13 +38,10 @@ public class QuartzJobCreator : IQuartzJobCreator, ISingletonDependency
             // 运行时搜寻本地作业
             jobType = typeof(QuartzJobSearchJobAdapter);
         }
-        else
+        else if (!typeof(IJob).IsAssignableFrom(jobType))
         {
-            if (!typeof(IJob).IsAssignableFrom(jobType))
+            var adapterType = typeof(QuartzJobSimpleAdapter<>);
-            {
+            jobType = adapterType.MakeGenericType(jobType);
-                var adapterType = typeof(QuartzJobSimpleAdapter<>);
-                jobType = adapterType.MakeGenericType(jobType);
-            }
         }
 
         if (jobType == null)

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN/Abp/BackgroundTasks/BackgroundJobAdapter.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using System.Threading.Tasks;
@@ -14,15 +13,12 @@ public class BackgroundJobAdapter<TArgs> : IJobRunnable
 
     protected AbpBackgroundJobOptions Options { get; }
     protected IBackgroundJobExecuter JobExecuter { get; }
-    protected IServiceScopeFactory ServiceScopeFactory { get; }
 
     public BackgroundJobAdapter(
         IOptions<AbpBackgroundJobOptions> options,
-        IBackgroundJobExecuter jobExecuter,
+        IBackgroundJobExecuter jobExecuter)
-        IServiceScopeFactory serviceScopeFactory)
     {
         JobExecuter = jobExecuter;
-        ServiceScopeFactory = serviceScopeFactory;
         Options = options.Value;
 
         Logger = NullLogger<BackgroundJobAdapter<TArgs>>.Instance;
@@ -30,17 +26,20 @@ public class BackgroundJobAdapter<TArgs> : IJobRunnable
 
     public async virtual Task ExecuteAsync(JobRunnableContext context)
     {
-        using var scope = ServiceScopeFactory.CreateScope();
+        object jobArgs = null;
-        object args = null;
         if (context.TryGetString(nameof(TArgs), out var argsJson))
         {
             var jsonSerializer = context.GetRequiredService<IJsonSerializer>();
-            args = jsonSerializer.Deserialize<TArgs>(argsJson);
+            jobArgs = jsonSerializer.Deserialize<TArgs>(argsJson);
-            // args = JsonConvert.DeserializeObject<TArgs>(argsJson);
         }
 
-        var jobType = Options.GetJob(typeof(TArgs)).JobType;
+        var jobConfiguration = Options.GetJob<TArgs>();
-        var jobContext = new JobExecutionContext(scope.ServiceProvider, jobType, args);
+
+        var jobContext = new JobExecutionContext(
+            context.ServiceProvider,
+            jobConfiguration.JobType,
+            jobArgs, 
+            context.CancellationToken);
         await JobExecuter.ExecuteAsync(jobContext);
     }
 }

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN/Abp/BackgroundTasks/BackgroundWorkerAdapter.cs

@@ -86,7 +86,7 @@ public class BackgroundWorkerAdapter<TWorker> : BackgroundWorkerBase, IBackgroun
     public async Task ExecuteAsync(JobRunnableContext context)
     {
         var worker = (IBackgroundWorker)context.GetService(typeof(TWorker));
-        var workerContext = new PeriodicBackgroundWorkerContext(ServiceProvider, context.CancellationToken);
+        var workerContext = new PeriodicBackgroundWorkerContext(context.ServiceProvider, context.CancellationToken);
 
         switch (worker)
         {