ComposerUpdate

This commit is contained in:
Anyon 2020-04-26 14:47:33 +08:00
parent 8f90662a29
commit d6f9508085
5 changed files with 11 additions and 11 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": "692d1f717a5010707d7bd4148d028602f0e3ba00" "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/692d1f717a5010707d7bd4148d028602f0e3ba00", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87",
"reference": "692d1f717a5010707d7bd4148d028602f0e3ba00", "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87",
"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-04-26T02:44:32+00:00" "time": "2020-04-26T06:36:23+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": "692d1f717a5010707d7bd4148d028602f0e3ba00" "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/692d1f717a5010707d7bd4148d028602f0e3ba00", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87",
"reference": "692d1f717a5010707d7bd4148d028602f0e3ba00", "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-04-26T02:44:32+00:00", "time": "2020-04-26T06:36:23+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-04-26 11:29:22 // This file is automatically generated at:2020-04-26 14:47:02
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

View File

@ -289,7 +289,7 @@ abstract class Controller extends \stdClass
* @param integer $rscript 任务类型(0单例,1多例) * @param integer $rscript 任务类型(0单例,1多例)
* @param integer $loops 循环等待时间 * @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 { try {
$queue = QueueService::instance()->register($title, $command, $later, $data, $rscript, $loops); $queue = QueueService::instance()->register($title, $command, $later, $data, $rscript, $loops);

View File

@ -133,7 +133,7 @@ class QueueService extends Service
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @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']]]; $map = [['title', '=', $title], ['status', 'in', ['1', '2']]];
if (empty($rscript) && ($queue = $this->app->db->name('SystemQueue')->where($map)->find())) { if (empty($rscript) && ($queue = $this->app->db->name('SystemQueue')->where($map)->find())) {