优化:计划任务强制停止 issues#62

This commit is contained in:
david 2022-10-05 23:33:29 +08:00
parent fa3706e955
commit bcacf008b0
2 changed files with 28 additions and 3 deletions

View File

@ -94,8 +94,13 @@ class Task extends BaseController
{
$rs = self::RS;
$uuid = $request->get('uuid');
//TODO...
return json(domainReseed::parser($uuid));
$pid_file = Crontab::getPidFile($uuid);
clearstatcache();
$rs['data'] = [
'success' => (is_file($pid_file) and unlink($pid_file)) or !is_file($pid_file),
];
return json($rs);
}
/**

View File

@ -388,6 +388,7 @@
<!-- 模板表格行工具条 -->
<script type="text/html" id="tableToolbar">
<span class="layui-badge layui-bg-cyan" lay-event="run">运行</span>
<span class="layui-badge layui-bg-cyan" lay-event="stop">停止</span>
<span class="layui-badge layui-bg-orange" lay-event="log">日志</span>
<span class="layui-badge layui-bg-gray" lay-event="clearLog">清理</span>
<span class="layui-badge layui-bg-green" lay-event="edit">编辑</span>
@ -409,6 +410,7 @@
,create: '/Api/Config'
,delete: '/Api/Config?config_filename=crontab&action=del'
,taskRun: '/Task/start'
,taskStop: '/Task/stop'
,taskLogs: '/Task/logs'
,taskClearLogs: '/Task/clearLogs'
};
@ -929,7 +931,7 @@
return d.body || d.command || '';
}
}
,{title: '操作', width: 230, templet: '#tableToolbar', fixed: "right", align: "center"}
,{title: '操作', width: 270, templet: '#tableToolbar', fixed: "right", align: "center"}
]]
,done: function(res, curr, count){
//如果是异步请求数据方式res即为你接口返回的信息。
@ -1010,6 +1012,24 @@
}
});
break;
case 'stop':
$.ajax({
url: API.taskStop,
type:'get',
data: {uuid: obj.data.uuid},
success:function(data){
if (data.ret !== 200) {
layer.msg(data.msg);
return;
}
let msg = data.data.success ? '已停止' : '操作失败';
layer.msg(msg, function () {
});
},
complete: function () {
}
});
break;
case 'clearLog':
$.ajax({
url: API.taskClearLogs,