diff --git a/client/cfg/tp-assist.windows.json b/client/cfg/tp-assist.windows.json
index f4fc876..0f9baea 100755
--- a/client/cfg/tp-assist.windows.json
+++ b/client/cfg/tp-assist.windows.json
@@ -71,12 +71,18 @@
"rdp" : {
"available" : [
{
+ "app" : "mstsc.exe",
+ "cmdline" : "\"{tmp_rdp_file}\"",
+ "display" : "微软RDP客户端(系统自带)",
+ "name" : "mstsc"
+ },
+ {
"app" : "{assist_tools_path}\\tprdp\\tprdp-client.exe",
"cmdline" : "/v:{host_ip}:{host_port} /u:{user_name} /t:\"TP#{real_ip}\"",
"display" : "FreeRDP(内置)",
"name" : "freerdp"
}
],
- "selected" : "freerdp"
+ "selected" : "mstsc"
}
}
diff --git a/client/tp_assist_win/tp_assist.vs2017.vcxproj b/client/tp_assist_win/tp_assist.vs2017.vcxproj
index 0ebbf9c..d2ab99a 100644
--- a/client/tp_assist_win/tp_assist.vs2017.vcxproj
+++ b/client/tp_assist_win/tp_assist.vs2017.vcxproj
@@ -46,8 +46,8 @@
true
..\..\out\client\$(PlatformTarget)\$(Configuration)\
..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
- C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath)
- C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)
+ C:\apps\vld\include;$(IncludePath)
+ C:\apps\vld\lib\Win32;$(LibraryPath)
false
diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi
index 91f46d4..f6c82e0 100644
Binary files a/dist/client/windows/assist/installer.nsi and b/dist/client/windows/assist/installer.nsi differ
diff --git a/server/tp_core/core/tp_core.vs2017.sln b/server/tp_core/core/tp_core.vs2017.sln
index d059e1d..3c23a0b 100644
--- a/server/tp_core/core/tp_core.vs2017.sln
+++ b/server/tp_core/core/tp_core.vs2017.sln
@@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {787A1953-2C25-4859-B81F-7F63A94B8EE3}
+ EndGlobalSection
EndGlobal
diff --git a/server/tp_core/core/tp_core.vs2017.vcxproj b/server/tp_core/core/tp_core.vs2017.vcxproj
index 8f3236a..ee0e4d1 100644
--- a/server/tp_core/core/tp_core.vs2017.vcxproj
+++ b/server/tp_core/core/tp_core.vs2017.vcxproj
@@ -9,14 +9,6 @@
Release
Win32
-
- Debug
- x64
-
-
- Release
- x64
-
{6548CB1D-A7BA-4A68-9B3F-A5129F77868B}
@@ -39,19 +31,6 @@
Unicode
v141
-
- Application
- true
- v140
- Unicode
-
-
- Application
- false
- v140
- true
- Unicode
-
@@ -63,35 +42,19 @@
-
-
-
-
-
-
true
..\..\..\out\server\$(PlatformTarget)\$(Configuration)\
..\..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
- C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath)
- C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)
-
-
- true
- ..\..\out\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
- ..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
+ c:\apps\vld\include;$(IncludePath)
+ C:\apps\vld\lib\Win32;$(LibraryPath)
false
..\..\..\out\server\$(PlatformTarget)\$(Configuration)\
..\..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
-
- false
- ..\..\out\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
- ..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\
-
@@ -111,22 +74,6 @@
Debug
-
-
-
-
- Level3
- Disabled
- _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- ../../external/windows/libuv/include;../../external/windows/openssl/include;../../external/windows/zlib/include;../../external/windows/mbedtls/include;../../external/windows/libssh/include;../../external/common/jsoncpp/include;../../external/common/sqlite;d:/apps/vld/include
-
-
- Windows
- true
- ../../external/windows/openssl/lib;../../external/windows/zlib/lib;../../external/windows/libssh/lib
-
-
Level3
@@ -148,26 +95,6 @@
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- ../../external/windows/libuv/include;../../external/windows/openssl/include;../../external/windows/zlib/include;../../external/windows/mbedtls/include;../../external/windows/libssh/include;../../external/common/jsoncpp/include;../../external/common/sqlite
-
-
- Windows
- true
- true
- true
- ../../external/windows/openssl/lib;../../external/windows/zlib/lib;../../external/windows/libssh/lib
-
-
diff --git a/server/tp_core/testssh/testssh.sln b/server/tp_core/testssh/testssh.sln
index 63aeb3c..7819b63 100644
--- a/server/tp_core/testssh/testssh.sln
+++ b/server/tp_core/testssh/testssh.sln
@@ -7,16 +7,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testssh", "testssh.vcxproj"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {27998EAA-69B4-4AA5-9D91-54CE740181A9}.Debug|x64.ActiveCfg = Debug|Win32
{27998EAA-69B4-4AA5-9D91-54CE740181A9}.Debug|x86.ActiveCfg = Debug|Win32
{27998EAA-69B4-4AA5-9D91-54CE740181A9}.Debug|x86.Build.0 = Debug|Win32
- {27998EAA-69B4-4AA5-9D91-54CE740181A9}.Release|x64.ActiveCfg = Release|Win32
{27998EAA-69B4-4AA5-9D91-54CE740181A9}.Release|x86.ActiveCfg = Release|Win32
{27998EAA-69B4-4AA5-9D91-54CE740181A9}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
diff --git a/server/tp_core/testssh/testssh.vcxproj b/server/tp_core/testssh/testssh.vcxproj
index e1dbf3a..7e764b2 100644
--- a/server/tp_core/testssh/testssh.vcxproj
+++ b/server/tp_core/testssh/testssh.vcxproj
@@ -55,13 +55,13 @@
Disabled
WIN32;_DEBUG;_CONSOLE;LIBSSH_STATIC;%(PreprocessorDefinitions)
true
- ..\..\..\..\external\libssh\include;%(AdditionalIncludeDirectories)
+ ..\..\..\external\libssh\include;%(AdditionalIncludeDirectories)
MultiThreadedDebug
Console
true
- ..\..\..\..\external\libssh\build\src\static;..\..\..\..\external\openssl\out32;%(AdditionalLibraryDirectories)
+ ..\..\..\external\libssh\build\src\static;..\..\..\external\openssl\out32;%(AdditionalLibraryDirectories)