diff --git a/convention.php b/convention.php index dc61842e..020f24be 100644 --- a/convention.php +++ b/convention.php @@ -154,8 +154,6 @@ return [ // | 数据库设置 // +---------------------------------------------------------------------- - // 是否启用多状态数据库配置 如果启用的话 需要跟随app_status配置不同的数据库信息 - 'use_db_switch' => false, 'db_fields_strict' => true, 'database' => [ // 数据库类型 diff --git a/library/think/Db.php b/library/think/Db.php index 408a1015..90237a63 100644 --- a/library/think/Db.php +++ b/library/think/Db.php @@ -61,10 +61,6 @@ class Db { if (empty($config)) { $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, '/')) { // 支持读取配置参数 $config = Config::get($config);