From a57c3a9373bc89f5eaa4142d047481a898b5757e Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 31 Jul 2020 18:25:21 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/service/AdminService.php | 6 +++--- .../think-library/src/service/CaptchaService.php | 4 ++-- .../src/service/bin/{font.ttf => captcha.ttf} | Bin 6 files changed, 14 insertions(+), 14 deletions(-) rename vendor/zoujingli/think-library/src/service/bin/{font.ttf => captcha.ttf} (100%) diff --git a/composer.lock b/composer.lock index 278b3c098..16a0023a4 100644 --- a/composer.lock +++ b/composer.lock @@ -879,12 +879,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21" + "reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/568ab719724c389c6b2a41d3fe4a2c5a82286d21", - "reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2ce8935d423feccfd59bba2963e9127f3fca8c90", + "reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90", "shasum": "", "mirrors": [ { @@ -928,7 +928,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", - "time": "2020-07-31T09:06:14+00:00" + "time": "2020-07-31T10:16:54+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0720fc44e..68f637094 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -903,12 +903,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21" + "reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/568ab719724c389c6b2a41d3fe4a2c5a82286d21", - "reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2ce8935d423feccfd59bba2963e9127f3fca8c90", + "reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90", "shasum": "", "mirrors": [ { @@ -924,7 +924,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-07-31T09:06:14+00:00", + "time": "2020-07-31T10:16:54+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 8b6b18477..2ed688973 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/service/AdminService.php b/vendor/zoujingli/think-library/src/service/AdminService.php index e26f30a69..bf2142454 100644 --- a/vendor/zoujingli/think-library/src/service/AdminService.php +++ b/vendor/zoujingli/think-library/src/service/AdminService.php @@ -73,7 +73,7 @@ class AdminService extends Service { if ($this->isSuper()) return true; $service = NodeService::instance(); - list($real, $nodes) = [$service->fullnode($node), $service->getMethods()]; + [$real, $nodes] = [$service->fullnode($node), $service->getMethods()]; foreach ($nodes as $key => $rule) if (stripos($key, '_') !== false) { $nodes[str_replace('_', '', $key)] = $rule; } @@ -92,9 +92,9 @@ class AdminService extends Service */ public function getTree($checkeds = []) { - list($nodes, $pnodes, $methods) = [[], [], array_reverse(NodeService::instance()->getMethods())]; + [$nodes, $pnodes, $methods] = [[], [], array_reverse(NodeService::instance()->getMethods())]; foreach ($methods as $node => $method) { - list($count, $pnode) = [substr_count($node, '/'), substr($node, 0, strripos($node, '/'))]; + [$count, $pnode] = [substr_count($node, '/'), substr($node, 0, strripos($node, '/'))]; if ($count === 2 && !empty($method['isauth'])) { in_array($pnode, $pnodes) or array_push($pnodes, $pnode); $nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php index f81003150..bb1a273ce 100644 --- a/vendor/zoujingli/think-library/src/service/CaptchaService.php +++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php @@ -45,12 +45,12 @@ class CaptchaService extends Service // 生成验证码序号 $this->uniqid = uniqid('captcha') . mt_rand(1000, 9999); // 生成验证码字符串 - list($this->code, $length) = ['', strlen($this->charset) - 1]; + [$this->code, $length] = ['', strlen($this->charset) - 1]; for ($i = 0; $i < $this->length; $i++) { $this->code .= $this->charset[mt_rand(0, $length)]; } // 设置字体文件路径 - $this->fontfile = __DIR__ . '/bin/font.ttf'; + $this->fontfile = __DIR__ . '/bin/captcha.ttf'; // 缓存验证码字符串 $this->app->cache->set($this->uniqid, $this->code, 360); // 返回当前对象 diff --git a/vendor/zoujingli/think-library/src/service/bin/font.ttf b/vendor/zoujingli/think-library/src/service/bin/captcha.ttf similarity index 100% rename from vendor/zoujingli/think-library/src/service/bin/font.ttf rename to vendor/zoujingli/think-library/src/service/bin/captcha.ttf