From 6684812014a0f48d0f3ddd9a6612f7c89dc18e8e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 11:31:26 +0800
Subject: [PATCH] update 标记过期 推荐迁移至新框架 xxl-job
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java | 3 ++-
ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java | 3 ++-
ruoyi-admin/pom.xml | 2 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java | 3 ++-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java | 1 +
pom.xml | 2 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java | 6 ++++--
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java | 3 ++-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java | 1 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java | 2 ++
ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java | 3 ++-
22 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index c35d131..c9124fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,7 @@
<version>${tlog.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+ <!-- 瀹氭椂浠诲姟 @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 12327e3..560051b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -41,7 +41,7 @@
<artifactId>ruoyi-system</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+ <!-- 瀹氭椂浠诲姟 @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
index 8318b8f..ba4986c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@@ -2,7 +2,8 @@
/**
* 浠诲姟璋冨害閫氱敤甯搁噺
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public class ScheduleConstants
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
index 14b2361..adba5a4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
@@ -2,7 +2,8 @@
/**
* 璁″垝绛栫暐寮傚父
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public class TaskException extends Exception
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
index c6b8384..61712e5 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
@@ -5,8 +5,10 @@
/**
* 瀹氭椂浠诲姟閰嶇疆
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author Lion Li
*/
+@Deprecated
@Configuration
public class ScheduleConfig {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
index 3a11170..4d895a4 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -23,6 +23,7 @@
/**
* 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
@RestController
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
index 6fcba39..280d6bd 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -18,6 +18,7 @@
/**
* 璋冨害鏃ュ織鎿嶄綔澶勭悊
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
@RestController
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 416dced..fa84159 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -23,6 +23,7 @@
/**
* 瀹氭椂浠诲姟璋冨害琛� sys_job
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
index bc9074a..5e09c80 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
@@ -16,6 +16,7 @@
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織琛� sys_job_log
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
index fe1a059..fd1f150 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
@@ -6,6 +6,7 @@
/**
* 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
index 14566b4..f96f5d2 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
@@ -6,6 +6,7 @@
/**
* 璋冨害浠诲姟淇℃伅 鏁版嵁灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public interface SysJobMapper extends BaseMapperPlus<SysJob> {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
index 27f598a..4b93480 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
@@ -9,6 +9,7 @@
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public interface ISysJobLogService extends IService<SysJobLog> {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
index 81eef93..bfeca5e 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
@@ -11,6 +11,7 @@
/**
* 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public interface ISysJobService extends IService<SysJob> {
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
index 3ee544c..e0a1004 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
@@ -17,6 +17,7 @@
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
@Service
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
index d4fc426..3cb7d78 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
@@ -26,6 +26,7 @@
/**
* 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞�
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
@Service
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index e5bfcb7..a387e96 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -7,6 +7,7 @@
/**
* 瀹氭椂浠诲姟璋冨害娴嬭瘯
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
@Component("ryTask")
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
index 95437a8..b083a81 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
@@ -20,6 +20,7 @@
/**
* 鎶借薄quartz璋冪敤
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public abstract class AbstractQuartzJob implements Job
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
index 6826787..4b41680 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
@@ -1,12 +1,14 @@
package com.ruoyi.quartz.util;
+import org.quartz.CronExpression;
+
import java.text.ParseException;
import java.util.Date;
-import org.quartz.CronExpression;
/**
* cron琛ㄨ揪寮忓伐鍏风被
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
index 40a19bd..c1f89d3 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
@@ -11,6 +11,7 @@
/**
* 浠诲姟鎵ц宸ュ叿
*
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public class JobInvokeUtil
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
index 96a6dcf..f298201 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
@@ -6,7 +6,8 @@
/**
* 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
index 87a06bc..f9e4fee 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
@@ -5,7 +5,8 @@
/**
* 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
index 37fe72e..8607fdf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
@@ -17,7 +17,8 @@
/**
* 瀹氭椂浠诲姟宸ュ叿绫�
- *
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*
*/
--
Gitblit v1.9.3