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

项目结构重构，提升可维护性与易读性；

Browse Source
3.2.0-release
xuxueli 4 weeks ago
parent 6ecae5800a
commit 6d316112a9
21 changed files with 170 additions and 175 deletions
Show Stats Download Patch File Download Diff File

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

@ -28,14 +28,14 @@ import java.util.List;
public class JobCodeController {
@Resource
private XxlJobInfoMapper xxlJobInfoDao;
private XxlJobInfoMapper xxlJobInfoMapper;
@Resource
private XxlJobLogGlueMapper xxlJobLogGlueDao;
private XxlJobLogGlueMapper xxlJobLogGlueMapper;
@RequestMapping
public String index(HttpServletRequest request, Model model, @RequestParam("jobId") int jobId) {
XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
List<XxlJobLogGlue> jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId);
XxlJobInfo jobInfo = xxlJobInfoMapper.loadById(jobId);
List<XxlJobLogGlue> jobLogGlues = xxlJobLogGlueMapper.findByJobId(jobId);
if (jobInfo == null) {
throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
@ -69,7 +69,7 @@ public class JobCodeController {
if (glueRemark.length()<4 || glueRemark.length()>100) {
return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_remark_limit"));
}
XxlJobInfo existsJobInfo = xxlJobInfoDao.loadById(id);
XxlJobInfo existsJobInfo = xxlJobInfoMapper.loadById(id);
if (existsJobInfo == null) {
return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
@ -83,7 +83,7 @@ public class JobCodeController {
existsJobInfo.setGlueUpdatetime(new Date());
existsJobInfo.setUpdateTime(new Date());
xxlJobInfoDao.update(existsJobInfo);
xxlJobInfoMapper.update(existsJobInfo);
// log old code
XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
@ -94,10 +94,10 @@ public class JobCodeController {
xxlJobLogGlue.setAddTime(new Date());
xxlJobLogGlue.setUpdateTime(new Date());
xxlJobLogGlueDao.save(xxlJobLogGlue);
xxlJobLogGlueMapper.save(xxlJobLogGlue);
// remove code backup more than 30
xxlJobLogGlueDao.removeOld(existsJobInfo.getId(), 30);
xxlJobLogGlueMapper.removeOld(existsJobInfo.getId(), 30);
return ReturnT.ofSuccess();
}

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

@ -28,11 +28,11 @@ import java.util.*;
public class JobGroupController {
@Resource
public XxlJobInfoMapper xxlJobInfoDao;
public XxlJobInfoMapper xxlJobInfoMapper;
@Resource
public XxlJobGroupMapper xxlJobGroupDao;
public XxlJobGroupMapper xxlJobGroupMapper;
@Resource
private XxlJobRegistryMapper xxlJobRegistryDao;
private XxlJobRegistryMapper xxlJobRegistryMapper;
@RequestMapping
@PermissionLimit(adminuser = true)
@ -50,8 +50,8 @@ public class JobGroupController {
@RequestParam("title") String title) {
// page query
List<XxlJobGroup> list = xxlJobGroupDao.pageList(start, length, appname, title);
int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title);
List<XxlJobGroup> list = xxlJobGroupMapper.pageList(start, length, appname, title);
int list_count = xxlJobGroupMapper.pageListCount(start, length, appname, title);
// package result
Map<String, Object> maps = new HashMap<String, Object>();
@ -101,7 +101,7 @@ public class JobGroupController {
// process
xxlJobGroup.setUpdateTime(new Date());
int ret = xxlJobGroupDao.save(xxlJobGroup);
int ret = xxlJobGroupMapper.save(xxlJobGroup);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
}
@ -148,13 +148,13 @@ public class JobGroupController {
// process
xxlJobGroup.setUpdateTime(new Date());
int ret = xxlJobGroupDao.update(xxlJobGroup);
int ret = xxlJobGroupMapper.update(xxlJobGroup);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
}
private List<String> findRegistryByAppName(String appnameParam){
HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
List<XxlJobRegistry> list = xxlJobRegistryMapper.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
if (list != null) {
for (XxlJobRegistry item: list) {
if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
@ -180,17 +180,17 @@ public class JobGroupController {
public ReturnT<String> remove(@RequestParam("id") int id){
// valid
int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null);
int count = xxlJobInfoMapper.pageListCount(0, 10, id, -1, null, null, null);
if (count > 0) {
return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0") );
}
List<XxlJobGroup> allList = xxlJobGroupDao.findAll();
List<XxlJobGroup> allList = xxlJobGroupMapper.findAll();
if (allList.size() == 1) {
return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1") );
}
int ret = xxlJobGroupDao.remove(id);
int ret = xxlJobGroupMapper.remove(id);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
}
@ -198,7 +198,7 @@ public class JobGroupController {
@ResponseBody
@PermissionLimit(adminuser = true)
public ReturnT<XxlJobGroup> loadById(@RequestParam("id") int id){
XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
XxlJobGroup jobGroup = xxlJobGroupMapper.load(id);
return jobGroup!=null?ReturnT.ofSuccess(jobGroup):ReturnT.ofFail();
}

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

@ -38,7 +38,7 @@ public class JobInfoController {
private static Logger logger = LoggerFactory.getLogger(JobInfoController.class);
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@Resource
private XxlJobService xxlJobService;
@ -53,7 +53,7 @@ public class JobInfoController {
model.addAttribute("MisfireStrategyEnum", MisfireStrategyEnum.values()); // 调度过期策略
// 执行器列表
List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
List<XxlJobGroup> jobGroupList_all = xxlJobGroupMapper.findAll();
// filter group
List<XxlJobGroup> jobGroupList = PermissionInterceptor.filterJobGroupByRole(request, jobGroupList_all);

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

@ -44,17 +44,17 @@ public class JobLogController {
private static Logger logger = LoggerFactory.getLogger(JobLogController.class);
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@Resource
public XxlJobInfoMapper xxlJobInfoDao;
public XxlJobInfoMapper xxlJobInfoMapper;
@Resource
public XxlJobLogMapper xxlJobLogDao;
public XxlJobLogMapper xxlJobLogMapper;
@RequestMapping
public String index(HttpServletRequest request, Model model, @RequestParam(value = "jobId", required = false, defaultValue = "0") Integer jobId) {
// 执行器列表
List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
List<XxlJobGroup> jobGroupList_all = xxlJobGroupMapper.findAll();
// filter group
List<XxlJobGroup> jobGroupList = PermissionInterceptor.filterJobGroupByRole(request, jobGroupList_all);
@ -66,7 +66,7 @@ public class JobLogController {
// 任务
if (jobId > 0) {
XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
XxlJobInfo jobInfo = xxlJobInfoMapper.loadById(jobId);
if (jobInfo == null) {
throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid"));
}
@ -83,7 +83,7 @@ public class JobLogController {
@RequestMapping("/getJobsByGroup")
@ResponseBody
public ReturnT<List<XxlJobInfo>> getJobsByGroup(@RequestParam("jobGroup") int jobGroup){
List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
List<XxlJobInfo> list = xxlJobInfoMapper.getJobsByGroup(jobGroup);
return ReturnT.ofSuccess(list);
}
@ -112,8 +112,8 @@ public class JobLogController {
}
// page query
List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
List<XxlJobLog> list = xxlJobLogMapper.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
int list_count = xxlJobLogMapper.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
// package result
Map<String, Object> maps = new HashMap<String, Object>();
@ -127,7 +127,7 @@ public class JobLogController {
public String logDetailPage(HttpServletRequest request, @RequestParam("id") int id, Model model){
// base check
XxlJobLog jobLog = xxlJobLogDao.load(id);
XxlJobLog jobLog = xxlJobLogMapper.load(id);
if (jobLog == null) {
throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid"));
}
@ -147,7 +147,7 @@ public class JobLogController {
public ReturnT<LogResult> logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum){
try {
// valid
XxlJobLog jobLog = xxlJobLogDao.load(logId); // todo, need to improve performance
XxlJobLog jobLog = xxlJobLogMapper.load(logId); // todo, need to improve performance
if (jobLog == null) {
return new ReturnT<LogResult>(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_logid_unvalid"));
}
@ -212,8 +212,8 @@ public class JobLogController {
@ResponseBody
public ReturnT<String> logKill(@RequestParam("id") int id){
// base check
XxlJobLog log = xxlJobLogDao.load(id);
XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId());
XxlJobLog log = xxlJobLogMapper.load(id);
XxlJobInfo jobInfo = xxlJobInfoMapper.loadById(log.getJobId());
if (jobInfo==null) {
return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
@ -278,9 +278,9 @@ public class JobLogController {
List<Long> logIds = null;
do {
logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000);
logIds = xxlJobLogMapper.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000);
if (logIds!=null && logIds.size()>0) {
xxlJobLogDao.clearLog(logIds);
xxlJobLogMapper.clearLog(logIds);
}
} while (logIds!=null && logIds.size()>0);

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

@ -30,16 +30,16 @@ import java.util.Map;
public class JobUserController {
@Resource
private XxlJobUserMapper xxlJobUserDao;
private XxlJobUserMapper xxlJobUserMapper;
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@RequestMapping
@PermissionLimit(adminuser = true)
public String index(Model model) {
// 执行器列表
List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
List<XxlJobGroup> groupList = xxlJobGroupMapper.findAll();
model.addAttribute("groupList", groupList);
return "user/user.index";
@ -54,8 +54,8 @@ public class JobUserController {
@RequestParam("role") int role) {
// page list
List<XxlJobUser> list = xxlJobUserDao.pageList(start, length, username, role);
int list_count = xxlJobUserDao.pageListCount(start, length, username, role);
List<XxlJobUser> list = xxlJobUserMapper.pageList(start, length, username, role);
int list_count = xxlJobUserMapper.pageListCount(start, length, username, role);
// filter
if (list!=null && list.size()>0) {
@ -98,13 +98,13 @@ public class JobUserController {
xxlJobUser.setPassword(passwordHash);
// check repeat
XxlJobUser existUser = xxlJobUserDao.loadByUserName(xxlJobUser.getUsername());
XxlJobUser existUser = xxlJobUserMapper.loadByUserName(xxlJobUser.getUsername());
if (existUser != null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat") );
}
// write
xxlJobUserDao.save(xxlJobUser);
xxlJobUserMapper.save(xxlJobUser);
return ReturnT.ofSuccess();
}
@ -133,7 +133,7 @@ public class JobUserController {
}
// write
xxlJobUserDao.update(xxlJobUser);
xxlJobUserMapper.update(xxlJobUser);
return ReturnT.ofSuccess();
}
@ -148,7 +148,7 @@ public class JobUserController {
return ReturnT.ofFail(I18nUtil.getString("user_update_loginuser_limit"));
}
xxlJobUserDao.delete(id);
xxlJobUserMapper.delete(id);
return ReturnT.ofSuccess();
}
@ -176,14 +176,14 @@ public class JobUserController {
// valid old pwd
XxlJobUser loginUser = PermissionInterceptor.getLoginUser(request);
XxlJobUser existUser = xxlJobUserDao.loadByUserName(loginUser.getUsername());
XxlJobUser existUser = xxlJobUserMapper.loadByUserName(loginUser.getUsername());
if (!oldPasswordHash.equals(existUser.getPassword())) {
return ReturnT.ofFail(I18nUtil.getString("change_pwd_field_oldpwd") + I18nUtil.getString("system_unvalid"));
}
// write new
existUser.setPassword(passwordHash);
xxlJobUserDao.update(existUser);
xxlJobUserMapper.update(existUser);
return ReturnT.ofSuccess();
}

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

@ -49,7 +49,7 @@ public class EmailJobAlarm implements JobAlarm {
}
// email info
XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(Integer.valueOf(info.getJobGroup()));
XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupMapper().load(Integer.valueOf(info.getJobGroup()));
String personal = I18nUtil.getString("admin_name_full");
String title = I18nUtil.getString("jobconf_monitor");
String content = MessageFormat.format(loadEmailJobAlarmTemplate(),

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/XxlJobCompleter.java
Unescape View File

@ -36,7 +36,7 @@ public class XxlJobCompleter {
}
// fresh handle
return XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateHandleInfo(xxlJobLog);
return XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().updateHandleInfo(xxlJobLog);
}
@ -48,7 +48,7 @@ public class XxlJobCompleter {
// 1、handle success, to trigger child job
String triggerChildMsg = null;
if (XxlJobContext.HANDLE_CODE_SUCCESS == xxlJobLog.getHandleCode()) {
XxlJobInfo xxlJobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(xxlJobLog.getJobId());
XxlJobInfo xxlJobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoMapper().loadById(xxlJobLog.getJobId());
if (xxlJobInfo!=null && xxlJobInfo.getChildJobId()!=null && xxlJobInfo.getChildJobId().trim().length()>0) {
triggerChildMsg = "<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_child_run") +"<<<<<<<<<<< </span><br>";

30
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/conf/XxlJobAdminConfig.java
Unescape View File

@ -73,15 +73,15 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
// dao, service
@Resource
private XxlJobLogMapper xxlJobLogDao;
private XxlJobLogMapper xxlJobLogMapper;
@Resource
private XxlJobInfoMapper xxlJobInfoDao;
private XxlJobInfoMapper xxlJobInfoMapper;
@Resource
private XxlJobRegistryMapper xxlJobRegistryDao;
private XxlJobRegistryMapper xxlJobRegistryMapper;
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@Resource
private XxlJobLogReportMapper xxlJobLogReportDao;
private XxlJobLogReportMapper xxlJobLogReportMapper;
@Resource
private JavaMailSender mailSender;
@Resource
@ -130,24 +130,24 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
return logretentiondays;
}
public XxlJobLogMapper getXxlJobLogDao() {
return xxlJobLogDao;
public XxlJobLogMapper getXxlJobLogMapper() {
return xxlJobLogMapper;
}
public XxlJobInfoMapper getXxlJobInfoDao() {
return xxlJobInfoDao;
public XxlJobInfoMapper getXxlJobInfoMapper() {
return xxlJobInfoMapper;
}
public XxlJobRegistryMapper getXxlJobRegistryDao() {
return xxlJobRegistryDao;
public XxlJobRegistryMapper getXxlJobRegistryMapper() {
return xxlJobRegistryMapper;
}
public XxlJobGroupMapper getXxlJobGroupDao() {
return xxlJobGroupDao;
public XxlJobGroupMapper getXxlJobGroupMapper() {
return xxlJobGroupMapper;
}
public XxlJobLogReportMapper getXxlJobLogReportDao() {
return xxlJobLogReportDao;
public XxlJobLogReportMapper getXxlJobLogReportMapper() {
return xxlJobLogReportMapper;
}
public JavaMailSender getMailSender() {

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

@ -76,7 +76,7 @@ public class JobCompleteHelper {
try {
// 任务结果丢失处理：调度记录停留在 "运行中" 状态超过10min，且对应执行器心跳注册失败不在线，则将本地调度主动标记失败；
Date losedTime = DateUtil.addMinutes(new Date(), -10);
List<Long> losedJobIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findLostJobIds(losedTime);
List<Long> losedJobIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().findLostJobIds(losedTime);
if (losedJobIds!=null && losedJobIds.size()>0) {
for (Long logId: losedJobIds) {
@ -153,7 +153,7 @@ public class JobCompleteHelper {
private ReturnT<String> callback(HandleCallbackParam handleCallbackParam) {
// valid log item
XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().load(handleCallbackParam.getLogId());
XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().load(handleCallbackParam.getLogId());
if (log == null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, "log item not found.");
}

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

@ -38,24 +38,24 @@ public class JobFailMonitorHelper {
while (!toStop) {
try {
List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000);
List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().findFailJobLogIds(1000);
if (failLogIds!=null && !failLogIds.isEmpty()) {
for (long failLogId: failLogIds) {
// lock log
int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().updateAlarmStatus(failLogId, 0, -1);
if (lockRet < 1) {
continue;
}
XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().load(failLogId);
XxlJobInfo info = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(log.getJobId());
XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().load(failLogId);
XxlJobInfo info = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoMapper().loadById(log.getJobId());
// 1、fail retry monitor
if (log.getExecutorFailRetryCount() > 0) {
JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount()-1), log.getExecutorShardingParam(), log.getExecutorParam(), null);
String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(log);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().updateTriggerInfo(log);
}
// 2、fail alarm monitor
@ -67,7 +67,7 @@ public class JobFailMonitorHelper {
newAlarmStatus = 1;
}
XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, -1, newAlarmStatus);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().updateAlarmStatus(failLogId, -1, newAlarmStatus);
}
}

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

@ -68,7 +68,7 @@ public class JobLogReportHelper {
xxlJobLogReport.setSucCount(0);
xxlJobLogReport.setFailCount(0);
Map<String, Object> triggerCountMap = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findLogReport(todayFrom, todayTo);
Map<String, Object> triggerCountMap = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().findLogReport(todayFrom, todayTo);
if (triggerCountMap!=null && triggerCountMap.size()>0) {
int triggerDayCount = triggerCountMap.containsKey("triggerDayCount")?Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCount"))):0;
int triggerDayCountRunning = triggerCountMap.containsKey("triggerDayCountRunning")?Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCountRunning"))):0;
@ -81,9 +81,9 @@ public class JobLogReportHelper {
}
// do refresh
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportDao().update(xxlJobLogReport);
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportMapper().update(xxlJobLogReport);
if (ret < 1) {
XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportDao().save(xxlJobLogReport);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportMapper().save(xxlJobLogReport);
}
}
@ -109,9 +109,9 @@ public class JobLogReportHelper {
// clean expired log
List<Long> logIds = null;
do {
logIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
logIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
if (logIds!=null && logIds.size()>0) {
XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().clearLog(logIds);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().clearLog(logIds);
}
} while (logIds!=null && logIds.size()>0);

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

@ -59,18 +59,18 @@ public class JobRegistryHelper {
while (!toStop) {
try {
// auto registry group
List<XxlJobGroup> groupList = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().findByAddressType(0);
List<XxlJobGroup> groupList = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupMapper().findByAddressType(0);
if (groupList!=null && !groupList.isEmpty()) {
// remove dead address (admin/executor)
List<Integer> ids = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findDead(RegistryConfig.DEAD_TIMEOUT, new Date());
List<Integer> ids = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryMapper().findDead(RegistryConfig.DEAD_TIMEOUT, new Date());
if (ids!=null && ids.size()>0) {
XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().removeDead(ids);
XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryMapper().removeDead(ids);
}
// fresh online address (admin/executor)
HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
List<XxlJobRegistry> list = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
List<XxlJobRegistry> list = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryMapper().findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
if (list != null) {
for (XxlJobRegistry item: list) {
if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
@ -104,7 +104,7 @@ public class JobRegistryHelper {
group.setAddressList(addressListStr);
group.setUpdateTime(new Date());
XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().update(group);
XxlJobAdminConfig.getAdminConfig().getXxlJobGroupMapper().update(group);
}
}
} catch (Throwable e) {
@ -160,7 +160,7 @@ public class JobRegistryHelper {
@Override
public void run() {
// 0-fail; 1-save suc; 2-update suc;
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().registrySaveOrUpdate(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date());
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryMapper().registrySaveOrUpdate(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date());
if (ret == 1) {
// fresh (add)
freshGroupRegistryInfo(registryParam);
@ -191,7 +191,7 @@ public class JobRegistryHelper {
registryOrRemoveThreadPool.execute(new Runnable() {
@Override
public void run() {
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().registryDelete(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());
int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryMapper().registryDelete(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());
if (ret > 0) {
// fresh (delete)
freshGroupRegistryInfo(registryParam);

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

@ -76,7 +76,7 @@ public class JobScheduleHelper {
// 1、pre read
long nowTime = System.currentTimeMillis();
List<XxlJobInfo> scheduleList = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().scheduleJobQuery(nowTime + PRE_READ_MS, preReadCount);
List<XxlJobInfo> scheduleList = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoMapper().scheduleJobQuery(nowTime + PRE_READ_MS, preReadCount);
if (scheduleList!=null && scheduleList.size()>0) {
// 2、push time-ring
for (XxlJobInfo jobInfo: scheduleList) {
@ -139,7 +139,7 @@ public class JobScheduleHelper {
// 3、update trigger info
for (XxlJobInfo jobInfo: scheduleList) {
XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().scheduleUpdate(jobInfo);
XxlJobAdminConfig.getAdminConfig().getXxlJobInfoMapper().scheduleUpdate(jobInfo);
}
} else {

8
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/XxlJobTrigger.java
Unescape View File

@ -49,7 +49,7 @@ public class XxlJobTrigger {
String addressList) {
// load data
XxlJobInfo jobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(jobId);
XxlJobInfo jobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoMapper().loadById(jobId);
if (jobInfo == null) {
logger.warn(">>>>>>>>>>>> trigger fail, jobId invalid，jobId={}", jobId);
return;
@ -58,7 +58,7 @@ public class XxlJobTrigger {
jobInfo.setExecutorParam(executorParam);
}
int finalFailRetryCount = failRetryCount>=0?failRetryCount:jobInfo.getExecutorFailRetryCount();
XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(jobInfo.getJobGroup());
XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupMapper().load(jobInfo.getJobGroup());
// cover addressList
if (addressList!=null && addressList.trim().length()>0) {
@ -120,7 +120,7 @@ public class XxlJobTrigger {
jobLog.setJobGroup(jobInfo.getJobGroup());
jobLog.setJobId(jobInfo.getId());
jobLog.setTriggerTime(new Date());
XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().save(jobLog);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().save(jobLog);
logger.debug(">>>>>>>>>>> xxl-job trigger start, jobId:{}", jobLog.getId());
// 2、init trigger-param
@ -193,7 +193,7 @@ public class XxlJobTrigger {
//jobLog.setTriggerTime();
jobLog.setTriggerCode(triggerResult.getCode());
jobLog.setTriggerMsg(triggerMsgSb.toString());
XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(jobLog);
XxlJobAdminConfig.getAdminConfig().getXxlJobLogMapper().updateTriggerInfo(jobLog);
logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
}

6
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/LoginService.java
Unescape View File

@ -23,7 +23,7 @@ public class LoginService {
public static final String LOGIN_IDENTITY_KEY = "XXL_JOB_LOGIN_IDENTITY";
@Resource
private XxlJobUserMapper xxlJobUserDao;
private XxlJobUserMapper xxlJobUserMapper;
// ---------------------- token tool ----------------------
@ -53,7 +53,7 @@ public class LoginService {
}
// valid passowrd
XxlJobUser xxlJobUser = xxlJobUserDao.loadByUserName(username);
XxlJobUser xxlJobUser = xxlJobUserMapper.loadByUserName(username);
if (xxlJobUser == null) {
return new ReturnT<String>(500, I18nUtil.getString("login_param_unvalid"));
}
@ -96,7 +96,7 @@ public class LoginService {
logout(request, response);
}
if (cookieUser != null) {
XxlJobUser dbUser = xxlJobUserDao.loadByUserName(cookieUser.getUsername());
XxlJobUser dbUser = xxlJobUserMapper.loadByUserName(cookieUser.getUsername());
if (dbUser != null) {
if (cookieUser.getPassword().equals(dbUser.getPassword())) {
return dbUser;

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

@ -35,22 +35,22 @@ public class XxlJobServiceImpl implements XxlJobService {
private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class);
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@Resource
private XxlJobInfoMapper xxlJobInfoDao;
private XxlJobInfoMapper xxlJobInfoMapper;
@Resource
public XxlJobLogMapper xxlJobLogDao;
public XxlJobLogMapper xxlJobLogMapper;
@Resource
private XxlJobLogGlueMapper xxlJobLogGlueDao;
private XxlJobLogGlueMapper xxlJobLogGlueMapper;
@Resource
private XxlJobLogReportMapper xxlJobLogReportDao;
private XxlJobLogReportMapper xxlJobLogReportMapper;
@Override
public Map<String, Object> pageList(int start, int length, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
// page list
List<XxlJobInfo> list = xxlJobInfoDao.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
int list_count = xxlJobInfoDao.pageListCount(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
List<XxlJobInfo> list = xxlJobInfoMapper.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
int list_count = xxlJobInfoMapper.pageListCount(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
// package result
Map<String, Object> maps = new HashMap<String, Object>();
@ -64,7 +64,7 @@ public class XxlJobServiceImpl implements XxlJobService {
public ReturnT<String> add(XxlJobInfo jobInfo, XxlJobUser loginUser) {
// valid base
XxlJobGroup group = xxlJobGroupDao.load(jobInfo.getJobGroup());
XxlJobGroup group = xxlJobGroupMapper.load(jobInfo.getJobGroup());
if (group == null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("system_please_choose")+I18nUtil.getString("jobinfo_field_jobgroup")) );
}
@ -126,7 +126,7 @@ public class XxlJobServiceImpl implements XxlJobService {
String[] childJobIds = jobInfo.getChildJobId().split(",");
for (String childJobIdItem: childJobIds) {
if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) {
XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem));
XxlJobInfo childJobInfo = xxlJobInfoMapper.loadById(Integer.parseInt(childJobIdItem));
if (childJobInfo==null) {
return new ReturnT<String>(ReturnT.FAIL_CODE,
MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_not_found")), childJobIdItem));
@ -157,7 +157,7 @@ public class XxlJobServiceImpl implements XxlJobService {
jobInfo.setGlueUpdatetime(new Date());
// remove the whitespace
jobInfo.setExecutorHandler(jobInfo.getExecutorHandler().trim());
xxlJobInfoDao.save(jobInfo);
xxlJobInfoMapper.save(jobInfo);
if (jobInfo.getId() < 1) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) );
}
@ -231,7 +231,7 @@ public class XxlJobServiceImpl implements XxlJobService {
}
// valid child
XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(childJobId);
XxlJobInfo childJobInfo = xxlJobInfoMapper.loadById(childJobId);
if (childJobInfo==null) {
return new ReturnT<String>(ReturnT.FAIL_CODE,
MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_not_found")), childJobIdItem));
@ -257,13 +257,13 @@ public class XxlJobServiceImpl implements XxlJobService {
}
// group valid
XxlJobGroup jobGroup = xxlJobGroupDao.load(jobInfo.getJobGroup());
XxlJobGroup jobGroup = xxlJobGroupMapper.load(jobInfo.getJobGroup());
if (jobGroup == null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_jobgroup")+I18nUtil.getString("system_unvalid")) );
}
// stage job info
XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(jobInfo.getId());
XxlJobInfo exists_jobInfo = xxlJobInfoMapper.loadById(jobInfo.getId());
if (exists_jobInfo == null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_id")+I18nUtil.getString("system_not_found")) );
}
@ -302,7 +302,7 @@ public class XxlJobServiceImpl implements XxlJobService {
exists_jobInfo.setTriggerNextTime(nextTriggerTime);
exists_jobInfo.setUpdateTime(new Date());
xxlJobInfoDao.update(exists_jobInfo);
xxlJobInfoMapper.update(exists_jobInfo);
return ReturnT.ofSuccess();
@ -310,21 +310,21 @@ public class XxlJobServiceImpl implements XxlJobService {
@Override
public ReturnT<String> remove(int id) {
XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(id);
XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id);
if (xxlJobInfo == null) {
return ReturnT.ofSuccess();
}
xxlJobInfoDao.delete(id);
xxlJobLogDao.delete(id);
xxlJobLogGlueDao.deleteByJobId(id);
xxlJobInfoMapper.delete(id);
xxlJobLogMapper.delete(id);
xxlJobLogGlueMapper.deleteByJobId(id);
return ReturnT.ofSuccess();
}
@Override
public ReturnT<String> start(int id) {
// load and valid
XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(id);
XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id);
if (xxlJobInfo == null) {
return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
@ -353,14 +353,14 @@ public class XxlJobServiceImpl implements XxlJobService {
xxlJobInfo.setTriggerNextTime(nextTriggerTime);
xxlJobInfo.setUpdateTime(new Date());
xxlJobInfoDao.update(xxlJobInfo);
xxlJobInfoMapper.update(xxlJobInfo);
return ReturnT.ofSuccess();
}
@Override
public ReturnT<String> stop(int id) {
// load and valid
XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(id);
XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id);
if (xxlJobInfo == null) {
return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
@ -371,7 +371,7 @@ public class XxlJobServiceImpl implements XxlJobService {
xxlJobInfo.setTriggerNextTime(0);
xxlJobInfo.setUpdateTime(new Date());
xxlJobInfoDao.update(xxlJobInfo);
xxlJobInfoMapper.update(xxlJobInfo);
return ReturnT.ofSuccess();
}
@ -383,7 +383,7 @@ public class XxlJobServiceImpl implements XxlJobService {
if (loginUser == null) {
return ReturnT.ofFail(I18nUtil.getString("system_permission_limit"));
}
XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(jobId);
XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(jobId);
if (xxlJobInfo == null) {
return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
@ -414,10 +414,10 @@ public class XxlJobServiceImpl implements XxlJobService {
@Override
public Map<String, Object> dashboardInfo() {
int jobInfoCount = xxlJobInfoDao.findAllCount();
int jobInfoCount = xxlJobInfoMapper.findAllCount();
int jobLogCount = 0;
int jobLogSuccessCount = 0;
XxlJobLogReport xxlJobLogReport = xxlJobLogReportDao.queryLogReportTotal();
XxlJobLogReport xxlJobLogReport = xxlJobLogReportMapper.queryLogReportTotal();
if (xxlJobLogReport != null) {
jobLogCount = xxlJobLogReport.getRunningCount() + xxlJobLogReport.getSucCount() + xxlJobLogReport.getFailCount();
jobLogSuccessCount = xxlJobLogReport.getSucCount();
@ -425,7 +425,7 @@ public class XxlJobServiceImpl implements XxlJobService {
// executor count
Set<String> executorAddressSet = new HashSet<String>();
List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
List<XxlJobGroup> groupList = xxlJobGroupMapper.findAll();
if (groupList!=null && !groupList.isEmpty()) {
for (XxlJobGroup group: groupList) {
@ -457,7 +457,7 @@ public class XxlJobServiceImpl implements XxlJobService {
int triggerCountSucTotal = 0;
int triggerCountFailTotal = 0;
List<XxlJobLogReport> logReportList = xxlJobLogReportDao.queryLogReport(startDate, endDate);
List<XxlJobLogReport> logReportList = xxlJobLogReportMapper.queryLogReport(startDate, endDate);
if (logReportList!=null && logReportList.size()>0) {
for (XxlJobLogReport item: logReportList) {

19
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobGroupMapperTest.java
Unescape View File

@ -1,7 +1,6 @@
package com.xxl.job.admin.dao;
package com.xxl.job.admin.mapper;
import com.xxl.job.admin.model.XxlJobGroup;
import com.xxl.job.admin.mapper.XxlJobGroupMapper;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@ -10,16 +9,16 @@ import java.util.Date;
import java.util.List;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class XxlJobGroupDaoTest {
public class XxlJobGroupMapperTest {
@Resource
private XxlJobGroupMapper xxlJobGroupDao;
private XxlJobGroupMapper xxlJobGroupMapper;
@Test
public void test(){
List<XxlJobGroup> list = xxlJobGroupDao.findAll();
List<XxlJobGroup> list = xxlJobGroupMapper.findAll();
List<XxlJobGroup> list2 = xxlJobGroupDao.findByAddressType(0);
List<XxlJobGroup> list2 = xxlJobGroupMapper.findByAddressType(0);
XxlJobGroup group = new XxlJobGroup();
group.setAppname("setAppName");
@ -28,18 +27,18 @@ public class XxlJobGroupDaoTest {
group.setAddressList("setAddressList");
group.setUpdateTime(new Date());
int ret = xxlJobGroupDao.save(group);
int ret = xxlJobGroupMapper.save(group);
XxlJobGroup group2 = xxlJobGroupDao.load(group.getId());
XxlJobGroup group2 = xxlJobGroupMapper.load(group.getId());
group2.setAppname("setAppName2");
group2.setTitle("setTitle2");
group2.setAddressType(2);
group2.setAddressList("setAddressList2");
group2.setUpdateTime(new Date());
int ret2 = xxlJobGroupDao.update(group2);
int ret2 = xxlJobGroupMapper.update(group2);
int ret3 = xxlJobGroupDao.remove(group.getId());
int ret3 = xxlJobGroupMapper.remove(group.getId());
}
}

27
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java
Unescape View File

@ -1,9 +1,8 @@
package com.xxl.job.admin.dao;
package com.xxl.job.admin.mapper;
import com.xxl.job.admin.model.XxlJobInfo;
import com.xxl.job.admin.scheduler.scheduler.MisfireStrategyEnum;
import com.xxl.job.admin.scheduler.scheduler.ScheduleTypeEnum;
import com.xxl.job.admin.mapper.XxlJobInfoMapper;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@ -14,21 +13,21 @@ import java.util.Date;
import java.util.List;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class XxlJobInfoDaoTest {
private static Logger logger = LoggerFactory.getLogger(XxlJobInfoDaoTest.class);
public class XxlJobInfoMapperTest {
private static Logger logger = LoggerFactory.getLogger(XxlJobInfoMapperTest.class);
@Resource
private XxlJobInfoMapper xxlJobInfoDao;
private XxlJobInfoMapper xxlJobInfoMapper;
@Test
public void pageList(){
List<XxlJobInfo> list = xxlJobInfoDao.pageList(0, 20, 0, -1, null, null, null);
int list_count = xxlJobInfoDao.pageListCount(0, 20, 0, -1, null, null, null);
List<XxlJobInfo> list = xxlJobInfoMapper.pageList(0, 20, 0, -1, null, null, null);
int list_count = xxlJobInfoMapper.pageListCount(0, 20, 0, -1, null, null, null);
logger.info("", list);
logger.info("", list_count);
List<XxlJobInfo> list2 = xxlJobInfoDao.getJobsByGroup(1);
List<XxlJobInfo> list2 = xxlJobInfoMapper.getJobsByGroup(1);
}
@Test
@ -54,9 +53,9 @@ public class XxlJobInfoDaoTest {
info.setUpdateTime(new Date());
info.setGlueUpdatetime(new Date());
int count = xxlJobInfoDao.save(info);
int count = xxlJobInfoMapper.save(info);
XxlJobInfo info2 = xxlJobInfoDao.loadById(info.getId());
XxlJobInfo info2 = xxlJobInfoMapper.loadById(info.getId());
info.setScheduleType(ScheduleTypeEnum.FIX_RATE.name());
info.setScheduleConf(String.valueOf(44));
info.setMisfireStrategy(MisfireStrategyEnum.FIRE_ONCE_NOW.name());
@ -74,13 +73,13 @@ public class XxlJobInfoDaoTest {
info2.setChildJobId("1");
info2.setUpdateTime(new Date());
int item2 = xxlJobInfoDao.update(info2);
int item2 = xxlJobInfoMapper.update(info2);
xxlJobInfoDao.delete(info2.getId());
xxlJobInfoMapper.delete(info2.getId());
List<XxlJobInfo> list2 = xxlJobInfoDao.getJobsByGroup(1);
List<XxlJobInfo> list2 = xxlJobInfoMapper.getJobsByGroup(1);
int ret3 = xxlJobInfoDao.findAllCount();
int ret3 = xxlJobInfoMapper.findAllCount();
}

15
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogGlueMapperTest.java
Unescape View File

@ -1,7 +1,6 @@
package com.xxl.job.admin.dao;
package com.xxl.job.admin.mapper;
import com.xxl.job.admin.model.XxlJobLogGlue;
import com.xxl.job.admin.mapper.XxlJobLogGlueMapper;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@ -10,10 +9,10 @@ import java.util.Date;
import java.util.List;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class XxlJobLogGlueDaoTest {
public class XxlJobLogGlueMapperTest {
@Resource
private XxlJobLogGlueMapper xxlJobLogGlueDao;
private XxlJobLogGlueMapper xxlJobLogGlueMapper;
@Test
public void test(){
@ -25,13 +24,13 @@ public class XxlJobLogGlueDaoTest {
logGlue.setAddTime(new Date());
logGlue.setUpdateTime(new Date());
int ret = xxlJobLogGlueDao.save(logGlue);
int ret = xxlJobLogGlueMapper.save(logGlue);
List<XxlJobLogGlue> list = xxlJobLogGlueDao.findByJobId(1);
List<XxlJobLogGlue> list = xxlJobLogGlueMapper.findByJobId(1);
int ret2 = xxlJobLogGlueDao.removeOld(1, 1);
int ret2 = xxlJobLogGlueMapper.removeOld(1, 1);
int ret3 =xxlJobLogGlueDao.deleteByJobId(1);
int ret3 = xxlJobLogGlueMapper.deleteByJobId(1);
}
}

27
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogMapperTest.java
Unescape View File

@ -1,7 +1,6 @@
package com.xxl.job.admin.dao;
package com.xxl.job.admin.mapper;
import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.mapper.XxlJobLogMapper;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@ -10,22 +9,22 @@ import java.util.Date;
import java.util.List;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class XxlJobLogDaoTest {
public class XxlJobLogMapperTest {
@Resource
private XxlJobLogMapper xxlJobLogDao;
private XxlJobLogMapper xxlJobLogMapper;
@Test
public void test(){
List<XxlJobLog> list = xxlJobLogDao.pageList(0, 10, 1, 1, null, null, 1);
int list_count = xxlJobLogDao.pageListCount(0, 10, 1, 1, null, null, 1);
List<XxlJobLog> list = xxlJobLogMapper.pageList(0, 10, 1, 1, null, null, 1);
int list_count = xxlJobLogMapper.pageListCount(0, 10, 1, 1, null, null, 1);
XxlJobLog log = new XxlJobLog();
log.setJobGroup(1);
log.setJobId(1);
long ret1 = xxlJobLogDao.save(log);
XxlJobLog dto = xxlJobLogDao.load(log.getId());
long ret1 = xxlJobLogMapper.save(log);
XxlJobLog dto = xxlJobLogMapper.load(log.getId());
log.setTriggerTime(new Date());
log.setTriggerCode(1);
@ -33,20 +32,20 @@ public class XxlJobLogDaoTest {
log.setExecutorAddress("1");
log.setExecutorHandler("1");
log.setExecutorParam("1");
ret1 = xxlJobLogDao.updateTriggerInfo(log);
dto = xxlJobLogDao.load(log.getId());
ret1 = xxlJobLogMapper.updateTriggerInfo(log);
dto = xxlJobLogMapper.load(log.getId());
log.setHandleTime(new Date());
log.setHandleCode(2);
log.setHandleMsg("2");
ret1 = xxlJobLogDao.updateHandleInfo(log);
dto = xxlJobLogDao.load(log.getId());
ret1 = xxlJobLogMapper.updateHandleInfo(log);
dto = xxlJobLogMapper.load(log.getId());
List<Long> ret4 = xxlJobLogDao.findClearLogIds(1, 1, new Date(), 100, 100);
List<Long> ret4 = xxlJobLogMapper.findClearLogIds(1, 1, new Date(), 100, 100);
int ret2 = xxlJobLogDao.delete(log.getJobId());
int ret2 = xxlJobLogMapper.delete(log.getJobId());
}

15
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java → xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobRegistryMapperTest.java
Unescape View File

@ -1,7 +1,6 @@
package com.xxl.job.admin.dao;
package com.xxl.job.admin.mapper;
import com.xxl.job.admin.model.XxlJobRegistry;
import com.xxl.job.admin.mapper.XxlJobRegistryMapper;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@ -12,29 +11,29 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class XxlJobRegistryDaoTest {
public class XxlJobRegistryMapperTest {
@Resource
private XxlJobRegistryMapper xxlJobRegistryDao;
private XxlJobRegistryMapper xxlJobRegistryMapper;
@Test
public void test(){
int ret = xxlJobRegistryDao.registrySaveOrUpdate("g1", "k1", "v1", new Date());
int ret = xxlJobRegistryMapper.registrySaveOrUpdate("g1", "k1", "v1", new Date());
/*int ret = xxlJobRegistryDao.registryUpdate("g1", "k1", "v1", new Date());
if (ret < 1) {
ret = xxlJobRegistryDao.registrySave("g1", "k1", "v1", new Date());
}*/
List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(1, new Date());
List<XxlJobRegistry> list = xxlJobRegistryMapper.findAll(1, new Date());
int ret2 = xxlJobRegistryDao.removeDead(Arrays.asList(1));
int ret2 = xxlJobRegistryMapper.removeDead(Arrays.asList(1));
}
@Test
public void test2() throws InterruptedException {
for (int i = 0; i < 100; i++) {
new Thread(()->{
int ret = xxlJobRegistryDao.registrySaveOrUpdate("g1", "k1", "v1", new Date());
int ret = xxlJobRegistryMapper.registrySaveOrUpdate("g1", "k1", "v1", new Date());
System.out.println(ret);
/*int ret = xxlJobRegistryDao.registryUpdate("g1", "k1", "v1", new Date());
Write Preview
Loading…
Cancel
Save