From 3a2e835e73741b34ec41458f28288195b7518437 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Aug 2019 19:58:39 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=BB=BB=E5=8A=A1=E6=8C=87=E5=AE=9A?=
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/Start.php  | 4 ++--
 application/admin/queue/task/State.php  | 6 +++---
 application/admin/queue/task/Stop.php   | 9 +++++----
 application/admin/queue/task/Work.php   | 2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/admin/queue/task/Listen.php b/application/admin/queue/task/Listen.php
index 085fced02..525757cb8 100644
--- a/application/admin/queue/task/Listen.php
+++ b/application/admin/queue/task/Listen.php
@@ -62,11 +62,11 @@ class Listen extends Task
                         throw new Exception("该任务{$item['id']}的处理子进程已经存在");
                     } else {
                         $this->createProcess();
-                        $output->info(">>> 创建任务{$item['id']}的处理子进程成功");
+                        $output->info("创建任务{$item['id']}的处理子进程成功");
                     }
                 } catch (Exception $e) {
                     Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '4', 'desc' => $e->getMessage()]);
-                    $output->error(">>> 创建任务{$item['id']}的处理进程失败，{$e->getMessage()}");
+                    $output->error("创建任务{$item['id']}的处理进程失败，{$e->getMessage()}");
                 }
             }
             sleep(3);
diff --git a/application/admin/queue/task/Start.php b/application/admin/queue/task/Start.php
index 47e13a4d3..167c39c89 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('xqueue:start')->setDescription('检查并创建异步任务监听主进程');
+        $this->setName('xqueue:start')->setDescription('创建异步任务监听守护主进程');
     }
 
     /**
@@ -44,7 +44,7 @@ class Start extends Task
     {
         $this->cmd = "{$this->bin} xqueue:listen";
         if (($pid = $this->checkProcess()) > 0) {
-            $output->writeln("异步任务监听主进程{$pid}已经启动！");
+            $output->info("异步任务监听主进程{$pid}已经启动！");
         } else {
             $this->createProcess();
             if (($pid = $this->checkProcess()) > 0) {
diff --git a/application/admin/queue/task/State.php b/application/admin/queue/task/State.php
index 98e2f604d..88512aaac 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('xqueue:state')->setDescription('查看异步任务监听主进程的状态');
+        $this->setName('xqueue:state')->setDescription('查看异步任务监听主进程状态');
     }
 
     /**
@@ -43,9 +43,9 @@ class State extends Task
     {
         $this->cmd = "{$this->bin} xqueue:listen";
         if (($pid = $this->checkProcess()) > 0) {
-            $output->info(">>> 异步任务监听主进程{$pid}正在运行...");
+            $output->info("异步任务监听主进程{$pid}正在运行...");
         } else {
-            $output->error(">>> 异步任务监听主进程没有运行哦^.^");
+            $output->error("异步任务监听主进程没有运行哦!");
         }
     }
 }
diff --git a/application/admin/queue/task/Stop.php b/application/admin/queue/task/Stop.php
index 04305ab06..c09ce59a8 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('xqueue:stop')->setDescription('平滑停止异步任务守护的主进程');
+        $this->setName('xqueue:stop')->setDescription('平滑停止异步任务守护主进程');
     }
 
     /**
@@ -43,10 +43,11 @@ class Stop extends Task
     protected function execute(Input $input, Output $output)
     {
         $this->cmd = "{$this->bin} xqueue:";
-        foreach ($this->queryProcess() as $item) {
+        if (count($processList = $this->queryProcess()) < 1) {
+            $output->writeln("没有需要结束的任务进程哦！");
+        } else foreach ($processList as $item) {
             $this->closeProcess($item['pid']);
-            $output->writeln(">>> 发送结束进程{$item['pid']}指令成功");
+            $output->writeln("发送结束任务进程{$item['pid']}指令成功！");
         }
-        $output->info(">>> 所有异步任务进程的结束指令发送成功");
     }
 }
diff --git a/application/admin/queue/task/Work.php b/application/admin/queue/task/Work.php
index 6f695eb98..9144f8f92 100644
--- a/application/admin/queue/task/Work.php
+++ b/application/admin/queue/task/Work.php
@@ -67,10 +67,10 @@ class Work extends Task
             if (empty($this->id)) throw new Exception("执行任务需要指定任务编号！");
             $queue = Db::name('SystemQueue')->where(['id' => $this->id, 'status' => '2'])->find();
             if (empty($queue)) throw new Exception("执行任务{$this->id}的信息或状态异常！");
+            // 设置进程标题
             if ($this->isWin() && function_exists('cli_set_process_title')) {
                 cli_set_process_title("ThinkAdmin {$this->version} 异步任务执行子进程 - {$queue['title']}");
             }
-            // 设置进程标题
             // 执行任务内容
             if (class_exists($queue['preload'])) {
                 if (method_exists($class = new $queue['preload'], 'execute')) {