From 03757ba1c32e8e3322691cc0a1dd44aa50302074 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 24 Aug 2020 14:03:39 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/service/NodeService.php | 14 ++++++++------ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index fc32830dd..12fddc9bd 100644 --- a/composer.lock +++ b/composer.lock @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f" + "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/656726c8c8e1175ec8d0f284e9fd00eb40d77d7f", - "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2", + "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2", "shasum": "", "mirrors": [ { @@ -987,7 +987,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", - "time": "2020-08-24T05:44:28+00:00" + "time": "2020-08-24T05:58:10+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6670a639f..50211b1d8 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f" + "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/656726c8c8e1175ec8d0f284e9fd00eb40d77d7f", - "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2", + "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-08-24T05:44:28+00:00", + "time": "2020-08-24T05:58:10+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index a4b1a067b..36c589b33 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/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php index 409f0925b..933d19afd 100644 --- a/vendor/zoujingli/think-library/src/service/NodeService.php +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -143,12 +143,14 @@ class NodeService extends Service */ public function scanDirectory($path, $data = [], $ext = 'php') { - if (file_exists($path) && is_dir($path)) foreach (scandir($path) as $item) if ($item[0] !== '.') { - $realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item; - if (is_readable($realpath)) if (is_dir($realpath)) { - $data = $this->scanDirectory($realpath, $data, $ext); - } elseif (is_file($realpath) && (is_null($ext) || pathinfo($realpath, 4) === $ext)) { - $data[] = strtr($realpath, '\\', '/'); + if (file_exists($path) && is_dir($path)) { + foreach (scandir($path) as $item) if ($item[0] !== '.') { + $realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item; + if (is_readable($realpath)) if (is_dir($realpath)) { + $data = $this->scanDirectory($realpath, $data, $ext); + } elseif (is_file($realpath) && (is_null($ext) || pathinfo($realpath, 4) === $ext)) { + $data[] = strtr($realpath, '\\', '/'); + } } } return $data;