From f7c74b5c9609d34ed9d95e3723d6f0e1922d9cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Tue, 13 Dec 2022 23:12:10 +0800
Subject: [PATCH] =?UTF-8?q?Quartz=E6=9B=B4=E6=94=B9=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=86=85=E7=BD=AE=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Quartz/MyQuartzFactory.cs                 | 32 -------------------
 .../MiddlewareExtend/QuartzExtensions.cs      |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 Yi.Framework.Net6/Yi.Framework.Core/Quartz/MyQuartzFactory.cs

diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Quartz/MyQuartzFactory.cs b/Yi.Framework.Net6/Yi.Framework.Core/Quartz/MyQuartzFactory.cs
deleted file mode 100644
index 098989f7..00000000
--- a/Yi.Framework.Net6/Yi.Framework.Core/Quartz/MyQuartzFactory.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Quartz;
-using Quartz.Spi;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Quartz
-{
-   public class MyQuartzFactory : IJobFactory
-    {
-        private readonly IServiceProvider _serviceProvider;
-
-        public MyQuartzFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler)
-        {
-            return _serviceProvider.GetRequiredService(bundle.JobDetail.JobType) as IJob;
-        }
-
-        public void ReturnJob(IJob job)
-        {
-            var disposable = job as IDisposable;
-            disposable?.Dispose();
-        }
-    }
-}
diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs
index 4dca1fd7..d8b18c18 100644
--- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs
+++ b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Yi.Framework.Core;
-using Yi.Framework.Core.Quartz;
 
 namespace Yi.Framework.WebCore.MiddlewareExtend
 {
@@ -25,7 +24,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
         public static IServiceCollection AddQuartzService(this IServiceCollection services)
         {
             services.AddSingleton<QuartzInvoker>();
-            services.AddSingleton<IJobFactory, MyQuartzFactory>();
+            services.AddQuartz();
             services.AddSingleton<ISchedulerFactory, StdSchedulerFactory>();
             return services;
         }