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

配置参数读取的时候取消环境变量判断 需要读取环境变量的时候使用

Browse Source
This commit is contained in:
thinkphp
2016-08-31 19:11:31 +08:00
parent a7707e1843
commit 51452be436
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/App.php
View File

@@ -12,6 +12,7 @@
namespace think; namespace think;
use think\Config; use think\Config;
use think\Env;
use think\Exception; use think\Exception;
use think\exception\HttpException; use think\exception\HttpException;
use think\exception\HttpResponseException; use think\exception\HttpResponseException;
@@ -371,7 +372,7 @@ class App
self::$suffix = $config['class_suffix']; self::$suffix = $config['class_suffix'];
// 应用调试模式 // 应用调试模式
self::$debug = Config::get('app_debug'); self::$debug = Env::get('app_debug', Config::get('app_debug'));
if (!self::$debug) { if (!self::$debug) {
ini_set('display_errors', 'Off'); ini_set('display_errors', 'Off');
} elseif (!IS_CLI) { } elseif (!IS_CLI) {

23
library/think/Config.php
View File

@@ -81,20 +81,10 @@ class Config
$range = $range ?: self::$range; $range = $range ?: self::$range;
if (!strpos($name, '.')) { if (!strpos($name, '.')) {
// 判断环境变量
$result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) {
return $result;
}
return isset(self::$config[$range][strtolower($name)]); return isset(self::$config[$range][strtolower($name)]);
} else { } else {
// 二维数组设置和获取支持 // 二维数组设置和获取支持
$name = explode('.', $name); $name = explode('.', $name);
$result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量
if (false !== $result) {
return $result;
}
return isset(self::$config[$range][strtolower($name[0])][$name[1]]); return isset(self::$config[$range][strtolower($name[0])][$name[1]]);
} }
} }
@@ -114,20 +104,11 @@ class Config
} }
if (!strpos($name, '.')) { if (!strpos($name, '.')) {
$result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) {
return $result;
}
$name = strtolower($name); $name = strtolower($name);
return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null; return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null;
} else { } else {
// 二维数组设置和获取支持 // 二维数组设置和获取支持
$name = explode('.', $name); $name = explode('.', $name);
$result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量
if (false !== $result) {
return $result;
}
$name[0] = strtolower($name[0]); $name[0] = strtolower($name[0]);
return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null; return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null;
} }