liangqi
/
xxl-job
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

任务调度生命周期重构：调度（schedule）、触发(trigger)、执行（handle）、回调(callback)、后处理（posthandle）；

Browse Source
master
xueli.xue 4 years ago
parent d30a2fcf39
commit 0d13f04ebb
4 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      xxl-job-admin/src/main/resources/i18n/message_en.properties
  2. 4
      xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
  3. 4
      xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
  4. 24
      xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl

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

@ -153,7 +153,7 @@ misfire_strategy=Misfire strategy
misfire_strategy_do_nothing=Do nothing misfire_strategy_do_nothing=Do nothing
misfire_strategy_fire_once_now=Fire once now misfire_strategy_fire_once_now=Fire once now
jobinfo_conf_base=Base configuration jobinfo_conf_base=Base configuration
jobinfo_conf_trigger=Trigger configuration jobinfo_conf_schedule=Schedule configuration
jobinfo_conf_job=Job configuration jobinfo_conf_job=Job configuration
jobinfo_conf_advanced=Advanced configuration jobinfo_conf_advanced=Advanced configuration

4
xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
Unescape View File

@ -153,9 +153,9 @@ misfire_strategy=调度过期策略
misfire_strategy_do_nothing=忽略 misfire_strategy_do_nothing=忽略
misfire_strategy_fire_once_now=立即执行一次 misfire_strategy_fire_once_now=立即执行一次
jobinfo_conf_base=基础配置 jobinfo_conf_base=基础配置
jobinfo_conf_trigger=触发配置 jobinfo_conf_schedule=调度配置
jobinfo_conf_job=任务配置 jobinfo_conf_job=任务配置
jobinfo_conf_advanced=高级信息 jobinfo_conf_advanced=高级配置
## job log ## job log
joblog_name=调度日志 joblog_name=调度日志

4
xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
Unescape View File

@ -153,9 +153,9 @@ misfire_strategy=調度過期策略
misfire_strategy_do_nothing=忽略 misfire_strategy_do_nothing=忽略
misfire_strategy_fire_once_now=立即執行壹次 misfire_strategy_fire_once_now=立即執行壹次
jobinfo_conf_base=基礎配置 jobinfo_conf_base=基礎配置
jobinfo_conf_trigger=觸發配置 jobinfo_conf_schedule=調度配置
jobinfo_conf_job=任務配置 jobinfo_conf_job=任務配置
jobinfo_conf_advanced=高級信息 jobinfo_conf_advanced=高級配置
## job log ## job log
joblog_name=調度日誌 joblog_name=調度日誌

24
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl
Unescape View File

@ -115,7 +115,7 @@
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal form" role="form" > <form class="form-horizontal form" role="form" >
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_base} -</p> <#-- 基础信息 --> <p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_base}</p> <#-- 基础信息 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_jobgroup}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_jobgroup}<font color="red">*</font></label>
<div class="col-sm-4"> <div class="col-sm-4">
@ -136,7 +136,8 @@
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div> <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_trigger} -</p> <#-- 触发配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_schedule}</p> <#-- 调度 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.schedule_type}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.schedule_type}<font color="red">*</font></label>
<div class="col-sm-4"> <div class="col-sm-4">
@ -164,7 +165,8 @@
</div> </div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_job} -</p> <#-- 任务配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_job}</p> <#-- 任务配置 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_gluetype}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_gluetype}<font color="red">*</font></label>
@ -186,7 +188,8 @@
</div> </div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_advanced} -</p> <#-- 高级配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_advanced}</p> <#-- 高级配置 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorRouteStrategy}<font color="black">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorRouteStrategy}<font color="black">*</font></label>
@ -359,9 +362,7 @@ exit 0
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal form" role="form" > <form class="form-horizontal form" role="form" >
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_base}</p> <#-- 基础信息 -->
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_base} -</p> <#-- 基础信息 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_jobgroup}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_jobgroup}<font color="red">*</font></label>
<div class="col-sm-4"> <div class="col-sm-4">
@ -382,7 +383,8 @@ exit 0
<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div> <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_trigger} -</p> <#-- 触发配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_schedule}</p> <#-- 调度配置 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.schedule_type}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.schedule_type}<font color="red">*</font></label>
<div class="col-sm-4"> <div class="col-sm-4">
@ -410,7 +412,8 @@ exit 0
</div> </div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_job} -</p> <#-- 任务配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_job}</p> <#-- 任务配置 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_gluetype}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_gluetype}<font color="red">*</font></label>
@ -432,7 +435,8 @@ exit 0
</div> </div>
</div> </div>
<p style="margin: 0 0 10px;text-align: center;color: gray;">- ${I18n.jobinfo_conf_advanced} -</p> <#-- 高级配置 --> <br>
<p style="margin: 0 0 10px;text-align: left;border-bottom: 1px solid #e5e5e5;color: gray;">${I18n.jobinfo_conf_advanced}</p> <#-- 高级配置 -->
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorRouteStrategy}<font color="red">*</font></label> <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorRouteStrategy}<font color="red">*</font></label>

Write Preview
Loading…
Cancel
Save