diff --git a/composer.lock b/composer.lock index 8d5c68928..b46cf3a30 100644 --- a/composer.lock +++ b/composer.lock @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "d14437d0ac14aa52fa7627ec99155d90c0b51c6e" + "reference": "92f62b2deed4cebbedc38896089590c00a291b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d14437d0ac14aa52fa7627ec99155d90c0b51c6e", - "reference": "d14437d0ac14aa52fa7627ec99155d90c0b51c6e", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/92f62b2deed4cebbedc38896089590c00a291b60", + "reference": "92f62b2deed4cebbedc38896089590c00a291b60", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-02T09:26:38+00:00" + "time": "2019-12-03T02:21:05+00:00" } ], "packages-dev": [], diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index db6a853d3..247f8496c 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "d14437d0ac14aa52fa7627ec99155d90c0b51c6e" + "reference": "92f62b2deed4cebbedc38896089590c00a291b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d14437d0ac14aa52fa7627ec99155d90c0b51c6e", - "reference": "d14437d0ac14aa52fa7627ec99155d90c0b51c6e", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/92f62b2deed4cebbedc38896089590c00a291b60", + "reference": "92f62b2deed4cebbedc38896089590c00a291b60", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-02T09:26:38+00:00", + "time": "2019-12-03T02:21:05+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 927158b34..ffc42a212 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php index c4a02b24b..6b41f4b28 100644 --- a/vendor/zoujingli/think-library/src/queue/WorkQueue.php +++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php @@ -72,7 +72,7 @@ class WorkQueue extends Command } else { // 锁定任务状态 $this->app->db->name('SystemQueue')->where(['code' => $this->code])->update([ - 'status' => '2', 'enter_time' => time(), 'exec_desc' => '', 'attempts' => $this->app->db->raw('attempts+1'), + 'status' => '2', 'enter_time' => microtime(true), 'exec_desc' => '', 'attempts' => $this->app->db->raw('attempts+1'), ]); // 设置进程标题 if (($process = ProcessService::instance())->iswin()) { @@ -113,7 +113,7 @@ class WorkQueue extends Command { $desc = explode("\n", trim(is_string($message) ? $message : '')); $result = $this->app->db->name('SystemQueue')->where(['code' => $this->code])->update([ - 'status' => $status, 'outer_time' => time(), 'exec_desc' => $desc[0], + 'status' => $status, 'outer_time' => microtime(true), 'exec_desc' => $desc[0], ]); $this->output->writeln(is_string($message) ? $message : ''); return $result !== false;