From d97b0a248e18319dcafdb7429d6da772e0ca6ad1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 6 Jan 2020 16:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B8=85=E7=90=86=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php  | 30 ++++++++++++++++++++++++++++--
 app/admin/view/queue/index.html |  4 ++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 2ee83259f..dae6e5596 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -97,7 +97,11 @@ class Queue extends Controller
     {
         try {
             $message = nl2br($this->app->console->call('xtask:start')->fetch());
-            preg_match('/主进程\d+/', $message, $attr) ? $this->success($message) : $this->error($message);
+            if (preg_match('/process.*?\d+/', $message, $attr)) {
+                $this->success('任务监听主进程启动成功！');
+            } else {
+                $this->error($message);
+            }
         } catch (HttpResponseException $exception) {
             throw $exception;
         } catch (\Exception $e) {
@@ -105,6 +109,22 @@ class Queue extends Controller
         }
     }
 
+    /**
+     * 清理3天前的记录
+     * @auth true
+     * @throws \think\db\exception\DbException
+     */
+    public function clear()
+    {
+        $map = [['exec_time', '<', strtotime('-3days')]];
+        $result = $this->app->db->name($this->table)->where($map)->delete();
+        if ($result !== false) {
+            $this->success('成功清理3天前的任务记录！');
+        } else {
+            $this->error('清理3天前的任务记录失败！');
+        }
+    }
+
     /**
      * WIN停止监听进程
      * @auth true
@@ -113,7 +133,13 @@ class Queue extends Controller
     {
         try {
             $message = nl2br($this->app->console->call('xtask:stop')->fetch());
-            stripos($message, '成功') !== false ? $this->success($message) : $this->error($message);
+            if (stripos($message, 'succeeded')) {
+                $this->success('停止任务监听主进程成功！');
+            } elseif (stripos($message, 'finish')) {
+                $this->success('没有找到需要停止的进程！');
+            } else {
+                $this->error($message);
+            }
         } catch (HttpResponseException $exception) {
             throw $exception;
         } catch (\Exception $e) {
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index 26e3c8099..206f4c943 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -14,6 +14,10 @@
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定批量删除任务吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
 {/if}
 
+{if auth("clear")}
+<button data-load='{:url("clear")}' data-confirm="确定要清理3天前的任务记录吗？" class='layui-btn layui-btn-sm layui-btn-primary'>清理记录</button>
+{/if}
+
 {/block}
 
 {block name="content"}