mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-21 20:56:08 +03:00
Code Issues Projects Releases Wiki Activity

4.0.4

Browse Source
This commit is contained in:
autumn 2021-07-13 10:12:15 +08:00
parent 2378f0c416
commit b9b41b6554
7 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProxySuper.Core/Services/BrookProject.cs
View File

@ -38,6 +38,10 @@ namespace ProxySuper.Core.Services
ConfigureSoftware();
WriteOutput("系统工具安装完成");
WriteOutput("检测网络环境");
EnsureIP();
WriteOutput("检测网络环境完成");
if (Parameters.BrookType == BrookType.wssserver)
{
WriteOutput("检测域名是否绑定本机IP...");

4
ProxySuper.Core/Services/NaiveProxyProject.cs
View File

@ -57,6 +57,10 @@ namespace ProxySuper.Core.Services
ConfigFirewalld();
WriteOutput("防火墙配置完成");
WriteOutput("检测网络环境");
EnsureIP();
WriteOutput("检测网络环境完成");
WriteOutput("同步系统和本地时间...");
SyncTimeDiff();
WriteOutput("时间同步完成");

2
ProxySuper.Core/Services/ProjectBase.cs
View File

@ -150,8 +150,6 @@ namespace ProxySuper.Core.Services
RunCmd(@"sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");
}
}
EnsureIP();
}
/// <summary>

4
ProxySuper.Core/Services/TrojanGoProject.cs
View File

@ -87,6 +87,10 @@ namespace ProxySuper.Core.Services
ConfigFirewalld();
WriteOutput("防火墙配置完成");
WriteOutput("检测网络环境");
EnsureIP();
WriteOutput("检测网络环境完成");
WriteOutput("同步系统和本地时间...");
SyncTimeDiff();
WriteOutput("时间同步完成");

13
ProxySuper.Core/Services/XrayProject.cs
View File

@ -60,6 +60,10 @@ namespace ProxySuper.Core.Services
ConfigFirewalld();
WriteOutput("防火墙配置完成");
WriteOutput("检测网络环境");
EnsureIP();
WriteOutput("检测网络环境完成");
WriteOutput("同步系统和本地时间...");
SyncTimeDiff();
WriteOutput("时间同步完成");
@ -69,11 +73,12 @@ namespace ProxySuper.Core.Services
WriteOutput("检测域名是否绑定本机IP...");
ValidateDomain();
WriteOutput("域名检测完成");
}
WriteOutput("安装Caddy...");
InstallCaddy();
WriteOutput("Caddy安装完成");
WriteOutput("安装Caddy...");
InstallCaddy();
WriteOutput("Caddy安装完成");
}
WriteOutput("安装Xray-Core...");
InstallXrayWithCert();

3
ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
View File

@ -89,7 +89,7 @@ namespace ProxySuper.Core.ViewModels
get => Settings.ShadowSocksPort;
set
{
Settings.VMESS_KCP_Port = value;
Settings.ShadowSocksPort = value;
RaisePropertyChanged("ShadowSocksPort");
}
}
@ -142,6 +142,7 @@ namespace ProxySuper.Core.ViewModels
get => Settings.TrojanPassword;
set => Settings.TrojanPassword = value;
}
public bool Checked_Trojan_TCP
{
get

11
ProxySuper.WPF/Controls/XraySettingsControl.xaml
View File

@ -301,17 +301,6 @@
Width="200" />
</StackPanel>
<!--Trojan端口-->
<StackPanel Margin="30,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_Trojan_TCP,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
<TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
</StackPanel>
<!--xray prot-->
<StackPanel Margin="30,15,0,0"
Orientation="Horizontal">