diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index b76760e..e58366a 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.23 Beta2" Height="675" Width="650"> + Title="ProxySU - v2.4.23 Beta3" Height="675" Width="650"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index e8c4c9d..f9c7052 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -7455,7 +7455,7 @@ namespace ProxySU } else { - FunctionResultErr(); + //FunctionResultErr(); client.Disconnect(); //****未检测到有效的IP地址......*** currentStatus = Application.Current.FindResource("DisplayInstallInfo_NoIpDetect").ToString(); @@ -7523,7 +7523,7 @@ namespace ProxySU MainWindowsShowInfo(currentStatus); sshShellCommand = @"rm /etc/resolv.conf"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); - sshShellCommand = @"mv /etc/resolv.conf.bak /etc/resolv.conf"; + sshShellCommand = @"ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); } @@ -8646,8 +8646,8 @@ namespace ProxySU sshShellCommand = $"sed -i 's/##path##/\\{ReceiveConfigurationParameters[6]}/' {upLoadPath}"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); - //设置伪装网站 - if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false) + //设置伪装网站/纯ipv6主机暂不设置 + if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false && onlyIpv6 == false) { sshShellCommand = $"sed -i 's/##reverse_Proxy1##/reverse_proxy http:\\/\\/{ReceiveConfigurationParameters[7]} {{/ ' {upLoadPath}"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index d53989a..74f524b 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ