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

取消extra_config_list配置参数 扩展配置文件直接放到 extra目录下面即可自动加载 数据库配置文件位置不变

Browse Source
This commit is contained in:
thinkphp
2016-09-21 17:41:01 +08:00
parent 5ad64223bb
commit f7e65f4f4b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -19,8 +19,6 @@ return [
'auto_bind_module' => false, 'auto_bind_module' => false,
// 注册的根命名空间 // 注册的根命名空间
'root_namespace' => [], 'root_namespace' => [],
// 扩展配置文件
'extra_config_list' => ['database', 'validate'],
// 扩展函数文件 // 扩展函数文件
'extra_file_list' => [THINK_PATH . 'helper' . EXT], 'extra_file_list' => [THINK_PATH . 'helper' . EXT],
// 默认输出类型 // 默认输出类型

16
library/think/App.php
View File

@@ -444,12 +444,18 @@ class App
$path = APP_PATH . $module; $path = APP_PATH . $module;
// 加载模块配置 // 加载模块配置
$config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT); $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
// 读取数据库配置文件
$filename = CONF_PATH . $module . 'database' . CONF_EXT;
Config::load($filename, 'database');
// 读取扩展配置文件 // 读取扩展配置文件
if ($config['extra_config_list']) { if (is_dir(CONF_PATH . $module . 'extra')) {
foreach ($config['extra_config_list'] as $name => $file) { $path = CONF_PATH . $module . 'extra';
$filename = CONF_PATH . $module . $file . CONF_EXT; $files = scandir($path);
Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME)); foreach ($files as $file) {
if (strpos($file, CONF_EXT)) {
$filename = $path . DS . $file;
Config::load($filename, pathinfo($file, PATHINFO_FILENAME));
}
} }
} }