Merge branch 'BeyondDimension:develop' into develop

4Darmygeometry · web-flow · commit 8f4f0af8f1ef · 2025-03-13T15:44:11.000+08:00
diff --git a/ref/WTTS.MicroServices.ClientSDK b/ref/WTTS.MicroServices.ClientSDK
@@ -1 +1 @@
-Subproject commit 213b92d243b3bfb6c128ff0357d737d62bf2a0b9
+Subproject commit 27e9c1c2c6ce17cb23baf24cb3ab150b5a876191
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs
@@ -406,8 +406,10 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)
             if (!string.IsNullOrEmpty(proxyTokenCache))
                 return proxyTokenCache;
 
+            using CancellationTokenSource cts = new();
+            cts.CancelAfter(TimeSpan.FromSeconds(4.99D)); // 5 秒超时
             var resp = await IMicroServiceClient.Instance.Account
-                .GenerateServerSideProxyToken();
+                .GenerateServerSideProxyToken(cts.Token);
 
             if (resp != null && !string.IsNullOrEmpty(resp.Content?.AccessToken))
             {
@@ -416,11 +418,14 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)
 
             return proxyTokenCache;
         }
+        catch (OperationCanceledException)
+        {
+        }
         catch (Exception ex)
         {
             ex.LogAndShowT();
-            return null;
         }
+        return null;
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -406,8 +406,10 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)`
`406`	`406`	`if (!string.IsNullOrEmpty(proxyTokenCache))`
`407`	`407`	`return proxyTokenCache;`
`408`	`408`
	`409`	`+ using CancellationTokenSource cts = new();`
	`410`	`+ cts.CancelAfter(TimeSpan.FromSeconds(4.99D)); // 5 秒超时`
`409`	`411`	`var resp = await IMicroServiceClient.Instance.Account`
`410`		`- .GenerateServerSideProxyToken();`
	`412`	`+ .GenerateServerSideProxyToken(cts.Token);`
`411`	`413`
`412`	`414`	`if (resp != null && !string.IsNullOrEmpty(resp.Content?.AccessToken))`
`413`	`415`	`{`
`@@ -416,11 +418,14 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)`
`416`	`418`
`417`	`419`	`return proxyTokenCache;`
`418`	`420`	`}`
	`421`	`+ catch (OperationCanceledException)`
	`422`	`+ {`
	`423`	`+ }`
`419`	`424`	`catch (Exception ex)`
`420`	`425`	`{`
`421`	`426`	`ex.LogAndShowT();`
`422`		`- return null;`
`423`	`427`	`}`
	`428`	`+ return null;`
`424`	`429`	`}`
`425`	`430`
`426`	`431`	`/// <summary>`