ComposerUpdate

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();
     }
 
     /**

app/admin/view/queue/index_search.html

@@ -18,6 +18,12 @@
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">任务编号</label>
+            <div class="layui-input-inline">
+                <input name="code" value="{:input('get.code')}" placeholder="请输入任务编号" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
             <label class="layui-form-label">任务名称</label>
             <div class="layui-input-inline">
                 <input name="title" value="{:input('get.title')}" placeholder="请输入任务名称" class="layui-input">

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;

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",

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": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-01-09 15:48:18
+// This file is automatically generated at:2020-01-09 15:55:25
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

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')) {

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