From 95f2b975796ec03673a9b485fac27b521c9f31e5 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 9 Jan 2020 15:55:35 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/controller/Queue.php | 2 +- app/admin/view/queue/index_search.html | 6 ++++++ app/wechat/controller/Fans.php | 2 +- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/common.php | 8 +++++--- .../zoujingli/think-library/src/service/QueueService.php | 2 +- 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index dc552e7cf..22323bc8a 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -64,7 +64,7 @@ class Queue extends Controller $this->iswin = ProcessService::instance()->iswin(); // 任务列表查询分页处理 $query = $this->_query($this->table)->dateBetween('create_at')->timeBetween('enter_time,exec_time'); - $query->like('title,command')->equal('status')->order('id desc')->page(); + $query->like('code,title,command')->equal('status')->order('id desc')->page(); } /** diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html index cb60fc1b9..558a35693 100644 --- a/app/admin/view/queue/index_search.html +++ b/app/admin/view/queue/index_search.html @@ -17,6 +17,12 @@
条件搜索
+
+ +
+ +
+
diff --git a/app/wechat/controller/Fans.php b/app/wechat/controller/Fans.php index 153b30649..c17b8f5ad 100644 --- a/app/wechat/controller/Fans.php +++ b/app/wechat/controller/Fans.php @@ -71,7 +71,7 @@ class Fans extends Controller public function sync() { try { - sysqueue('同步用户数据', "xadmin:fansall", 1, [], 0); + sysqueue('同步微信用户数据', "xadmin:fansall", 1, [], 0); $this->success('创建任务成功，请等待完成！'); } catch (HttpResponseException $exception) { throw $exception; diff --git a/composer.lock b/composer.lock index 1281f7093..ca3d215dd 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "d121a5b29ef178def60e1b72c3b1ad9e0fece7cb" + "reference": "608e1bd304e8935c19318540ba328625914e2b44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d121a5b29ef178def60e1b72c3b1ad9e0fece7cb", - "reference": "d121a5b29ef178def60e1b72c3b1ad9e0fece7cb", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/608e1bd304e8935c19318540ba328625914e2b44", + "reference": "608e1bd304e8935c19318540ba328625914e2b44", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-01-09T07:42:54+00:00" + "time": "2020-01-09T07:53:07+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0384b0407..1d7b1966e 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": "d121a5b29ef178def60e1b72c3b1ad9e0fece7cb" + "reference": "608e1bd304e8935c19318540ba328625914e2b44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d121a5b29ef178def60e1b72c3b1ad9e0fece7cb", - "reference": "d121a5b29ef178def60e1b72c3b1ad9e0fece7cb", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/608e1bd304e8935c19318540ba328625914e2b44", + "reference": "608e1bd304e8935c19318540ba328625914e2b44", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-01-09T07:42:54+00:00", + "time": "2020-01-09T07:53:07+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 16ef48798..440818fea 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index c8e039e1b..8b40dfdfe 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -90,16 +90,18 @@ if (!function_exists('sysqueue')) { * @param string $command 执行内容 * @param integer $later 延时执行时间 * @param array $data 任务附加数据 - * @param integer $rscript 任务多开 + * @param integer $rscript 任务类型(0单例,1多例) + * @param integer $loops 循环等待时间 + * @param integer $attempts 已执行次数 * @return QueueService * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - function sysqueue($title, $command, $later = 0, $data = [], $rscript = 1) + function sysqueue($title, $command, $later = 0, $data = [], $rscript = 1, $loops = 0, $attempts = 0) { - return QueueService::instance()->register($title, $command, $later, $data, $rscript); + return QueueService::instance()->register($title, $command, $later, $data, $rscript, $loops, $attempts); } } if (!function_exists('systoken')) { diff --git a/vendor/zoujingli/think-library/src/service/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php index ee9ed585e..056af9dca 100644 --- a/vendor/zoujingli/think-library/src/service/QueueService.php +++ b/vendor/zoujingli/think-library/src/service/QueueService.php @@ -118,7 +118,7 @@ class QueueService extends Service * @param array $data 任务附加数据 * @param integer $rscript 任务类型(0单例,1多例) * @param integer $loops 循环等待时间 - * @param integer $attempts 执行次数 + * @param integer $attempts 已执行次数 * @return $this * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException