diff --git a/app/controller/Api.php b/app/controller/Api.php index a523b8b..d4481b8 100644 --- a/app/controller/Api.php +++ b/app/controller/Api.php @@ -10,7 +10,7 @@ class Api extends BaseController //获取插件列表 public function get_plugin_list(){ - if(!$this->checklist()) return ''; + if(!$this->checklist()) return json('你的服务器被禁止使用此云端'); $record = Db::name('record')->where('ip',$this->clientip)->find(); if($record){ Db::name('record')->where('id',$record['id'])->update(['usetime'=>date("Y-m-d H:i:s")]); @@ -24,7 +24,7 @@ class Api extends BaseController //获取插件列表(win) public function get_plugin_list_win(){ - if(!$this->checklist()) return ''; + if(!$this->checklist()) return json('你的服务器被禁止使用此云端'); $record = Db::name('record')->where('ip',$this->clientip)->find(); if($record){ Db::name('record')->where('id',$record['id'])->update(['usetime'=>date("Y-m-d H:i:s")]); diff --git a/app/script/convert.sh b/app/script/convert.sh index 56287cc..17121f2 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="8.0.2" +Linux_Version="8.0.3" Windows_Version="7.9.0" Btm_Version="2.2.9" diff --git a/install.sql b/install.sql index ee073bd..91e7ab1 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.2'), +('new_version', '8.0.3'), ('update_msg', '暂无更新日志'), -('update_date', '2023-08-28'), +('update_date', '2023-10-08'), ('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 0b34e73..ec224be 100644 --- a/public/install/install_6.0.sh +++ b/public/install/install_6.0.sh @@ -786,16 +786,14 @@ Set_Bt_Panel(){ fi sleep 1 admin_auth="/www/server/panel/data/admin_path.pl" - if [ "${SAFE_PATH}" ];then - auth_path=$SAFE_PATH - echo "/${auth_path}" > ${admin_auth} - fi if [ ! -f ${admin_auth} ];then auth_path=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8) echo "/${auth_path}" > ${admin_auth} fi - auth_path=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8) - echo "/${auth_path}" > ${admin_auth} + if [ "${SAFE_PATH}" ];then + auth_path=$SAFE_PATH + echo "/${auth_path}" > ${admin_auth} + fi chmod -R 700 $pyenv_path/pyenv/bin btpip install docxtpl==0.16.7 /www/server/panel/pyenv/bin/pip3 install pymongo @@ -1034,7 +1032,7 @@ if [ "${PANEL_SSL}" == "True" ];then HTTP_S="https" else HTTP_S="http" -fi +fi echo > /www/server/panel/data/bind.pl echo -e "==================================================================" @@ -1059,3 +1057,4 @@ endTime=`date +%s` echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" + diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 5c67670..0f97c3e 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.2.zip b/public/install/update/LinuxPanel-8.0.3.zip similarity index 80% rename from public/install/update/LinuxPanel-8.0.2.zip rename to public/install/update/LinuxPanel-8.0.3.zip index b7b9909..9b6de11 100644 Binary files a/public/install/update/LinuxPanel-8.0.2.zip and b/public/install/update/LinuxPanel-8.0.3.zip differ