update

app/script/convert.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-Linux_Version="8.0.5"
+Linux_Version="8.1.0"
 Windows_Version="7.9.0"
 Btm_Version="2.2.9"
 

public/install/install_6.0.sh

@@ -709,8 +709,8 @@ Install_Bt(){
 		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
+		if [ -d "${setup_path}/server/panel/data/db" ];then
-			mv -f ${setup_path}/server/panel/data/db/ ${setup_path}/server/panel/old_data/
+			\cp -r ${setup_path}/server/panel/data/db ${setup_path}/server/panel/old_data/
 		fi
 		
 	fi
@@ -732,8 +732,8 @@ Install_Bt(){
 		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
+		if [ -d "${setup_path}/server/panel/old_data/db" ];then
-			mv -f ${setup_path}/server/panel/old_data/db/ ${setup_path}/server/panel/data/db
+			\cp -r ${setup_path}/server/panel/old_data/db ${setup_path}/server/panel/data/
 		fi
 		
 		if [ -d "/${setup_path}/server/panel/old_data" ];then
@@ -819,6 +819,7 @@ Set_Bt_Panel(){
 		btpip uninstall enum34 -y
 		btpip install geoip2==4.7.0
 		btpip install brotli
+		btpip install PyMySQL
 	fi
 	auth_path=$(cat ${admin_auth})
 	cd ${setup_path}/server/panel/

public/install/update6.sh

@@ -110,6 +110,24 @@ if [ -z "$BROTLI_C" ]; then
     btpip install brotli
 fi
 
+PYMYSQL_C=$(btpip list 2> /dev/null |grep PyMySQL)
+if [ -z "$PYMYSQL_C" ]; then
+    btpip install PyMySQL
+fi
+
+
+PY_CRPYT=$(btpip list 2> /dev/null |grep cryptography|awk '{print $2}'|cut -f 1 -d '.')
+if [ "${PY_CRPYT}" -le "10" ];then
+    btpip install pyOpenSSL==24.1.0
+    btpip install cryptography==42.0.5
+fi
+
+PYMYSQL_SSL_CHECK=$(btpython -c "import pymysql" 2>&1|grep "AttributeError: module 'cryptography.hazmat.bindings._rust.openssl'")
+if [ "${PYMYSQL_SSL_CHECK}" ];then
+    btpip uninstall pyopenssl cryptography -y
+    btpip install pyopenssl cryptography
+fi
+
 btpip uninstall enum34 -y
 btpip install geoip2==4.7.0
 btpip install pandas

wiki/update.md

@@ -20,6 +20,8 @@
 
 - 全局搜索替换 https://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
 
+- 搜索并删除提交异常报告的代码 bt_error/index.php
+
 - class/ajax.py 文件 \# 是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home')
 
   class/jobs.py 文件 \#尝试升级到独立环境 下面的 public.get_url() 改成 public.GetConfigValue('home')
@@ -42,6 +44,8 @@
 
   在 def check_domain_cloud(domain): 这一行下面加上 return
 
+  在 def err_collect 这一行下面加上 return
+
   在 def get_improvement(): 这一行下面加上 return False
 
   在free_login_area方法内get_free_ips_area替换成get_ips_area
@@ -65,13 +69,15 @@
 
 - class/config.py 文件，get_nps方法内data['nps'] = False改成True，get_nps_new方法下面加上 return public.returnMsg(False, "获取问卷失败")
 
+  def err_collection(self, get): 这一行下面加上 return public.returnMsg(True, "OK")
+
 - script/flush_plugin.py 文件，删除clear_hosts()一行
 
 - 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'
+- tools.py 文件，u_input == 16下面的public.get_url()替换成public.GetConfigValue('home')
 
 - install/install_soft.sh 在. 执行之前加入以下代码