github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-10 11:49:10 +00:00
Code Issues Projects Releases Wiki Activity

change uri /kill to /ws/kill

Browse Source
This commit is contained in:
liuzheng712
2016-07-31 10:29:17 +08:00
parent 270499a4fd
commit ce7a3d1f33
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
run_server.py
View File

@@ -494,7 +494,7 @@ def main():
[ [
(r'/ws/monitor', MonitorHandler), (r'/ws/monitor', MonitorHandler),
(r'/ws/terminal', WebTerminalHandler), (r'/ws/terminal', WebTerminalHandler),
(r'/kill', WebTerminalKillHandler), (r'/ws/kill', WebTerminalKillHandler),
(r'/ws/exec', ExecHandler), (r'/ws/exec', ExecHandler),
(r"/static/(.*)", tornado.web.StaticFileHandler, (r"/static/(.*)", tornado.web.StaticFileHandler,
dict(path=os.path.join(os.path.dirname(__file__), "static"))), dict(path=os.path.join(os.path.dirname(__file__), "static"))),

2
templates/jlog/log_online.html
View File

@@ -215,7 +215,7 @@
function cut(num, login_type){ function cut(num, login_type){
var protocol = window.location.protocol; var protocol = window.location.protocol;
var endpoint = protocol + '//' + document.URL.match(RegExp('//(.*?)/'))[1] + '/kill'; var endpoint = protocol + '//' + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/kill';
if (login_type=='web'){ if (login_type=='web'){
var g_url = endpoint + '?id=' + num; var g_url = endpoint + '?id=' + num;
console.log(g_url); console.log(g_url);