From b3704611fba741478c0b22ae3dc90b9a421ed3a4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 9 Dec 2019 14:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 2bf427ee0..7311af4ef 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -47,7 +47,7 @@ class Queue extends Controller
             try {
                 $this->command = ProcessService::instance()->think('xtask:start');
                 $this->message = $this->app->console->call('xtask:state')->fetch();
-                $this->listen = preg_match('/主进程\d+/', $this->message, $attr);
+                $this->listen = preg_match('/主进程.*?\d+/', $this->message, $attr);
             } catch (\Exception $exception) {
                 $this->message = $exception->getMessage();
             }
diff --git a/app/service/view/config/form.html b/app/service/view/config/form.html
index 712f0edd9..c30d197d7 100644
--- a/app/service/view/config/form.html
+++ b/app/service/view/config/form.html
@@ -21,7 +21,7 @@
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">开放平台消息校验 Token</span>
-                <input name="service.component_token" required placeholder="请输入微信消息校验Token" value="{:sysconf('service.component_token')}" class="layui-input">
+                <input name="service.component_token" required placeholder="请输入开放平台消息校验Token" value="{:sysconf('service.component_token')}" class="layui-input">
             </label>
             <p class="help-block">开发者在代替微信接收到消息时，用此 Token 来校验消息</p>
         </div>
@@ -29,7 +29,7 @@
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">开放平台消息加解密 AesKey</span>
-                <input name="service.component_encodingaeskey" required pattern="^.{43}$" maxlength="43" placeholder="请输入43位微信消息加解密Key" value="{:sysconf('service.component_encodingaeskey')}" class="layui-input">
+                <input name="service.component_encodingaeskey" required pattern="^.{43}$" maxlength="43" placeholder="请输入43位开放平台消息加解密Key" value="{:sysconf('service.component_encodingaeskey')}" class="layui-input">
             </label>
             <p class="help-block">在代替微信收发消息时使用，必须是长度为43位字母和数字组合的字符串</p>
         </div>