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

改进

Browse Source
This commit is contained in:
thinkphp
2016-07-22 18:05:58 +08:00
parent a1cbf20e6c
commit f8070ea8db
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/console/command/optimize/Config.php
View File

@@ -10,7 +10,6 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace think\console\command\optimize; namespace think\console\command\optimize;
use think\Config as ThinkConfig;
use think\console\command\Command; use think\console\command\Command;
use think\console\Input; use think\console\Input;
use think\console\input\Option; use think\console\input\Option;
@@ -52,18 +51,18 @@ class Config extends Command
$content = ''; $content = '';
$path = realpath(APP_PATH . $module) . DS; $path = realpath(APP_PATH . $module) . DS;
// 加载模块配置 // 加载模块配置
$config = ThinkConfig::load(CONF_PATH . $module . 'config' . CONF_EXT); $config = \think\Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
// 加载应用状态配置 // 加载应用状态配置
if ($config['app_status']) { if ($config['app_status']) {
$config = ThinkConfig::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT); $config = \think\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) {
$filename = CONF_PATH . $module . $file . CONF_EXT; $filename = CONF_PATH . $module . $file . CONF_EXT;
ThinkConfig::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME)); \think\Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
} }
} }
@@ -82,7 +81,7 @@ class Config extends Command
$content .= substr(file_get_contents($path . 'common' . EXT), 5) . PHP_EOL; $content .= substr(file_get_contents($path . 'common' . EXT), 5) . PHP_EOL;
} }
$content .= '\think\Config::set(' . var_export(ThinkConfig::get(), true) . ');'; $content .= '\think\Config::set(' . var_export(\think\Config::get(), true) . ');';
return $content; return $content;
} }
} }