From 6684812014a0f48d0f3ddd9a6612f7c89dc18e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 15 Oct 2021 11:31:26 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E8=AE=B0=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=20=E6=8E=A8=E8=8D=90=E8=BF=81=E7=A7=BB=E8=87=B3=E6=96=B0?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=20xxl-job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ruoyi-admin/pom.xml | 2 +- .../java/com/ruoyi/common/constant/ScheduleConstants.java | 3 ++- .../java/com/ruoyi/common/exception/job/TaskException.java | 3 ++- .../main/java/com/ruoyi/quartz/config/ScheduleConfig.java | 2 ++ .../java/com/ruoyi/quartz/controller/SysJobController.java | 1 + .../com/ruoyi/quartz/controller/SysJobLogController.java | 1 + .../src/main/java/com/ruoyi/quartz/domain/SysJob.java | 1 + .../src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 1 + .../main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java | 1 + .../src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java | 1 + .../java/com/ruoyi/quartz/service/ISysJobLogService.java | 1 + .../main/java/com/ruoyi/quartz/service/ISysJobService.java | 1 + .../com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java | 1 + .../com/ruoyi/quartz/service/impl/SysJobServiceImpl.java | 1 + .../src/main/java/com/ruoyi/quartz/task/RyTask.java | 1 + .../main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 1 + .../src/main/java/com/ruoyi/quartz/util/CronUtils.java | 6 ++++-- .../src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 1 + .../quartz/util/QuartzDisallowConcurrentExecution.java | 3 ++- .../main/java/com/ruoyi/quartz/util/QuartzJobExecution.java | 3 ++- .../src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java | 3 ++- 22 files changed, 31 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index c35d13127..c9124fc84 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ ${tlog.version} - + com.ruoyi ruoyi-quartz diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 12327e305..560051b1b 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -41,7 +41,7 @@ ruoyi-system - + com.ruoyi ruoyi-quartz 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 8318b8f5f..ba4986cfe 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 @@ package com.ruoyi.common.constant; /** * 任务调度通用常量 - * + * + * @deprecated 3.5.0删除 迁移至xxl-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 14b2361d0..adba5a464 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 @@ package com.ruoyi.common.exception.job; /** * 计划策略异常 - * + * + * @deprecated 3.5.0删除 迁移至xxl-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 c6b838461..61712e5a3 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 @@ import org.springframework.context.annotation.Configuration; /** * 定时任务配置 * + * @deprecated 3.5.0删除 迁移至xxl-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 3a11170d5..4d895a476 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 @@ import java.util.List; /** * 调度任务信息操作处理 * + * @deprecated 3.5.0删除 迁移至xxl-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 6fcba3994..280d6bdb1 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 @@ import java.util.List; /** * 调度日志操作处理 * + * @deprecated 3.5.0删除 迁移至xxl-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 416dced2b..fa841598f 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 @@ import java.util.Map; /** * 定时任务调度表 sys_job * + * @deprecated 3.5.0删除 迁移至xxl-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 bc9074af1..5e09c8018 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 @@ import java.util.Map; /** * 定时任务调度日志表 sys_job_log * + * @deprecated 3.5.0删除 迁移至xxl-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 fe1a059e2..fd1f15005 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 @@ import com.ruoyi.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * + * @deprecated 3.5.0删除 迁移至xxl-job * @author ruoyi */ public interface SysJobLogMapper extends BaseMapperPlus { 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 14566b439..f96f5d2c8 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 @@ import com.ruoyi.quartz.domain.SysJob; /** * 调度任务信息 数据层 * + * @deprecated 3.5.0删除 迁移至xxl-job * @author ruoyi */ public interface SysJobMapper extends BaseMapperPlus { 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 27f598ac3..4b934808c 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 @@ import java.util.List; /** * 定时任务调度日志信息信息 服务层 * + * @deprecated 3.5.0删除 迁移至xxl-job * @author ruoyi */ public interface ISysJobLogService extends IService { 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 81eef937b..bfeca5e03 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 @@ import java.util.List; /** * 定时任务调度信息信息 服务层 * + * @deprecated 3.5.0删除 迁移至xxl-job * @author ruoyi */ public interface ISysJobService extends IService { 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 3ee544ca1..e0a10044c 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 @@ import java.util.Map; /** * 定时任务调度日志信息 服务层 * + * @deprecated 3.5.0删除 迁移至xxl-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 d4fc4265f..3cb7d78a7 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 @@ import java.util.List; /** * 定时任务调度信息 服务层 * + * @deprecated 3.5.0删除 迁移至xxl-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 e5bfcb798..a387e9622 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 @@ import org.springframework.stereotype.Component; /** * 定时任务调度测试 * + * @deprecated 3.5.0删除 迁移至xxl-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 95437a81f..b083a817f 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 @@ import java.util.Date; /** * 抽象quartz调用 * + * @deprecated 3.5.0删除 迁移至xxl-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 6826787a6..4b4168093 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删除 迁移至xxl-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 40a19bdea..c1f89d37d 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 @@ import com.ruoyi.quartz.domain.SysJob; /** * 任务执行工具 * + * @deprecated 3.5.0删除 迁移至xxl-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 96a6dcf8e..f29820108 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 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务处理（禁止并发执行） - * + * + * @deprecated 3.5.0删除 迁移至xxl-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 87a06bc13..f9e4fee85 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 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务处理（允许并发执行） - * + * + * @deprecated 3.5.0删除 迁移至xxl-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 37fe72e04..8607fdfef 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 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务工具类 - * + * + * @deprecated 3.5.0删除 迁移至xxl-job * @author ruoyi * */