改名
This commit is contained in:
@@ -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 . '/';
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user