mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-02-21 08:53:17 +03:00
优化删除Nat64网关
This commit is contained in:
parent
05c58d33f6
commit
1823d8b4da
@ -5,7 +5,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:ProxySU"
|
xmlns:local="clr-namespace:ProxySU"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="ProxySU - v2.4.23 Beta2" Height="675" Width="650">
|
Title="ProxySU - v2.4.23 Beta3" Height="675" Width="650">
|
||||||
<!--以下样式参考自:https://yq.aliyun.com/articles/331878
|
<!--以下样式参考自:https://yq.aliyun.com/articles/331878
|
||||||
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
|
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
|
@ -7455,7 +7455,7 @@ namespace ProxySU
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FunctionResultErr();
|
//FunctionResultErr();
|
||||||
client.Disconnect();
|
client.Disconnect();
|
||||||
//****未检测到有效的IP地址......***
|
//****未检测到有效的IP地址......***
|
||||||
currentStatus = Application.Current.FindResource("DisplayInstallInfo_NoIpDetect").ToString();
|
currentStatus = Application.Current.FindResource("DisplayInstallInfo_NoIpDetect").ToString();
|
||||||
@ -7523,7 +7523,7 @@ namespace ProxySU
|
|||||||
MainWindowsShowInfo(currentStatus);
|
MainWindowsShowInfo(currentStatus);
|
||||||
sshShellCommand = @"rm /etc/resolv.conf";
|
sshShellCommand = @"rm /etc/resolv.conf";
|
||||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
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);
|
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8646,8 +8646,8 @@ namespace ProxySU
|
|||||||
sshShellCommand = $"sed -i 's/##path##/\\{ReceiveConfigurationParameters[6]}/' {upLoadPath}";
|
sshShellCommand = $"sed -i 's/##path##/\\{ReceiveConfigurationParameters[6]}/' {upLoadPath}";
|
||||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||||
|
|
||||||
//设置伪装网站
|
//设置伪装网站/纯ipv6主机暂不设置
|
||||||
if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false)
|
if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false && onlyIpv6 == false)
|
||||||
{
|
{
|
||||||
sshShellCommand = $"sed -i 's/##reverse_Proxy1##/reverse_proxy http:\\/\\/{ReceiveConfigurationParameters[7]} {{/ ' {upLoadPath}";
|
sshShellCommand = $"sed -i 's/##reverse_Proxy1##/reverse_proxy http:\\/\\/{ReceiveConfigurationParameters[7]} {{/ ' {upLoadPath}";
|
||||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user