From bcacf008b08b828cf525883be2506006ccb7bfe9 Mon Sep 17 00:00:00 2001
From: david <nz1985@qq.com>
Date: Wed, 5 Oct 2022 23:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=BA=E5=88=B6=E5=81=9C=E6=AD=A2=20issues?=
 =?UTF-8?q?#62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Task.php  |  9 +++++++--
 public/page/crontab.html | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/controller/Task.php b/app/controller/Task.php
index d8b3a11..50afded 100644
--- a/app/controller/Task.php
+++ b/app/controller/Task.php
@@ -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);
     }
 
     /**
diff --git a/public/page/crontab.html b/public/page/crontab.html
index dae505f..0b17de7 100644
--- a/public/page/crontab.html
+++ b/public/page/crontab.html
@@ -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,