From 5816094d5aaff8c7b0b0c885f009c9f316096f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 18 May 2021 11:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- System/Abstracts/BaseApplication.php | 5 +---- System/Abstracts/Config.php | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php index 93f311c1..04a6a986 100644 --- a/System/Abstracts/BaseApplication.php +++ b/System/Abstracts/BaseApplication.php @@ -153,10 +153,7 @@ abstract class BaseApplication extends Service */ public function parseInt($config) { - $_config = Snowflake::app()->getConfig(); - foreach ($config as $key => $value) { - $_config->setData($key, $value); - } + Config::sets($config); if ($storage = Config::get('storage', 'storage')) { if (!str_contains($storage, APP_PATH)) { $storage = APP_PATH . $storage . '/'; diff --git a/System/Abstracts/Config.php b/System/Abstracts/Config.php index 97458a9a..3708a920 100644 --- a/System/Abstracts/Config.php +++ b/System/Abstracts/Config.php @@ -57,7 +57,11 @@ class Config extends Component if (empty($configs)) { return; } - $config->data = ArrayAccess::merge($config->data, $configs); + if (!empty($config->data)) { + $config->data = ArrayAccess::merge($config->data, $configs); + } else { + $config->data = $configs; + } } /**