Route类的domain方法和域名路由动态注册机制调整 修正Connction类

This commit is contained in:
thinkphp
2016-08-02 16:53:05 +08:00
parent 17c76a41c7
commit 81a2222143
3 changed files with 96 additions and 68 deletions

View File

@@ -251,10 +251,9 @@ abstract class Connection
public function connect(array $config = [], $linkNum = 0, $autoConnection = false)
{
if (!isset($this->links[$linkNum])) {
if ($config) {
$this->setConfig($config);
if (!$config) {
$config = $this->config;
}
$config = $this->config;
// 连接参数
if (isset($config['params']) && is_array($config['params'])) {
$params = $config['params'] + $this->params;