as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-05-18 11:15:40 +08:00
parent ac02a90aa6
commit 5816094d5a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Abstracts/BaseApplication.php
+1 -4
View File
@@ -153,10 +153,7 @@ abstract class BaseApplication extends Service
*/ */
public function parseInt($config) public function parseInt($config)
{ {
$_config = Snowflake::app()->getConfig(); Config::sets($config);
foreach ($config as $key => $value) {
$_config->setData($key, $value);
}
if ($storage = Config::get('storage', 'storage')) { if ($storage = Config::get('storage', 'storage')) {
if (!str_contains($storage, APP_PATH)) { if (!str_contains($storage, APP_PATH)) {
$storage = APP_PATH . $storage . '/'; $storage = APP_PATH . $storage . '/';
System/Abstracts/Config.php
+4
View File
@@ -57,7 +57,11 @@ class Config extends Component
if (empty($configs)) { if (empty($configs)) {
return; return;
} }
if (!empty($config->data)) {
$config->data = ArrayAccess::merge($config->data, $configs); $config->data = ArrayAccess::merge($config->data, $configs);
} else {
$config->data = $configs;
}
} }
/** /**