From 17cdd02e8e1b73225205f48acbc85430858c24cb Mon Sep 17 00:00:00 2001 From: "bt.cn" <287962566@qq.com> Date: Sat, 19 Oct 2019 14:33:54 +0800 Subject: [PATCH] 7.0.2-2 --- BTPanel/__init__.py | 2 +- BTPanel/static/css/site.css | 6 ++++-- BTPanel/static/js/index.js | 2 +- BTPanel/static/js/public.js | 2 +- BTPanel/static/js/public_backup.js | 6 ++++-- BTPanel/templates/default/index.html | 2 +- class/plugin_deployment.py | 2 +- class/public.py | 2 ++ class/ssh_terminal.py | 1 + 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/BTPanel/__init__.py b/BTPanel/__init__.py index 47d53e02..de196b09 100644 --- a/BTPanel/__init__.py +++ b/BTPanel/__init__.py @@ -153,7 +153,7 @@ def request_check(): if request.path.find('/static/') != -1 or request.path == '/code': if not 'login' in session and not 'admin_auth' in session: session.clear() - if request.path == '/code': return abort(401) + return abort(401) domain_check = public.check_domain_panel() if domain_check: return domain_check if public.is_local(): diff --git a/BTPanel/static/css/site.css b/BTPanel/static/css/site.css index bd379d03..e074d26b 100644 --- a/BTPanel/static/css/site.css +++ b/BTPanel/static/css/site.css @@ -2837,10 +2837,12 @@ html .menu .menu_exit:hover { vertical-align: middle; padding: 5px 10px; height: 40px; - font-size: 12.5px; + font-size: 12px; box-sizing: border-box; } - +.table>tbody{ + border-bottom: 1px solid #ddd; +} .showpicdiv { max-height: 500px; overflow: hidden; diff --git a/BTPanel/static/js/index.js b/BTPanel/static/js/index.js index 49a6f233..be4c75b1 100644 --- a/BTPanel/static/js/index.js +++ b/BTPanel/static/js/index.js @@ -145,7 +145,7 @@ var index = { crs += 'CPU-' + i + ": " + d[2][i] + '%' + (n1 % 2 == 0?'
':' | '); } - layer.tips(d[3] + "
" + d[5] + "个物理CPU，" + d[4] + "个物理核心，" + d[4]+"线程
"+ crs, _this.find('.cicle'), { time: 0, tips: [1, '#999'] }); + layer.tips(d[3] + "
" + d[5] + "个物理CPU，" + (d[5] * d[4]) + "个物理核心，" + d[1]+"线程
"+ crs, _this.find('.cicle'), { time: 0, tips: [1, '#999'] }); }, function () { layer.closeAll('tips'); }); diff --git a/BTPanel/static/js/public.js b/BTPanel/static/js/public.js index 3fe2f753..2bfca4df 100644 --- a/BTPanel/static/js/public.js +++ b/BTPanel/static/js/public.js @@ -2625,7 +2625,7 @@ function connect_io() { socket.on('ssh_data', function (data) { if (data === "\r服务器连接失败!\r" || data === "\r用户名或密码错误!\r") { show_ssh_login(0); - return; + //return; } term.write(data); diff --git a/BTPanel/static/js/public_backup.js b/BTPanel/static/js/public_backup.js index a61fe2d9..1e0b72a4 100644 --- a/BTPanel/static/js/public_backup.js +++ b/BTPanel/static/js/public_backup.js @@ -463,13 +463,15 @@ var bt = //会话失效时自动跳转到登录页面 if (typeof (rdata) == 'string') { - if (rdata.indexOf('/static/favicon.ico') != -1 && rdata.indexOf('/static/img/qrCode.png') != -1) { + if ((rdata.indexOf('/static/favicon.ico') != -1 && rdata.indexOf('/static/img/qrCode.png') != -1) || rdata.indexOf('') === 0) { window.location.href = "/login" return } } + if(callback) callback(rdata); - }).error(function () { + }).error(function (e, f) { + console.log(e,f) if(callback) callback('error'); }); } diff --git a/BTPanel/templates/default/index.html b/BTPanel/templates/default/index.html index fcededea..cbd19fcd 100644 --- a/BTPanel/templates/default/index.html +++ b/BTPanel/templates/default/index.html @@ -139,7 +139,7 @@

{{data['lan']['S2']}}

- +