From f6184c15c51a1ad7decc4d7964fa01ab358bea7d Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 9 Apr 2020 22:21:50 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 +++---- vendor/composer/installed.json | 8 +++---- vendor/services.php | 2 +- .../zoujingli/think-library/src/Command.php | 22 +++++++++++++++++++ .../think-library/src/command/Install.php | 2 +- .../src/command/queue/CleanQueue.php | 3 ++- 6 files changed, 34 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 7af664413..271bbe040 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89" + "reference": "a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", - "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f", + "reference": "a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-08T02:44:51+00:00" + "time": "2020-04-09T14:06:42+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 628e42b6e..bd75cb557 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": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89" + "reference": "a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", - "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f", + "reference": "a6b2f3929c9853c700e45e260c2eaf0ed0aeda3f", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-08T02:44:51+00:00", + "time": "2020-04-09T14:06:42+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 5b4048055..189daa9c7 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.php b/vendor/zoujingli/think-library/src/Command.php index 057c853e2..1195be61d 100644 --- a/vendor/zoujingli/think-library/src/Command.php +++ b/vendor/zoujingli/think-library/src/Command.php @@ -95,4 +95,26 @@ class Command extends ThinkCommand return $this; } + /** + * 设置成功的消息 + * @param string $message 消息内容 + * @return Command + * @throws Exception + */ + protected function setQueueSuccessMessage($message) + { + return $this->setQueueMessage(3, $message); + } + + /** + * 设置失败的消息 + * @param string $message 消息内容 + * @return Command + * @throws Exception + */ + protected function setQueueErrorMessage($message) + { + return $this->setQueueMessage(4, $message); + } + } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index 4386c632e..ceb29d906 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -114,7 +114,7 @@ class Install extends Command else foreach ($data as $file) { list($state, $mode, $name) = InstallService::instance()->fileSynchronization($file); if ($state) { - if ($mode === 'add') $this->output->writeln("--- {$name} added successfully"); + if ($mode === 'add') $this->output->writeln("--- {$name} add successfully"); if ($mode === 'mod') $this->output->writeln("--- {$name} update successfully"); if ($mode === 'del') $this->output->writeln("--- {$name} delete successfully"); } else { diff --git a/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php b/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php index b71c621ff..59180fb12 100644 --- a/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php +++ b/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php @@ -47,7 +47,8 @@ class CleanQueue extends Queue * @param Input $input * @param Output $output * @throws \think\admin\Exception - * @throws \think\db\exception\DbException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException */ protected function execute(Input $input, Output $output) {