4.0.4

zlb715 · Jul 13, 2021 · b9b41b6 · b9b41b6
1 parent 2378f0c
commit b9b41b6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 18 deletions.
diff --git a/ProxySuper.Core/Services/BrookProject.cs b/ProxySuper.Core/Services/BrookProject.cs
@@ -38,6 +38,10 @@ public override void Install()
             ConfigureSoftware();
             WriteOutput("系统工具安装完成");
 
+            WriteOutput("检测网络环境");
+            EnsureIP();
+            WriteOutput("检测网络环境完成");
+
             if (Parameters.BrookType == BrookType.wssserver)
             {
                 WriteOutput("检测域名是否绑定本机IP...");

diff --git a/ProxySuper.Core/Services/NaiveProxyProject.cs b/ProxySuper.Core/Services/NaiveProxyProject.cs
@@ -57,6 +57,10 @@ public override void Install()
                 ConfigFirewalld();
                 WriteOutput("防火墙配置完成");
 
+                WriteOutput("检测网络环境");
+                EnsureIP();
+                WriteOutput("检测网络环境完成");
+
                 WriteOutput("同步系统和本地时间...");
                 SyncTimeDiff();
                 WriteOutput("时间同步完成");

diff --git a/ProxySuper.Core/Services/ProjectBase.cs b/ProxySuper.Core/Services/ProjectBase.cs
@@ -150,8 +150,6 @@ protected void EnsureSystemEnv()
                     RunCmd(@"sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");
                 }
             }
-
-            EnsureIP();
         }
 
         /// <summary>

diff --git a/ProxySuper.Core/Services/TrojanGoProject.cs b/ProxySuper.Core/Services/TrojanGoProject.cs
@@ -87,6 +87,10 @@ public override void Install()
                 ConfigFirewalld();
                 WriteOutput("防火墙配置完成");
 
+                WriteOutput("检测网络环境");
+                EnsureIP();
+                WriteOutput("检测网络环境完成");
+
                 WriteOutput("同步系统和本地时间...");
                 SyncTimeDiff();
                 WriteOutput("时间同步完成");

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

diff --git a/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs b/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
@@ -89,7 +89,7 @@ public int ShadowSocksPort
             get => Settings.ShadowSocksPort;
             set
             {
-                Settings.VMESS_KCP_Port = value;
+                Settings.ShadowSocksPort = value;
                 RaisePropertyChanged("ShadowSocksPort");
             }
         }
@@ -142,6 +142,7 @@ public string TrojanPassword
             get => Settings.TrojanPassword;
             set => Settings.TrojanPassword = value;
         }
+
         public bool Checked_Trojan_TCP
         {
             get

diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -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">
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,8 +150,6 @@ protected void EnsureSystemEnv() @@
                         RunCmd(@"sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");
                     }
                 }
-                EnsureIP();
             }
             /// <summary>
@@ Expand Down @@