Fix auto check local server error

jie65535 · Aug 23, 2023 · b69b294 · b69b294
1 parent 90deaa8
commit b69b294
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Source/GrasscutterTools/App.config b/Source/GrasscutterTools/App.config
@@ -29,7 +29,7 @@
     <value>10001</value>
    </setting>
    <setting name="Host" serializeAs="String">
-    <value>https://127.0.0.1</value>
+    <value>http://127.0.0.1:443</value>
    </setting>
    <setting name="CheckedLastVersion" serializeAs="String">
     <value />

diff --git a/Source/GrasscutterTools/Pages/PageOpenCommand.cs b/Source/GrasscutterTools/Pages/PageOpenCommand.cs
@@ -26,6 +26,7 @@
 using System.Windows.Forms;
 
 using GrasscutterTools.DispatchServer;
+using GrasscutterTools.DispatchServer.Model;
 using GrasscutterTools.Game;
 using GrasscutterTools.GOOD;
 using GrasscutterTools.OpenCommand;
@@ -125,21 +126,21 @@ public override void OnEnter()
                 // 自动尝试查询本地服务端地址，降低使用门槛
                 Task.Run(async () =>
                 {
-                    var localhosts = new string[] {
+                    var localhostList = new[] {
                         "http://127.0.0.1:443",
                         "https://127.0.0.1",
                         "http://127.0.0.1",
                         "https://127.0.0.1:80",
                         "http://127.0.0.1:8080",
                         "https://127.0.0.1:8080",
                     };
-                    foreach (var host in localhosts)
+                    foreach (var host in localhostList)
                     {
                         try
                         {
                             await UpdateServerStatus(host);
                             // 自动填写本地服务端地址
-                            TxtHost.Text = host;
+                            BeginInvoke(new Action(() => TxtHost.Text = host));
                             break;
                         }
                         catch (Exception)
@@ -169,6 +170,14 @@ public override void OnClosed()
         private async Task UpdateServerStatus(string host)
         {
             var status = await DispatchServerAPI.QueryServerStatus(host);
+            if (InvokeRequired)
+                BeginInvoke(new Action<ServerStatus>(ShowServerStatus), status);
+            else
+                ShowServerStatus(status);
+        }
+
+        private void ShowServerStatus(ServerStatus status)
+        {
             LblServerVersion.Text = status.Version;
             LblPlayerCount.Text = status.MaxPlayer > 0 ? $"{status.PlayerCount}/{status.MaxPlayer}" : status.PlayerCount.ToString();
         }

diff --git a/Source/GrasscutterTools/Properties/Settings.Designer.cs b/Source/GrasscutterTools/Properties/Settings.Designer.cs
diff --git a/Source/GrasscutterTools/Properties/Settings.settings b/Source/GrasscutterTools/Properties/Settings.settings
@@ -21,7 +21,7 @@
       <Value Profile="(Default)">10001</Value>
     </Setting>
     <Setting Name="Host" Type="System.String" Scope="User">
-      <Value Profile="(Default)">https://127.0.0.1</Value>
+      <Value Profile="(Default)">http://127.0.0.1:443</Value>
     </Setting>
     <Setting Name="CheckedLastVersion" Type="System.String" Scope="User">
       <Value Profile="(Default)" />