diff --git a/app/command/CleanViteJs.php b/app/command/CleanViteJs.php index f619d2f..861e395 100644 --- a/app/command/CleanViteJs.php +++ b/app/command/CleanViteJs.php @@ -164,6 +164,10 @@ class CleanViteJs extends Command $file = preg_replace('!computed\(\(\)=>"input"===\w+\.\w+\.type\)!', '!1', $file); $file = preg_replace('!computed\(function\(\)\{return"calc"===\w+\.\w+\.type\}\)!', '!1', $file); $file = preg_replace('!computed\(function\(\)\{return"input"===\w+\.\w+\.type\}\)!', '!1', $file); + $file = preg_replace('!computed\(\(\)=>\w+\.\w+\.type==="calc"\)!', '!1', $file); + $file = preg_replace('!computed\(\(\)=>\w+\.\w+\.type==="input"\)!', '!1', $file); + $file = preg_replace('!computed\(function\(\)\{return\w+\.\w+\.type==="calc"\}\)!', '!1', $file); + $file = preg_replace('!computed\(function\(\)\{return\w+\.\w+\.type==="input"\}\)!', '!1', $file); $code = $this->getExtendCode($file, '"自动部署"', 2); if($code){ $file = str_replace($code.',', '', $file); @@ -220,6 +224,7 @@ class CleanViteJs extends Command $code2 = str_replace($this->getExtendFunction($code, '"购买商业证书"'), '', $code2); $file = str_replace($code, $code2, $file); } + $file = str_replace('.value="busSslList"', '.value="letsEncryptList"', $file); $flag = true; } if(strpos($file, '"busSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl diff --git a/app/script/convert.sh b/app/script/convert.sh index 9e72902..a2f5bc8 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="11.4.1" +Linux_Version="11.5.0" Windows_Version="8.2.2" Aapanel_Version="7.0.25" Btm_Version="2.3.3" diff --git a/install.sql b/install.sql index c5c44fe..01adeba 100644 --- a/install.sql +++ b/install.sql @@ -12,12 +12,12 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES ('bt_key', ''), ('whitelist', '0'), ('download_page', '1'), -('new_version', '11.4.1'), +('new_version', '11.5.0'), ('update_msg', '暂无更新日志'), -('update_date', '2025-12-16'), -('new_version_win', '8.5.0'), +('update_date', '2026-01-19'), +('new_version_win', '8.5.1'), ('update_msg_win', '暂无更新日志'), -('update_date_win', '2025-12-16'), +('update_date_win', '2026-01-19'), ('new_version_en', '7.0.25'), ('update_msg_en', '暂无更新日志'), ('update_date_en', '2025-09-10'), diff --git a/public/install/install_panel.sh b/public/install/install_panel.sh index 20b3d5c..d637a15 100644 --- a/public/install/install_panel.sh +++ b/public/install/install_panel.sh @@ -1229,6 +1229,8 @@ Install_Bt(){ chmod -R +x ${setup_path}/server/panel/script chmod -R 700 $pyenv_path/pyenv/bin ln -sf /etc/init.d/bt /usr/bin/bt + chmod +x /www/server/panel/script/btcli.py + ln -sf /www/server/panel/script/btcli.py /usr/bin/btcli echo "${panelPort}" > ${setup_path}/server/panel/data/port.pl wget -O /etc/init.d/bt ${download_Url}/install/src/bt7.init -T 15 wget -O /www/server/panel/init.sh ${download_Url}/install/src/bt7.init -T 15 @@ -1282,6 +1284,7 @@ Set_Bt_Panel(){ echo "/${auth_path}" > ${admin_auth} fi + btpip install asn1crypto==1.5.1 cbor2==5.4.6 if [ ! -f "/www/server/panel/pyenv/n.pl" ];then btpip install docxtpl==0.16.7 /www/server/panel/pyenv/bin/pip3 install pymongo @@ -1364,12 +1367,16 @@ Set_Firewall(){ if [ "${PM}" = "apt-get" ]; then #apt-get install -y ufw if [ -f "/usr/sbin/ufw" ];then + if [ "${PANEL_PORT}" ];then + ufw allow ${PANEL_PORT}/tcp + fi ufw allow 20/tcp ufw allow 21/tcp ufw allow 22/tcp ufw allow 80/tcp ufw allow 443/tcp ufw allow 888/tcp + ufw allow 8888/tcp ufw allow ${panelPort}/tcp ufw allow ${sshPort}/tcp ufw allow 39000:40000/tcp @@ -1412,6 +1419,10 @@ Set_Firewall(){ firewall-cmd --permanent --zone=public --add-port=22/tcp > /dev/null 2>&1 firewall-cmd --permanent --zone=public --add-port=80/tcp > /dev/null 2>&1 firewall-cmd --permanent --zone=public --add-port=443/tcp > /dev/null 2>&1 + firewall-cmd --permanent --zone=public --add-port=8888/tcp > /dev/null 2>&1 + if [ "${PANEL_PORT}" ];then + firewall-cmd --permanent --zone=public --add-port=${PANEL_PORT}/tcp > /dev/null 2>&10 + fi firewall-cmd --permanent --zone=public --add-port=${panelPort}/tcp > /dev/null 2>&1 firewall-cmd --permanent --zone=public --add-port=${sshPort}/tcp > /dev/null 2>&1 firewall-cmd --permanent --zone=public --add-port=39000-40000/tcp > /dev/null 2>&1 @@ -1526,6 +1537,9 @@ Start_Ip_Cert_Async(){ } Check_Ip_Cert_Async(){ + if [ "$SET_SSL" != "true" ];then + return + fi if [ -z "$IP_SSL_PID" ]; then if [ "$acme_http_code" != "200" ];then echo "受信ip证书申请失败,exit code=$acme_http_code" @@ -1560,7 +1574,7 @@ Check_Ip_Cert_Async(){ } Install_Main(){ Ready_Check - #Set_Ssl + Set_Ssl startTime=`date +%s` Lock_Clear System_Check @@ -1586,12 +1600,12 @@ Install_Main(){ Install_Bt Get_Ip_Address + Start_Ip_Cert_Async Set_Bt_Panel Service_Add - Set_Firewall - Get_Ip_Address + Check_Ip_Cert_Async Setup_Count ${IDC_CODE} Add_lib_Install } diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 4a32db9..bcba254 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-11.4.1.zip b/public/install/update/LinuxPanel-11.5.0.zip similarity index 84% rename from public/install/update/LinuxPanel-11.4.1.zip rename to public/install/update/LinuxPanel-11.5.0.zip index 938162a..fa951f7 100644 Binary files a/public/install/update/LinuxPanel-11.4.1.zip and b/public/install/update/LinuxPanel-11.5.0.zip differ diff --git a/public/install/update6.sh b/public/install/update6.sh index 7494fdc..26f3abe 100644 --- a/public/install/update6.sh +++ b/public/install/update6.sh @@ -219,6 +219,8 @@ fi btpip uninstall enum34 -y +btpip install asn1crypto==1.5.1 cbor2==5.4.6 + GEOIP_C=$(echo $pip_list|grep geoip2) if [ -z "${GEOIP_C}" ];then btpip install geoip2==4.7.0 diff --git a/public/win/panel/panel_8.5.1.zip b/public/win/panel/panel_8.5.1.zip index 47397d5..6dca7f3 100644 Binary files a/public/win/panel/panel_8.5.1.zip and b/public/win/panel/panel_8.5.1.zip differ