From b6443e0c01553ced0592e6e6cec7464e9b07b3c1 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: Wed, 20 Oct 2021 13:53:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20quartz=E6=94=B9=E4=B8=BA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ruoyi-admin/pom.xml | 2 +- .../main/java/com/ruoyi/common/constant/ScheduleConstants.java | 2 +- .../common/core/mybatisplus/cache/MybatisPlusRedisCache.java | 2 +- .../main/java/com/ruoyi/common/exception/job/TaskException.java | 2 +- .../src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java | 2 +- .../main/java/com/ruoyi/quartz/controller/SysJobController.java | 2 +- .../java/com/ruoyi/quartz/controller/SysJobLogController.java | 2 +- ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 2 +- .../src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 2 +- .../src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java | 2 +- .../src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java | 2 +- .../main/java/com/ruoyi/quartz/service/ISysJobLogService.java | 2 +- .../src/main/java/com/ruoyi/quartz/service/ISysJobService.java | 2 +- .../com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java | 2 +- .../java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java | 2 +- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 2 +- .../src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 2 +- ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java | 2 +- .../src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 2 +- .../ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java | 2 +- .../src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java | 2 +- .../src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index f14bbd792..63135fd79 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ ${tlog.version} - + com.ruoyi ruoyi-quartz diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index b203e6eb4..966e0655f 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -41,7 +41,7 @@ ruoyi-system - + 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 ba4986cfe..ec430c26a 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 @@ -3,7 +3,7 @@ package com.ruoyi.common.constant; /** * 任务调度通用常量 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.0删除 迁移至xxl-job * @author ruoyi */ public class ScheduleConstants diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java index 8f7379fcd..c790c663b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java @@ -18,7 +18,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * 使用方法 配置文件开启 mybatis-plus 二级缓存 * 在 XxxMapper.java 类上添加注解 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) * - * @deprecated 3.5.0删除 推荐使用spirng-cache + * @deprecated 3.4.0删除 推荐使用spirng-cache * @author Lion Li */ @Slf4j 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 adba5a464..59ea3a687 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 @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.job; /** * 计划策略异常 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 61712e5a3..c5fa2ec0f 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,7 +5,7 @@ import org.springframework.context.annotation.Configuration; /** * 定时任务配置 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.0删除 迁移至xxl-job * @author Lion Li */ @Deprecated 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 4d895a476..58efca748 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,7 +23,7 @@ import java.util.List; /** * 调度任务信息操作处理 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 280d6bdb1..f568d65d1 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,7 +18,7 @@ import java.util.List; /** * 调度日志操作处理 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 fa841598f..ee15e552e 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,7 +23,7 @@ import java.util.Map; /** * 定时任务调度表 sys_job * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 5e09c8018..2ea63df5c 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,7 +16,7 @@ import java.util.Map; /** * 定时任务调度日志表 sys_job_log * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 fd1f15005..0bffa118c 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,7 +6,7 @@ import com.ruoyi.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 f96f5d2c8..13f2da7c7 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,7 +6,7 @@ import com.ruoyi.quartz.domain.SysJob; /** * 调度任务信息 数据层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 4b934808c..ff8451acc 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,7 +9,7 @@ import java.util.List; /** * 定时任务调度日志信息信息 服务层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 bfeca5e03..cbe4621fd 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,7 +11,7 @@ import java.util.List; /** * 定时任务调度信息信息 服务层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 e0a10044c..76edb49bb 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,7 +17,7 @@ import java.util.Map; /** * 定时任务调度日志信息 服务层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 3cb7d78a7..6962cf1db 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,7 +26,7 @@ import java.util.List; /** * 定时任务调度信息 服务层 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 a387e9622..7fd55c5d9 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,7 +7,7 @@ import org.springframework.stereotype.Component; /** * 定时任务调度测试 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 b083a817f..1705433f3 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,7 +20,7 @@ import java.util.Date; /** * 抽象quartz调用 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 4b4168093..2253af18c 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 @@ -8,7 +8,7 @@ import java.util.Date; /** * cron表达式工具类 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 c1f89d37d..ed15d1f7c 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,7 +11,7 @@ import com.ruoyi.quartz.domain.SysJob; /** * 任务执行工具 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 f29820108..fc0ce7b9f 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 @@ -7,7 +7,7 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务处理(禁止并发执行) * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 f9e4fee85..404c26634 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 @@ -6,7 +6,7 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务处理(允许并发执行) * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.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 8607fdfef..182d1d698 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 @@ -18,7 +18,7 @@ import com.ruoyi.quartz.domain.SysJob; /** * 定时任务工具类 * - * @deprecated 3.5.0删除 迁移至xxl-job + * @deprecated 3.4.0删除 迁移至xxl-job * @author ruoyi * */