diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index a178587..8164d04 100644 --- a/ProxySU/MainWindow.xaml +++ b/ProxySU/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ProxySU" mc:Ignorable="d" - Title="ProxySU - v2.4.18" Height="675" Width="650"> + Title="ProxySU - v2.4.19-beta1" Height="675" Width="650"> <!--以下样式参考自:https://yq.aliyun.com/articles/331878 https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview--> <Window.Resources> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index c3d8fe4..ab248ef 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -7348,11 +7348,11 @@ namespace ProxySU ipv6 = String.Empty; //sshShellCommand = @"curl -4 ip.sb"; - sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv4"; + sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv4 --max-time 8"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); ipv4 = currentShellCommandResult.TrimEnd('\r', '\n'); - sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv6"; + sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv6 --max-time 8"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); ipv6 = currentShellCommandResult.TrimEnd('\r', '\n'); @@ -8088,11 +8088,11 @@ namespace ProxySU onlyIpv6 = false; //sshShellCommand = @"curl -4 ip.sb"; - sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv4"; + sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv4 --max-time 8"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); ipv4 = currentShellCommandResult.TrimEnd('\r', '\n'); - sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv6"; + sshShellCommand = @"curl -s https://api.ip.sb/ip --ipv6 --max-time 8"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); ipv6 = currentShellCommandResult.TrimEnd('\r', '\n'); diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index a591baa..929d1b9 100644 --- a/ProxySU/Properties/AssemblyInfo.cs +++ b/ProxySU/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.18.0")] -[assembly: AssemblyFileVersion("2.4.18.0")] +[assembly: AssemblyVersion("2.4.19.0")] +[assembly: AssemblyFileVersion("2.4.19.0")] diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 17a39be..8d3cb3c 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ