From 08f6c582112cdeaa785d79f04bbc90d4c0ca9b62 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Tue, 16 Nov 2021 21:15:52 +0800
Subject: [PATCH] close https://github.com/elunez/eladmin/issues/692

---
 .../modules/quartz/config/QuartzConfig.java   | 22 +------------------
 .../modules/quartz/utils/QuartzManage.java    |  3 ++-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java
index a1e7f2e7..99f2e50e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java
@@ -15,13 +15,10 @@
  */
 package me.zhengjie.modules.quartz.config;
 
-import org.quartz.Scheduler;
 import org.quartz.spi.TriggerFiredBundle;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.quartz.AdaptableJobFactory;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.stereotype.Component;
 
 /**
@@ -46,27 +43,10 @@ public class QuartzConfig {
 
 		@Override
 		protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-
-			//调用父类的方法
+			//调用父类的方法，把Job注入到spring中
 			Object jobInstance = super.createJobInstance(bundle);
 			capableBeanFactory.autowireBean(jobInstance);
 			return jobInstance;
 		}
 	}
-
-	/**
-	 * 注入scheduler到spring
-	 * @param quartzJobFactory /
-	 * @return Scheduler
-	 * @throws Exception /
-	 */
-	@Bean(name = "scheduler")
-	public Scheduler scheduler(QuartzJobFactory quartzJobFactory) throws Exception {
-		SchedulerFactoryBean factoryBean=new SchedulerFactoryBean();
-		factoryBean.setJobFactory(quartzJobFactory);
-		factoryBean.afterPropertiesSet();
-		Scheduler scheduler=factoryBean.getScheduler();
-		scheduler.start();
-		return scheduler;
-	}
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java
index b96cbe74..e0cf1e0a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java
@@ -20,6 +20,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.quartz.domain.QuartzJob;
 import org.quartz.*;
 import org.quartz.impl.triggers.CronTriggerImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.Date;
@@ -35,7 +36,7 @@ public class QuartzManage {
 
     private static final String JOB_NAME = "TASK_";
 
-    @Resource(name = "scheduler")
+    @Resource
     private Scheduler scheduler;
 
     public void addJob(QuartzJob quartzJob){