diff --git a/app/script/convert.sh b/app/script/convert.sh index 777d6a0..a2d7f29 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="7.9.5" +Linux_Version="7.9.6" Windows_Version="7.7.0" FILES=( diff --git a/install.sql b/install.sql index d85d112..86faae0 100644 --- 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', '7.9.5'), +('new_version', '7.9.6'), ('update_msg', '暂无更新日志'), -('update_date', '2022-11-02'), +('update_date', '2022-11-29'), ('new_version_win', '7.7.0'), ('update_msg_win', '暂无更新日志'), ('update_date_win', '2022-09-09'), diff --git a/public/install/install_6.0.sh b/public/install/install_6.0.sh index 0116897..d7bc443 100644 --- a/public/install/install_6.0.sh +++ b/public/install/install_6.0.sh @@ -54,6 +54,27 @@ GetSysInfo(){ echo -e ${SYS_VERSION} echo -e Bit:${SYS_BIT} Mem:${MEM_TOTAL}M Core:${CPU_INFO} echo -e ${SYS_INFO} + + if [ -z "${os_version}" ];then + echo -e "============================================" + echo -e "检测到为非常用系统安装,建议更换至Centos-7或Debian-10+或Ubuntu-20+系统安装宝塔面板" + echo -e "详情请查看系统兼容表:https://docs.qq.com/sheet/DUm54VUtyTVNlc21H?tab=BB08J2" + echo -e "特殊情况可通过以下联系方式寻求安装协助情况" + fi + + is64bit=$(getconf LONG_BIT) + if [ "${is64bit}" == '32' ];then + echo -e "宝塔面板不支持32位系统进行安装,请使用64位系统/服务器架构进行安装宝塔" + exit 1 + fi + + S390X_CHECK=$(uname -a|grep s390x) + if [ "${S390X_CHECK}" ];then + echo -e "宝塔面板不支持s390x架构进行安装,请使用64位系统/服务器架构进行安装宝塔" + exit 1 + fi + + echo -e "============================================" echo -e "请截图以上报错信息发帖至论坛www.bt.cn/bbs求助" } Red_Error(){ @@ -183,7 +204,7 @@ get_node_url(){ echo '---------------------------------------------'; echo "Selected download node..."; - nodes=(http://dg2.bt.cn http://dg1.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://38.34.185.130 http://116.213.43.206:5880 http://128.1.164.196); + nodes=(http://dg2.bt.cn http://dg1.bt.cn http://download.bt.cn http://125.90.93.52:5880 http://36.133.1.8:5880 http://123.129.198.197 http://103.179.243.14:5880 http://128.1.164.196); if [ "$1" ];then nodes=($(echo ${nodes[*]}|sed "s#${1}##")) @@ -426,7 +447,7 @@ Install_Python_Lib(){ if [ "$is_package" = "" ];then wget -O $pyenv_path/pyenv/pip.txt $download_Url/install/pyenv/pip.txt -T 5 $pyenv_path/pyenv/bin/pip install -U pip - $pyenv_path/pyenv/bin/pip install -U setuptools + $pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0 $pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt fi source $pyenv_path/pyenv/bin/activate @@ -560,7 +581,7 @@ Install_Python_Lib(){ ln -sf $pyenv_path/pyenv/bin/python3.7 /usr/bin/btpython chmod -R 700 $pyenv_path/pyenv/bin $pyenv_path/pyenv/bin/pip install -U pip - $pyenv_path/pyenv/bin/pip install -U setuptools + $pyenv_path/pyenv/bin/pip install -U setuptools==65.5.0 $pyenv_path/pyenv/bin/pip install -U wheel==0.34.2 $pyenv_path/pyenv/bin/pip install -r $pyenv_path/pyenv/pip.txt source $pyenv_path/pyenv/bin/activate diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 543e85d..61f447f 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-7.9.5.zip b/public/install/update/LinuxPanel-7.9.6.zip similarity index 86% rename from public/install/update/LinuxPanel-7.9.5.zip rename to public/install/update/LinuxPanel-7.9.6.zip index ffc1b6e..31d6385 100644 Binary files a/public/install/update/LinuxPanel-7.9.5.zip and b/public/install/update/LinuxPanel-7.9.6.zip differ diff --git a/public/install/update6.sh b/public/install/update6.sh index 6051fcb..6425c42 100644 --- a/public/install/update6.sh +++ b/public/install/update6.sh @@ -42,7 +42,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='7.9.5' + version='7.9.6' fi armCheck=$(uname -m|grep arm) if [ "${armCheck}" ];then diff --git a/public/install/update_panel.sh b/public/install/update_panel.sh index 21d8941..5a565e3 100644 --- a/public/install/update_panel.sh +++ b/public/install/update_panel.sh @@ -70,7 +70,7 @@ select_node(){ get_version(){ version=$(curl -Ss --connect-timeout 5 -m 2 $Btapi_Url/api/panel/get_version) if [ "$version" = '' ];then - version='7.9.5' + version='7.9.6' fi } diff --git a/wiki/update.md b/wiki/update.md index f268b3c..1e1821a 100644 --- a/wiki/update.md +++ b/wiki/update.md @@ -16,6 +16,8 @@ - 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/(需排除clearModel.py、scanningModel.py、ipsModel.py) +- class/panelAuth.py 替换 http://www.bt.cn/api/ => http://www.example.com/api/ + - 全局搜索替换 http://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh - class/ajax.py 文件 \#是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home') @@ -42,18 +44,20 @@ 在 def get_improvement(): 这一行下面加上 return False + 在free_login_area方法内get_free_ips_area替换成get_ips_area + - class/panelPlugin.py 文件,download_icon方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn' -- class/panelPlugin.py 文件,删除public.total_keyword(get.query)这一行 + 删除public.total_keyword(get.query)这一行 -- class/panelPlugin.py 文件,set_pyenv方法内,temp_file = public.readFile(filename)这行代码下面加上 + set_pyenv方法内,temp_file = public.readFile(filename)这行代码下面加上 ```python temp_file = temp_file.replace('wget -O Tpublic.sh', '#wget -O Tpublic.sh') temp_file = temp_file.replace('\cp -rpa Tpublic.sh', '#\cp -rpa Tpublic.sh') temp_file = temp_file.replace('http://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh') ``` - + - install/install_soft.sh 在bash执行之前加入以下代码 ```shell