代码重构
This commit is contained in:
parent
a1755156e2
commit
4eae26a353
|
@ -4,6 +4,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
|
||||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
||||||
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
||||||
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
import com.xxl.job.admin.core.util.I18nUtil;
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
||||||
import com.xxl.job.admin.service.XxlJobService;
|
import com.xxl.job.admin.service.XxlJobService;
|
||||||
|
@ -91,7 +92,7 @@ public class JobInfoController {
|
||||||
@RequestMapping("/trigger")
|
@RequestMapping("/trigger")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ReturnT<String> triggerJob(int id) {
|
public ReturnT<String> triggerJob(int id) {
|
||||||
JobTriggerPoolHelper.trigger(id, -1, I18nUtil.getString("jobconf_trigger_type_manual"));
|
JobTriggerPoolHelper.trigger(id, -1, TriggerTypeEnum.MANUAL);
|
||||||
return ReturnT.SUCCESS;
|
return ReturnT.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.xxl.job.admin.core.jobbean;
|
package com.xxl.job.admin.core.jobbean;
|
||||||
|
|
||||||
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
||||||
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
import com.xxl.job.admin.core.util.I18nUtil;
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import org.quartz.JobExecutionContext;
|
import org.quartz.JobExecutionContext;
|
||||||
import org.quartz.JobExecutionException;
|
import org.quartz.JobExecutionException;
|
||||||
|
@ -28,7 +29,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
|
||||||
|
|
||||||
// trigger
|
// trigger
|
||||||
//XxlJobTrigger.trigger(jobId);
|
//XxlJobTrigger.trigger(jobId);
|
||||||
JobTriggerPoolHelper.trigger(jobId, -1, I18nUtil.getString("jobconf_trigger_type_cron"));
|
JobTriggerPoolHelper.trigger(jobId, -1, TriggerTypeEnum.CRON);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -4,6 +4,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
|
||||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
import com.xxl.job.admin.core.model.XxlJobLog;
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
||||||
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
||||||
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
import com.xxl.job.admin.core.util.I18nUtil;
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import com.xxl.job.admin.core.util.MailUtil;
|
import com.xxl.job.admin.core.util.MailUtil;
|
||||||
import com.xxl.job.core.biz.model.ReturnT;
|
import com.xxl.job.core.biz.model.ReturnT;
|
||||||
|
@ -75,7 +76,7 @@ public class JobFailMonitorHelper {
|
||||||
|
|
||||||
// TODO,分片任务失败重试优化,仅重试失败分片
|
// TODO,分片任务失败重试优化,仅重试失败分片
|
||||||
|
|
||||||
JobTriggerPoolHelper.trigger(log.getJobId(), (log.getExecutorFailRetryCount()-1), I18nUtil.getString("jobconf_trigger_type_retry"));
|
JobTriggerPoolHelper.trigger(log.getJobId(), (log.getExecutorFailRetryCount()-1), TriggerTypeEnum.RETRY);
|
||||||
String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
|
String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
|
||||||
log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
|
log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
|
||||||
XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(log);
|
XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(log);
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.xxl.job.admin.core.thread;
|
package com.xxl.job.admin.core.thread;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
import com.xxl.job.admin.core.trigger.XxlJobTrigger;
|
import com.xxl.job.admin.core.trigger.XxlJobTrigger;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
@ -28,11 +29,11 @@ public class JobTriggerPoolHelper {
|
||||||
new ThreadPoolExecutor.CallerRunsPolicy());
|
new ThreadPoolExecutor.CallerRunsPolicy());
|
||||||
|
|
||||||
|
|
||||||
public void addTrigger(final int jobId, final int failRetryCount, final String type){
|
public void addTrigger(final int jobId, final int failRetryCount, final TriggerTypeEnum triggerType){
|
||||||
triggerPool.execute(new Runnable() {
|
triggerPool.execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
XxlJobTrigger.trigger(jobId, failRetryCount, type);
|
XxlJobTrigger.trigger(jobId, failRetryCount, triggerType);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -55,8 +56,8 @@ public class JobTriggerPoolHelper {
|
||||||
* <0: use param from job info config
|
* <0: use param from job info config
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public static void trigger(int jobId, int failRetryCount, String type) {
|
public static void trigger(int jobId, int failRetryCount, TriggerTypeEnum triggerType) {
|
||||||
helper.addTrigger(jobId, failRetryCount, type);
|
helper.addTrigger(jobId, failRetryCount, triggerType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toStop(){
|
public static void toStop(){
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
package com.xxl.job.admin.core.trigger;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* trigger type enum
|
||||||
|
*
|
||||||
|
* @author xuxueli 2018-09-16 04:56:41
|
||||||
|
*/
|
||||||
|
public enum TriggerTypeEnum {
|
||||||
|
|
||||||
|
MANUAL(I18nUtil.getString("jobconf_trigger_type_manual")),
|
||||||
|
CRON(I18nUtil.getString("jobconf_trigger_type_cron")),
|
||||||
|
RETRY(I18nUtil.getString("jobconf_trigger_type_retry")),
|
||||||
|
PARENT(I18nUtil.getString("jobconf_trigger_type_parent")),
|
||||||
|
API(I18nUtil.getString("jobconf_trigger_type_api"));
|
||||||
|
|
||||||
|
private TriggerTypeEnum(String title){
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
private String title;
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -35,7 +35,7 @@ public class XxlJobTrigger {
|
||||||
* <0: use param from job info config
|
* <0: use param from job info config
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public static void trigger(int jobId, int failRetryCount, String type) {
|
public static void trigger(int jobId, int failRetryCount, TriggerTypeEnum triggerType) {
|
||||||
|
|
||||||
// load data
|
// load data
|
||||||
XxlJobInfo jobInfo = XxlJobDynamicScheduler.xxlJobInfoDao.loadById(jobId); // job info
|
XxlJobInfo jobInfo = XxlJobDynamicScheduler.xxlJobInfoDao.loadById(jobId); // job info
|
||||||
|
@ -75,7 +75,7 @@ public class XxlJobTrigger {
|
||||||
|
|
||||||
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
||||||
StringBuffer triggerMsgSb = new StringBuffer();
|
StringBuffer triggerMsgSb = new StringBuffer();
|
||||||
triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(type);
|
triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(triggerType.getTitle());
|
||||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
|
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
|
||||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
|
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
|
||||||
.append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
|
.append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
|
||||||
|
@ -134,7 +134,7 @@ public class XxlJobTrigger {
|
||||||
|
|
||||||
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
||||||
StringBuffer triggerMsgSb = new StringBuffer();
|
StringBuffer triggerMsgSb = new StringBuffer();
|
||||||
triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(type);
|
triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(triggerType.getTitle());
|
||||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
|
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
|
||||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
|
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
|
||||||
.append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
|
.append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
|
||||||
|
|
|
@ -3,6 +3,7 @@ package com.xxl.job.admin.service.impl;
|
||||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
import com.xxl.job.admin.core.model.XxlJobLog;
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
||||||
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
||||||
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
import com.xxl.job.admin.core.util.I18nUtil;
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
||||||
import com.xxl.job.admin.dao.XxlJobLogDao;
|
import com.xxl.job.admin.dao.XxlJobLogDao;
|
||||||
|
@ -70,7 +71,7 @@ public class AdminBizImpl implements AdminBiz {
|
||||||
int childJobId = (StringUtils.isNotBlank(childJobIds[i]) && StringUtils.isNumeric(childJobIds[i]))?Integer.valueOf(childJobIds[i]):-1;
|
int childJobId = (StringUtils.isNotBlank(childJobIds[i]) && StringUtils.isNumeric(childJobIds[i]))?Integer.valueOf(childJobIds[i]):-1;
|
||||||
if (childJobId > 0) {
|
if (childJobId > 0) {
|
||||||
|
|
||||||
JobTriggerPoolHelper.trigger(childJobId, 0, I18nUtil.getString("jobconf_trigger_type_parent"));
|
JobTriggerPoolHelper.trigger(childJobId, 0, TriggerTypeEnum.PARENT);
|
||||||
ReturnT<String> triggerChildResult = ReturnT.SUCCESS;
|
ReturnT<String> triggerChildResult = ReturnT.SUCCESS;
|
||||||
|
|
||||||
// add msg
|
// add msg
|
||||||
|
@ -129,7 +130,7 @@ public class AdminBizImpl implements AdminBiz {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ReturnT<String> triggerJob(int jobId) {
|
public ReturnT<String> triggerJob(int jobId) {
|
||||||
JobTriggerPoolHelper.trigger(jobId, -1, I18nUtil.getString("jobconf_trigger_type_api"));
|
JobTriggerPoolHelper.trigger(jobId, -1, TriggerTypeEnum.API);
|
||||||
return ReturnT.SUCCESS;
|
return ReturnT.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue