github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1. 无法连接到远程主机时，连接超时设置为10秒； 2. 解决RDP连接出错时，仍然汇报连接成功的问题。

pull/32/head
Apex Liu 2017-05-28 13:08:37 +08:00
parent ef23397be8
commit 4ae6d4c5b5
6 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/tp_core/common/ts_const.h
View File

@ -63,6 +63,8 @@
#define SESS_STAT_ERR_UNSUPPORT_PROTOCOL 5 // 会话结束，因为协议不支持(RDP)
#define SESS_STAT_ERR_BAD_PKG 6 // 会话结束，因为收到错误的报文
#define SESS_STAT_ERR_RESET 7 // 会话结束，因为teleport核心服务重置了
#define SESS_STAT_ERR_IO 8 // 会话结束，因为网络中断
#define SESS_STAT_ERR_SESSION 9 // 会话结束，因为无效的会话ID
#endif // __TS_ERRNO_H__

2
server/www/teleport/static/css/main.css
View File

File diff suppressed because one or more lines are too long

18
server/www/teleport/static/js/ui/common.js
View File

@ -251,15 +251,17 @@ ywl.create_dlg_modify_host_desc = function (tbl, row_id, host_id, host_ip, host_
self._make_dialog_box = function () {
var _html = [
'<div class="popover-inline-edit" id="' + self.dlg_id + '">',
' <div class="popover fade bottom in" role="tooltip" ywl-dlg="modify-host-desc">',
' <div class="arrow" style="left:50px;"></div>',
' <h3 class="popover-title">为主机 ' + self.host_ip + ' 添加备注，以便识别</h3>',
' <div class="popover fade bottom in" ywl-dlg="modify-host-desc">',
' <div class="arrow" style="left:70px;"></div>',
' <h3 class="popover-title">编辑备注</h3>',
' <div class="popover-content">',
' <div>为主机 ' + self.host_ip + ' 设置备注，以便识别：</div>',
' <div style="display:inline-block;float:right;">',
' <a href="javascript:;" class="btn btn-success btn-sm" ywl-btn="ok"><i class="glyphicon glyphicon-ok"></i></a>',
' <a href="javascript:;" class="btn btn-danger btn-sm" ywl-btn="cancel"><i class="glyphicon glyphicon-remove"></i></a>',
// ' <a href="javascript:;" class="btn btn-success btn-sm" ywl-btn="ok"><i class="glyphicon glyphicon-ok"></i></a>',
' <a href="javascript:;" class="btn btn-success btn-sm" ywl-btn="ok"><i class="fa fa-check"></i> 确定</a>',
' <a href="javascript:;" class="btn btn-danger btn-sm" ywl-btn="cancel"><i class="fa fa-close"></i> 取消</a>',
' </div>',
' <div style="padding-right:80px;">',
' <div style="padding-right:120px;">',
' <input type="text" ywl-input="desc" class="form-control" value="' + self.host_desc + '">',
' </div>',
' </div>',
@ -277,9 +279,9 @@ ywl.create_dlg_modify_host_desc = function (tbl, row_id, host_id, host_ip, host_
});
// 绑定“修改主机描述” 对话框中的输入框的回车事件
$('#' + self.dlg_id + " [ywl-input='desc']").keydown(function (event) {
if (event.which == 13) {
if (event.which === 13) {
self._save();
} else if (event.which == 27) {
} else if (event.which === 27) {
self._destroy();
}
});

14
server/www/teleport/static/js/ui/log.js
View File

@ -238,10 +238,16 @@ ywl.on_host_table_created = function (tbl) {
msg = '协议不支持';
break;
case 6:
msg = '通讯错误';
msg = '数据格式错误';
break;
case 7:
msg = '错误重置';
msg = '核心服务重置';
break;
case 8:
msg = '网络通讯故障';
break;
case 9:
msg = '无效会话';
break;
default:
msg = fields.ret_code;
@ -286,7 +292,9 @@ ywl.on_host_table_created = function (tbl) {
render.make_action_btn = function (row_id, fields) {
var ret = [];
if (fields.protocol === PROTOCOL_TYPE_RDP) {
ret.push('<a href="javascript:;" class="btn btn-sm btn-primary" protocol=' + fields.protocol + ' ywl-btn-record="' + fields.ID + '">录像查看</a>&nbsp');
if(fields.ret_code === 9999) {
ret.push('<a href="javascript:;" class="btn btn-sm btn-primary" protocol=' + fields.protocol + ' ywl-btn-record="' + fields.ID + '">录像查看</a>&nbsp');
}
} else if (fields.protocol === PROTOCOL_TYPE_SSH) {
if (fields.ret_code === 9999 && fields.cost_time > 0) {
ret.push('<a href="javascript:;" class="btn btn-sm btn-primary" protocol=' + fields.protocol + ' ywl-btn-record="' + fields.ID + '">录像查看</a>&nbsp');

2
server/www/teleport/static/less/_base.less
View File

@ -516,4 +516,4 @@ hr.small {
.form-group-sm .form-control-static {
padding: 6px 0;
}
}

5
server/www/teleport/static/less/main.less
View File

@ -689,6 +689,11 @@
.popover {
padding: 0;
max-width: 500px;
.popover-content {
padding: 10px 10px 20px 10px;
}
&.bottom > .arrow:after {
top: 1px;