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

改进Config类和App类 Lange类

Browse Source 
支持扩展配置文件分离
This commit is contained in:
thinkphp
2015-12-01 19:47:57 +08:00
parent 2375e257b3
commit 5f1fe79e17
11 changed files with 145 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/db/driver.php
View File

@@ -15,7 +15,7 @@ use PDO;
use think\Config;
use think\Debug;
use think\Exception;
use think\Lang as Lang;
use think\Lang;
use think\Log;
abstract class Driver
@@ -1035,7 +1035,7 @@ abstract class Driver
$this->model = $options['model'];
$this->parseBind(!empty($options['bind']) ? $options['bind'] : []);
$sql = $this->buildSelectSql($options);
$result = $this->query($sql, !empty($options['fetch_sql']) ? true : false, !empty($options['read_master']) ? true : false);
$result = $this->query($sql, !empty($options['fetch_sql']) ? true : false, !empty($options['master']) ? true : false);
return $result;
}
@@ -1169,13 +1169,11 @@ abstract class Driver
*/
protected function initConnect($master = true)
{
if (!empty($this->config['deploy']))
// 采用分布式数据库
{
if (!empty($this->config['deploy'])) {
// 采用分布式数据库
$this->_linkID = $this->multiConnect($master);
} else
// 默认单数据库
if (!$this->_linkID) {
} elseif (!$this->_linkID) {
// 默认单数据库
$this->_linkID = $this->connect();
}