CompoesrUpdate

This commit is contained in:
Anyon 2020-05-11 17:20:51 +08:00
parent 9c5c988ef7
commit 44382a850a
5 changed files with 13 additions and 10 deletions

8
composer.lock generated
View File

@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d" "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/069ed2ae0ce1c144ea7349938b2a017433b8561d", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
"reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d", "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-05-11T08:36:34+00:00" "time": "2020-05-11T09:07:41+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

View File

@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d" "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/069ed2ae0ce1c144ea7349938b2a017433b8561d", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
"reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d", "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-05-11T08:36:34+00:00", "time": "2020-05-11T09:07:41+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-05-11 16:41:27 // This file is automatically generated at:2020-05-11 17:18:34
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

View File

@ -43,7 +43,7 @@ class Database extends Command
{ {
$action = $input->getArgument('action'); $action = $input->getArgument('action');
if (in_array($action, ['repair', 'optimize'])) { if (in_array($action, ['repair', 'optimize'])) {
return $this->${"_{$action}"}(); return $this->{"_{$action}"}();
} }
$this->output->error("Wrong operation, currently allow repair|optimize"); $this->output->error("Wrong operation, currently allow repair|optimize");
} }

View File

@ -15,6 +15,7 @@
namespace think\admin\command; namespace think\admin\command;
use Psr\Log\NullLogger;
use think\admin\Command; use think\admin\Command;
use think\Collection; use think\Collection;
use think\console\Input; use think\console\Input;
@ -50,6 +51,7 @@ class Queue extends Command
$this->setName('xadmin:queue'); $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', 'listen');
$this->addArgument('code', Argument::OPTIONAL, 'Taskcode'); $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('daemon', 'd', Option::VALUE_NONE, 'Run the queue listen in daemon mode');
$this->setDescription('Asynchronous Command Queue for ThinkAdmin'); $this->setDescription('Asynchronous Command Queue for ThinkAdmin');
} }
@ -152,6 +154,7 @@ class Queue extends Command
protected function listenAction() protected function listenAction()
{ {
set_time_limit(0); set_time_limit(0);
$this->app->db->setLog(new NullLogger());
$this->app->db->name($this->table)->count(); $this->app->db->name($this->table)->count();
if ($this->process->iswin()) { if ($this->process->iswin()) {
$this->setProcessTitle("ThinkAdmin {$this->process->version()} Queue Listen"); $this->setProcessTitle("ThinkAdmin {$this->process->version()} Queue Listen");