diff --git a/composer.lock b/composer.lock index 89daae76b..80b8fa5af 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87" + "reference": "373e7587a6ade11254892b63e431cb57498f8fa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87", - "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373e7587a6ade11254892b63e431cb57498f8fa3", + "reference": "373e7587a6ade11254892b63e431cb57498f8fa3", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-26T06:36:23+00:00" + "time": "2020-04-26T09:48:50+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 11db50fd3..a6b55fdc7 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": "1d4b617db91e31cbd02b81268651dd93f5b66e87" + "reference": "373e7587a6ade11254892b63e431cb57498f8fa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1d4b617db91e31cbd02b81268651dd93f5b66e87", - "reference": "1d4b617db91e31cbd02b81268651dd93f5b66e87", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373e7587a6ade11254892b63e431cb57498f8fa3", + "reference": "373e7587a6ade11254892b63e431cb57498f8fa3", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-26T06:36:23+00:00", + "time": "2020-04-26T09:48:50+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 8822b4e89..8ba6abf87 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php index c11062e0f..42075d224 100644 --- a/vendor/zoujingli/think-library/src/Helper.php +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -28,7 +28,7 @@ use think\db\Query; abstract class Helper { /** - * 当前应用容器 + * 应用容器 * @var App */ public $app; @@ -40,7 +40,7 @@ abstract class Helper public $query; /** - * 当前控制器实例 + * 控制器实例 * @var Controller */ public $controller; diff --git a/vendor/zoujingli/think-library/src/command/database/Repair.php b/vendor/zoujingli/think-library/src/command/database/Repair.php index aad7f77ac..dc111d1ea 100644 --- a/vendor/zoujingli/think-library/src/command/database/Repair.php +++ b/vendor/zoujingli/think-library/src/command/database/Repair.php @@ -54,6 +54,5 @@ class Repair extends Command $this->setQueueProgress(2, "[{$stridx}] 正在修复数据表 {$table}", $used / $total * 100); $this->app->db->query("REPAIR TABLE `{$table}`"); } - $this->setQueueMessage(3, '数据库修复完成！'); } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php b/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php index 952cdb405..2a8067358 100644 --- a/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php +++ b/vendor/zoujingli/think-library/src/command/queue/CleanQueue.php @@ -66,8 +66,6 @@ class CleanQueue extends Queue 'status' => '4', 'exec_desc' => '任务执行超时，已自动标识为失败！', ]); $this->setQueueProgress(2, "处理 {$count2} 条超时间任务成功", 100); - // 返回消息到任务状态描述 - $this->setQueueMessage(3, "共清理 {$count1} 条 + 无响应 {$count2} 条"); } } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/extend/CodeExtend.php b/vendor/zoujingli/think-library/src/extend/CodeExtend.php index b40062cab..5107e54f9 100644 --- a/vendor/zoujingli/think-library/src/extend/CodeExtend.php +++ b/vendor/zoujingli/think-library/src/extend/CodeExtend.php @@ -34,7 +34,6 @@ class CodeExtend $numbs = '0123456789'; $chars = 'abcdefghijklmnopqrstuvwxyz'; if (intval($type) === 1) $chars = $numbs; - if (intval($type) === 2) $chars = "{$chars}"; if (intval($type) === 3) $chars = "{$numbs}{$chars}"; $string = $prefix . $chars[rand(1, strlen($chars) - 1)]; if (isset($chars)) while (strlen($string) < $size) { diff --git a/vendor/zoujingli/think-library/src/service/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php index ef701d4a7..a2bdcf53f 100644 --- a/vendor/zoujingli/think-library/src/service/QueueService.php +++ b/vendor/zoujingli/think-library/src/service/QueueService.php @@ -68,8 +68,7 @@ class QueueService extends Service $this->app->log->error("Qeueu initialize failed, Queue {$code} not found."); throw new \think\admin\Exception("Qeueu initialize failed, Queue {$code} not found."); } - $this->code = $this->queue['code']; - $this->title = $this->queue['title']; + list($this->code, $this->title) = [$this->queue['code'], $this->queue['title']]; $this->data = json_decode($this->queue['exec_data'], true) ?: []; } return $this; @@ -99,8 +98,7 @@ class QueueService extends Service $this->app->log->error("Qeueu reset failed, Queue {$this->code} data cannot be empty!"); throw new \think\admin\Exception("Qeueu reset failed, Queue {$this->code} data cannot be empty!"); } - $map = ['code' => $this->code]; - $this->app->db->name('SystemQueue')->where($map)->strict(false)->failException(true)->update([ + $this->app->db->name('SystemQueue')->where(['code' => $this->code])->strict(false)->failException(true)->update([ 'exec_pid' => '0', 'exec_time' => time() + $wait, 'status' => '1', ]); return $this->initialize($this->code);