panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复覆盖安装库存在问题

Browse Source
This commit is contained in:
Ying
2022-08-24 15:49:41 +08:00
parent 3f310751e1
commit 3ef9177ea2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/install/controller/Index.php
View File

@@ -132,21 +132,22 @@ class Index extends BaseController
// 检测MySQL版本 // 检测MySQL版本
$mysqlInfo = @mysqli_get_server_info($connect); $mysqlInfo = @mysqli_get_server_info($connect);
if ((float)$mysqlInfo < 5.6) {
return $this->error('MySQL版本过低');
}
// 查询数据库名 // 查询数据库名
$database = false;
$mysql_table = @mysqli_query($connect, 'SHOW DATABASES'); $mysql_table = @mysqli_query($connect, 'SHOW DATABASES');
while ($row = @mysqli_fetch_assoc($mysql_table)) { while ($row = @mysqli_fetch_assoc($mysql_table)) {
if ($row['Database'] == $params['database']) { if ($row['Database'] == $params['database']) {
return $this->error('数据库已存在，请勿重复安装'); $database = true;
break;
} }
} }
$query = "CREATE DATABASE IF NOT EXISTS `" . $params['database'] . "` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"; if (!$database) {
if (!@mysqli_query($connect, $query)) { $query = "CREATE DATABASE IF NOT EXISTS `" . $params['database'] . "` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;";
return $this->error('数据库创建失败或已存在，请手动修改'); if (!@mysqli_query($connect, $query)) {
return $this->error('数据库创建失败或已存在，请手动修改');
}
} }
Cache::set('mysqlInfo', $params); Cache::set('mysqlInfo', $params);