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

.

pull/105/head
Apex Liu 2018-03-05 17:49:12 +08:00
parent 54bd8332f9
commit 1ff768dd4f
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/tp_assist_win/cfg/tp-assist.default.json
View File

@ -72,7 +72,7 @@
"available" : [
{
"app" : "{assist_tools_path}\\tprdp\\tprdp-client.exe",
"cmdline" : "{size} {console} /v:{host_ip}:{host_port} /u:{user_name} /p:**** {clipboard} {drives} /t:\"TP#{real_ip}\"",
"cmdline" : "/v:{host_ip}:{host_port} /u:{user_name} /t:\"TP#{real_ip}\"",
"display" : "FreeRDP（内置）",
"name" : "freerdp"
}

24
client/tp_assist_win/site/index.html
View File

@ -22,7 +22,7 @@
<div class="header">
<div class="container">
<span class="title"><i class="fa fa-cog fa-fw"></i> Teleport助手本地配置</span>
<span class="title"><i class="fa fa-cog fa-fw"></i> Teleport 助手本地配置</span>
<span class="sub-title" id="version"></span>
</div>
</div>
@ -30,7 +30,7 @@
<div class="footer">
<div class="container">
<p>触维软件旗下产品 | TELEPORT | &copy;2015 - 2017 <a href="http://teleport.eomsoft.net/" target="_blank">触维软件</a>，保留所有权利。</p>
<p><a href="http://teleport.eomsoft.net/" target="_blank">TELEPORT</a> | &copy;2015 - 2018，保留所有权利。</p>
</div>
</div>
@ -148,16 +148,16 @@
<hr/>
<p class="cfg-title">本地 RDP 客户端配置</p>
<div class="arg-detail arg-detail-common">
RDP专用命令行参数：
<ul>
<li><span class="arg-varb">{tmp_rdp_file}</span> 替换为助手工具生成的临时配置文件（.rdp）的绝对路径，用于支持按.rdp配置文件进行连接的RDP客户端</li>
<li><span class="arg-varb">{size}</span> [仅FreeRDP] 替换为屏幕尺寸</li>
<li><span class="arg-varb">{console}</span> [仅FreeRDP] 替换为是否以Console模式连接</li>
<li><span class="arg-varb">{clipboard}</span> [仅FreeRDP] 替换为是否允许剪贴板</li>
<li><span class="arg-varb">{drives}</span> [仅FreeRDP] 替换为是否允许映射本地磁盘</li>
</ul>
</div>
<!--<div class="arg-detail arg-detail-common">-->
<!--RDP专用命令行参数：-->
<!--<ul>-->
<!--<li><span class="arg-varb">{tmp_rdp_file}</span> 替换为助手工具生成的临时配置文件（.rdp）的绝对路径，用于支持按.rdp配置文件进行连接的RDP客户端</li>-->
<!--<li><span class="arg-varb">{size}</span> [仅FreeRDP] 替换为屏幕尺寸</li>-->
<!--<li><span class="arg-varb">{console}</span> [仅FreeRDP] 替换为是否以Console模式连接</li>-->
<!--<li><span class="arg-varb">{clipboard}</span> [仅FreeRDP] 替换为是否允许剪贴板</li>-->
<!--<li><span class="arg-varb">{drives}</span> [仅FreeRDP] 替换为是否允许映射本地磁盘</li>-->
<!--</ul>-->
<!--</div>-->
<div class="form-horizontal">

11
client/tp_assist_win/ts_http_rpc.cpp
View File

@ -664,11 +664,11 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf)
w_exe_path = _T("\"");
w_exe_path += g_cfg.rdp_app + _T("\" ");
w_exe_path += g_cfg.rdp_cmdline;
ex_wstr rdp_name = g_cfg.rdp_name;
if (rdp_name == L"mstsc") {
// w_exe_path += g_cfg.rdp_cmdline;
w_exe_path += g_cfg.rdp_cmdline;
int width = 0;
int higth = 0;
int cx = 0;
@ -755,8 +755,8 @@ 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;
w_exe_path += L"{size} {console} {clipboard} {drives} ";
w_exe_path += g_cfg.rdp_cmdline;
ex_wstr w_screen;
@ -789,8 +789,7 @@ 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"; // [new style] 防止启动FreeRDP后，失去本地键盘响应，必须得先最小化一下FreeRDP窗口（不过貌似不起作用）
//w_exe_path += L" -K"; // [old style] 防止启动FreeRDP后，失去本地键盘响应，必须得先最小化一下FreeRDP窗口（不过貌似不起作用）
w_exe_path += L" -grab-keyboard"; // [new style] 防止启动FreeRDP后，失去本地键盘响应，必须得先最小化一下FreeRDP窗口（不过貌似不起作用）
// 变量替换
ex_replace_all(w_exe_path, _T("{size}"), w_screen);

4
server/www/teleport/webroot/app/controller/system.py
View File

@ -284,9 +284,9 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
_cleanup_hour = _cfg['cleanup_hour']
_cleanup_minute = _cfg['cleanup_minute']
if not (30 <= _keep_log <= 365):
if not ((30 <= _keep_log <= 365) or _keep_log == 0):
return self.write_json(TPE_PARAM, '系统日志保留时间超出范围！')
if not (30 <= _keep_record <= 365):
if not ((30 <= _keep_record <= 365) or _keep_record == 0):
return self.write_json(TPE_PARAM, '会话录像保留时间超出范围！')
err = system_model.save_config(self, '更新存储策略设置', 'storage', _cfg)

2
server/www/teleport/webroot/app/model/record.py
View File

@ -469,7 +469,7 @@ def cleanup_storage(handler):
msg.append('没有满足条件的系统日志需要清除！')
else:
s.reset().delete_from('syslog').where('log_time<{chk_time}'.format(chk_time=chk_time))
err = s.query()
err = s.exec()
if err != TPE_OK:
have_error = True
msg.append('清理系统日志时发生错误：无法清除指定的系统日志！')