From 01322e33e558298b788da74d05a7e791a3413e8c Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 22 Nov 2019 10:10:38 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/Storage.php | 2 +- .../think-library/src/service/ProcessService.php | 1 - 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 542b7f4c7..12a9395bd 100644 --- a/composer.lock +++ b/composer.lock @@ -699,12 +699,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "35a0122215949195abc4754f461f502052fe7bc3" + "reference": "00fe6b75407a6dbde28add584886ad7e48abc604" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/35a0122215949195abc4754f461f502052fe7bc3", - "reference": "35a0122215949195abc4754f461f502052fe7bc3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/00fe6b75407a6dbde28add584886ad7e48abc604", + "reference": "00fe6b75407a6dbde28add584886ad7e48abc604", "shasum": "" }, "require": { @@ -742,7 +742,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-21T06:31:36+00:00" + "time": "2019-11-22T02:07:09+00:00" } ], "packages-dev": [], diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e5cc1c0c0..db47234df 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -721,12 +721,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "35a0122215949195abc4754f461f502052fe7bc3" + "reference": "00fe6b75407a6dbde28add584886ad7e48abc604" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/35a0122215949195abc4754f461f502052fe7bc3", - "reference": "35a0122215949195abc4754f461f502052fe7bc3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/00fe6b75407a6dbde28add584886ad7e48abc604", + "reference": "00fe6b75407a6dbde28add584886ad7e48abc604", "shasum": "" }, "require": { @@ -736,7 +736,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-21T06:31:36+00:00", + "time": "2019-11-22T02:07:09+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 5c76ea72d..ba0dc8626 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.php b/vendor/zoujingli/think-library/src/Storage.php index b42b60533..88b9153c3 100644 --- a/vendor/zoujingli/think-library/src/Storage.php +++ b/vendor/zoujingli/think-library/src/Storage.php @@ -130,7 +130,7 @@ abstract class Storage { $mimes = self::mimes(); foreach (is_string($exts) ? explode(',', $exts) : $exts as $e) { - $mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : ''; + $mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : 'application/octet-stream'; } return join(',', array_unique($mime)); } diff --git a/vendor/zoujingli/think-library/src/service/ProcessService.php b/vendor/zoujingli/think-library/src/service/ProcessService.php index fb9630b70..ce22167b1 100644 --- a/vendor/zoujingli/think-library/src/service/ProcessService.php +++ b/vendor/zoujingli/think-library/src/service/ProcessService.php @@ -54,7 +54,6 @@ class ProcessService extends Service { if ($this->iswin()) { $command = __DIR__ . "/bin/console.exe {$command}"; - echo $command."
"; pclose(popen("wmic process call create \"{$command}\"", 'r')); } else { pclose(popen("{$command} &", 'r'));