From ae4ed95573de835cd488eadd6f2cf5d4e1202c17 Mon Sep 17 00:00:00 2001 From: flucont Date: Fri, 4 Nov 2022 20:46:46 +0800 Subject: [PATCH] update --- README.md | 2 +- app/controller/Install.php | 2 + app/script/convert.sh | 2 +- app/view/admin/index.html | 1 + app/view/admin/login.html | 5 +- public/install/install_6.0.sh | 19 +- public/install/src/panel6.zip | Bin 9067821 -> 9084846 bytes ...uxPanel-7.9.4.zip => LinuxPanel-7.9.5.zip} | Bin 9036776 -> 9053801 bytes public/install/update6.sh | 2 +- public/install/update_panel.sh | 2 +- public/win/panel/panel_7.7.0.zip | Bin 13346686 -> 13346731 bytes wiki/files/bt.js | 359 ++++++++++++++---- wiki/update.md | 10 +- 13 files changed, 320 insertions(+), 84 deletions(-) rename public/install/update/{LinuxPanel-7.9.4.zip => LinuxPanel-7.9.5.zip} (89%) diff --git a/README.md b/README.md index a6ff61b..dcc7a06 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 网站后台管理可一键同步宝塔官方的插件列表与增量更新插件包，还有云端使用记录、IP黑白名单、操作日志、定时任务等功能。 -本项目自带的宝塔安装包和更新包是7.9.3最新版，已修改适配此第三方云端，并且全开源，无so等加密文件。 +本项目自带的宝塔安装包和更新包是7.9.5最新版，已修改适配此第三方云端，并且全开源，无so等加密文件。 觉得该项目不错的可以给个Star~ diff --git a/app/controller/Install.php b/app/controller/Install.php index 85b82e8..a8469f4 100644 --- a/app/controller/Install.php +++ b/app/controller/Install.php @@ -52,6 +52,8 @@ class Install extends BaseController $sqls=file_get_contents(app()->getRootPath().'install.sql'); $sqls=explode(';', $sqls); $sqls[]="REPLACE INTO `".$mysql_prefix."config` VALUES ('syskey', '".random(16)."')"; + $sqls[]="REPLACE INTO `".$mysql_prefix."config` VALUES ('admin_username', '".addslashes($admin_username)."')"; + $sqls[]="REPLACE INTO `".$mysql_prefix."config` VALUES ('admin_password', '".addslashes($admin_password)."')"; $success=0;$error=0;$errorMsg=null; foreach ($sqls as $value) { $value=trim($value); diff --git a/app/script/convert.sh b/app/script/convert.sh index 5bc3fa5..777d6a0 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="7.9.4" +Linux_Version="7.9.5" Windows_Version="7.7.0" FILES=( diff --git a/app/view/admin/index.html b/app/view/admin/index.html index b1c8139..d986196 100644 --- a/app/view/admin/index.html +++ b/app/view/admin/index.html @@ -2,6 +2,7 @@ {block name="title"}宝塔第三方云端管理中心{/block} {block name="main"}