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

废除use_db_switch配置及 应用状态单独数据库配置功能 应用状态可以直接配置更改的database参数 而不需要全部配置

Browse Source
This commit is contained in:
thinkphp
2016-02-19 11:42:48 +08:00
parent 1b2273ddc3
commit 85c2abdc6a
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -154,8 +154,6 @@ return [
// | 数据库设置 // | 数据库设置
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// 是否启用多状态数据库配置 如果启用的话 需要跟随app_status配置不同的数据库信息
'use_db_switch' => false,
'db_fields_strict' => true, 'db_fields_strict' => true,
'database' => [ 'database' => [
// 数据库类型 // 数据库类型

4
library/think/Db.php
View File

@@ -61,10 +61,6 @@ class Db
{ {
if (empty($config)) { if (empty($config)) {
$config = Config::get('database'); $config = Config::get('database');
if (Config::get('use_db_switch')) {
$status = Config::get('app_status');
$config = $config[$status ?: 'default'];
}
} elseif (is_string($config) && false === strpos($config, '/')) { } elseif (is_string($config) && false === strpos($config, '/')) {
// 支持读取配置参数 // 支持读取配置参数
$config = Config::get($config); $config = Config::get($config);