mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yunwuxin
2016-03-23 15:52:05 +08:00
parent 6b754aae02 235e9f847f
commit 233bab7e9d
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/App.php
View File

@@ -28,9 +28,6 @@ class App
*/
public static function run()
{
// 加载环境变量配置文件
Config::loadEnv(APP_PATH . 'env' . EXT);
// 初始化应用（公共模块）
self::initModule(COMMON_MODULE, Config::get());
@@ -276,8 +273,8 @@ class App
// 读取扩展配置文件
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));
$filename = $path . $file . EXT;
Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
}
}

45
library/think/Config.php
View File

@@ -61,26 +61,6 @@ class Config
return is_file($file) ? self::set(include $file, $name, $range) : self::$config[$range];
}
/**
* 加载环境变量配置文件
* @param string $file 配置文件名
* @param string $name 配置名（如设置即表示二级配置）
* @return void
*/
public static function loadEnv($file, $name = '')
{
if (is_file($file)) {
$env = include $file;
foreach ($env as $key => $val) {
if (!empty($name)) {
$_ENV[ENV_PREFIX . $name . '_' . $key] = $val;
} else {
$_ENV[ENV_PREFIX . $key] = $val;
}
}
}
}
/**
* 检测配置是否存在
* @param string $name 配置参数名（支持二级配置 .号分割）
@@ -92,10 +72,20 @@ class Config
$range = $range ?: self::$range;
if (!strpos($name, '.')) {
// 判断环境变量
$result = getenv(ENV_PREFIX . $name);
if (false !== $result) {
return $result;
}
return isset(self::$config[$range][strtolower($name)]);
} else {
// 二维数组设置和获取支持
$name = explode('.', $name);
$name = explode('.', $name);
$result = getenv(ENV_PREFIX . $name[0] . '_' . $name[1]);
// 判断环境变量
if (false !== $result) {
return $result;
}
return isset(self::$config[$range][strtolower($name[0])][$name[1]]);
}
}
@@ -115,18 +105,19 @@ class Config
}
if (!strpos($name, '.')) {
// 判断环境变量
if (isset($_ENV[ENV_PREFIX . $name])) {
return $_ENV[ENV_PREFIX . $name];
$result = getenv(ENV_PREFIX . $name);
if (false !== $result) {
return $result;
}
$name = strtolower($name);
return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null;
} else {
// 二维数组设置和获取支持
$name = explode('.', $name);
$name = explode('.', $name);
$result = getenv(ENV_PREFIX . $name[0] . '_' . $name[1]);
// 判断环境变量
if (isset($_ENV[ENV_PREFIX . $name[0] . '_' . $name[1]])) {
return $_ENV[ENV_PREFIX . $name[0] . '_' . $name[1]];
if (false !== $result) {
return $result;
}
$name[0] = strtolower($name[0]);
return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null;