diff --git a/composer.lock b/composer.lock index db394a969..f3ca7f43f 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d" + "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/069ed2ae0ce1c144ea7349938b2a017433b8561d", - "reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157", + "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "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", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9dca4f1ef..b76bf4293 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": "069ed2ae0ce1c144ea7349938b2a017433b8561d" + "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/069ed2ae0ce1c144ea7349938b2a017433b8561d", - "reference": "069ed2ae0ce1c144ea7349938b2a017433b8561d", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2343b2987a50aa6107fdcc8691ac5a3ad92fa157", + "reference": "2343b2987a50aa6107fdcc8691ac5a3ad92fa157", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-05-11T08:36:34+00:00", + "time": "2020-05-11T09:07:41+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index e11ad0c49..2daba33e1 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/command/Database.php b/vendor/zoujingli/think-library/src/command/Database.php index 7486bbd76..bc418da91 100644 --- a/vendor/zoujingli/think-library/src/command/Database.php +++ b/vendor/zoujingli/think-library/src/command/Database.php @@ -43,7 +43,7 @@ class Database extends Command { $action = $input->getArgument('action'); if (in_array($action, ['repair', 'optimize'])) { - return $this->${"_{$action}"}(); + return $this->{"_{$action}"}(); } $this->output->error("Wrong operation, currently allow repair|optimize"); } diff --git a/vendor/zoujingli/think-library/src/command/Queue.php b/vendor/zoujingli/think-library/src/command/Queue.php index 5289b8077..2ce808e39 100644 --- a/vendor/zoujingli/think-library/src/command/Queue.php +++ b/vendor/zoujingli/think-library/src/command/Queue.php @@ -15,6 +15,7 @@ namespace think\admin\command; +use Psr\Log\NullLogger; use think\admin\Command; use think\Collection; use think\console\Input; @@ -50,6 +51,7 @@ class Queue extends Command $this->setName('xadmin:queue'); $this->addArgument('action', Argument::OPTIONAL, 'stop|start|status|query|listen|clean|dorun', '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->setDescription('Asynchronous Command Queue for ThinkAdmin'); } @@ -152,6 +154,7 @@ class Queue extends Command protected function listenAction() { set_time_limit(0); + $this->app->db->setLog(new NullLogger()); $this->app->db->name($this->table)->count(); if ($this->process->iswin()) { $this->setProcessTitle("ThinkAdmin {$this->process->version()} Queue Listen");