This commit is contained in:
flucout 2026-01-23 16:00:06 +08:00
parent c0ebc38d54
commit 08bd35c997
8 changed files with 29 additions and 8 deletions

View File

@ -164,6 +164,10 @@ class CleanViteJs extends Command
$file = preg_replace('!computed\(\(\)=>"input"===\w+\.\w+\.type\)!', '!1', $file); $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"calc"===\w+\.\w+\.type\}\)!', '!1', $file);
$file = preg_replace('!computed\(function\(\)\{return"input"===\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); $code = $this->getExtendCode($file, '"自动部署"', 2);
if($code){ if($code){
$file = str_replace($code.',', '', $file); $file = str_replace($code.',', '', $file);
@ -220,6 +224,7 @@ class CleanViteJs extends Command
$code2 = str_replace($this->getExtendFunction($code, '"购买商业证书"'), '', $code2); $code2 = str_replace($this->getExtendFunction($code, '"购买商业证书"'), '', $code2);
$file = str_replace($code, $code2, $file); $file = str_replace($code, $code2, $file);
} }
$file = str_replace('.value="busSslList"', '.value="letsEncryptList"', $file);
$flag = true; $flag = true;
} }
if(strpos($file, '"busSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl if(strpos($file, '"busSslList"')!==false && strpos($filepath, '/useStore')){ //site-ssl

View File

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

View File

@ -12,12 +12,12 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
('bt_key', ''), ('bt_key', ''),
('whitelist', '0'), ('whitelist', '0'),
('download_page', '1'), ('download_page', '1'),
('new_version', '11.4.1'), ('new_version', '11.5.0'),
('update_msg', '暂无更新日志'), ('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_msg_win', '暂无更新日志'),
('update_date_win', '2025-12-16'), ('update_date_win', '2026-01-19'),
('new_version_en', '7.0.25'), ('new_version_en', '7.0.25'),
('update_msg_en', '暂无更新日志'), ('update_msg_en', '暂无更新日志'),
('update_date_en', '2025-09-10'), ('update_date_en', '2025-09-10'),

View File

@ -1229,6 +1229,8 @@ Install_Bt(){
chmod -R +x ${setup_path}/server/panel/script chmod -R +x ${setup_path}/server/panel/script
chmod -R 700 $pyenv_path/pyenv/bin chmod -R 700 $pyenv_path/pyenv/bin
ln -sf /etc/init.d/bt /usr/bin/bt 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 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 /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 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} echo "/${auth_path}" > ${admin_auth}
fi fi
btpip install asn1crypto==1.5.1 cbor2==5.4.6
if [ ! -f "/www/server/panel/pyenv/n.pl" ];then if [ ! -f "/www/server/panel/pyenv/n.pl" ];then
btpip install docxtpl==0.16.7 btpip install docxtpl==0.16.7
/www/server/panel/pyenv/bin/pip3 install pymongo /www/server/panel/pyenv/bin/pip3 install pymongo
@ -1364,12 +1367,16 @@ Set_Firewall(){
if [ "${PM}" = "apt-get" ]; then if [ "${PM}" = "apt-get" ]; then
#apt-get install -y ufw #apt-get install -y ufw
if [ -f "/usr/sbin/ufw" ];then if [ -f "/usr/sbin/ufw" ];then
if [ "${PANEL_PORT}" ];then
ufw allow ${PANEL_PORT}/tcp
fi
ufw allow 20/tcp ufw allow 20/tcp
ufw allow 21/tcp ufw allow 21/tcp
ufw allow 22/tcp ufw allow 22/tcp
ufw allow 80/tcp ufw allow 80/tcp
ufw allow 443/tcp ufw allow 443/tcp
ufw allow 888/tcp ufw allow 888/tcp
ufw allow 8888/tcp
ufw allow ${panelPort}/tcp ufw allow ${panelPort}/tcp
ufw allow ${sshPort}/tcp ufw allow ${sshPort}/tcp
ufw allow 39000:40000/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=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=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=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=${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=${sshPort}/tcp > /dev/null 2>&1
firewall-cmd --permanent --zone=public --add-port=39000-40000/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(){ Check_Ip_Cert_Async(){
if [ "$SET_SSL" != "true" ];then
return
fi
if [ -z "$IP_SSL_PID" ]; then if [ -z "$IP_SSL_PID" ]; then
if [ "$acme_http_code" != "200" ];then if [ "$acme_http_code" != "200" ];then
echo "受信ip证书申请失败exit code=$acme_http_code" echo "受信ip证书申请失败exit code=$acme_http_code"
@ -1560,7 +1574,7 @@ Check_Ip_Cert_Async(){
} }
Install_Main(){ Install_Main(){
Ready_Check Ready_Check
#Set_Ssl Set_Ssl
startTime=`date +%s` startTime=`date +%s`
Lock_Clear Lock_Clear
System_Check System_Check
@ -1586,12 +1600,12 @@ Install_Main(){
Install_Bt Install_Bt
Get_Ip_Address Get_Ip_Address
Start_Ip_Cert_Async
Set_Bt_Panel Set_Bt_Panel
Service_Add Service_Add
Set_Firewall
Get_Ip_Address Check_Ip_Cert_Async
Setup_Count ${IDC_CODE} Setup_Count ${IDC_CODE}
Add_lib_Install Add_lib_Install
} }

Binary file not shown.

View File

@ -219,6 +219,8 @@ fi
btpip uninstall enum34 -y btpip uninstall enum34 -y
btpip install asn1crypto==1.5.1 cbor2==5.4.6
GEOIP_C=$(echo $pip_list|grep geoip2) GEOIP_C=$(echo $pip_list|grep geoip2)
if [ -z "${GEOIP_C}" ];then if [ -z "${GEOIP_C}" ];then
btpip install geoip2==4.7.0 btpip install geoip2==4.7.0

Binary file not shown.