red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增任务分类，杀死进程等

Browse Source 
常驻任务和定时任务
常驻任务暂停时杀死进程
This commit is contained in:
郝大全
2017-06-30 15:49:33 +08:00
parent fbd1f9e1a7
commit 4d8e647523
10 changed files with 160 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
views/task/add.html
View File

@@ -23,17 +23,27 @@
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_name">任务名称</label>
<div class="col-sm-3" >
<input type="text" class="form-control input-sm" placeholder="" name="task_name" value="" required />
<input type="text" class="form-control input-sm" placeholder="不需要带分组名称" name="task_name" value="" required />
</div>
<div class="col-sm-6" style="padding-top:5px;">
<i style="color:red">*</i>
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_tag">进程标志</label>
<div class="col-sm-3" >
<input type="text" class="form-control input-sm" placeholder="用于查找进程，一般为方法名称" name="task_tag" value="" required />
</div>
<div class="col-sm-6" style="padding-top:5px;">
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="description">任务说明</label>
<div class="col-sm-5" >
<textarea name="description" class="form-control" id="description" rows="3"></textarea>
<textarea name="description" class="form-control" id="description" rows="3" placeholder="注明执行周期"></textarea>
</div>
<div class="col-sm-4" style="padding-top:5px;">
@@ -66,7 +76,22 @@
</label>
</div>
<div class="col-sm-6" style="padding-top:5px;">
<i>设为“是”的话，如果该任务在上一个时间点还没执行完，则略过不执行</i>
<i style="font-size: 12px">设为“是”的话，如果该任务在上一个时间点还没执行完，则略过不执行</i>
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_type">任务类型</label>
<div class="col-sm-3" >
<label class="radio-inline">
<input type="radio" name="task_type" value="0" checked> 定时任务
</label>
<label class="radio-inline">
<input type="radio" name="task_type" value="1"> 常驻任务
</label>
</div>
<div class="col-sm-6" style="padding-top:5px;">
<i></i>
</div>
</div>
@@ -76,17 +101,16 @@
<input type="text" class="form-control input-sm" placeholder="" name="cron_spec" value="" />
</div>
<div class="col-sm-6" style="padding-top:5px;">
<a href="{{urlfor "HelpController.Index"}}" target="_blank">参见使用帮助</a>
<a href="{{urlfor "HelpController.Index"}}" target="_blank"><i style="font-size: 12px">支持秒级定时，详见《参见使用帮助》</i></a>
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="command">命令脚本</label>
<div class="col-sm-5" >
<textarea name="command" class="form-control" id="command" rows="3"></textarea>
<textarea name="command" class="form-control" id="command" rows="3" placeholder="支持bash命令和shell文件"></textarea>
</div>
<div class="col-sm-4" style="padding-top:5px;">
</div>
</div>
@@ -94,10 +118,10 @@
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="timeout">超时设置</label>
<div class="col-sm-3" >
<input type="text" class="form-control input-sm" placeholder="秒" name="timeout" value="" />
<input type="text" class="form-control input-sm" placeholder="秒,默认一天" name="timeout" value="" />
</div>
<div class="col-sm-6" style="padding-top:5px;">
单位秒，不设置的话，默认超时时间为1天
</div>
</div>

25
views/task/edit.html
View File

@@ -30,6 +30,16 @@
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_tag">进程标志</label>
<div class="col-sm-3" >
<input type="text" class="form-control input-sm" placeholder="用于查找进程，一般为方法名称" name="task_tag" value="{{.task.TaskTag}}" required />
</div>
<div class="col-sm-6" style="padding-top:5px;">
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_name">任务说明</label>
<div class="col-sm-5" >
@@ -70,6 +80,21 @@
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="task_type">任务类型</label>
<div class="col-sm-3" >
<label class="radio-inline">
<input type="radio" name="task_type" value="0" {{if eq .task.TaskType 0}}checked{{end}}> 定时任务
</label>
<label class="radio-inline">
<input type="radio" name="task_type" value="1" {{if eq .task.TaskType 1}}checked{{end}}> 常驻任务
</label>
</div>
<div class="col-sm-6" style="padding-top:5px;">
<i></i>
</div>
</div>
<div class="form-group" style="margin-top: 15px">
<label class="col-sm-3 control-label" for="cron_spec">时间表达式</label>
<div class="col-sm-3" >

23
views/task/list.html
View File

@@ -61,6 +61,8 @@
<td>ID</td>
<td width="20%">任务名称</td>
<td>时间表达式</td>
<td>任务说明</td>
<td>任务类型</td>
<td>上次执行时间</td>
<td>下次执行时间</td>
<td width="25%">操作</td>
@@ -77,9 +79,19 @@
{{else}}
<span class="glyphicon glyphicon-ok-sign brand-success " aria-hidden="true"></span>
{{end}}
&nbsp;
{{$v.name}}
</td>
<td> {{$v.cron_spec}} </td>
<td> {{$v.description}} </td>
<td>
{{if eq $v.task_type 0}}
定时任务
{{else}}
<i style="color:red">常驻任务</i>
{{end}}
</td>
<td> {{$v.prev_time}} </td>
<td> {{$v.next_time}} </td>
<td>
@@ -95,9 +107,14 @@
<a class="btn btn-info btn-xs" href="{{urlfor "TaskController.Edit"}}?id={{$v.id}}">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span> 编辑
</a>
<a class="btn btn-info btn-run btn-xs" href="{{urlfor "TaskController.Run"}}?id={{$v.id}}">
{{if eq $v.task_type 0}}
<a class="btn btn-info btn-run btn-xs" href="{{urlfor "TaskController.Run"}}?id={{$v.id}}">
<span class="glyphicon glyphicon-flash" aria-hidden="true"></span> 执行
</a>
</a>
{{end}}
<a class="btn btn-info btn-xs" href="{{urlfor "TaskController.Logs"}}?id={{$v.id}}">
<span class="glyphicon glyphicon-file" aria-hidden="true"></span> 日志
</a>
@@ -108,7 +125,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="7">
<td colspan="9">
<div class="pull-right">
{{str2html .pageBar}}
</div>