Browse Source

文案调整

xuxueli 7 years ago
parent
commit
4c8190f6a8

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java View File

76
 										// TODO,分片任务失败重试优化,仅重试失败分片
76
 										// TODO,分片任务失败重试优化,仅重试失败分片
77
 
77
 
78
 										JobTriggerPoolHelper.trigger(log.getJobId(), (log.getExecutorFailRetryCount()-1), I18nUtil.getString("jobconf_trigger_type_retry"));
78
 										JobTriggerPoolHelper.trigger(log.getJobId(), (log.getExecutorFailRetryCount()-1), I18nUtil.getString("jobconf_trigger_type_retry"));
79
-										String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_fail_trigger_retry") +"<<<<<<<<<<< </span><br>";
79
+										String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
80
 										log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
80
 										log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
81
 										XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(log);
81
 										XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(log);
82
 									}
82
 									}

+ 0 - 2
xxl-job-admin/src/main/resources/i18n/message.properties View File

197
 jobconf_block_SERIAL_EXECUTION=单机串行
197
 jobconf_block_SERIAL_EXECUTION=单机串行
198
 jobconf_block_DISCARD_LATER=丢弃后续调度
198
 jobconf_block_DISCARD_LATER=丢弃后续调度
199
 jobconf_block_COVER_EARLY=覆盖之前调度
199
 jobconf_block_COVER_EARLY=覆盖之前调度
200
-jobconf_fail_trigger_retry=调度失败重试
201
-jobconf_fail_handle_retry=执行失败重试
202
 jobconf_route_first=第一个
200
 jobconf_route_first=第一个
203
 jobconf_route_last=最后一个
201
 jobconf_route_last=最后一个
204
 jobconf_route_round=轮询
202
 jobconf_route_round=轮询

+ 0 - 2
xxl-job-admin/src/main/resources/i18n/message_en.properties View File

197
 jobconf_block_SERIAL_EXECUTION=Serial execution
197
 jobconf_block_SERIAL_EXECUTION=Serial execution
198
 jobconf_block_DISCARD_LATER=Discard Later
198
 jobconf_block_DISCARD_LATER=Discard Later
199
 jobconf_block_COVER_EARLY=Cover Early
199
 jobconf_block_COVER_EARLY=Cover Early
200
-jobconf_fail_trigger_retry=Trigger Fail Retry
201
-jobconf_fail_handle_retry=Handle Fail Retry
202
 jobconf_route_first=First
200
 jobconf_route_first=First
203
 jobconf_route_last=Last
201
 jobconf_route_last=Last
204
 jobconf_route_round=Round
202
 jobconf_route_round=Round