From c630fd42746aa6a213db0cef9c9768d0a18d02a5 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 16 Dec 2020 14:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Queue.php | 43 ----------------- app/admin/controller/api/Plugs.php | 20 -------- app/admin/controller/api/Queue.php | 65 ++++++++++++++++++++++++++ app/admin/view/auth/form.html | 4 +- app/admin/view/auth/index.html | 13 +++--- app/admin/view/config/index.html | 1 - app/admin/view/config/system.html | 7 +++ app/admin/view/menu/index.html | 1 + app/admin/view/oplog/index.html | 7 +-- app/admin/view/queue/index.html | 23 +++++---- app/admin/view/queue/index_search.html | 8 ++-- app/admin/view/user/form.html | 10 ++-- app/admin/view/user/index.html | 16 +++---- 13 files changed, 116 insertions(+), 102 deletions(-) diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index 2339d160e..74e7ec870 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -98,49 +98,6 @@ class Queue extends Controller } } - /** - * WIN创建监听进程 - * @auth true - */ - public function start() - { - try { - $message = nl2br($this->app->console->call('xadmin:queue', ['start'])->fetch()); - if (stripos($message, 'daemons started successfully for pid')) { - $this->success('任务监听主进程启动成功！'); - } elseif (stripos($message, 'daemons already exist for pid')) { - $this->success('任务监听主进程已经存在！'); - } else { - $this->error($message); - } - } catch (HttpResponseException $exception) { - throw $exception; - } catch (\Exception $exception) { - $this->error($exception->getMessage()); - } - } - - /** - * WIN停止监听进程 - * @auth true - */ - public function stop() - { - try { - $message = nl2br($this->app->console->call('xadmin:queue', ['stop'])->fetch()); - if (stripos($message, 'sent end signal to process')) { - $this->success('停止任务监听主进程成功！'); - } elseif (stripos($message, 'processes to stop')) { - $this->success('没有找到需要停止的进程！'); - } else { - $this->error($message); - } - } catch (HttpResponseException $exception) { - throw $exception; - } catch (\Exception $exception) { - $this->error($exception->getMessage()); - } - } /** * 创建记录清理任务 diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php index fd7c69f03..d189c7cef 100644 --- a/app/admin/controller/api/Plugs.php +++ b/app/admin/controller/api/Plugs.php @@ -58,26 +58,6 @@ class Plugs extends Controller } } - /** - * 检查任务状态 - * @login true - */ - public function queue() - { - if (AdminService::instance()->isSuper()) try { - $message = $this->app->console->call('xadmin:queue', ['status'])->fetch(); - if (preg_match('/process.*?\d+.*?running/', $message, $attrs)) { - echo '' . $message . ''; - } else { - echo '' . $message . ''; - } - } catch (\Exception $exception) { - echo '' . $exception->getMessage() . ''; - } else { - echo '只有超级管理员才能操作！'; - } - } - /** * 优化数据库 * @login true diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php index ab4b63a5b..244f6dbac 100644 --- a/app/admin/controller/api/Queue.php +++ b/app/admin/controller/api/Queue.php @@ -16,7 +16,9 @@ namespace app\admin\controller\api; use think\admin\Controller; +use think\admin\service\AdminService; use think\admin\service\QueueService; +use think\exception\HttpResponseException; /** * 后台任务通用接口 @@ -40,4 +42,67 @@ class Queue extends Controller $this->success('获取任务进度成功！', $queue->progress()); } + /** + * WIN停止监听进程 + * @login true + */ + public function stop() + { + try { + $message = nl2br($this->app->console->call('xadmin:queue', ['stop'])->fetch()); + if (stripos($message, 'sent end signal to process')) { + $this->success('停止后台服务主进程成功！'); + } elseif (stripos($message, 'processes to stop')) { + $this->success('没有找到需要停止的进程！'); + } else { + $this->error($message); + } + } catch (HttpResponseException $exception) { + throw $exception; + } catch (\Exception $exception) { + $this->error($exception->getMessage()); + } + } + + /** + * WIN创建监听进程 + * @login true + */ + public function start() + { + try { + $message = nl2br($this->app->console->call('xadmin:queue', ['start'])->fetch()); + if (stripos($message, 'daemons started successfully for pid')) { + $this->success('后台服务主进程启动成功！'); + } elseif (stripos($message, 'daemons already exist for pid')) { + $this->success('后台服务主进程已经存在！'); + } else { + $this->error($message); + } + } catch (HttpResponseException $exception) { + throw $exception; + } catch (\Exception $exception) { + $this->error($exception->getMessage()); + } + } + + /** + * 检查任务状态 + * @login true + */ + public function status() + { + if (AdminService::instance()->isSuper()) try { + $message = $this->app->console->call('xadmin:queue', ['status'])->fetch(); + if (preg_match('/process.*?\d+.*?running/', $message, $attrs)) { + echo '' . $message . ''; + } else { + echo '' . $message . ''; + } + } catch (\Exception $exception) { + echo '' . $exception->getMessage() . ''; + } else { + echo '只有超级管理员才能操作！'; + } + } } \ No newline at end of file diff --git a/app/admin/view/auth/form.html b/app/admin/view/auth/form.html index 69ec4ad01..f0d031c1c 100644 --- a/app/admin/view/auth/form.html +++ b/app/admin/view/auth/form.html @@ -3,13 +3,13 @@
diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html index c4aa77c40..7b6a5e377 100644 --- a/app/admin/view/auth/index.html +++ b/app/admin/view/auth/index.html @@ -4,6 +4,7 @@ + @@ -36,22 +37,22 @@ {$vo.title|default='-'} {$vo.desc|default="没有写描述哦！"} {$vo.create_at|format_datetime} - {eq name='vo.status' value='0'}已禁用{else}已激活{/eq} + {eq name='vo.status' value='0'}已禁用{else}已激活{/eq} - 编 辑 + 编 辑 - 授 权 + 授 权 - 禁 用 + 禁 用 - 激 活 + 激 活 - 删 除 + 删 除 diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index eff2e62b0..45ae8db67 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -2,7 +2,6 @@ {block name="button"} -优化数据库 清理无效配置 diff --git a/app/admin/view/config/system.html b/app/admin/view/config/system.html index 4f79deb8b..ecc78a2e1 100644 --- a/app/admin/view/config/system.html +++ b/app/admin/view/config/system.html @@ -1,5 +1,6 @@
+
后台登录入口 Login @@ -9,6 +10,7 @@ 名称由英文字母开头且不能存在相同名称的应用，设置之后原地址不能继续访问！
+ +
+ + + +
diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html index 36fba1f78..525907078 100644 --- a/app/admin/view/menu/index.html +++ b/app/admin/view/menu/index.html @@ -4,6 +4,7 @@ + diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html index 60b372242..f5d57e777 100644 --- a/app/admin/view/oplog/index.html +++ b/app/admin/view/oplog/index.html @@ -2,10 +2,11 @@ {block name="button"} - + + - + {/block} @@ -55,7 +56,7 @@ - 删 除 + 删 除 diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html index a0b655689..d73230745 100644 --- a/app/admin/view/queue/index.html +++ b/app/admin/view/queue/index.html @@ -1,17 +1,20 @@ {extend name='main'} {block name="button"} - - + +优化数据库 + + + - - - - - + - + + + + + {/block} @@ -20,7 +23,7 @@
-
待处理
+
等待处理
{$total.pre|default=0}
待处理的任务数量
@@ -28,7 +31,7 @@
-
处理中
+
正在处理
{$total.dos|default=0}
处理中的任务数量
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html index 2efa47020..6aeccee13 100644 --- a/app/admin/view/queue/index_search.html +++ b/app/admin/view/queue/index_search.html @@ -1,13 +1,13 @@ {if session('user.username') eq 'admin'}
- 守护状态 + 服务状态
-

守护进程运行状态

+

后台服务主进程运行状态

Checking task process running status ...

配置定时任务来检查并启动进程（建议每分钟执行）

-

{$command|default='--'}

+
{$command|default='--'}
- +
{/if} diff --git a/app/admin/view/user/form.html b/app/admin/view/user/form.html index 8c392f832..ade4eb88b 100644 --- a/app/admin/view/user/form.html +++ b/app/admin/view/user/form.html @@ -8,11 +8,11 @@
@@ -20,8 +20,8 @@
@@ -76,7 +76,7 @@ {/notempty}
diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html index 7e670536f..913067f55 100644 --- a/app/admin/view/user/index.html +++ b/app/admin/view/user/index.html @@ -40,8 +40,8 @@ - - + + @@ -78,23 +78,23 @@ {if isset($type) and $type eq 'all'} - 密 码 + 密 码 - 编 辑 + 编 辑 - 禁 用 + 禁 用 {else} - 编 辑 + 编 辑 - 恢 复 + 恢 复 - 删 除 + 删 除 {/if}