From c10fd7d02f4c6cee41220ac52885885c5f9359d9 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 17 Jun 2025 14:01:22 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=AD=A3=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E6=9C=AA=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/system/service/quartz/config/QuartzConfig.java  | 1 -
 .../java/org/nl/system/service/quartz/utils/QuartzManage.java   | 2 +-
 lms/nladmin-system/src/main/resources/config/application.yml    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java
index 82c430e..270e81e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java
@@ -18,7 +18,6 @@ import java.util.Properties;
  * @date 2019-01-07
  */
 @Configuration
-@ConditionalOnProperty(name = "autojob", havingValue = "true")
 public class QuartzConfig {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
index eed54d2..7b214cf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
@@ -23,7 +23,7 @@ import static org.quartz.TriggerBuilder.newTrigger;
 public class QuartzManage {
     private static final String JOB_NAME = "TASK_";
 
-    @Resource(name = "quartzScheduler")
+    @Resource(name = "scheduler")
     private Scheduler scheduler;
 
     public void addJob(SysQuartzJob quartzJob) {
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index a435e11..3b2d3e2 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -69,7 +69,7 @@ spring:
           threadPool:
             threadCount: 14
     #            class: org.nl.system.service.quartz.SimpleThreadPool
-    scheduler-name: quartzScheduler
+    scheduler-name: scheduler
 task:
   pool:
     # 核心线程池大小