update

2025-10-14 14:20:22 +00:00 · 2024-01-20 21:42:10 +08:00
parent 71db6b0a3e
commit 11961b8f0b
11 changed files with 796 additions and 744 deletions
--- a/app/script/convert.sh
+++ b/app/script/convert.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-Linux_Version="8.0.4"
+Linux_Version="8.0.5"
 Windows_Version="7.9.0"
 Btm_Version="2.2.9"

--- 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.4'),
+('new_version', '8.0.5'),
 ('update_msg', '暂无更新日志'),
-('update_date', '2023-11-19'),
+('update_date', '2024-01-12'),
 ('new_version_win', '7.9.0'),
 ('update_msg_win', '暂无更新日志'),
 ('update_date_win', '2023-07-20'),
--- a/public/install/install_6.0.sh
+++ b/public/install/install_6.0.sh
@@ -40,7 +40,7 @@ cd ~
 setup_path="/www"
 python_bin=$setup_path/server/panel/pyenv/bin/python
 cpu_cpunt=$(cat /proc/cpuinfo|grep processor|wc -l)
-
+panelPort=$(expr $RANDOM % 55535 + 10000)
 # if [ "$1" ];then
 # 	IDC_CODE=$1
 # fi
@@ -508,7 +508,7 @@ Install_Python_Lib(){
 			chmod -R 700 $pyenv_path/pyenv/bin
 			is_package=$($python_bin -m psutil 2>&1|grep package)
 			if [ "$is_package" = "" ];then
-				wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 5
+				wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 15
 				$pyenv_path/pyenv/bin/pip install -U pip
 				$pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0
 				$pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt
@@ -584,10 +584,10 @@ Install_Python_Lib(){

 	if [ "${os_version}" != "" ];then
 		pyenv_file="/www/pyenv.tar.gz"
-		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 10
+		wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 15
 		if [ "$?" != "0" ];then
 			get_node_url $download_Url
-			wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 10
+			wget -O $pyenv_file $download_Url/install/pyenv/pyenv-${os_type}${os_version}-x${is64bit}.tar.gz -T 15
 		fi
 		tmp_size=$(du -b $pyenv_file|awk '{print $1}')
 		if [ $tmp_size -lt 703460 ];then
@@ -618,7 +618,7 @@ Install_Python_Lib(){
 	cd /www
 	python_src='/www/python_src.tar.xz'
 	python_src_path="/www/Python-${py_version}"
-	wget -O $python_src $download_Url/src/Python-${py_version}.tar.xz -T 5
+	wget -O $python_src $download_Url/src/Python-${py_version}.tar.xz -T 15
 	tmp_size=$(du -b $python_src|awk '{print $1}')
 	if [ $tmp_size -lt 10703460 ];then
 		rm -f $python_src
@@ -672,11 +672,8 @@ Install_Python_Lib(){
 	fi
 }
 Install_Bt(){
-	panelPort="8888"
 	if [ -f ${setup_path}/server/panel/data/port.pl ];then
 		panelPort=$(cat ${setup_path}/server/panel/data/port.pl)
-	else
-		panelPort=$(expr $RANDOM % 55535 + 10000)
 	fi
 	if [ "${PANEL_PORT}" ];then
 		panelPort=$PANEL_PORT
@@ -701,9 +698,9 @@ Install_Bt(){
 		sleep 1
 	fi

-	wget -O /etc/init.d/bt ${download_Url}/install/src/bt6.init -T 10
-	wget -O /www/server/panel/install/public.sh ${Btapi_Url}/install/public.sh -T 10
-	wget -O panel.zip ${Btapi_Url}/install/src/panel6.zip -T 10
+	wget -O /etc/init.d/bt ${download_Url}/install/src/bt6.init -T 15
+	wget -O /www/server/panel/install/public.sh ${Btapi_Url}/install/public.sh -T 15
+	wget -O panel.zip ${Btapi_Url}/install/src/panel6.zip -T 15

 	if [ -f "${setup_path}/server/panel/data/default.db" ];then
 		if [ -d "/${setup_path}/server/panel/old_data" ];then
@@ -716,6 +713,11 @@ Install_Bt(){
 		mv -f ${setup_path}/server/panel/data/system.db ${setup_path}/server/panel/old_data/system.db
 		mv -f ${setup_path}/server/panel/data/port.pl ${setup_path}/server/panel/old_data/port.pl
 		mv -f ${setup_path}/server/panel/data/admin_path.pl ${setup_path}/server/panel/old_data/admin_path.pl
+		
+		if [ -f "${setup_path}/server/panel/data/db/default.db" ];then
+			mv -f ${setup_path}/server/panel/data/db/ ${setup_path}/server/panel/old_data/
+		fi
+		
 	fi

 	if [ ! -f "/usr/bin/unzip" ]; then
@@ -734,6 +736,11 @@ Install_Bt(){
 		mv -f ${setup_path}/server/panel/old_data/system.db ${setup_path}/server/panel/data/system.db
 		mv -f ${setup_path}/server/panel/old_data/port.pl ${setup_path}/server/panel/data/port.pl
 		mv -f ${setup_path}/server/panel/old_data/admin_path.pl ${setup_path}/server/panel/data/admin_path.pl
+		
+		if [ -f "${setup_path}/server/panel/old_data/db/default.db" ];then
+			mv -f ${setup_path}/server/panel/old_data/db/ ${setup_path}/server/panel/data/db
+		fi
+		
 		if [ -d "/${setup_path}/server/panel/old_data" ];then
 			rm -rf ${setup_path}/server/panel/old_data
 		fi
@@ -744,6 +751,11 @@ Install_Bt(){
 		Red_Error "ERROR: Failed to download, please try install again!" "ERROR: 下载宝塔失败，请尝试重新安装！"
 	fi
    
+    SYS_LOG_CHECK=$(grep ^weekly /etc/logrotate.conf)
+    if [ "${SYS_LOG_CHECK}" ];then
+        sed -i 's/rotate [0-9]*/rotate 8/g' /etc/logrotate.conf 
+    fi
+
 	rm -f panel.zip
 	rm -f ${setup_path}/server/panel/class/*.pyc
 	rm -f ${setup_path}/server/panel/*.pyc
@@ -753,8 +765,8 @@ Install_Bt(){
 	chmod -R +x ${setup_path}/server/panel/script
 	ln -sf /etc/init.d/bt /usr/bin/bt
 	echo "${panelPort}" > ${setup_path}/server/panel/data/port.pl
-	wget -O /etc/init.d/bt ${download_Url}/install/src/bt7.init -T 10
-	wget -O /www/server/panel/init.sh ${download_Url}/install/src/bt7.init -T 10
+	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/data/softList.conf ${download_Url}/install/conf/softList.conf

 	rm -f /www/server/panel/class/*.so
@@ -805,14 +817,13 @@ Set_Bt_Panel(){
 	/www/server/panel/pyenv/bin/pip3 install psycopg2-binary
 	/www/server/panel/pyenv/bin/pip3 install flask -U
 	/www/server/panel/pyenv/bin/pip3 install flask-sock
+	/www/server/panel/pyenv/bin/pip3 install -I gevent
 	btpip install simple-websocket==0.10.0
 	btpip install natsort
+	btpip uninstall enum34 -y
+	btpip install geoip2==4.7.0
 	auth_path=$(cat ${admin_auth})
 	cd ${setup_path}/server/panel/
-	if [ "$SET_SSL" == true ]; then
-        btpip install -I pyOpenSSl 2>/dev/null
-        btpython /www/server/panel/tools.py ssl
-    fi
 	/etc/init.d/bt start
 	$python_bin -m py_compile tools.py
 	$python_bin tools.py username
@@ -824,6 +835,10 @@ Set_Bt_Panel(){
 	echo "${password}" > ${setup_path}/server/panel/default.pl
 	chmod 600 ${setup_path}/server/panel/default.pl
 	sleep 3
+	if [ "$SET_SSL" == true ]; then
+        btpip install -I pyOpenSSl 2>/dev/null
+        btpython /www/server/panel/tools.py ssl
+    fi
 	/etc/init.d/bt restart 	
 	sleep 3
 	isStart=$(ps aux |grep 'BT-Panel'|grep -v grep|awk '{print $2}')
@@ -982,7 +997,7 @@ echo "
 +----------------------------------------------------------------------
 | Copyright © 2015-2099 BT-SOFT(http://www.bt.cn) All rights reserved.
 +----------------------------------------------------------------------
-| The WebPanel URL will be http://SERVER_IP:8888 when installed.
+| The WebPanel URL will be http://SERVER_IP:${panelPort} when installed.
 +----------------------------------------------------------------------
 | 为了您的正常使用，请确保使用全新或纯净的系统安装宝塔面板，不支持已部署项目/环境的系统安装
 +----------------------------------------------------------------------
--- a/public/install/public.sh
+++ b/public/install/public.sh
@@ -9,8 +9,13 @@ export PATH
 export LANG=en_US.UTF-8
 export LANGUAGE=en_US:en

+NODE_FILE_CHECK=$(cat /www/server/panel/data/node.json |grep 125.88.182.172)
+if [ "${NODE_FILE_CHECK}" ];then
+	rm -f /www/server/panel/data/node.json
+fi
+
 get_node_url(){
-	nodes=(https://dg2.bt.cn https://download.bt.cn https://ctcc1-node.bt.cn https://cmcc1-node.bt.cn https://ctcc2-node.bt.cn https://hk1-node.bt.cn https://na1-node.bt.cn https://jp1-node.bt.cn);
+	nodes=(https://dg2.bt.cn https://download.bt.cn https://ctcc1-node.bt.cn https://cmcc1-node.bt.cn https://ctcc2-node.bt.cn https://hk1-node.bt.cn https://na1-node.bt.cn https://jp1-node.bt.cn https://cf1-node.aapanel.com);

 	if [ "$1" ];then
 		nodes=($(echo ${nodes[*]}|sed "s#${1}##"))
@@ -40,8 +45,8 @@ get_node_url(){
 			fi

 			i=$(($i+1))
-			if [ $TIME_TOTAL -lt 200 ];then
-				if [ $RES -ge 3000 ];then
+			if [ $TIME_TOTAL -lt 300 ];then
+				if [ $RES -ge 2390 ];then
 					break;
 				fi
 			fi	
--- a/public/install/src/panel6.zip
+++ b/public/install/src/panel6.zip
--- a/public/install/update/LinuxPanel-8.0.5.zip
+++ b/public/install/update/LinuxPanel-8.0.5.zip
--- a/public/install/update6.sh
+++ b/public/install/update6.sh
@@ -18,6 +18,11 @@ if [ ! -f "/www/server/panel/pyenv/bin/python3" ];then
 	echo "请截图发帖至论坛www.bt.cn/bbs求助"
 	exit 0;
 fi
+Centos6Check=$(cat /etc/redhat-release | grep ' 6.' | grep -iE 'centos|Red Hat')
+if [ "${Centos6Check}" ];then
+	echo "Centos6不支持升级宝塔面板，建议备份数据重装更换Centos7/8安装宝塔面板"
+	exit 1
+fi 

 public_file=/www/server/panel/install/public.sh
 if [ ! -f $public_file ];then
@@ -42,7 +47,7 @@ download_Url=$NODE_URL
 setup_path=/www
 version=$(curl -Ss --connect-timeout 5 -m 2 $Btapi_Url/api/panel/get_version)
 if [ "$version" = '' ];then
-	version='8.0.1'
+	version='8.0.5'
 fi
 armCheck=$(uname -m|grep arm)
 if [ "${armCheck}" ];then
@@ -58,6 +63,7 @@ if [ $dsize -lt 10240 ];then
 	echo "获取更新包失败，请稍后更新或联系宝塔运维"
 	exit;
 fi
+
 unzip -o /tmp/panel.zip -d $setup_path/server/ > /dev/null
 rm -f /tmp/panel.zip
 cd $setup_path/server/panel/
@@ -67,6 +73,8 @@ if [ "${check_bt}" = "" ];then
 	wget -O /etc/init.d/bt $download_Url/install/src/bt7.init -T 20
 	chmod +x /etc/init.d/bt
 fi
+echo "=============================================================="
+echo "正在修复面板依赖问题"
 rm -f /www/server/panel/*.pyc
 rm -f /www/server/panel/class/*.pyc
 #pip install flask_sqlalchemy
@@ -92,12 +100,23 @@ pymysql=$(echo "$pip_list"|grep pymysql)
 if [ "$pymysql" = "" ];then
 	$mypip install pymysql
 fi
+GEVENT_V=$(btpip list 2> /dev/null|grep "gevent "|awk '{print $2}'|cut -f 1 -d '.')
+if [ "${GEVENT_V}" -le "1" ];then
+    /www/server/panel/pyenv/bin/pip3 install -I gevent
+fi
+
+btpip uninstall enum34 -y
+btpip install geoip2==4.7.0
+btpip install pandas

 pymysql=$(echo "$pip_list"|grep pycryptodome)
 if [ "$pymysql" = "" ];then
 	$mypip install pycryptodome
 fi

+echo "修复面板依赖完成！"
+echo "==========================================="
+
 #psutil=$(echo "$pip_list"|grep psutil|awk '{print $2}'|grep '5.7.')
 #if [ "$psutil" = "" ];then
 #	$mypip install -U psutil
--- a/public/install/update_panel.sh
+++ b/public/install/update_panel.sh
@@ -14,10 +14,14 @@ if [ "${is64bit}" != '64' ];then
 	echo "退出、不做任何操作"
 	exit 1
 fi
+Centos6Check=$(cat /etc/redhat-release | grep ' 6.' | grep -iE 'centos|Red Hat')
+if [ "${Centos6Check}" ];then
+	echo "Centos6不支持升级宝塔面板，建议备份数据重装更换Centos7/8安装宝塔面板"
+	exit 1
+fi 

 Btapi_Url='http://www.example.com'

-
 up_plugin=0

 download_file(){
--- a/public/static/css/download.css
+++ b/public/static/css/download.css
@@ -66,7 +66,7 @@ canvas {
 	top: 0;
 	display: flex;
 	align-items: center;
-	width: 24%;
+	width: 30%;
 	padding: 30px 10px 16px 20px;
 	border-radius: 8px;
 	background-color: #fff;
--- a/public/static/images/bt_monitor.png
+++ b/public/static/images/bt_monitor.png
--- a/wiki/update.md
+++ b/wiki/update.md
@@ -63,14 +63,21 @@
  
 - class/plugin_deployment.py 文件，SetupPackage方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'

+- class/config.py 文件，get_nps方法内data['nps'] = False改成True，get_nps_new方法下面加上 return public.returnMsg(False, "获取问卷失败")
+
 - script/flush_plugin.py 文件，删除clear_hosts()一行

- install/install_soft.sh 在bash执行之前加入以下代码
+- script/reload_check.py 文件，在第2行插入sys.exit()
+
+- script/local_fix.sh 文件，${D_NODE_URL}替换成www.example.com
+
+- tools.py 文件，u_input == 16下面的public.get_url()替换成'http://www.example.com'
+
+- install/install_soft.sh 在. 执行之前加入以下代码

  ```shell
  sed -i "s/http:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" lib.sh
  sed -i "s/https:\/\/download.bt.cn\/install\/public.sh/http:\/\/www.example.com\/install\/public.sh/" lib.sh
-  sed -i "/wget -O Tpublic.sh/d" $name.sh
  ```
  
 - install/public.sh 用官网最新版的[public.sh](http://download.bt.cn/install/public.sh)替换，并去除最下面bt_check一行
@@ -81,6 +88,8 @@

  PluginLoader.daemon_panel()

+  check_node_status()
+
 - 去除WebRTC连接：BTPanel/static/js/public.js  删除stun.start();这一行

 - 去除首页广告：BTPanel/static/js/index.js 文件删除两处index.recommend_paid_version()