mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

状态配置和扩展配置的加载顺序调整 便于状态配置文件中可以更改扩展配置的参数

Browse Source
This commit is contained in:
thinkphp
2016-08-16 16:19:56 +08:00
parent 26c0fac85e
commit f96d302ad5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/App.php
View File

@@ -424,11 +424,6 @@ class App
// 加载模块配置 // 加载模块配置
$config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT); $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
// 加载应用状态配置
if ($config['app_status']) {
$config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
}
// 读取扩展配置文件 // 读取扩展配置文件
if ($config['extra_config_list']) { if ($config['extra_config_list']) {
foreach ($config['extra_config_list'] as $name => $file) { foreach ($config['extra_config_list'] as $name => $file) {
@@ -437,6 +432,11 @@ class App
} }
} }
// 加载应用状态配置
if ($config['app_status']) {
$config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
}
// 加载别名文件 // 加载别名文件
if (is_file(CONF_PATH . $module . 'alias' . EXT)) { if (is_file(CONF_PATH . $module . 'alias' . EXT)) {
Loader::addClassMap(include CONF_PATH . $module . 'alias' . EXT); Loader::addClassMap(include CONF_PATH . $module . 'alias' . EXT);