From dafaf5efd85f9b5885ac4d1c7792881cbabc74a0 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 6 May 2020 10:15:53 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 11 +++++------ public/index.php | 4 ++-- vendor/composer/autoload_real.php | 3 --- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/service/SystemService.php | 9 +++++++++ 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index 9816362e1..2956d4dea 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "0dfd6270436823d9a2173532ad21ef0126bcb863" + "reference": "13fabbc1826f03e5ee13dfc74776ccc54da8f429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0dfd6270436823d9a2173532ad21ef0126bcb863", - "reference": "0dfd6270436823d9a2173532ad21ef0126bcb863", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/13fabbc1826f03e5ee13dfc74776ccc54da8f429", + "reference": "13fabbc1826f03e5ee13dfc74776ccc54da8f429", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-05-02T11:46:38+00:00" + "time": "2020-05-06T02:04:54+00:00" }, { "name": "zoujingli/wechat-developer", @@ -1047,6 +1047,5 @@ "ext-mbstring": "*", "ext-simplexml": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } diff --git a/public/index.php b/public/index.php index c02b8e6f6..9cf165e9b 100644 --- a/public/index.php +++ b/public/index.php @@ -21,9 +21,9 @@ require __DIR__ . '/../vendor/autoload.php'; $app = new App(); -SystemService::instance()->productMode(); +$debug = SystemService::instance()->isDebug(); -$response = $app->http->run(); +$response = $app->debug($debug)->http->run(); $response->send(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 353738d8b..105a2e9b6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -13,9 +13,6 @@ class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 } } - /** - * @return \Composer\Autoload\ClassLoader - */ public static function getLoader() { if (null !== self::$loader) { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d4a2cf993..6a95f7aa8 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": "0dfd6270436823d9a2173532ad21ef0126bcb863" + "reference": "13fabbc1826f03e5ee13dfc74776ccc54da8f429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0dfd6270436823d9a2173532ad21ef0126bcb863", - "reference": "0dfd6270436823d9a2173532ad21ef0126bcb863", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/13fabbc1826f03e5ee13dfc74776ccc54da8f429", + "reference": "13fabbc1826f03e5ee13dfc74776ccc54da8f429", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-05-02T11:46:38+00:00", + "time": "2020-05-06T02:04:54+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 599bab84d..43eacdb8b 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index f279844cd..afd0cb90d 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -296,4 +296,13 @@ class SystemService extends Service return $this->app->debug($data['app_run'] !== 'product')->isDebug(); } + /** + * 判断实时运行模式 + * @return boolean + */ + public function isDebug() + { + return $this->getRuntime('app_run') !== 'product'; + } + } \ No newline at end of file