From bd748b22836c39dc17b2e9d2e0d82b707e4a16ca Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 11 May 2020 17:28:27 +0800
Subject: [PATCH] ComposerUpdate
---
composer.lock | 8 +--
readme.md | 54 ++++++++++---------
vendor/composer/installed.json | 8 +--
vendor/services.php | 2 +-
.../think-library/src/command/Database.php | 2 +-
.../think-library/src/command/Install.php | 2 +-
.../think-library/src/command/Version.php | 2 +-
7 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/composer.lock b/composer.lock
index f3ca7f43f..2217a39d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -909,12 +909,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157"
+ "reference": "4c1cb3800578c58b0b63ea0d1fcf850ea7f80579"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
- "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4c1cb3800578c58b0b63ea0d1fcf850ea7f80579",
+ "reference": "4c1cb3800578c58b0b63ea0d1fcf850ea7f80579",
"shasum": "",
"mirrors": [
{
@@ -958,7 +958,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top",
- "time": "2020-05-11T09:07:41+00:00"
+ "time": "2020-05-11T09:23:33+00:00"
},
{
"name": "zoujingli/wechat-developer",
diff --git a/readme.md b/readme.md
index 13729d5a1..1a2a670c3 100644
--- a/readme.md
+++ b/readme.md
@@ -82,39 +82,43 @@ public function index(){
* 执行 `php think xadmin:install config` 从线上服务更新 `config` 常用配置文件（注意文件安全）
#### 2. 守护进程管理
-* 执行 `php think xtask:listen` [监听]启动任务监听主进程
-* 执行 `php think xtask:query` [控制]查询正在运行的进程
-* 执行 `php think xtask:start` [控制]创建守护监听主进程
-* 执行 `php think xtask:state` [控制]查看监听主进程状态
-* 执行 `php think xtask:stop` [控制]平滑停止所有的进程
+* 执行 `php think xadmin:queue listen` [监听]启动任务监听主进程
+* 执行 `php think xadmin:queue query` [控制]查询正在运行的进程
+* 执行 `php think xadmin:queue start` [控制]创建守护监听主进程
+* 执行 `php think xadmin:queue status` [控制]查看监听主进程状态
+* 执行 `php think xadmin:queue stop` [控制]平滑停止所有的进程
## 赞助打赏
## 项目版本
体验账号及密码都是admin
+### ThinkAdmin v6 基于 ThinkPHP 6.0 开发（后台权限基于注解实现）
+* 在线体验地址：https://v6.thinkadmin.top
+* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v6
+* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v6
-### ThinkAdmin v1 基于 ThinkPHP 5.0 开发
-* 在线体验地址：https://v1.thinkadmin.top
-* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v1
-* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v1
-### ThinkAdmin v2 基于 ThinkPHP 5.0 开发
-* 在线体验地址：https://v2.thinkadmin.top
-* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v2
-* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v2
-### ThinkAdmin v3 基于 ThinkPHP 5.1 开发
-* 在线体验地址：https://v3.thinkadmin.top
-* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v3
-* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v3
-### ThinkAdmin v4 基于 ThinkPHP 5.1 开发
-* 在线体验地址：https://v4.thinkadmin.top
-* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v4
-* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v4
### ThinkAdmin v5 基于 ThinkPHP 5.1 开发（后台权限基于注解实现）
* 在线体验地址：https://v5.thinkadmin.top
* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v5
* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v5
-### ThinkAdmin v6 基于 ThinkPHP 6.0 开发（后台权限基于注解实现）
-* 在线体验地址：https://v6.thinkadmin.top
-* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v6
-* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v6
\ No newline at end of file
+
+### ThinkAdmin v4 基于 ThinkPHP 5.1 开发（不建议继续使用）
+* 在线体验地址：https://v4.thinkadmin.top
+* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v4
+* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v4
+
+### ThinkAdmin v3 基于 ThinkPHP 5.1 开发（不建议继续使用）
+* 在线体验地址：https://v3.thinkadmin.top
+* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v3
+* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v3
+
+### ThinkAdmin v2 基于 ThinkPHP 5.0 开发（不建议继续使用）
+* 在线体验地址：https://v2.thinkadmin.top
+* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v2
+* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v2
+
+### ThinkAdmin v1 基于 ThinkPHP 5.0 开发（不建议继续使用）
+* 在线体验地址：https://v1.thinkadmin.top
+* Gitee 代码地址：https://gitee.com/zoujingli/ThinkAdmin/tree/v1
+* Github 代码地址：https://github.com/zoujingli/ThinkAdmin/tree/v1
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b76bf4293..1dd0fcfc9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -935,12 +935,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157"
+ "reference": "4c1cb3800578c58b0b63ea0d1fcf850ea7f80579"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
- "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4c1cb3800578c58b0b63ea0d1fcf850ea7f80579",
+ "reference": "4c1cb3800578c58b0b63ea0d1fcf850ea7f80579",
"shasum": "",
"mirrors": [
{
@@ -956,7 +956,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
- "time": "2020-05-11T09:07:41+00:00",
+ "time": "2020-05-11T09:23:33+00:00",
"type": "library",
"extra": {
"think": {
diff --git a/vendor/services.php b/vendor/services.php
index 2daba33e1..5d09c2113 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
<?php
-// This file is automatically generated at:2020-05-11 17:18:34
+// This file is automatically generated at:2020-05-11 17:27:15
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/command/Database.php b/vendor/zoujingli/think-library/src/command/Database.php
index bc418da91..3e7721add 100644
--- a/vendor/zoujingli/think-library/src/command/Database.php
+++ b/vendor/zoujingli/think-library/src/command/Database.php
@@ -31,7 +31,7 @@ class Database extends Command
{
$this->setName('xadmin:database');
$this->addArgument('action', Argument::OPTIONAL, 'repair|optimize', 'optimize');
- $this->setDescription('Optimize Or Repair Database for ThinkAdmin');
+ $this->setDescription('Optimize and Repair Database for ThinkAdmin');
}
/**
diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php
index 88a61fb0d..136360cc0 100644
--- a/vendor/zoujingli/think-library/src/command/Install.php
+++ b/vendor/zoujingli/think-library/src/command/Install.php
@@ -88,7 +88,7 @@ class Install extends Command
protected function configure()
{
$this->setName('xadmin:install');
- $this->setDescription("Install or update thinkamdin module");
+ $this->setDescription("Install and Update file for ThinkAdmin");
$this->addArgument('name', Argument::OPTIONAL, 'ModuleName', '');
}
diff --git a/vendor/zoujingli/think-library/src/command/Version.php b/vendor/zoujingli/think-library/src/command/Version.php
index 4ed0ab42a..0dc24fa78 100644
--- a/vendor/zoujingli/think-library/src/command/Version.php
+++ b/vendor/zoujingli/think-library/src/command/Version.php
@@ -29,7 +29,7 @@ class Version extends Command
protected function configure()
{
$this->setName('xadmin:version');
- $this->setDescription("Query application framework version");
+ $this->setDescription("Application and Framework Version for ThinkAdmin");
}
/**