From b4409e61e0caf3399bc57c9c9a81102e45c6822d Mon Sep 17 00:00:00 2001
From: az13js <1654602334@qq.com>
Date: Thu, 29 Apr 2021 14:00:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=97=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=8C=87=E5=AE=9Asock=E6=96=B9=E5=BC=8F=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                             | 4 +++-
 controllers/home/InstallController.php | 8 ++++----
 views/install/step2.html               | 7 +++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5beb75..94509e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
 /static/js/app.js
 /static/js/field.js
 
-runtime/smarty/*
\ No newline at end of file
+runtime/smarty/*
+runtime/cache
+runtime/install
diff --git a/controllers/home/InstallController.php b/controllers/home/InstallController.php
index 58032f7..5add550 100644
--- a/controllers/home/InstallController.php
+++ b/controllers/home/InstallController.php
@@ -72,9 +72,9 @@ class InstallController extends PublicController
             Yii::$app->response->format = Response::FORMAT_JSON;
 
             $step2 = $request->post('Step2');
-
+            $dsn = empty($step2['sock']) ? "mysql:host={$step2['host']};port={$step2['port']}}" : "mysql:unix_socket={$step2['sock']}";
             $db = [
-                'dsn'      => "mysql:host={$step2['host']};port={$step2['port']}}",
+                'dsn'      => $dsn,
                 'username' => $step2['username'],
                 'password' => $step2['password'],
                 'charset'  => 'utf8',
@@ -97,10 +97,10 @@ class InstallController extends PublicController
             $sql = "CREATE DATABASE IF NOT EXISTS {$step2['dbname']} CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';";
 
             if(!$connection->createCommand($sql)->execute()){
-                return ['status' => 'error', 'message' => "数据库 {$step2['dbname']} 创建失败，没有创建数据库权限，请手动创建数据库"];
+                return ['status' => 'error', 'message' => "数据库 {$step2['dbname']} 创建失败，没有创建数据库权限，请手动创建数据库".json_encode($db)];
             }
 
-            $db['dsn']         = "mysql:host={$step2['host']};port={$step2['port']};dbname={$step2['dbname']}";
+            $db['dsn']         = "$dsn;dbname={$step2['dbname']}";
             $db['tablePrefix'] = $step2['prefix'];
             $db = ['class' => 'yii\db\Connection'] + $db;
 
diff --git a/views/install/step2.html b/views/install/step2.html
index f009ca4..d6aab87 100644
--- a/views/install/step2.html
+++ b/views/install/step2.html
@@ -38,6 +38,13 @@
                                             </div>
                                         </div>
 
+                                        <div class="form-group">
+                                            <label class="col-sm-2 control-label">数据库sock路径（可选）</label>
+                                            <div class="col-sm-10">
+                                                <input type="text" name="Step2[sock]" class="form-control" placeholder="数据库服务器sock地址，例如：/run/mysqld/mysqld.sock" value="">
+                                            </div>
+                                        </div>
+
                                         <div class="form-group">
                                             <label class="col-sm-2 control-label">数据库端口号</label>
                                             <div class="col-sm-10">
-- 
Gitee


From fddb062bebd6c7fd7dd12bd6a622f2461c9bb3d7 Mon Sep 17 00:00:00 2001
From: az13js <1654602334@qq.com>
Date: Thu, 29 Apr 2021 14:04:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E8=BE=93=E5=87=BA=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/home/InstallController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/home/InstallController.php b/controllers/home/InstallController.php
index 5add550..73d9e3c 100644
--- a/controllers/home/InstallController.php
+++ b/controllers/home/InstallController.php
@@ -97,7 +97,7 @@ class InstallController extends PublicController
             $sql = "CREATE DATABASE IF NOT EXISTS {$step2['dbname']} CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';";
 
             if(!$connection->createCommand($sql)->execute()){
-                return ['status' => 'error', 'message' => "数据库 {$step2['dbname']} 创建失败，没有创建数据库权限，请手动创建数据库".json_encode($db)];
+                return ['status' => 'error', 'message' => "数据库 {$step2['dbname']} 创建失败，没有创建数据库权限，请手动创建数据库"];
             }
 
             $db['dsn']         = "$dsn;dbname={$step2['dbname']}";
-- 
Gitee


From e5f92b54ba9b71807b529cab63c95922c530e944 Mon Sep 17 00:00:00 2001
From: az13js <1654602334@qq.com>
Date: Thu, 29 Apr 2021 16:25:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 94509e0..e27a1a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 runtime/smarty/*
 runtime/cache
 runtime/install
+runtime/logs
-- 
Gitee