Result修改为GetAwaiter().GetResult(),防止抛出的Exception多被封装一层。

Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

@@ -341,8 +341,8 @@
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(TargetDir)x64" mkdir "$(TargetDir)x64"
 if not exist "$(TargetDir)TRTC" mkdir "$(TargetDir)TRTC"
-
-if not exist "$(TargetDir)Settings"  XCopy /Y /E /R  $(SolutionDir)Settings\* $(TargetDir)Settings\* 
+if not exist "$(TargetDir)Settings" mkdir "$(TargetDir)Settings"
+if not exist "$(TargetDir)Settings\Sonopost"  XCopy /Y /E /R  $(SolutionDir)Settings\Sonopost\* $(TargetDir)Settings\Sonopost\* 
 XCopy /E/Y/R "$(SolutionDir)packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\runtimes\win10-x64\*" "$(TargetDir)runtimes\win10-x64\*"
 XCopy /E/Y/R "$(SolutionDir)packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\runtimes\win-x64\*" "$(TargetDir)runtimes\win-x64\*"
 Copy /Y "$(SolutionDir)packages\SmartStreamingSDK\Windows\x64\*.*" "$(TargetDir)x64\*.*"
@@ -350,6 +350,8 @@ Copy /Y "$(SolutionDir)packages\TRTC\Win64\lib\*.*" "$(TargetDir)TRTC\*.*"
 Copy /Y "$(SolutionDir)packages\Lennox.LibYuvSharp.1.1.2\runtimes\win-x64\native\libyuv_internal.dll" "$(TargetDir)libyuv_internal.dll"
 Copy /Y "$(SolutionDir)Bin\Vinno.FIS.TRTCClient\*.*" "$(TargetDir)*.*"
 Move "$(TargetDir)ManageLiteAV.dll" "$(TargetDir)TRTC\ManageLiteAV.dll"
-Move "$(TargetDir)ManageLiteAV.xml" "$(TargetDir)TRTC\ManageLiteAV.xml"</PostBuildEvent>
+Move "$(TargetDir)ManageLiteAV.xml" "$(TargetDir)TRTC\ManageLiteAV.xml"
+Copy /Y "$(SolutionDir)Settings\FISSDK\FISServerSettings.conf" "$(TargetDir)\FISServerSettings.conf"
+Copy /Y "$(SolutionDir)Settings\FISSDK\FISServerSettingsV2.conf" "$(TargetDir)\FISServerSettingsV2.conf"</PostBuildEvent>
   </PropertyGroup>
 </Project>

Vinno.vCloud.Common.FIS/vCloudTerminalBuilder.cs

@@ -189,10 +189,10 @@ namespace Vinno.vCloud.Common.FIS
                         stopWatch.Restart();
                         try
                         {
-                            var result = httpClient.GetAsync(prefix + serverUrl + "/HomePage/API/Connect.json").Result;
+                            var result = httpClient.GetAsync(prefix + serverUrl + "/HomePage/API/Connect.json").GetAwaiter().GetResult();
                             if (result != null)
                             {
-                                var content = result.Content.ReadAsStringAsync()?.Result;
+                                var content = result.Content.ReadAsStringAsync().GetAwaiter().GetResult();
                                 stopWatch.Stop();
                                 if (result.IsSuccessStatusCode && content.Length > 0 && i > 0)
                                 {

Vinno.vCloud.Common.FIS/vStation/vStation.cs

@@ -197,10 +197,10 @@ namespace Vinno.vCloud.Common.FIS.vStation
                 _httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(_timeOut) };
                 var content = new StringContent(Security.Hash(Security.Salt(validateString)));
                 content.Headers.Add("Action", "Connect");
-                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).Result).Result;
+                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).GetAwaiter().GetResult()).GetAwaiter().GetResult();
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
-                    var data = Task.Run(() => response.Content.ReadAsStringAsync().Result).Result;
+                    var data = Task.Run(() => response.Content.ReadAsStringAsync().GetAwaiter().GetResult()).GetAwaiter().GetResult();
                     var spliters = data.Split(';');
                     if (spliters.Count() == 2 && spliters[0] == "ConnectSuccess")
                     {
@@ -250,10 +250,10 @@ namespace Vinno.vCloud.Common.FIS.vStation
 
                 var content = new StringContent(Security.Hash(Security.Salt(validateString)));
                 content.Headers.Add("Action", "TestConnection");
-                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).Result).Result;
+                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).GetAwaiter().GetResult()).GetAwaiter().GetResult();
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
-                    var data = Task.Run(() => response.Content.ReadAsStringAsync().Result).Result;
+                    var data = Task.Run(() => response.Content.ReadAsStringAsync().GetAwaiter().GetResult()).GetAwaiter().GetResult();
                     if (!string.IsNullOrEmpty(data) && data == Security.Hash(Security.Salt("TestConnectionSuccess")))
                     {
                         return true;
@@ -331,7 +331,7 @@ namespace Vinno.vCloud.Common.FIS.vStation
                 content.Headers.Add("Token", _token);
                 content.Headers.Add("Action", "UploadFile");
                 vidData.Status = UploadStatus.Uploading;
-                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).Result).Result;
+                var response = Task.Run(() => _httpClient.PostAsync(new Uri($"http://{_ipAddress}:{_port}/"), content, _cancellationTokenSource.Token).GetAwaiter().GetResult()).GetAwaiter().GetResult();
                 var result = CheckResult(response);
                 if (!result)
                 {
@@ -371,7 +371,7 @@ namespace Vinno.vCloud.Common.FIS.vStation
         {
             if (response.StatusCode == HttpStatusCode.OK)
             {
-                var data = Task.Run(() => response.Content.ReadAsStringAsync().Result).Result;
+                var data = Task.Run(() => response.Content.ReadAsStringAsync().GetAwaiter().GetResult()).GetAwaiter().GetResult();
                 if (data == Security.Hash(Security.Salt("200 - OK.")))
                 {
                     return true;