From fad861325333180a8c50f8b78f52f38d84aa9381 Mon Sep 17 00:00:00 2001
From: wolfcode <mumu5632@live.cn>
Date: Tue, 30 Aug 2022 17:57:40 +0800
Subject: [PATCH] fix bug

---
 app/middleware/InstallCheck.php | 10 ++++++++--
 extend/sqldata.sql              |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/middleware/InstallCheck.php b/app/middleware/InstallCheck.php
index b9e0abc..785e6d1 100644
--- a/app/middleware/InstallCheck.php
+++ b/app/middleware/InstallCheck.php
@@ -51,15 +51,21 @@ class InstallCheck implements MiddlewareInterface
             $conn = mysqli_connect($dbHost, $dbUser, $dbPwd, null, $dbPort);
             mysqli_query($conn, "SET NAMES {$dbCharset}");
             try {
-                mysqli_select_db($conn, $dbName);
+                if (!mysqli_select_db($conn, $dbName)) {
+                    if (!mysqli_query($conn, "CREATE DATABASE IF NOT EXISTS `{$dbName}` DEFAULT CHARACTER SET {$dbCharset};")) {
+                        $errorMsg = "数据库{$dbName} 不存在，也没权限创建新的数据库！";
+                        mysqli_close($conn);
+                        return response($errorMsg, 400);
+                    }
+                }
             } catch (\mysqli_sql_exception $exception) {
                 if (!mysqli_query($conn, "CREATE DATABASE IF NOT EXISTS `{$dbName}` DEFAULT CHARACTER SET {$dbCharset};")) {
                     $errorMsg = "数据库{$dbName} 不存在，也没权限创建新的数据库！";
                     mysqli_close($conn);
                     return response($errorMsg, 400);
                 }
-                mysqli_select_db($conn, $dbName);
             }
+            mysqli_select_db($conn, $dbName);
             // 先建表
             $db_data   = file_get_contents($db_base_data);
             $sqlFormat = sql_split($db_data);
diff --git a/extend/sqldata.sql b/extend/sqldata.sql
index c315921..234fbe2 100644
--- a/extend/sqldata.sql
+++ b/extend/sqldata.sql
@@ -8,4 +8,4 @@ INSERT INTO `category` VALUES (2, '技术', 1, '2022-04-16 20:54:11', NULL, 0);
 INSERT INTO `category` VALUES (3, '折腾', 1, '2022-04-16 20:54:11', NULL, 0);
 INSERT INTO `article` VALUES (1, '蒹葭', '蒹葭苍苍，白露为霜。所谓伊人，在水一方。溯洄从之，道阻且长。溯游从之，宛在水中央。\n蒹葭萋萋，白露未晞。所谓伊人，在水之湄。溯洄从之，道阻且跻。溯游从之，宛在水中坻。\n蒹葭采采，白露未已。所谓伊人，在', 1, '/upload/20220517/dip1652765664FSjzHW.jpg', '蒹葭苍苍，白露为霜。所谓伊人，在水一方。溯洄从之，道阻且长。溯游从之，宛在水中央。<br>\n蒹葭萋萋，白露未晞。所谓伊人，在水之湄。溯洄从之，道阻且跻。溯游从之，宛在水中坻。<br>\n蒹葭采采，白露未已。所谓伊人，在水之涘。溯洄从之，道阻且右。溯游从之，宛在水中沚。<br>', '2022-05-08', 11, 1, 0, '2022-05-08 15:55:46', '2022-05-17 13:34:29');
 INSERT INTO `article` VALUES (2, '我承认我找不到素材了', '那就这样吧！\n\n\n\n', 3, '', '那就这样吧！\n<div><br>\n</div>\n<div align=\"center\"><img src=\"/upload/20220517/Hkb1652765942zWOqaJ.jpg\"><br>\n</div>', '2022-05-17', 11, 1, 0, '2022-05-17 13:39:04', '2022-05-17 13:41:21');
-INSERT INTO `banner` VALUES (1, '轮播图可以后台设置', '', 0, '', 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F2020-03-16%2F5e6f456284b3e.jpg&refer=http%3A%2F%2Fpic1.win4000.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664443024&t=56aed7f75b80334354600cd8556d093c', 1, NULL, NULL, 1);
\ No newline at end of file
+INSERT INTO `banner` VALUES (1, '轮播图可以后台设置', '/info/2/', 1, '', 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F2020-03-16%2F5e6f456284b3e.jpg&refer=http%3A%2F%2Fpic1.win4000.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664443024&t=56aed7f75b80334354600cd8556d093c', 1, NULL, NULL, 1);
\ No newline at end of file
-- 
GitLab