diff --git a/app/script/convert.sh b/app/script/convert.sh index 17121f2..945efad 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="8.0.3" +Linux_Version="8.0.4" Windows_Version="7.9.0" Btm_Version="2.2.9" diff --git a/install.sql b/install.sql index 91e7ab1..1cbb116 100644 --- a/install.sql +++ b/install.sql @@ -12,9 +12,9 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES ('bt_key', ''), ('whitelist', '0'), ('download_page', '1'), -('new_version', '8.0.3'), +('new_version', '8.0.4'), ('update_msg', '暂无更新日志'), -('update_date', '2023-10-08'), +('update_date', '2023-11-19'), ('new_version_win', '7.9.0'), ('update_msg_win', '暂无更新日志'), ('update_date_win', '2023-07-20'), diff --git a/public/install/install_6.0.sh b/public/install/install_6.0.sh index ec224be..696dae2 100644 --- a/public/install/install_6.0.sh +++ b/public/install/install_6.0.sh @@ -30,6 +30,11 @@ if [ "${UbuntuCheck}" ] && [ "${UbuntuCheck}" -lt "16" ];then echo "Ubuntu ${UbuntuCheck}不支持安装宝塔面板,建议更换Ubuntu18/20安装宝塔面板" exit 1 fi +HOSTNAME_CHECK=$(cat /etc/hostname) +if [ -z "${HOSTNAME_CHECK}" ];then + echo "当前主机名hostname为空无法安装宝塔面板,请咨询服务器运营商设置好hostname后再重新安装" + exit 1 +fi cd ~ setup_path="/www" diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 0f97c3e..2f64e23 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-8.0.3.zip b/public/install/update/LinuxPanel-8.0.4.zip similarity index 72% rename from public/install/update/LinuxPanel-8.0.3.zip rename to public/install/update/LinuxPanel-8.0.4.zip index 9b6de11..6ea334c 100644 Binary files a/public/install/update/LinuxPanel-8.0.3.zip and b/public/install/update/LinuxPanel-8.0.4.zip differ diff --git a/route/app.php b/route/app.php index 10b426f..66c3e4a 100644 --- a/route/app.php +++ b/route/app.php @@ -91,6 +91,7 @@ Route::group('api', function () { Route::get('/panel/notpro', 'api/return_empty'); Route::post('/Btdeployment/get_deplist', 'api/get_deplist'); Route::post('/panel/get_deplist', 'api/get_deplist'); + Route::get('/ip/info_json', 'api/return_empty_array'); Route::post('/LinuxBeta', 'api/return_error'); Route::post('/panel/apple_beta', 'api/return_error'); diff --git a/wiki/files/linux/PluginLoader.py b/wiki/files/linux/PluginLoader.py index 06d50fc..41e1975 100644 --- a/wiki/files/linux/PluginLoader.py +++ b/wiki/files/linux/PluginLoader.py @@ -16,7 +16,11 @@ def get_plugin_list(force = 0): except Exception as ex: raise public.error_conn_cloud(str(ex)) softList = json.loads(jsonData) - if type(softList)!=dict or 'list' not in softList: raise Exception('云端插件列表获取失败') + if type(softList)!=dict or 'list' not in softList: + if type(softList)==str: + raise Exception(softList) + else: + raise Exception('云端插件列表获取失败') public.writeFile(cache_file, jsonData) return softList diff --git a/wiki/files/win/PluginLoader.py b/wiki/files/win/PluginLoader.py index e7ffd52..aa7338c 100644 --- a/wiki/files/win/PluginLoader.py +++ b/wiki/files/win/PluginLoader.py @@ -16,7 +16,11 @@ def get_plugin_list(force = 0): except Exception as ex: raise public.error_conn_cloud(str(ex)) softList = json.loads(jsonData) - if type(softList)!=dict or 'list' not in softList: raise Exception('云端插件列表获取失败') + if type(softList)!=dict or 'list' not in softList: + if type(softList)==str: + raise Exception(softList) + else: + raise Exception('云端插件列表获取失败') public.writeFile(cache_file, jsonData) return softList diff --git a/wiki/update.md b/wiki/update.md index 3e0f3ed..d8f5c80 100644 --- a/wiki/update.md +++ b/wiki/update.md @@ -16,9 +16,11 @@ - 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/(需排除clearModel.py、scanningModel.py、ipsModel.py) +- 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/(需排除js文件) + - 全局搜索替换 https://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh -- class/ajax.py 文件 \#是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home') +- class/ajax.py 文件 \# 是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home') class/jobs.py 文件 \#尝试升级到独立环境 下面的 public.get_url() 改成 public.GetConfigValue('home') @@ -63,6 +65,8 @@ - class/plugin_deployment.py 文件,SetupPackage方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn' +- script/flush_plugin.py 文件,删除clear_hosts()一行 + - install/install_soft.sh 在bash执行之前加入以下代码 ```shell @@ -97,11 +101,11 @@ - [可选]去除创建网站自动创建的垃圾文件:在class/panelSite.py,分别删除 - htaccess = self.sitePath+'/.htaccess' + htaccess = self.sitePath + '/.htaccess' - index = self.sitePath+'/index.html' + index = self.sitePath + '/index.html' - doc404 = self.sitePath+'/404.html' + doc404 = self.sitePath + '/404.html' 这3行及分别接下来的4行代码