From ecf8073ae65380b45c494521d15ed5b851d5b420 Mon Sep 17 00:00:00 2001 From: Anyon Date: Sat, 11 Jan 2020 15:52:22 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../zoujingli/think-library/src/storage/LocalStorage.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index e99ccad91..7d6ced173 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5" + "reference": "88d74e6f666cc23103da97e8e2307ecc5db1b031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5", - "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/88d74e6f666cc23103da97e8e2307ecc5db1b031", + "reference": "88d74e6f666cc23103da97e8e2307ecc5db1b031", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-01-11T07:36:56+00:00" + "time": "2020-01-11T07:50:11+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 963b38712..640d5cfc5 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": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5" + "reference": "88d74e6f666cc23103da97e8e2307ecc5db1b031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5", - "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/88d74e6f666cc23103da97e8e2307ecc5db1b031", + "reference": "88d74e6f666cc23103da97e8e2307ecc5db1b031", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-01-11T07:36:56+00:00", + "time": "2020-01-11T07:50:11+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 7f6757c77..1e3e15b7d 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/storage/LocalStorage.php b/vendor/zoujingli/think-library/src/storage/LocalStorage.php index 1009e7606..4ab60411b 100644 --- a/vendor/zoujingli/think-library/src/storage/LocalStorage.php +++ b/vendor/zoujingli/think-library/src/storage/LocalStorage.php @@ -38,7 +38,7 @@ class LocalStorage extends Storage $type = strtolower(sysconf('storage.local_http_protocol')); if ($type === 'path') { $file = $this->app->request->baseFile(false); - $this->prefix = dirname(strtr($file, '\\', '/')); + $this->prefix = trim(dirname($file), '\\/'); } else { $this->prefix = dirname($this->app->request->basefile(true)); list(, $domain) = explode('://', strtr($this->prefix, '\\', '/'));