ComposerUpdate 增加调试web服务

composer.lock

@@ -915,12 +915,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "41cba1a861a1cadebd71dc1b75d247b78e2cdeac"
+                "reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/41cba1a861a1cadebd71dc1b75d247b78e2cdeac",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/093c05394e9310edfa1b0d4d5d7ccda5f919ad74",
-                "reference": "41cba1a861a1cadebd71dc1b75d247b78e2cdeac",
+                "reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -964,7 +964,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-05-15T03:25:42+00:00"
+            "time": "2020-05-15T06:47:21+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

readme.md

@@ -81,12 +81,17 @@ public function index(){
 * 执行 `php think xadmin:install static` 从线上服务更新 `plugs` 静态资料文件（注意文件安全）
 * 执行 `php think xadmin:install config` 从线上服务更新 `config` 常用配置文件（注意文件安全）
 
-#### 2. 守护进程管理
+#### 2. 守护进程管理（可自建定时任务去守护监听主进程）
-* 执行 `php think xadmin:queue listen` [监听]启动任务监听主进程
+* 执行 `php think xadmin:queue listen` [监听]启动异步任务监听服务
-* 执行 `php think xadmin:queue query`  [控制]查询正在运行的进程
+* 执行 `php think xadmin:queue start`  [控制]检查创建任务监听服务（建议定时任务执行）
-* 执行 `php think xadmin:queue start`  [控制]创建守护监听主进程
+* 执行 `php think xadmin:queue query`  [控制]查询当前任务相关的进程
-* 执行 `php think xadmin:queue status`  [控制]查看监听主进程状态
+* 执行 `php think xadmin:queue status`  [控制]查看异步任务监听状态
-* 执行 `php think xadmin:queue stop`   [控制]平滑停止所有的进程
+* 执行 `php think xadmin:queue stop`   [控制]平滑停止所有任务进程
+
+#### 3. 本地调试管理（可自建定时任务去守护监听主进程）
+* 执行 `php think xadmin:queue webstop` [调试]停止本地调试服务
+* 执行 `php think xadmin:queue webstart` [调试]开启本地调试服务（建议定时任务执行）
+* 执行 `php think xadmin:queue webstatus` [调试]查看本地调试状态
 
 ## 赞助打赏
 ![赞助](http://static.thinkadmin.top/pay.png)

vendor/composer/installed.json

@@ -941,12 +941,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "41cba1a861a1cadebd71dc1b75d247b78e2cdeac"
+            "reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/41cba1a861a1cadebd71dc1b75d247b78e2cdeac",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/093c05394e9310edfa1b0d4d5d7ccda5f919ad74",
-            "reference": "41cba1a861a1cadebd71dc1b75d247b78e2cdeac",
+            "reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74",
             "shasum": "",
             "mirrors": [
                 {
@@ -962,7 +962,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-05-15T03:25:42+00:00",
+        "time": "2020-05-15T06:47:21+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-05-15 11:34:31
+// This file is automatically generated at:2020-05-15 14:56:28
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

vendor/zoujingli/think-library/src/command/Queue.php

@@ -49,10 +49,12 @@ class Queue extends Command
     public function configure()
     {
         $this->setName('xadmin:queue');
-        $this->addArgument('action', Argument::OPTIONAL, 'stop|start|status|query|listen|clean|dorun', 'listen');
+        $this->addArgument('action', Argument::OPTIONAL, 'stop|start|status|query|listen|clean|dorun|webstop|webstart|webstatus', 'listen');
         $this->addArgument('code', Argument::OPTIONAL, 'Taskcode');
         $this->addArgument('spts', Argument::OPTIONAL, 'Separator');
         $this->addOption('daemon', 'd', Option::VALUE_NONE, 'Run the queue listen in daemon mode');
+        $this->addOption('host', '-H', Option::VALUE_OPTIONAL, 'The host of PHP WebServer.');
+        $this->addOption('port', '-p', Option::VALUE_OPTIONAL, 'The port of PHP WebServer.');
         $this->setDescription('Asynchronous Command Queue Task for ThinkAdmin');
     }
 
@@ -66,7 +68,61 @@ class Queue extends Command
     {
         $action = $this->input->hasOption('daemon') ? 'start' : $input->getArgument('action');
         if (method_exists($this, $method = "{$action}Action")) return $this->$method();
-        $this->output->error("Wrong operation, currently allow stop|start|status|query|listen|clean|dorun");
+        $this->output->error("Wrong operation, Allow stop|start|status|query|listen|clean|dorun|webstop|webstart|webstatus");
+    }
+
+    /**
+     * 停止 WebServer 调试进程
+     */
+    protected function webStopAction()
+    {
+        $keyword = $this->process->think('run -p');
+        if (count($result = $this->process->query($keyword)) < 1) {
+            $this->output->warning("There is no WebServer process to finish");
+        } else foreach ($result as $item) {
+            $this->process->close($item['pid']);
+            $this->output->info("Sending end process {$item['pid']} signal succeeded");
+        }
+    }
+
+    /**
+     * 启动 WebServer 调试进程
+     */
+    protected function webStartAction()
+    {
+        $port = $this->input->getOption('port') ?: '80';
+        $host = $this->input->getOption('host') ?: '127.0.0.1';
+        $command = $this->process->think("run -p {$port} -H {$host}");
+        if (count($result = $this->process->query($command)) > 0) {
+            if ($this->process->iswin()) {
+                $this->process->exec("start http://{$host}:{$port}");
+            }
+            $this->output->info("WebServer process {$result['0']['pid']} has started");
+        } else {
+            [$this->process->create($command), usleep(1000)];
+            if (count($result = $this->process->query($command)) > 0) {
+                $this->output->info("WebServer process {$result['0']['pid']} started successfully");
+                if ($this->process->iswin()) {
+                    $this->process->exec("start http://{$host}:{$port}");
+                }
+            } else {
+                $this->output->error('Failed to create WebServer process');
+            }
+        }
+    }
+
+    /**
+     * 查看 WebServer 调试进程
+     */
+    protected function webStatusAction()
+    {
+        $command = $this->process->think("run -p");
+        if (count($result = $this->process->query($command)) > 0) {
+            $this->output->info("WebServer process {$result[0]['pid']} running");
+            $this->output->write("># {$result[0]['cmd']}");
+        } else {
+            $this->output->warning("The WebServer process is not running");
+        }
     }
 
     /**
@@ -93,7 +149,7 @@ class Queue extends Command
         if (count($result = $this->process->query($command)) > 0) {
             $this->output->info("Listening main process {$result['0']['pid']} has started");
         } else {
-            [$this->process->create($command), sleep(1)];
+            [$this->process->create($command), usleep(1000)];
             if (count($result = $this->process->query($command)) > 0) {
                 $this->output->info("Listening main process {$result['0']['pid']} started successfully");
             } else {
@@ -197,7 +253,7 @@ class Queue extends Command
      * 执行任务内容
      * @throws \think\db\exception\DbException
      */
-    protected function dorunAction()
+    protected function doRunAction()
     {
         set_time_limit(0);
         $this->code = trim($this->input->getArgument('code'));
@@ -252,7 +308,7 @@ class Queue extends Command
      * @param boolean $issplit 是否分隔
      * @throws \think\db\exception\DbException
      */
-    protected function update($status, $message, $issplit = true)
+    protected function updateQueue($status, $message, $issplit = true)
     {
         // 更新当前任务
         $info = trim(is_string($message) ? $message : '');