update

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,10 +224,11 @@ 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, '"btSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl
+        if(strpos($file, '"busSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl
-            $file = str_replace('"btSslList"', '"currentCertInfo"', $file);
+            $file = str_replace('"busSslList"', '"currentCertInfo"', $file);
             $flag = true;
         }
 
@@ -231,7 +236,9 @@ class CleanViteJs extends Command
             $code = $this->getExtendFunction($file, '"商用SSL"', '{', '}');
             $file = str_replace($code, '', $file);
             $code = $this->getExtendFunction($file, '"宝塔证书"', '{', '}');
-            $file = str_replace($code, '', $file);
+            if($code){
+                $file = str_replace($code, '', $file);
+            }
             for($i=0;$i<3;$i++){
                 $code = $this->getExtendCode($file, ',"联系客服"', 2, '[', ']');
                 if($code){
@@ -241,7 +248,7 @@ class CleanViteJs extends Command
             $flag = true;
         }
         if(strpos($file, '"SSL-CERTIFICATE-STORE"')!==false){ //ssl
-            $file = str_replace('("bt")', '("encrypt")', $file);
+            $file = str_replace('("ssl")', '("encrypt")', $file);
             $flag = true;
         }
 

app/script/convert.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-Linux_Version="11.4.0"
+Linux_Version="11.5.0"
 Windows_Version="8.2.2"
 Aapanel_Version="7.0.25"
 Btm_Version="2.3.3"

install.sql

@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS `cloud_config`;
 CREATE TABLE `cloud_config` (
   `key` varchar(32) NOT NULL,
-  `value` varchar(255) DEFAULT NULL,
+  `value` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -12,12 +12,12 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
 ('bt_key', ''),
 ('whitelist', '0'),
 ('download_page', '1'),
-('new_version', '11.4.0'),
+('new_version', '11.5.0'),
 ('update_msg', '暂无更新日志'),
-('update_date', '2025-12-16'),
+('update_date', '2026-01-19'),
-('new_version_win', '8.5.0'),
+('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'),

public/install/install_panel.sh

@@ -358,7 +358,7 @@ Set_Repo_Url(){
 		if { [ "${NODE_STATUS}" != "200" ] && [ "${NODE_STATUS}" != "301" ]; } || [ "${TIME_TOTAL}" -ge "500" ] || [ "${SOURCE_URL_CHECK}" ]; then
 			\cp -rpa /etc/apt/sources.list /etc/apt/sources.list.btbackup
 			apt_lists=(mirrors.cloud.tencent.com  mirrors.163.com repo.huaweicloud.com mirrors.tuna.tsinghua.edu.cn mirrors.aliyun.com mirrors.ustc.edu.cn )
-			apt_lists=(mirrors.cloud.tencent.com  mirrors.163.com repo.huaweicloud.com mirrors.aliyun.com mirrors.ustc.edu.cn )
+			apt_lists=(mirrors.cloud.tencent.com repo.huaweicloud.com mirrors.aliyun.com mirrors.ustc.edu.cn mirrors.163.com)
 			for list in ${apt_lists[@]};
 			do
 				NODE_CHECK=$(curl --connect-timeout 3 -m 3 2>/dev/null -w "%{http_code} %{time_total}" ${list} -o /dev/null)
@@ -715,7 +715,7 @@ Install_RPM_Pack(){
 
 	sed -i 's/SELINUX=enforcing/SELINUX=disabled/' /etc/selinux/config
 	#yum remove -y python-requests python3-requests python-greenlet python3-greenlet
-	yumPacks="libcurl-devel wget tar gcc make zip unzip openssl openssl-devel gcc libxml2 libxml2-devel libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs icu libicu-devel c-ares libffi-devel bzip2-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel xz-devel qrencode at mariadb rsyslog net-tools firewalld"
+	yumPacks="libcurl-devel wget tar gcc make zip unzip openssl openssl-devel gcc libxml2 libxml2-devel libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs icu libicu-devel c-ares libffi-devel bzip2-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel xz-devel qrencode at rsyslog net-tools firewalld"
 	yum install -y ${yumPacks}
 
 	for yumPack in ${yumPacks}
@@ -730,6 +730,10 @@ Install_RPM_Pack(){
 		dnf install -y redhat-rpm-config
 	fi
 
+	# if [ ! -f "/usr/bin/mysql" ] && [ -f "/usr/sbin/mysql" ];then
+	# 	yum install 
+	# fi
+
 	ALI_OS=$(cat /etc/redhat-release |grep "Alibaba Cloud Linux release 3")
 	if [ -z "${ALI_OS}" ];then 
 		yum install epel-release -y
@@ -757,6 +761,7 @@ Install_Deb_Pack(){
 	apt-get install bash -y
 	if [ -f "/usr/bin/bash" ];then
 		ln -sf /usr/bin/bash /bin/sh
+		ln -sf /usr/bin/bash /usr/bin/sh
 	fi
 	apt-get install ruby -y
 	apt-get install lsb-release -y
@@ -777,7 +782,7 @@ Install_Deb_Pack(){
 		apt-get install curl -y
 	fi
 
-	debPacks="wget curl libcurl4-openssl-dev gcc make zip unzip tar openssl libssl-dev gcc libxml2 libxml2-dev zlib1g zlib1g-dev libjpeg-dev libpng-dev lsof libpcre3 libpcre3-dev cron net-tools swig build-essential libffi-dev libbz2-dev libncurses-dev libsqlite3-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libdb++-dev libpcap-dev xz-utils git qrencode sqlite3 at mariadb-client rsyslog net-tools ufw";
+	debPacks="wget curl libcurl4-openssl-dev gcc make zip unzip tar openssl libssl-dev gcc libxml2 libxml2-dev zlib1g zlib1g-dev libjpeg-dev libpng-dev lsof libpcre3 libpcre3-dev cron net-tools swig build-essential libffi-dev libbz2-dev libncurses-dev libsqlite3-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libdb++-dev libpcap-dev xz-utils git qrencode sqlite3 at rsyslog net-tools ufw";
 	apt-get install -y $debPacks --force-yes
 
 	for debPack in ${debPacks}
@@ -787,7 +792,11 @@ Install_Deb_Pack(){
 			apt-get install -y $debPack
 		fi
 	done
-
+	
+	if [ ! -f "/usr/bin/mysql" ] && [ -f "/usr/sbin/mysql" ];then
+		apt-get install mysql-client -y
+	fi
+	
 	if [ ! -d '/etc/letsencrypt' ];then
 		mkdir -p /etc/letsencryp
 		mkdir -p /var/spool/cron
@@ -1218,7 +1227,10 @@ Install_Bt(){
 	chmod +x /etc/init.d/bt
 	chmod -R 600 ${setup_path}/server/panel
 	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
@@ -1271,7 +1283,8 @@ Set_Bt_Panel(){
 		auth_path=$SAFE_PATH
 		echo "/${auth_path}" > ${admin_auth}
 	fi
-	chmod -R 700 $pyenv_path/pyenv/bin
+
+	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
@@ -1354,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
@@ -1402,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
@@ -1492,9 +1513,68 @@ Setup_Count(){
 	fi
 	echo /www > /var/bt_setupPath.conf
 }
+
+Start_Ip_Cert_Async(){
+    IP_SSL_PID=""
+    if [ -z "${ipv4_address}" ];then
+        return
+    fi
+
+    if [ "$SET_SSL" == "true" ];then
+        if [ -f "/www/server/panel/script/auto_apply_ip_ssl.py" ];then
+             acme_connect_url="https://acme-v02.api.letsencrypt.org"
+             acme_http_code=$(curl -sS --connect-timeout 2 -m 60 -o /dev/null -w "%{http_code}" "$acme_connect_url")
+             if [ "$acme_http_code" == "200" ];then
+                echo "正在后台开启受信任宝塔面板ip证书..."
+                (
+                    timeout 60 $pyenv_path/pyenv/bin/python3.7 /www/server/panel/script/auto_apply_ip_ssl.py -ips ${ipv4_address} -path /www/server/panel/ssl > /tmp/auto_apply_ip_ssl.log 2>&1
+                    echo $? > /tmp/ip_ssl_exit_code.pl
+                ) &
+                IP_SSL_PID=$!
+             fi
+        fi
+    fi
+}
+
+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"
+			echo "转为使用默认自签证书，后续可手动在面板设置中重新使用Let's encrypt申请ip证书"
+			return
+		fi
+		echo "受信宝塔面板ip证书开启成功"
+        /etc/init.d/bt restart
+        return
+    fi
+
+	echo "正在检查受信宝塔面板ip证书开启状态..."
+    wait $IP_SSL_PID
+    
+    if [ -f "/tmp/ip_ssl_exit_code.pl" ]; then
+        rc=$(cat /tmp/ip_ssl_exit_code.pl)
+        rm -f /tmp/ip_ssl_exit_code.pl
+    else
+        rc=1
+    fi
+
+    if [ $rc -eq 0 ]; then
+        echo "受信宝塔面板ip证书开启成功"
+        /etc/init.d/bt restart
+    elif [ $rc -eq 124 ]; then
+        echo "受信ip证书申请超时（60秒）"
+        echo "转为使用默认自签证书，后续可手动在面板设置中重新使用Let's encrypt申请ip证书"
+    else
+        echo "受信ip证书申请失败，exit code=$rc"
+        echo "转为使用默认自签证书，后续可手动在面板设置中重新使用Let's encrypt申请ip证书"
+    fi
+}
 Install_Main(){
 	Ready_Check
-	#Set_Ssl
+	Set_Ssl
 	startTime=`date +%s`
 	Lock_Clear
 	System_Check
@@ -1515,15 +1595,17 @@ Install_Main(){
 		Install_Other_Pack
 	fi
 
+	Set_Firewall
 	Install_Python_Lib
 	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
 }

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