准备3.5.3测试版本。

build/builder/core/ver.py

@@ -1,3 +1,3 @@
 # -*- coding: utf8 -*-
-VER_TP_SERVER = "3.5.1"
+VER_TP_SERVER = "3.5.3"
-VER_TP_ASSIST = "3.5.1"
+VER_TP_ASSIST = "3.5.3"

client/cfg/tp-assist.windows.json

@@ -1,9 +1,8 @@
 {
     "ssh": {
         "selected": "putty",
-        "available": [
+        "available": [{
-            {
+                "name": "putty",
-                "name":"putty",
                 "display": "PuTTY（内置）",
                 "app": "{assist_tools_path}\\putty\\putty.exe",
                 "cmdline": "-ssh -pw **** -P {host_port} -l {user_name} {host_ip}"
@@ -30,9 +29,8 @@
     },
     "scp": {
         "selected": "winscp",
-        "available": [
+        "available": [{
-            {
+                "name": "winscp",
-                "name":"winscp",
                 "display": "WinSCP（内置）",
                 "app": "{assist_tools_path}\\winscp\\winscp.exe",
                 "cmdline": "/sessionname=\"TP#{real_ip}\" {user_name}:****@{host_ip}:{host_port}"
@@ -47,9 +45,8 @@
     },
     "telnet": {
         "selected": "putty",
-        "available": [
+        "available": [{
-            {
+                "name": "putty",
-                "name":"putty",
                 "display": "PuTTY（内置）",
                 "app": "{assist_tools_path}\\putty\\putty.exe",
                 "cmdline": "telnet://{user_name}@{host_ip}:{host_port}"
@@ -68,21 +65,20 @@
             }
         ]
     },
-   "rdp" : {
+    "rdp": {
-      "available" : [
+        "available": [{
-         {
+                "app": "mstsc.exe",
-            "app" : "mstsc.exe",
+                "cmdline": "\"{tmp_rdp_file}\"",
-            "cmdline" : "\"{tmp_rdp_file}\"",
+                "display": "微软RDP客户端（系统自带）",
-            "display" : "微软RDP客户端（系统自带）",
+                "name": "mstsc"
-            "name" : "mstsc"
+            },
-         },
+            {
-	 {
+                "app": "{assist_tools_path}\\tprdp\\wfreerdp.exe",
-            "app" : "{assist_tools_path}\\tprdp\\tprdp-client.exe",
+                "cmdline": "/v:{host_ip}:{host_port} /u:{user_name} /t:\"TP#{real_ip}\"",
-            "cmdline" : "/v:{host_ip}:{host_port} /u:{user_name} /t:\"TP#{real_ip}\"",
+                "display": "FreeRDP（内置）",
-            "display" : "FreeRDP（内置）",
+                "name": "freerdp"
-            "name" : "freerdp"
+            }
-         }
+        ],
-      ],
+        "selected": "mstsc"
-      "selected" : "mstsc"
+    }
-   }
 }

client/tp-player/thr_data.cpp

@@ -66,7 +66,7 @@ static QImage* _rdpimg2QImage(int w, int h, int bitsPerPixel, bool isCompressed,
     case 24:
     case 32:
     default:
-        qDebug() << "--------NOT support UNKNOWN bitsPerPix" << bitsPerPixel;
+        qDebug() << "--------NOT support " << bitsPerPixel << " bitsPerPix.";
         return nullptr;
     }
 }

client/tp_assist_macos/src/TP-Assist-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.1</string>
+	<string>3.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.5.1</string>
+	<string>3.5.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

client/tp_assist_macos/src/csrc/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_ASSIST_VER_H__
 #define __TS_ASSIST_VER_H__
 
-#define TP_ASSIST_VER	L"3.5.1"
+#define TP_ASSIST_VER	L"3.5.3"
 
 #endif // __TS_ASSIST_VER_H__

client/tp_assist_win/ts_http_rpc.cpp

@@ -1174,7 +1174,7 @@ void TsHttpRpc::_rpc_func_file_action(const ex_astr& func_args, ex_astr& buf) {
             return;
         }
     } else {
-        _create_json_ret(buf, TPE_DATA);
+        _create_json_ret(buf, TPE_FAILED);
         return;
     }
 }

client/tp_assist_win/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_ASSIST_VER_H__
 #define __TS_ASSIST_VER_H__
 
-#define TP_ASSIST_VER	L"3.5.1"
+#define TP_ASSIST_VER	L"3.5.3"
 
 #endif // __TS_ASSIST_VER_H__

common/libex/src/ex_thread.cpp

@@ -72,7 +72,7 @@ bool ExThreadBase::stop(void) {
     m_need_stop = true;
     _on_stop();
 
-    EXLOGV("[thread] - wait `%s` exit, thread-handle=0x%08x.\n", m_thread_name.c_str(), m_handle);
+    //EXLOGV("[thread] - wait `%s` exit, thread-handle=0x%08x.\n", m_thread_name.c_str(), m_handle);
 
 #ifdef EX_OS_WIN32
     if (m_handle) {

server/tp_core/core/ts_ver.h

@@ -1,6 +1,6 @@
 #ifndef __TS_SERVER_VER_H__
 #define __TS_SERVER_VER_H__
 
-#define TP_SERVER_VER	L"3.5.0"
+#define TP_SERVER_VER	L"3.5.3"
 
 #endif // __TS_SERVER_VER_H__

server/www/teleport/webroot/app/app_ver.py

@@ -1,3 +1,3 @@
 # -*- coding: utf8 -*-
-TP_SERVER_VER = "3.5.1"
+TP_SERVER_VER = "3.5.3"
-TP_ASSIST_REQUIRE_VER = "3.5.1"
+TP_ASSIST_REQUIRE_VER = "3.5.3"

version.in

@@ -10,8 +10,8 @@ Minor: 次版本号。如果两个程序集的名称和主版本号相同，而
 Revision: 修订号。主版本号和次版本号都相同但修订号不同的程序集应是完全可互换的。
           这适用于修复以前发布的程序集中的错误或安全漏洞。
 
-TP_SERVER 3.5.1           # 整个服务端打包的版本
+TP_SERVER 3.5.3           # 整个服务端打包的版本
-TP_TPCORE 3.5.0           # 核心服务 tp_core 的版本
+TP_TPCORE 3.5.3           # 核心服务 tp_core 的版本
 TP_TPWEB 3.1.0            # web服务 tp_web 的版本（一般除非升级Python，否则不会变化）
-TP_ASSIST 3.5.1           # 助手版本
+TP_ASSIST 3.5.3           # 助手版本
-TP_ASSIST_REQUIRE 3.5.1   # 适配的助手最低版本
+TP_ASSIST_REQUIRE 3.5.3   # 适配的助手最低版本