jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into satoken

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
This commit is contained in:
疯狂的狮子li
2021-10-27 13:16:19 +08:00
parent c9a3164a29 dbb2d8462b
commit 695cb6d76b
418 changed files with 43660 additions and 4512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
View File

@ -5,8 +5,10 @@ import org.springframework.context.annotation.Configuration;
/**
* 定时任务配置
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author Lion Li
*/
@Deprecated
@Configuration
public class ScheduleConfig {

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View File

@ -23,6 +23,7 @@ import java.util.List;
/**
* 调度任务信息操作处理
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
@RestController

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
View File

@ -18,6 +18,7 @@ import java.util.List;
/**
* 调度日志操作处理
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
@RestController

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
View File

@ -23,6 +23,7 @@ import java.util.Map;
/**
* 定时任务调度表 sys_job
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
View File

@ -16,6 +16,7 @@ import java.util.Map;
/**
* 定时任务调度日志表 sys_job_log
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.quartz.domain.SysJobLog;
/**
* 调度任务日志信息 数据层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.quartz.domain.SysJob;
/**
* 调度任务信息 数据层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public interface SysJobMapper extends BaseMapperPlus<SysJob> {

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
View File

@ -9,6 +9,7 @@ import java.util.List;
/**
* 定时任务调度日志信息信息 服务层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public interface ISysJobLogService extends IService<SysJobLog> {

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
View File

@ -11,6 +11,7 @@ import java.util.List;
/**
* 定时任务调度信息信息 服务层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public interface ISysJobService extends IService<SysJob> {

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
View File

@ -17,6 +17,7 @@ import java.util.Map;
/**
* 定时任务调度日志信息 服务层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
@Service

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
View File

@ -26,6 +26,7 @@ import java.util.List;
/**
* 定时任务调度信息 服务层
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
@Service

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
View File

@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
/**
* 定时任务调度测试
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
@Component("ryTask")

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
View File

@ -20,6 +20,7 @@ import java.util.Date;
/**
* 抽象quartz调用
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public abstract class AbstractQuartzJob implements Job

6
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
View File

@ -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.4.0删除 迁移至xxl-job
* @author ruoyi
*
*/

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
View File

@ -11,6 +11,7 @@ import com.ruoyi.quartz.domain.SysJob;
/**
* 任务执行工具
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*/
public class JobInvokeUtil

3
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
View File

@ -6,7 +6,8 @@ import com.ruoyi.quartz.domain.SysJob;
/**
* 定时任务处理（禁止并发执行）
*
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*
*/

3
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
View File

@ -5,7 +5,8 @@ import com.ruoyi.quartz.domain.SysJob;
/**
* 定时任务处理（允许并发执行）
*
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*
*/

3
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
View File

@ -17,7 +17,8 @@ import com.ruoyi.quartz.domain.SysJob;
/**
* 定时任务工具类
*
*
* @deprecated 3.4.0删除 迁移至xxl-job
* @author ruoyi
*
*/