diff --git a/client/tp_assist_win/ts_http_rpc.cpp b/client/tp_assist_win/ts_http_rpc.cpp index 69918a4..973b9ee 100644 --- a/client/tp_assist_win/ts_http_rpc.cpp +++ b/client/tp_assist_win/ts_http_rpc.cpp @@ -668,6 +668,7 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) ex_wstr rdp_name = g_cfg.rdp_name; if (rdp_name == L"mstsc") { +// w_exe_path += g_cfg.rdp_cmdline; int width = 0; int higth = 0; int cx = 0; @@ -754,6 +755,9 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) ex_replace_all(w_exe_path, _T("{tmp_rdp_file}"), tmp_rdp_file); } else if (g_cfg.rdp_name == L"freerdp") { +// w_exe_path += L"{size} {console} {clipboard} {drives} "; +// w_exe_path += g_cfg.rdp_cmdline; + ex_wstr w_screen; if (rdp_w == 0 || rdp_h == 0) { @@ -785,12 +789,14 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) w_sid = L"02" + w_sid; w_exe_path += L" /gdi:sw"; // 使用软件渲染,gdi:hw使用硬件加速,但是会出现很多黑块(录像回放时又是正常的!) - w_exe_path += L" -grab-keyboard"; // 防止启动FreeRDP后,失去本地键盘响应,必须得先最小化一下FreeRDP窗口(不过貌似不起作用) + //w_exe_path += L" -grab-keyboard"; // [new style] 防止启动FreeRDP后,失去本地键盘响应,必须得先最小化一下FreeRDP窗口(不过貌似不起作用) + //w_exe_path += L" -K"; // [old style] 防止启动FreeRDP后,失去本地键盘响应,必须得先最小化一下FreeRDP窗口(不过貌似不起作用) // 变量替换 ex_replace_all(w_exe_path, _T("{size}"), w_screen); ex_replace_all(w_exe_path, _T("{console}"), w_console); - ex_replace_all(w_exe_path, _T("{clipboard}"), L"+clipboard"); + //ex_replace_all(w_exe_path, _T("{clipboard}"), L"+clipboard"); + ex_replace_all(w_exe_path, _T("{clipboard}"), L"/clipboard"); ex_replace_all(w_exe_path, _T("{drives}"), L"/drives"); } else { diff --git a/server/www/teleport/static/js/audit/record-list.js b/server/www/teleport/static/js/audit/record-list.js index c57e504..6497461 100644 --- a/server/www/teleport/static/js/audit/record-list.js +++ b/server/www/teleport/static/js/audit/record-list.js @@ -292,7 +292,7 @@ $app.on_table_host_render_created = function (render) { case TP_SESS_STAT_RUNNING: return '姝e湪杩炴帴'; case TP_SESS_STAT_STARTED: - return '浣跨敤涓'; + return '浣跨敤涓'; case TP_SESS_STAT_END: return '宸茬粨鏉'; case TP_SESS_STAT_ERR_AUTH_DENIED: diff --git a/server/www/teleport/static/js/ops/remote-list.js b/server/www/teleport/static/js/ops/remote-list.js index a341e96..c3bba1f 100644 --- a/server/www/teleport/static/js/ops/remote-list.js +++ b/server/www/teleport/static/js/ops/remote-list.js @@ -308,6 +308,7 @@ $app.create_dlg_rdp_options = function () { dlg.rdp_w = _w; dlg.rdp_h = _h; + dlg.rdp_console = _console; Cookies.set('rdp_options', {w: _w, h: _h, 'c': _console}, {path: '/ops/remote'}); $app.connect_remote(dlg.uni_id, dlg.acc_id, dlg.host_id, dlg.protocol_type, dlg.protocol_sub_type); @@ -401,6 +402,8 @@ $app.connect_remote = function (uni_id, acc_id, host_id, protocol_type, protocol rdp_console: $app.dlg_rdp_options.rdp_console }; + console.log('--s--', args); + if(uni_id === 'none') args.mode = 2; diff --git a/server/www/teleport/static/js/ops/session-list.js b/server/www/teleport/static/js/ops/session-list.js index 6dbf3a2..6c1ef2e 100644 --- a/server/www/teleport/static/js/ops/session-list.js +++ b/server/www/teleport/static/js/ops/session-list.js @@ -306,7 +306,7 @@ $app.on_table_session_render_created = function (render) { case TP_SESS_STAT_RUNNING: return '姝e湪杩炴帴'; case TP_SESS_STAT_STARTED: - return '浣跨敤涓'; + return '浣跨敤涓'; case TP_SESS_STAT_END: return '宸茬粨鏉'; case TP_SESS_STAT_ERR_AUTH_DENIED: