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

fix: layer notice

Browse Source
This commit is contained in:
Ying
2022-08-20 18:39:44 +08:00
parent e4b3594077
commit 7345c52212
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,20 +137,18 @@ class Index extends BaseController
}
// 查询数据库名
$database = @mysqli_select_db($connect, $params['database']);
if (!$database) {
$query = "CREATE DATABASE IF NOT EXISTS `" . $params['database'] . "` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;";
if (!@mysqli_query($connect, $query)) {
return $this->error('数据库创建失败或已存在，请手动修改');
}
} else {
$mysql_table = @mysqli_query($connect, 'SHOW TABLES FROM' . ' ' . $params['database']);
$mysql_table = @mysqli_fetch_array($mysql_table);
if (!empty($mysql_table) && is_array($mysql_table)) {
$mysql_table = @mysqli_query($connect, 'SHOW DATABASES');
while ($row = @mysqli_fetch_assoc($mysql_table)) {
if ($row['Database'] == $params['database']) {
return $this->error('数据表已存在，请勿重复安装');
}
}
$query = "CREATE DATABASE IF NOT EXISTS `" . $params['database'] . "` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;";
if (!@mysqli_query($connect, $query)) {
return $this->error('数据库创建失败或已存在，请手动修改');
}
Cache::set('mysqlInfo', $params);
return json(['code' => 200, 'url' => '/install/index/step3']);
}
@@ -248,7 +246,7 @@ class Index extends BaseController
// 清理安装包
Cache::clear();
recursive_delete(root_path('app' . DIRECTORY_SEPARATOR . 'install'));
recursive_delete(root_path('app' . DIRECTORY_SEPARATOR . 'install'));
system_reload();
} catch (\Throwable $th) {
return $this->error($th->getMessage());

2
app/install/view/index/step1.html
View File

@@ -170,7 +170,7 @@
location.href = res.url;
}
else {
layer.msg(res.msg);
layer.msg(res.msg,'error');
}
})
})

2
app/install/view/index/step2.html
View File

@@ -147,7 +147,7 @@
location.href = res.url;
}
else {
layer.msg(res.msg);
layer.msg(res.msg,'error');
}
},'json');
return false;