github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

temp.

pull/32/merge
Apex Liu 2017-05-05 19:10:12 +08:00
parent 67c321dfa6
commit a98df86d19
2 changed files with 199 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/www/teleport/app/eom_app/controller/rpc.py
View File

@ -68,6 +68,8 @@ class RpcHandler(TPBaseJsonHandler):
return self.write_json(0, data=x) return self.write_json(0, data=x)
elif authid < 0: elif authid < 0:
x = web_session().taken('tmp-auth-info-{}'.format(authid), None) 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) return self.write_json(0, data=x)
else: else:
return self.write_json(-1, message='invalid auth id.') return self.write_json(-1, message='invalid auth id.')

6
server/www/teleport/static/js/ui/teleport.js
View File

@ -97,7 +97,7 @@ var to_teleport = function (url, args, func_success, func_error) {
} }
}); });
} else { } else {
func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message);
} }
}, },
error: function () { error: function () {
@ -145,7 +145,7 @@ var to_admin_teleport = function (url, args, func_success, func_error) {
} }
}); });
} else { } else {
func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message);
} }
}, },
error: function () { error: function () {
@ -196,7 +196,7 @@ var to_admin_fast_teleport = function (url, args, func_success, func_error) {
} }
}); });
} else { } else {
func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！'); func_error(TPE_NO_CORE_SERVER, '远程连接请求失败，可能teleport核心服务尚未启动！' + ret.message);
} }
}, },
error: function () { error: function () {