From 42c0cc47ee263c9cbd1be930185d2fbbb6c95b3e Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 23 Nov 2019 18:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 753d578bf..4ae6febd9 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -84,7 +84,7 @@ class Queue extends Controller
     {
         try {
             $message = nl2br($this->app->console->call('xtask:start')->fetch());
-            stripos($message, '成功') !== false ? $this->success($message) : $this->error($message);
+            preg_match('/主进程\d+/', $message, $attr) ? $this->success($message) : $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 fde42582b..fd5714acc 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -3,11 +3,11 @@
 {block name="button"}
 
 {if auth("remove")}
-<button data-action='{:url("remove")}' data-confirm="确定要批量删除任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
+<button data-action='{:url("remove")}' data-confirm="确定批量删除任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
 {/if}
 
 {if auth("start") && $iswin}
-<button data-load='{:url("start")}' class='layui-btn layui-btn-sm layui-btn-primary'>创建监听</button>
+<button data-load='{:url("start")}' class='layui-btn layui-btn-sm layui-btn-primary'>开始监听</button>
 {/if}
 
 {if auth("stop") && $iswin}