From 20c2235cb7c0de5e6a54ded2420e946646f8653a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 15 Aug 2019 14:39:44 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/queue/task/Listen.php | 4 ++--
 application/admin/queue/task/Query.php  | 2 +-
 application/admin/queue/task/Start.php  | 2 +-
 application/admin/queue/task/State.php  | 2 +-
 application/admin/queue/task/Stop.php   | 2 +-
 application/admin/queue/task/Work.php   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/admin/queue/task/Listen.php b/application/admin/queue/task/Listen.php
index a06b84a6c..24601606d 100644
--- a/application/admin/queue/task/Listen.php
+++ b/application/admin/queue/task/Listen.php
@@ -33,7 +33,7 @@ class Listen extends Task
      */
     protected function configure()
     {
-        $this->setName('xtask:listen')->setDescription('启动异步任务监听守护主进程');
+        $this->setName('xtask:listen')->setDescription('[监听]常驻异步任务循环监听主进程');
     }
 
     /**
@@ -58,7 +58,7 @@ class Listen extends Task
                     Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]);
                     $this->cmd = "{$this->bin} xtask:_work {$item['id']}";
                     if ($this->checkProcess()) {
-                        throw new Exception("处理任务的子进程已经存在 --> [{$item['id']}] {$item['title']}");
+                        $output->comment("处理任务的子进程已经存在 --> [{$item['id']}] {$item['title']}");
                     } else {
                         $this->createProcess();
                         $output->info("创建处理任务的子进程成功 --> [{$item['id']}] {$item['title']}");
diff --git a/application/admin/queue/task/Query.php b/application/admin/queue/task/Query.php
index 430b1f351..8f0a9af40 100644
--- a/application/admin/queue/task/Query.php
+++ b/application/admin/queue/task/Query.php
@@ -31,7 +31,7 @@ class Query extends Task
      */
     protected function configure()
     {
-        $this->setName('xtask:query')->setDescription('查询正在执行的所有任务进程');
+        $this->setName('xtask:query')->setDescription('[指令]查询正在执行的所有任务进程');
     }
 
     /**
diff --git a/application/admin/queue/task/Start.php b/application/admin/queue/task/Start.php
index 7d39e5e80..94d48880e 100644
--- a/application/admin/queue/task/Start.php
+++ b/application/admin/queue/task/Start.php
@@ -32,7 +32,7 @@ class Start extends Task
      */
     protected function configure()
     {
-        $this->setName('xtask:start')->setDescription('创建异步任务监听守护主进程');
+        $this->setName('xtask:start')->setDescription('[指令]创建异步任务守护监听主进程');
     }
 
     /**
diff --git a/application/admin/queue/task/State.php b/application/admin/queue/task/State.php
index dbfba9a07..ef3bdd08a 100644
--- a/application/admin/queue/task/State.php
+++ b/application/admin/queue/task/State.php
@@ -31,7 +31,7 @@ class State extends Task
      */
     protected function configure()
     {
-        $this->setName('xtask:state')->setDescription('查看异步任务监听主进程状态');
+        $this->setName('xtask:state')->setDescription('[指令]查看异步任务监听主进程状态');
     }
 
     /**
diff --git a/application/admin/queue/task/Stop.php b/application/admin/queue/task/Stop.php
index f5844acbb..ae4797931 100644
--- a/application/admin/queue/task/Stop.php
+++ b/application/admin/queue/task/Stop.php
@@ -32,7 +32,7 @@ class Stop extends Task
      */
     protected function configure()
     {
-        $this->setName('xtask:stop')->setDescription('平滑停止异步任务所有的进程');
+        $this->setName('xtask:stop')->setDescription('[指令]平滑停止所有的异步任务进程');
     }
 
     /**
diff --git a/application/admin/queue/task/Work.php b/application/admin/queue/task/Work.php
index be6b79a72..40abff7aa 100644
--- a/application/admin/queue/task/Work.php
+++ b/application/admin/queue/task/Work.php
@@ -49,7 +49,7 @@ class Work extends Task
     protected function configure()
     {
         // 执行任务配置
-        $this->setName('xtask:_work')->setDescription('启动执行单个指定任务子进程');
+        $this->setName('xtask:_work')->setDescription('[执行]创建执行单个指定任务的进程');
         $this->addArgument('id', Argument::OPTIONAL, '指定任务ID');
     }