This commit is contained in:
2021-05-18 11:15:40 +08:00
parent ac02a90aa6
commit 5816094d5a
2 changed files with 6 additions and 5 deletions
+1 -4
View File
@@ -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 . '/';
+5 -1
View File
@@ -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;
}
}
/**