msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

refactor(admin): 项目结构AI Ready重构，业务逻辑与框架逻辑分离，提升项目可读性与可维护性；

Browse Source
3.4.1-release
xuxueli 3 months ago
parent 639a493549
commit 6873757d78
101 changed files with 335 additions and 309 deletions
Show Stats Download Patch File Download Diff File

2
doc/XXL-JOB官方文档.md
Unescape View File

@ -2840,7 +2840,7 @@ alter table xxl_job_log
``` ```
### 7.45 版本 v3.4.1 Release Notes[ING] ### 7.45 版本 v3.4.1 Release Notes[ING]
- 1、【重构】项目结构AI Ready重构，将业务逻辑与数据访问逻辑分离，提升项目可读性与可维护性； - 1、【重构】项目结构AI Ready重构，业务逻辑与框架逻辑分离，提升项目可读性与可维护性；
- 2、【调整】消息中心移除context-path前缀配置项，简化客户端配置； - 2、【调整】消息中心移除context-path前缀配置项，简化客户端配置；
（存量客户端升级需要注意：升级后需要将配置项 "xxl.job.admin.addresses" 中的 context-path 前缀移除） （存量客户端升级需要注意：升级后需要将配置项 "xxl.job.admin.addresses" 中的 context-path 前缀移除）
- 3、【升级】升级多项maven依赖至较新版本，如 spring、netty 等； - 3、【升级】升级多项maven依赖至较新版本，如 spring、netty 等；

14
xxl-job-admin/src/main/java/com/xxl/job/admin/constant/TriggerStatus.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/constant/TriggerStatus.java
Unescape View File

@ -1,8 +1,20 @@
package com.xxl.job.admin.constant; package com.xxl.job.admin.business.constant;
/**
* Trigger Status
*
* @author xuxueli 2019-05-04
*/
public enum TriggerStatus { public enum TriggerStatus {
/**
* Stopped
*/
STOPPED(0, "stopped"), STOPPED(0, "stopped"),
/**
* Running
*/
RUNNING(1, "running"); RUNNING(1, "running");
private int value; private int value;

17
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobCodeController.java
Unescape View File

@ -1,11 +1,11 @@
package com.xxl.job.admin.controller.biz; package com.xxl.job.admin.business.controller;
import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.business.mapper.XxlJobInfoMapper;
import com.xxl.job.admin.mapper.XxlJobLogGlueMapper; import com.xxl.job.admin.business.mapper.XxlJobLogGlueMapper;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLogGlue; import com.xxl.job.admin.business.model.XxlJobLogGlue;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil; import com.xxl.job.admin.framework.util.JobGroupPermissionUtil;
import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
@ -26,6 +26,7 @@ import java.util.List;
/** /**
* job code controller * job code controller
*
* @author xuxueli 2015-12-19 16:13:16 * @author xuxueli 2015-12-19 16:13:16
*/ */
@Controller @Controller

19
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java
Unescape View File

@ -1,12 +1,12 @@
package com.xxl.job.admin.controller.biz; package com.xxl.job.admin.business.controller;
import com.xxl.job.admin.constant.Consts; import com.xxl.job.admin.framework.constant.Consts;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.admin.business.model.XxlJobRegistry;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.business.mapper.XxlJobGroupMapper;
import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.business.mapper.XxlJobInfoMapper;
import com.xxl.job.admin.mapper.XxlJobRegistryMapper; import com.xxl.job.admin.business.mapper.XxlJobRegistryMapper;
import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.Const;
import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.constant.RegistType;
import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.annotation.XxlSso;
@ -26,6 +26,7 @@ import java.util.*;
/** /**
* job group controller * job group controller
*
* @author xuxueli 2016-10-02 20:52:56 * @author xuxueli 2016-10-02 20:52:56
*/ */
@Controller @Controller

24
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java
Unescape View File

@ -1,15 +1,15 @@
package com.xxl.job.admin.controller.biz; package com.xxl.job.admin.business.controller;
import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.business.mapper.XxlJobGroupMapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.admin.business.scheduler.exception.XxlJobException;
import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum;
import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum;
import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.business.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil; import com.xxl.job.admin.framework.util.JobGroupPermissionUtil;
import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;

27
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java
Unescape View File

@ -1,16 +1,16 @@
package com.xxl.job.admin.controller.biz; package com.xxl.job.admin.business.controller;
import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.business.mapper.XxlJobGroupMapper;
import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.business.mapper.XxlJobInfoMapper;
import com.xxl.job.admin.mapper.XxlJobLogMapper; import com.xxl.job.admin.business.mapper.XxlJobLogMapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.admin.business.scheduler.exception.XxlJobException;
import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.business.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil; import com.xxl.job.admin.framework.util.JobGroupPermissionUtil;
import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.job.core.openapi.model.KillRequest; import com.xxl.job.core.openapi.model.KillRequest;
@ -40,6 +40,7 @@ import java.util.Map;
/** /**
* index controller * index controller
*
* @author xuxueli 2015-12-19 16:13:16 * @author xuxueli 2015-12-19 16:13:16
*/ */
@Controller @Controller

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobGroupMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobInfoMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLockMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLockMapper.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLogGlue; import com.xxl.job.admin.business.model.XxlJobLogGlue;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobLogReportMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLogReport; import com.xxl.job.admin.business.model.XxlJobLogReport;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobRegistryMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.admin.business.model.XxlJobRegistry;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobGroup.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobInfo.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import java.util.Date; import java.util.Date;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLog.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLog.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import java.util.Date; import java.util.Date;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogGlue.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogGlue.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import java.util.Date; import java.util.Date;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobLogReport.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import java.util.Date; import java.util.Date;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobRegistry.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.business.model;
import java.util.Date; import java.util.Date;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarm.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarm.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.alarm; package com.xxl.job.admin.business.scheduler.alarm;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
/** /**
* @author xuxueli 2020-01-19 * @author xuxueli 2020-01-19

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/JobAlarmer.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.alarm; package com.xxl.job.admin.business.scheduler.alarm;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.CollectionTool;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

16
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java
Unescape View File

@ -1,11 +1,11 @@
package com.xxl.job.admin.scheduler.alarm.impl; package com.xxl.job.admin.business.scheduler.alarm.impl;
import com.xxl.job.admin.scheduler.alarm.JobAlarm; import com.xxl.job.admin.business.scheduler.alarm.JobAlarm;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobContext;
import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage;
import org.slf4j.Logger; import org.slf4j.Logger;

18
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/complete/JobCompleter.java
Unescape View File

@ -1,12 +1,12 @@
package com.xxl.job.admin.scheduler.complete; package com.xxl.job.admin.business.scheduler.complete;
import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.business.mapper.XxlJobInfoMapper;
import com.xxl.job.admin.mapper.XxlJobLogMapper; import com.xxl.job.admin.business.mapper.XxlJobLogMapper;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobContext;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

12
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java
Unescape View File

@ -1,10 +1,10 @@
package com.xxl.job.admin.scheduler.config; package com.xxl.job.admin.business.scheduler.config;
import com.xxl.job.admin.mapper.*; import com.xxl.job.admin.business.mapper.*;
import com.xxl.job.admin.scheduler.alarm.JobAlarmer; import com.xxl.job.admin.business.scheduler.alarm.JobAlarmer;
import com.xxl.job.admin.scheduler.complete.JobCompleter; import com.xxl.job.admin.business.scheduler.complete.JobCompleter;
import com.xxl.job.admin.scheduler.thread.*; import com.xxl.job.admin.business.scheduler.thread.*;
import com.xxl.job.admin.scheduler.trigger.JobTrigger; import com.xxl.job.admin.business.scheduler.trigger.JobTrigger;
import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.Const;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/cron/CronExpression.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/cron/CronExpression.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.scheduler.cron; package com.xxl.job.admin.business.scheduler.cron;
/* /*
* All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved. * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
* Copyright IBM Corp. 2024, 2025 * Copyright IBM Corp. 2024, 2025

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/exception/XxlJobException.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/exception/XxlJobException.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.scheduler.exception; package com.xxl.job.admin.business.scheduler.exception;
/** /**
* @author xuxueli 2019-05-04 23:19:29 * @author xuxueli 2019-05-04 23:19:29

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireHandler.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireHandler.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.scheduler.misfire; package com.xxl.job.admin.business.scheduler.misfire;
/** /**
* Misfire Handler * Misfire Handler

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireStrategyEnum.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/MisfireStrategyEnum.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.misfire; package com.xxl.job.admin.business.scheduler.misfire;
import com.xxl.job.admin.scheduler.misfire.strategy.MisfireDoNothing; import com.xxl.job.admin.business.scheduler.misfire.strategy.MisfireDoNothing;
import com.xxl.job.admin.scheduler.misfire.strategy.MisfireFireOnceNow; import com.xxl.job.admin.business.scheduler.misfire.strategy.MisfireFireOnceNow;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
/** /**
* @author xuxueli 2020-10-29 21:11:23 * @author xuxueli 2020-10-29 21:11:23

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireDoNothing.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireDoNothing.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.misfire.strategy; package com.xxl.job.admin.business.scheduler.misfire.strategy;
import com.xxl.job.admin.scheduler.misfire.MisfireHandler; import com.xxl.job.admin.business.scheduler.misfire.MisfireHandler;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireFireOnceNow.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/misfire/strategy/MisfireFireOnceNow.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.misfire.strategy; package com.xxl.job.admin.business.scheduler.misfire.strategy;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.misfire.MisfireHandler; import com.xxl.job.admin.business.scheduler.misfire.MisfireHandler;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.openapi; package com.xxl.job.admin.business.scheduler.openapi;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.Const;
import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.AdminBiz;
import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.CallbackRequest;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouteStrategyEnum.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouteStrategyEnum.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route; package com.xxl.job.admin.business.scheduler.route;
import com.xxl.job.admin.scheduler.route.strategy.*; import com.xxl.job.admin.business.scheduler.route.strategy.*;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
/** /**
* Created by xuxueli on 17/3/10. * Created by xuxueli on 17/3/10.

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.scheduler.route; package com.xxl.job.admin.business.scheduler.route;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.job.core.openapi.model.IdleBeatRequest; import com.xxl.job.core.openapi.model.IdleBeatRequest;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route.strategy; package com.xxl.job.admin.business.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.CallbackRequest;
import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobContext;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;

12
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobFailAlarmMonitorHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobFailAlarmMonitorHelper.java
Unescape View File

@ -1,10 +1,10 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobLogReportHelper.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.model.XxlJobLogReport; import com.xxl.job.admin.business.model.XxlJobLogReport;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.admin.business.model.XxlJobRegistry;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.constant.RegistType;
import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.Const;

16
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobScheduleHelper.java
Unescape View File

@ -1,11 +1,11 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.constant.TriggerStatus; import com.xxl.job.admin.business.constant.TriggerStatus;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum;
import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.MapTool; import com.xxl.tool.core.MapTool;
import org.slf4j.Logger; import org.slf4j.Logger;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobTriggerPoolHelper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobTriggerPoolHelper.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.thread; package com.xxl.job.admin.business.scheduler.thread;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

20
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java
Unescape View File

@ -1,14 +1,14 @@
package com.xxl.job.admin.scheduler.trigger; package com.xxl.job.admin.business.scheduler.trigger;
import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.business.mapper.XxlJobGroupMapper;
import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.business.mapper.XxlJobInfoMapper;
import com.xxl.job.admin.mapper.XxlJobLogMapper; import com.xxl.job.admin.business.mapper.XxlJobLogMapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum;
import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/TriggerTypeEnum.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/TriggerTypeEnum.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.trigger; package com.xxl.job.admin.business.scheduler.trigger;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
/** /**
* trigger type enum * trigger type enum

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleType.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleType.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.type; package com.xxl.job.admin.business.scheduler.type;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import java.util.Date; import java.util.Date;

10
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleTypeEnum.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/ScheduleTypeEnum.java
Unescape View File

@ -1,9 +1,9 @@
package com.xxl.job.admin.scheduler.type; package com.xxl.job.admin.business.scheduler.type;
import com.xxl.job.admin.scheduler.type.strategy.CronScheduleType; import com.xxl.job.admin.business.scheduler.type.strategy.CronScheduleType;
import com.xxl.job.admin.scheduler.type.strategy.FixRateScheduleType; import com.xxl.job.admin.business.scheduler.type.strategy.FixRateScheduleType;
import com.xxl.job.admin.scheduler.type.strategy.NoneScheduleType; import com.xxl.job.admin.business.scheduler.type.strategy.NoneScheduleType;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
/** /**
* @author xuxueli 2020-10-29 21:11:23 * @author xuxueli 2020-10-29 21:11:23

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/CronScheduleType.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/CronScheduleType.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.scheduler.type.strategy; package com.xxl.job.admin.business.scheduler.type.strategy;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.cron.CronExpression; import com.xxl.job.admin.business.scheduler.cron.CronExpression;
import com.xxl.job.admin.scheduler.type.ScheduleType; import com.xxl.job.admin.business.scheduler.type.ScheduleType;
import java.util.Date; import java.util.Date;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/FixRateScheduleType.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/FixRateScheduleType.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.type.strategy; package com.xxl.job.admin.business.scheduler.type.strategy;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.type.ScheduleType; import com.xxl.job.admin.business.scheduler.type.ScheduleType;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import java.util.Date; import java.util.Date;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/NoneScheduleType.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/type/strategy/NoneScheduleType.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.type.strategy; package com.xxl.job.admin.business.scheduler.type.strategy;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.type.ScheduleType; import com.xxl.job.admin.business.scheduler.type.ScheduleType;
import java.util.Date; import java.util.Date;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.service; package com.xxl.job.admin.business.service;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.response.PageModel; import com.xxl.tool.response.PageModel;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.service.impl; package com.xxl.job.admin.business.service.impl;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.AdminBiz;
import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.CallbackRequest;
import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.openapi.model.RegistryRequest;

34
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java → xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java
Unescape View File

@ -1,20 +1,20 @@
package com.xxl.job.admin.service.impl; package com.xxl.job.admin.business.service.impl;
import com.xxl.job.admin.constant.TriggerStatus; import com.xxl.job.admin.business.constant.TriggerStatus;
import com.xxl.job.admin.mapper.*; import com.xxl.job.admin.business.mapper.*;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLogReport; import com.xxl.job.admin.business.model.XxlJobLogReport;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.cron.CronExpression; import com.xxl.job.admin.business.scheduler.cron.CronExpression;
import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum;
import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum; import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.scheduler.thread.JobScheduleHelper; import com.xxl.job.admin.business.scheduler.thread.JobScheduleHelper;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum; import com.xxl.job.admin.business.scheduler.trigger.TriggerTypeEnum;
import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum;
import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.business.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil; import com.xxl.job.admin.framework.util.JobGroupPermissionUtil;
import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;

7
xxl-job-admin/src/main/java/com/xxl/job/admin/constant/Consts.java
Unescape View File

@ -1,7 +0,0 @@
package com.xxl.job.admin.constant;
public class Consts {
public static final String ADMIN_ROLE = "ADMIN";
}

15
xxl-job-admin/src/main/java/com/xxl/job/admin/framework/constant/Consts.java
Unescape View File

@ -0,0 +1,15 @@
package com.xxl.job.admin.framework.constant;
/**
* System Constants
*
* @author xuxueli 2018-08-24 03:43
*/
public class Consts {
/**
* Admin Role
*/
public static final String ADMIN_ROLE = "ADMIN";
}

10
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/IndexController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/IndexController.java
Unescape View File

@ -1,9 +1,9 @@
package com.xxl.job.admin.controller.base; package com.xxl.job.admin.framework.controller;
import com.xxl.job.admin.constant.Consts; import com.xxl.job.admin.framework.constant.Consts;
import com.xxl.job.admin.model.dto.XxlBootResourceDTO; import com.xxl.job.admin.framework.model.dto.XxlBootResourceDTO;
import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.business.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;

20
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/JobUserController.java
Unescape View File

@ -1,11 +1,11 @@
package com.xxl.job.admin.controller.biz; package com.xxl.job.admin.framework.controller;
import com.xxl.job.admin.constant.Consts; import com.xxl.job.admin.framework.constant.Consts;
import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.business.mapper.XxlJobGroupMapper;
import com.xxl.job.admin.mapper.XxlJobUserMapper; import com.xxl.job.admin.framework.mapper.XxlJobUserMapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.framework.model.XxlJobUser;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
@ -22,11 +22,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* job user controller
*
* @author xuxueli 2019-05-04 16:39:50 * @author xuxueli 2019-05-04 16:39:50
*/ */
@Controller @Controller

9
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/LoginController.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.controller.base; package com.xxl.job.admin.framework.controller;
import com.xxl.job.admin.mapper.XxlJobUserMapper; import com.xxl.job.admin.framework.mapper.XxlJobUserMapper;
import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.framework.model.XxlJobUser;
import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.framework.util.I18nUtil;
import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
@ -22,6 +22,7 @@ import org.springframework.web.servlet.view.RedirectView;
/** /**
* index controller * index controller
*
* @author xuxueli 2015-12-19 16:13:16 * @author xuxueli 2015-12-19 16:13:16
*/ */
@Controller @Controller

4
xxl-job-admin/src/main/java/com/xxl/job/admin/mapper/XxlJobUserMapper.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/mapper/XxlJobUserMapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.framework.mapper;
import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.framework.model.XxlJobUser;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobUser.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/XxlJobUser.java
Unescape View File

@ -1,6 +1,8 @@
package com.xxl.job.admin.model; package com.xxl.job.admin.framework.model;
/** /**
* xxl job user
*
* @author xuxueli 2019-05-04 16:43:12 * @author xuxueli 2019-05-04 16:43:12
*/ */
public class XxlJobUser { public class XxlJobUser {

2
xxl-job-admin/src/main/java/com/xxl/job/admin/model/dto/XxlBootResourceDTO.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/model/dto/XxlBootResourceDTO.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.model.dto; package com.xxl.job.admin.framework.model.dto;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/I18nUtil.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.util; package com.xxl.job.admin.framework.util;
import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum;
import com.xxl.tool.core.PropTool; import com.xxl.tool.core.PropTool;

6
xxl-job-admin/src/main/java/com/xxl/job/admin/util/JobGroupPermissionUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/JobGroupPermissionUtil.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.util; package com.xxl.job.admin.framework.util;
import com.xxl.job.admin.constant.Consts; import com.xxl.job.admin.framework.constant.Consts;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CommonDataInterceptor.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CommonDataInterceptor.java
Unescape View File

@ -1,6 +1,6 @@
//package com.xxl.job.admin.web.interceptor; //package com.xxl.job.admin.framework.web.interceptor;
// //
//import com.xxl.job.admin.util.I18nUtil; //import com.xxl.job.admin.framework.util.I18nUtil;
//import com.xxl.tool.freemarker.FtlTool; //import com.xxl.tool.freemarker.FtlTool;
//import jakarta.servlet.http.HttpServletRequest; //import jakarta.servlet.http.HttpServletRequest;
//import jakarta.servlet.http.HttpServletResponse; //import jakarta.servlet.http.HttpServletResponse;

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/CookieUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/CookieUtil.java
Unescape View File

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/FtlUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/FtlUtil.java
Unescape View File

2
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/JacksonUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/JacksonUtil.java
Unescape View File

@ -1,4 +1,4 @@
//package com.xxl.job.admin.util.old; //package com.xxl.job.admin.framework.util.old;
// //
//import com.fasterxml.jackson.core.JsonGenerationException; //import com.fasterxml.jackson.core.JsonGenerationException;
//import com.fasterxml.jackson.core.JsonParseException; //import com.fasterxml.jackson.core.JsonParseException;

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/LocalCacheUtil.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/LocalCacheUtil.java
Unescape View File

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/RemoteHttpJobBean.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/RemoteHttpJobBean.java
Unescape View File

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobDynamicScheduler.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobDynamicScheduler.java
Unescape View File

0
xxl-job-admin/src/main/java/com/xxl/job/admin/util/old/XxlJobThreadPool.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/util/old/XxlJobThreadPool.java
Unescape View File

2
xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebErrorPageRegistrar.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.web.error; package com.xxl.job.admin.framework.web.error;
import org.springframework.boot.web.error.ErrorPage; import org.springframework.boot.web.error.ErrorPage;
import org.springframework.boot.web.error.ErrorPageRegistrar; import org.springframework.boot.web.error.ErrorPageRegistrar;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/error/WebHandlerExceptionResolver.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.web.error; package com.xxl.job.admin.framework.web.error;
import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.admin.business.scheduler.exception.XxlJobException;
import com.xxl.tool.json.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

8
xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/SimpleLoginStore.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/SimpleLoginStore.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.web.xxlsso; package com.xxl.job.admin.framework.web.xxlsso;
import com.xxl.job.admin.constant.Consts; import com.xxl.job.admin.framework.constant.Consts;
import com.xxl.job.admin.mapper.XxlJobUserMapper; import com.xxl.job.admin.framework.mapper.XxlJobUserMapper;
import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.framework.model.XxlJobUser;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.sso.core.store.LoginStore; import com.xxl.sso.core.store.LoginStore;
import com.xxl.tool.core.MapTool; import com.xxl.tool.core.MapTool;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/web/xxlsso/XxlSsoConfig.java → xxl-job-admin/src/main/java/com/xxl/job/admin/framework/web/xxlsso/XxlSsoConfig.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.web.xxlsso; package com.xxl.job.admin.framework.web.xxlsso;
import com.xxl.sso.core.auth.interceptor.XxlSsoWebInterceptor; import com.xxl.sso.core.auth.interceptor.XxlSsoWebInterceptor;
import com.xxl.sso.core.bootstrap.XxlSsoBootstrap; import com.xxl.sso.core.bootstrap.XxlSsoBootstrap;

8
xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobGroupMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobGroupMapper">
<resultMap id="XxlJobGroup" type="com.xxl.job.admin.model.XxlJobGroup" > <resultMap id="XxlJobGroup" type="com.xxl.job.admin.business.model.XxlJobGroup" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="app_name" property="appname" /> <result column="app_name" property="appname" />
<result column="title" property="title" /> <result column="title" property="title" />
@ -34,12 +34,12 @@
ORDER BY t.app_name, t.title, t.id ASC ORDER BY t.app_name, t.title, t.id ASC
</select> </select>
<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" > <insert id="save" parameterType="com.xxl.job.admin.business.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`)
values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} );
</insert> </insert>
<update id="update" parameterType="com.xxl.job.admin.model.XxlJobGroup" > <update id="update" parameterType="com.xxl.job.admin.business.model.XxlJobGroup" >
UPDATE xxl_job_group UPDATE xxl_job_group
SET `app_name` = #{appname}, SET `app_name` = #{appname},
`title` = #{title}, `title` = #{title},

10
xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobInfoMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobInfoMapper">
<resultMap id="XxlJobInfo" type="com.xxl.job.admin.model.XxlJobInfo" > <resultMap id="XxlJobInfo" type="com.xxl.job.admin.business.model.XxlJobInfo" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="job_group" property="jobGroup" /> <result column="job_group" property="jobGroup" />
@ -111,7 +111,7 @@
</trim> </trim>
</select> </select>
<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id" > <insert id="save" parameterType="com.xxl.job.admin.business.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_info ( INSERT INTO xxl_job_info (
job_group, job_group,
job_desc, job_desc,
@ -173,7 +173,7 @@
WHERE t.id = #{id} WHERE t.id = #{id}
</select> </select>
<update id="update" parameterType="com.xxl.job.admin.model.XxlJobInfo" > <update id="update" parameterType="com.xxl.job.admin.business.model.XxlJobInfo" >
UPDATE xxl_job_info UPDATE xxl_job_info
SET SET
job_group = #{jobGroup}, job_group = #{jobGroup},
@ -228,7 +228,7 @@
LIMIT #{pagesize} LIMIT #{pagesize}
</select> </select>
<update id="scheduleUpdate" parameterType="com.xxl.job.admin.model.XxlJobInfo" > <update id="scheduleUpdate" parameterType="com.xxl.job.admin.business.model.XxlJobInfo" >
UPDATE xxl_job_info UPDATE xxl_job_info
SET SET
trigger_last_time = #{triggerLastTime}, trigger_last_time = #{triggerLastTime},

2
xxl-job-admin/src/main/resources/mapper/business/XxlJobLockMapper.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobLockMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobLockMapper">
<select id="scheduleLock" resultType="java.lang.String" > <select id="scheduleLock" resultType="java.lang.String" >
SELECT * FROM xxl_job_lock SELECT * FROM xxl_job_lock

6
xxl-job-admin/src/main/resources/mapper/business/XxlJobLogGlueMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogGlueMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobLogGlueMapper">
<resultMap id="XxlJobLogGlue" type="com.xxl.job.admin.model.XxlJobLogGlue" > <resultMap id="XxlJobLogGlue" type="com.xxl.job.admin.business.model.XxlJobLogGlue" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="job_id" property="jobId" /> <result column="job_id" property="jobId" />
<result column="glue_type" property="glueType" /> <result column="glue_type" property="glueType" />
@ -23,7 +23,7 @@
t.update_time t.update_time
</sql> </sql>
<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" > <insert id="save" parameterType="com.xxl.job.admin.business.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_logglue ( INSERT INTO xxl_job_logglue (
`job_id`, `job_id`,
`glue_type`, `glue_type`,

6
xxl-job-admin/src/main/resources/mapper/business/XxlJobLogMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobLogMapper">
<resultMap id="XxlJobLog" type="com.xxl.job.admin.model.XxlJobLog" > <resultMap id="XxlJobLog" type="com.xxl.job.admin.business.model.XxlJobLog" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="job_group" property="jobGroup" /> <result column="job_group" property="jobGroup" />
@ -117,7 +117,7 @@
</select> </select>
<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" > <insert id="save" parameterType="com.xxl.job.admin.business.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_log ( INSERT INTO xxl_job_log (
`job_group`, `job_group`,
`job_id`, `job_id`,

8
xxl-job-admin/src/main/resources/mapper/business/XxlJobLogReportMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobLogReportMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobLogReportMapper">
<resultMap id="XxlJobLogReport" type="com.xxl.job.admin.model.XxlJobLogReport" > <resultMap id="XxlJobLogReport" type="com.xxl.job.admin.business.model.XxlJobLogReport" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="trigger_day" property="triggerDay" /> <result column="trigger_day" property="triggerDay" />
<result column="running_count" property="runningCount" /> <result column="running_count" property="runningCount" />
@ -21,7 +21,7 @@
t.update_time t.update_time
</sql> </sql>
<!--<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" > <!--<insert id="save" parameterType="com.xxl.job.admin.business.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_log_report ( INSERT INTO xxl_job_log_report (
`trigger_day`, `trigger_day`,
`running_count`, `running_count`,
@ -46,7 +46,7 @@
WHERE `trigger_day` = #{triggerDay} WHERE `trigger_day` = #{triggerDay}
</update>--> </update>-->
<insert id="saveOrUpdate" parameterType="com.xxl.job.admin.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" > <insert id="saveOrUpdate" parameterType="com.xxl.job.admin.business.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_log_report ( INSERT INTO xxl_job_log_report (
`trigger_day`, `trigger_day`,
`running_count`, `running_count`,

4
xxl-job-admin/src/main/resources/mapper/business/XxlJobRegistryMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobRegistryMapper"> <mapper namespace="com.xxl.job.admin.business.mapper.XxlJobRegistryMapper">
<resultMap id="XxlJobRegistry" type="com.xxl.job.admin.model.XxlJobRegistry" > <resultMap id="XxlJobRegistry" type="com.xxl.job.admin.business.model.XxlJobRegistry" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="registry_group" property="registryGroup" /> <result column="registry_group" property="registryGroup" />
<result column="registry_key" property="registryKey" /> <result column="registry_key" property="registryKey" />

8
xxl-job-admin/src/main/resources/mapper/framework/XxlJobUserMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxl.job.admin.mapper.XxlJobUserMapper"> <mapper namespace="com.xxl.job.admin.framework.mapper.XxlJobUserMapper">
<resultMap id="XxlJobUser" type="com.xxl.job.admin.model.XxlJobUser" > <resultMap id="XxlJobUser" type="com.xxl.job.admin.framework.model.XxlJobUser" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="username" property="username" /> <result column="username" property="username" />
<result column="password" property="password" /> <result column="password" property="password" />
@ -61,7 +61,7 @@
WHERE t.id = #{id} WHERE t.id = #{id}
</select> </select>
<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobUser" useGeneratedKeys="true" keyProperty="id" > <insert id="save" parameterType="com.xxl.job.admin.framework.model.XxlJobUser" useGeneratedKeys="true" keyProperty="id" >
INSERT INTO xxl_job_user ( INSERT INTO xxl_job_user (
username, username,
password, password,
@ -75,7 +75,7 @@
); );
</insert> </insert>
<update id="update" parameterType="com.xxl.job.admin.model.XxlJobUser" > <update id="update" parameterType="com.xxl.job.admin.framework.model.XxlJobUser" >
UPDATE xxl_job_user UPDATE xxl_job_user
SET SET
<if test="password != null and password != ''"> <if test="password != null and password != ''">

2
xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/AbstractSpringMvcTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.controller; package com.xxl.job.admin.business.controller;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/controller/JobInfoControllerTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.xxl.job.admin.controller; package com.xxl.job.admin.business.controller;
import com.xxl.sso.core.constant.Const; import com.xxl.sso.core.constant.Const;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/core/util/CronExpressionTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.core.util; package com.xxl.job.admin.business.core.util;
import com.xxl.job.admin.scheduler.cron.CronExpression; import com.xxl.job.admin.business.scheduler.cron.CronExpression;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobGroupMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.business.model.XxlJobGroup;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

12
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java
Unescape View File

@ -1,10 +1,10 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.constant.TriggerStatus; import com.xxl.job.admin.business.constant.TriggerStatus;
import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.business.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum; import com.xxl.job.admin.business.scheduler.misfire.MisfireStrategyEnum;
import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.business.scheduler.type.ScheduleTypeEnum;
import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogGlueMapperTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLogGlue; import com.xxl.job.admin.business.model.XxlJobLogGlue;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogMapperTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.business.model.XxlJobLog;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogReportMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobLogReportMapperTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobLogReport; import com.xxl.job.admin.business.model.XxlJobLogReport;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobRegistryMapperTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobRegistryMapperTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.mapper; package com.xxl.job.admin.business.mapper;
import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.admin.business.model.XxlJobRegistry;
import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.constant.RegistType;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/JobScheduleTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/JobScheduleTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.schedule; package com.xxl.job.admin.business.schedule;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/schedule/route/ExecutorRouteConsistentHashTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/business/schedule/route/ExecutorRouteConsistentHashTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.xxl.job.admin.schedule.route; package com.xxl.job.admin.business.schedule.route;
import com.xxl.job.admin.scheduler.route.strategy.ExecutorRouteConsistentHash; import com.xxl.job.admin.business.scheduler.route.strategy.ExecutorRouteConsistentHash;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/JacksonUtilTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/framework/core/util/JacksonUtilTest.java
Unescape View File

@ -1,12 +1,12 @@
//package com.xxl.job.admin.core.util; //package com.xxl.job.admin.core.util;
// //
//import com.xxl.job.admin.util.JacksonUtil; //import com.xxl.job.admin.framework.util.JacksonUtil;
//import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
// //
//import java.util.HashMap; //import java.util.HashMap;
//import java.util.Map; //import java.util.Map;
// //
//import static com.xxl.job.admin.util.JacksonUtil.writeValueAsString; //import static com.xxl.job.admin.framework.util.JacksonUtil.writeValueAsString;
//import static org.junit.jupiter.api.Assertions.assertEquals; //import static org.junit.jupiter.api.Assertions.assertEquals;
// //
//public class JacksonUtilTest { //public class JacksonUtilTest {

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save