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

模块支持扩展配置文件加载

Browse Source
This commit is contained in:
thinkphp
2016-02-10 10:22:36 +08:00
parent c8dadb0e06
commit 8dfb389f20
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/think/App.php
View File

@@ -31,14 +31,6 @@ class App
// 初始化应用（公共模块）
self::initModule(COMMON_MODULE, Config::get());
// 读取扩展配置文件
if (Config::get('extra_config_list')) {
foreach (Config::get('extra_config_list') as $name => $file) {
$file = strpos($file, '.') ? $file : APP_PATH . $file . EXT;
Config::load($file, is_string($name) ? $name : pathinfo($file, PATHINFO_FILENAME));
}
}
// 获取配置参数
$config = Config::get();
@@ -299,11 +291,19 @@ class App
} else {
$path = APP_PATH . $module;
// 加载模块配置
Config::load(APP_PATH . $module . 'config' . EXT);
$config = Config::load(APP_PATH . $module . 'config' . EXT);
// 加载应用状态配置
if ($config['app_status']) {
Config::load(APP_PATH . $module . $config['app_status'] . EXT);
$config = Config::load(APP_PATH . $module . $config['app_status'] . EXT);
}
// 读取扩展配置文件
if ($config['extra_config_list']) {
foreach ($config['extra_config_list'] as $name => $file) {
$file = strpos($file, '.') ? $file : $path . $file . EXT;
Config::load($file, is_string($name) ? $name : pathinfo($file, PATHINFO_FILENAME));
}
}
// 加载别名文件