blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-06 03:58:00 +08:00
Code Issues Projects Releases Wiki Activity

fixed 合并版本冲突

Browse Source
This commit is contained in:
zhaoxiang 2016-11-25 16:00:55 +08:00
commit 0f0433bf86
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/install/controller/Index.php
View File

@ -130,7 +130,7 @@ class Index extends Controller {
//检测数据库连接，并且初始化数据 //检测数据库连接，并且初始化数据
if( $dbConfig['DB_TYPE'] == 0 ){ if( $dbConfig['DB_TYPE'] == 0 ){
$dbConfig['DB_TYPE'] = 'mysql'; $dbConfig['DB_TYPE'] = 'mysql';
$dsn = "mysql:dbname={$dbConfig['DB_NAME']};host={$dbConfig['DB_HOST']};port={$dbConfig['DB_PORT']};charset=utf8"; $dsn = "mysql:dbname={$dbConfig['DB_NAME']};host={$dbConfig['DB_HOST']};port={$dbConfig['DB_PORT']};charset=utf8mb4";
try { try {
$db = new \PDO($dsn, $dbConfig['DB_USER'], $dbConfig['DB_PWD']); $db = new \PDO($dsn, $dbConfig['DB_USER'], $dbConfig['DB_PWD']);
} catch (\PDOException $e) { } catch (\PDOException $e) {