diff --git a/Source/GrasscutterTools/App.config b/Source/GrasscutterTools/App.config index 4105b93..c72e11e 100644 --- a/Source/GrasscutterTools/App.config +++ b/Source/GrasscutterTools/App.config @@ -29,7 +29,7 @@ 10001 - https://127.0.0.1 + http://127.0.0.1:443 diff --git a/Source/GrasscutterTools/Pages/PageOpenCommand.cs b/Source/GrasscutterTools/Pages/PageOpenCommand.cs index b14d11d..36dad17 100644 --- a/Source/GrasscutterTools/Pages/PageOpenCommand.cs +++ b/Source/GrasscutterTools/Pages/PageOpenCommand.cs @@ -26,6 +26,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using GrasscutterTools.DispatchServer; +using GrasscutterTools.DispatchServer.Model; using GrasscutterTools.Game; using GrasscutterTools.GOOD; using GrasscutterTools.OpenCommand; @@ -125,7 +126,7 @@ namespace GrasscutterTools.Pages // 自动尝试查询本地服务端地址,降低使用门槛 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", @@ -133,13 +134,13 @@ namespace GrasscutterTools.Pages "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 @@ namespace GrasscutterTools.Pages private async Task UpdateServerStatus(string host) { var status = await DispatchServerAPI.QueryServerStatus(host); + if (InvokeRequired) + BeginInvoke(new Action(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 index 69c57b7..ec46169 100644 --- a/Source/GrasscutterTools/Properties/Settings.Designer.cs +++ b/Source/GrasscutterTools/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GrasscutterTools.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -97,7 +97,7 @@ namespace GrasscutterTools.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://127.0.0.1")] + [global::System.Configuration.DefaultSettingValueAttribute("http://127.0.0.1:443")] public string Host { get { return ((string)(this["Host"])); diff --git a/Source/GrasscutterTools/Properties/Settings.settings b/Source/GrasscutterTools/Properties/Settings.settings index 40157f8..23ec6bf 100644 --- a/Source/GrasscutterTools/Properties/Settings.settings +++ b/Source/GrasscutterTools/Properties/Settings.settings @@ -21,7 +21,7 @@ 10001 - https://127.0.0.1 + http://127.0.0.1:443