From a98df86d19d546868da042ece5bec4b951d3713c Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Fri, 5 May 2017 19:10:12 +0800 Subject: [PATCH] temp. --- .../teleport/app/eom_app/controller/rpc.py | 2 + server/www/teleport/static/js/ui/teleport.js | 394 +++++++++--------- 2 files changed, 199 insertions(+), 197 deletions(-) diff --git a/server/www/teleport/app/eom_app/controller/rpc.py b/server/www/teleport/app/eom_app/controller/rpc.py index 3b25186..ee7a006 100644 --- a/server/www/teleport/app/eom_app/controller/rpc.py +++ b/server/www/teleport/app/eom_app/controller/rpc.py @@ -68,6 +68,8 @@ class RpcHandler(TPBaseJsonHandler): return self.write_json(0, data=x) elif authid < 0: x = web_session().taken('tmp-auth-info-{}'.format(authid), None) + log.d("[rpc] get_auth_info(): ", x) + log.d("\n") return self.write_json(0, data=x) else: return self.write_json(-1, message='invalid auth id.') diff --git a/server/www/teleport/static/js/ui/teleport.js b/server/www/teleport/static/js/ui/teleport.js index ba6db61..6d8ee13 100644 --- a/server/www/teleport/static/js/ui/teleport.js +++ b/server/www/teleport/static/js/ui/teleport.js @@ -7,222 +7,222 @@ var g_current_version = ""; var g_host_name = window.location.hostname; var error_process = function (ret, func_success, func_error) { - var code = ret.code; - if (code === TPE_OK) { - func_success(ret); - return; - } + var code = ret.code; + if (code === TPE_OK) { + func_success(ret); + return; + } - if (code === TPE_START_CLIENT) { - func_error(TPE_START_CLIENT, '启动本地客户端进程失败，请检查命令行是否正确：' + ret.path); - console.log('启动本地进程失败，命令行：', ret.path); - } else if (code === TPE_JSON_FORMAT || code === TPE_PARAM) { - func_error(TPE_START_CLIENT, "启动本地客户端进程失败：启动参数错误！"); - } else if (code === TPE_OLD_ASSIST) { - func_error(TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); - } - else { - func_error(TPE_START_CLIENT, '启动本地客户端失败，错误代码：' + ret.code); - } + if (code === TPE_START_CLIENT) { + func_error(TPE_START_CLIENT, '启动本地客户端进程失败，请检查命令行是否正确：' + ret.path); + console.log('启动本地进程失败，命令行：', ret.path); + } else if (code === TPE_JSON_FORMAT || code === TPE_PARAM) { + func_error(TPE_START_CLIENT, "启动本地客户端进程失败：启动参数错误！"); + } else if (code === TPE_OLD_ASSIST) { + func_error(TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); + } + else { + func_error(TPE_START_CLIENT, '启动本地客户端失败，错误代码：' + ret.code); + } }; var teleport_init = function (last_version, req_version, func_success, func_error) { - g_req_version = req_version; - g_last_version = last_version; - var data = {}; - var args_ = encodeURIComponent(JSON.stringify(data)); - $.ajax({ - type: 'GET', - timeout: 5000, - url: 'http://127.0.0.1:50022/ts_get_version/' + args_, - jsonp: 'callback', - dataType: 'json', - success: function (ret) { - g_current_version = ret.version; - if (version_compare()) { - error_process(ret, func_success, func_error); - } else { - func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); - } - }, - error: function () { - func_error({}, TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); - } - }); + g_req_version = req_version; + g_last_version = last_version; + var data = {}; + var args_ = encodeURIComponent(JSON.stringify(data)); + $.ajax({ + type: 'GET', + timeout: 5000, + url: 'http://127.0.0.1:50022/ts_get_version/' + args_, + jsonp: 'callback', + dataType: 'json', + success: function (ret) { + g_current_version = ret.version; + if (version_compare()) { + error_process(ret, func_success, func_error); + } else { + func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请下载最新版本！'); + } + }, + error: function () { + func_error({}, TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); + } + }); }; var version_compare = function () { - var cur_version = parseInt(g_current_version.split(".")[2]); - var req_version = parseInt(g_req_version.split(".")[2]); - return cur_version >= req_version; + var cur_version = parseInt(g_current_version.split(".")[2]); + var req_version = parseInt(g_req_version.split(".")[2]); + return cur_version >= req_version; }; var to_teleport = function (url, args, func_success, func_error) { - var auth_id = args['auth_id']; - // 开始Ajax调用 - var args_ = JSON.stringify({auth_id: auth_id}); - $.ajax({ - url: url, - type: 'POST', - timeout: 6000, - //data: {_xsrf: get_cookie('_xsrf'), args: args_}, - data: {args: args_}, - dataType: 'json', - success: function (ret) { - if (ret.code === 0) { - var session_id = ret.data.session_id; - var data = { - server_ip: g_host_name, //args.server_ip, - server_port: parseInt(args.server_port), - host_ip: args.host_ip, - size: parseInt(args.size), - console: args.console, - session_id: session_id, - pro_type: parseInt(args.pro_type), - pro_sub: parseInt(args.pro_sub) - }; - var args_ = encodeURIComponent(JSON.stringify(data)); - $.ajax({ - type: 'GET', - timeout: 5000, - url: 'http://127.0.0.1:50022/ts_op/' + args_, - jsonp: 'callback', - dataType: 'json', - success: function (ret) { - error_process(ret, func_success, func_error); - }, - error: function () { - func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); - } - }); - } else { - func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); - } - }, - error: function () { - func_error(TPE_NETWORK, '远程网络通讯失败！'); - } - }); + var auth_id = args['auth_id']; + // 开始Ajax调用 + var args_ = JSON.stringify({auth_id: auth_id}); + $.ajax({ + url: url, + type: 'POST', + timeout: 6000, + //data: {_xsrf: get_cookie('_xsrf'), args: args_}, + data: {args: args_}, + dataType: 'json', + success: function (ret) { + if (ret.code === 0) { + var session_id = ret.data.session_id; + var data = { + server_ip: g_host_name, //args.server_ip, + server_port: parseInt(args.server_port), + host_ip: args.host_ip, + size: parseInt(args.size), + console: args.console, + session_id: session_id, + pro_type: parseInt(args.pro_type), + pro_sub: parseInt(args.pro_sub) + }; + var args_ = encodeURIComponent(JSON.stringify(data)); + $.ajax({ + type: 'GET', + timeout: 5000, + url: 'http://127.0.0.1:50022/ts_op/' + args_, + jsonp: 'callback', + dataType: 'json', + success: function (ret) { + error_process(ret, func_success, func_error); + }, + error: function () { + func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); + } + }); + } else { + func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message); + } + }, + error: function () { + func_error(TPE_NETWORK, '远程网络通讯失败！'); + } + }); }; var to_admin_teleport = function (url, args, func_success, func_error) { - var host_auth_id = args['host_auth_id']; - // 开始Ajax调用 - var args_ = JSON.stringify({host_auth_id: host_auth_id}); - $.ajax({ - url: url, - type: 'POST', - timeout: 6000, - //data: {_xsrf: get_cookie('_xsrf'), args: args_}, - data: {args: args_}, - dataType: 'json', - success: function (ret) { - if (ret.code === 0) { - var session_id = ret.data.session_id; - var data = { - server_ip: g_host_name, - server_port: parseInt(args.server_port), - host_ip: args.host_ip, - size: parseInt(args.size), - console: args.console, - session_id: session_id, - pro_type: parseInt(args.pro_type), - pro_sub: parseInt(args.pro_sub) - }; - var args_ = encodeURIComponent(JSON.stringify(data)); - $.ajax({ - type: 'GET', - timeout: 5000, - url: 'http://127.0.0.1:50022/ts_op/' + args_, - jsonp: 'callback', - dataType: 'json', - success: function (ret) { - error_process(ret, func_success, func_error); - }, - error: function () { - func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); - } - }); - } else { - func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); - } - }, - error: function () { - func_error(TPE_NETWORK, '远程网络通讯失败！'); - } - }); + var host_auth_id = args['host_auth_id']; + // 开始Ajax调用 + var args_ = JSON.stringify({host_auth_id: host_auth_id}); + $.ajax({ + url: url, + type: 'POST', + timeout: 6000, + //data: {_xsrf: get_cookie('_xsrf'), args: args_}, + data: {args: args_}, + dataType: 'json', + success: function (ret) { + if (ret.code === 0) { + var session_id = ret.data.session_id; + var data = { + server_ip: g_host_name, + server_port: parseInt(args.server_port), + host_ip: args.host_ip, + size: parseInt(args.size), + console: args.console, + session_id: session_id, + pro_type: parseInt(args.pro_type), + pro_sub: parseInt(args.pro_sub) + }; + var args_ = encodeURIComponent(JSON.stringify(data)); + $.ajax({ + type: 'GET', + timeout: 5000, + url: 'http://127.0.0.1:50022/ts_op/' + args_, + jsonp: 'callback', + dataType: 'json', + success: function (ret) { + error_process(ret, func_success, func_error); + }, + error: function () { + func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); + } + }); + } else { + func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message); + } + }, + error: function () { + func_error(TPE_NETWORK, '远程网络通讯失败！'); + } + }); }; var to_admin_fast_teleport = function (url, args, func_success, func_error) { - // 开始Ajax调用 - var args_ = JSON.stringify(args); - $.ajax({ - url: url, - type: 'POST', - timeout: 6000, - //data: {_xsrf: get_cookie('_xsrf'), args: args_}, - data: {args: args_}, - dataType: 'json', - success: function (ret) { - if (ret.code === 0) { - var session_id = ret.data.session_id; - var data = { - server_ip: g_host_name, - server_port: parseInt(args.server_port), - host_ip: args.host_ip, - size: parseInt(args.size), - session_id: session_id, - pro_type: parseInt(args.protocol), - pro_sub: parseInt(args.protocol_sub) - }; - var args_ = encodeURIComponent(JSON.stringify(data)); - $.ajax({ - type: 'GET', - timeout: 5000, - url: 'http://127.0.0.1:50022/ts_op/' + args_, - jsonp: 'callback', - dataType: 'json', - success: function (ret) { - error_process(ret, func_success, func_error); - }, - error: function (jqXhr, _error, _e) { - console.log('jqXhr', jqXhr); - console.log('error', _error); - console.log('e', _e); + // 开始Ajax调用 + var args_ = JSON.stringify(args); + $.ajax({ + url: url, + type: 'POST', + timeout: 6000, + //data: {_xsrf: get_cookie('_xsrf'), args: args_}, + data: {args: args_}, + dataType: 'json', + success: function (ret) { + if (ret.code === 0) { + var session_id = ret.data.session_id; + var data = { + server_ip: g_host_name, + server_port: parseInt(args.server_port), + host_ip: args.host_ip, + size: parseInt(args.size), + session_id: session_id, + pro_type: parseInt(args.protocol), + pro_sub: parseInt(args.protocol_sub) + }; + var args_ = encodeURIComponent(JSON.stringify(data)); + $.ajax({ + type: 'GET', + timeout: 5000, + url: 'http://127.0.0.1:50022/ts_op/' + args_, + jsonp: 'callback', + dataType: 'json', + success: function (ret) { + error_process(ret, func_success, func_error); + }, + error: function (jqXhr, _error, _e) { + console.log('jqXhr', jqXhr); + console.log('error', _error); + console.log('e', _e); - console.log('state:', jqXhr.state()); - func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); - } - }); - } else { - func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); - } - }, - error: function () { - func_error(TPE_NETWORK, '远程网络通讯失败！'); - } - }); + console.log('state:', jqXhr.state()); + func_error(TPE_NO_ASSIST, '无法连接到teleport助手，可能尚未启动！'); + } + }); + } else { + func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message); + } + }, + error: function () { + func_error(TPE_NETWORK, '远程网络通讯失败！'); + } + }); }; var start_rdp_replay = function (args, func_success, func_error) { - var args_ = encodeURIComponent(JSON.stringify(args)); - $.ajax({ - type: 'GET', - timeout: 6000, - url: 'http://127.0.0.1:50022/ts_rdp_play/' + args_, - jsonp: 'callback', - dataType: 'json', - success: function (ret) { - if (ret.code === TPE_OK) { - error_process(ret, func_success, func_error); - } else { - func_error(ret.code, '查看录像失败！'); - } - console.log('ret', ret); - }, - error: function () { - func_error(TPE_NETWORK, '与助手的络通讯失败！'); - } - }); + var args_ = encodeURIComponent(JSON.stringify(args)); + $.ajax({ + type: 'GET', + timeout: 6000, + url: 'http://127.0.0.1:50022/ts_rdp_play/' + args_, + jsonp: 'callback', + dataType: 'json', + success: function (ret) { + if (ret.code === TPE_OK) { + error_process(ret, func_success, func_error); + } else { + func_error(ret.code, '查看录像失败！'); + } + console.log('ret', ret); + }, + error: function () { + func_error(TPE_NETWORK, '与助手的络通讯失败！'); + } + }); };