From d6f9508085ddad40222b4850099902db60c48434 Mon Sep 17 00:00:00 2001 From: Anyon Date: Sun, 26 Apr 2020 14:47:33 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/Controller.php | 2 +- .../zoujingli/think-library/src/service/QueueService.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 87daee717..89daae76b 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "692d1f717a5010707d7bd4148d028602f0e3ba00" + "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/692d1f717a5010707d7bd4148d028602f0e3ba00", - "reference": "692d1f717a5010707d7bd4148d028602f0e3ba00", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87", + "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-26T02:44:32+00:00" + "time": "2020-04-26T06:36:23+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index af0f29c8f..11db50fd3 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": "692d1f717a5010707d7bd4148d028602f0e3ba00" + "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/692d1f717a5010707d7bd4148d028602f0e3ba00", - "reference": "692d1f717a5010707d7bd4148d028602f0e3ba00", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87", + "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-26T02:44:32+00:00", + "time": "2020-04-26T06:36:23+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 5d672b0bd..8822b4e89 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 126900d91..518cec510 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -289,7 +289,7 @@ abstract class Controller extends \stdClass * @param integer $rscript 任务类型(0单例,1多例) * @param integer $loops 循环等待时间 */ - protected function _queue($title, $command, $later = 0, $data = [], $rscript = 1, $loops = 0) + protected function _queue($title, $command, $later = 0, $data = [], $rscript = 0, $loops = 0) { try { $queue = QueueService::instance()->register($title, $command, $later, $data, $rscript, $loops); diff --git a/vendor/zoujingli/think-library/src/service/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php index e8335199b..ef701d4a7 100644 --- a/vendor/zoujingli/think-library/src/service/QueueService.php +++ b/vendor/zoujingli/think-library/src/service/QueueService.php @@ -133,7 +133,7 @@ class QueueService extends Service * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function register($title, $command, $later = 0, $data = [], $rscript = 1, $loops = 0) + public function register($title, $command, $later = 0, $data = [], $rscript = 0, $loops = 0) { $map = [['title', '=', $title], ['status', 'in', ['1', '2']]]; if (empty($rscript) && ($queue = $this->app->db->name('SystemQueue')->where($map)->find())) {