diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 93c6d37..d2d4de1 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-8.0.1.zip b/public/install/update/LinuxPanel-8.0.1.zip index 7ae22e1..8c26f65 100644 Binary files a/public/install/update/LinuxPanel-8.0.1.zip and b/public/install/update/LinuxPanel-8.0.1.zip differ diff --git a/wiki/files/linux/bt.js b/wiki/files/linux/bt.js index 45dc444..5af7379 100644 --- a/wiki/files/linux/bt.js +++ b/wiki/files/linux/bt.js @@ -38,6 +38,31 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){ }); } } +if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){ + bt.compute_confirm = function (config, callback) { + layer.open({ + type: 1, + title: config.title, + area: '430px', + closeBtn: 2, + shadeClose: true, + btn: [lan['public'].ok, lan['public'].cancel], + content: + '
\ +
\ + \ +
' + + config.msg + + '
\ +
\ +
', + yes: function (layers, index) { + layer.close(layers) + if (callback) callback() + } + }); + } +} if("undefined" != typeof database && database.hasOwnProperty("del_database")){ database.del_database = function (wid, dbname, obj, callback) { var is_db_type = false, del_data = [] diff --git a/wiki/files/win/bt.js b/wiki/files/win/bt.js index 9b353b8..6ba0d4b 100644 --- a/wiki/files/win/bt.js +++ b/wiki/files/win/bt.js @@ -41,6 +41,31 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){ }); } } +if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){ + bt.compute_confirm = function (config, callback) { + layer.open({ + type: 1, + title: config.title, + area: '430px', + closeBtn: 2, + shadeClose: true, + btn: [lan['public'].ok, lan['public'].cancel], + content: + '
\ +
\ + \ +
' + + config.msg + + '
\ +
\ +
', + yes: function (layers, index) { + layer.close(layers) + if (callback) callback() + } + }); + } +} if("undefined" != typeof database && database.hasOwnProperty("del_database")){ database.del_database = function (wid, dbname,obj, callback) { var title = '', diff --git a/wiki/update.md b/wiki/update.md index 0e5fd77..9d9c0e9 100644 --- a/wiki/update.md +++ b/wiki/update.md @@ -44,11 +44,15 @@ 在free_login_area方法内get_free_ips_area替换成get_ips_area + 在get_free_ip_info方法内,获取IP的部分改成res = get_ips_area([address]) + + 在login_send_body方法内,free_login_area(login_ip=server_ip_area的server_ip_area改成login_ip + - class/panelPlugin.py 文件,download_icon方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn' 删除public.total_keyword(get.query)这一行 - 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') @@ -73,13 +77,15 @@ "check_panel_msg": check_panel_msg, + PluginLoader.daemon_panel() + - 去除WebRTC连接:BTPanel/static/js/public.js 删除stun.start();这一行 -- 去除首页广告:BTPanel/static/js/index.js 文件删除最下面index.recommend_paid_version()这一行 +- 去除首页广告:BTPanel/static/js/index.js 文件删除两处index.recommend_paid_version() - 去除首页自动检测更新,避免频繁请求云端:BTPanel/static/js/index.js 文件注释掉bt.system.check_update这一段代码外的setTimeout -- 去除内页广告:BTPanel/templates/default/layout.html 删除getPaymentStatus();这一行 +- 去除内页广告:BTPanel/templates/default/layout.html 删除两处getPaymentStatus(); - 删除问卷调查:BTPanel/templates/default/layout.html 删除if(window.localStorage.getItem('panelNPS') == null)以及下面的行 @@ -103,7 +109,9 @@ - [可选]关闭自动生成访问日志:在 BTPanel/\_\_init\_\_.py 删除public.write_request_log()这一行 -- [可选]删除小图标广告:在BTPanel/static/js/site.js,删除“WAF防火墙,保护网站安全”对应的html标签,files.js,删除“开启保护,文件无法编辑”对应的html标签 +- [可选]删除小图标广告:在BTPanel/static/js/site.js,删除“WAF防火墙”对应的span标签 + +- [可选]上传文件默认选中覆盖,在BTPanel/static/js/upload-drog.js,id="all_operation"加checked属性 解压安装包panel6.zip,将更新包改好的文件覆盖到里面,然后重新打包,即可更新安装包。( diff --git a/wiki/updatewin.md b/wiki/updatewin.md index 95f4ca3..5303503 100644 --- a/wiki/updatewin.md +++ b/wiki/updatewin.md @@ -16,7 +16,7 @@ Windows版宝塔由于加密文件太多,无法全部解密,因此无法做 - 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/ -- 全局搜索替换 http://download.bt.cn/win/panel/data/setup.py => http://www.example.com/win/panel/data/setup.py +- 全局搜索替换 https://download.bt.cn/win/panel/data/setup.py => http://www.example.com/win/panel/data/setup.py - class/panel_update.py 文件 public.get_url() => 'http://www.example.com'