diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 23456f1..99e6cc0 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.5.1" Height="675" Width="660"> + Title="ProxySU - v2.5.2 Beta1" Height="675" Width="660"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index 1b4d1ed..8201184 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -2919,13 +2919,13 @@ namespace ProxySU //currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); //备份原来的文件 - //functionResult = FileCheckExists(client, @"/usr/local/etc/xray/config.json"); - //if (functionResult == true) - //{ + functionResult = FileCheckExists(client, @"/usr/local/etc/xray/config.json"); + if (functionResult == true) + { sshShellCommand = @"mv /usr/local/etc/xray/config.json /usr/local/etc/xray/config.json.1"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); - //} + } //读取配置文件各个模块 string logConfigJson = $"{pwdir}" + @"TemplateConfg\xray\server\00_log\00_log.json"; string apiConfigJson = $"{pwdir}" + @"TemplateConfg\xray\server\01_api\01_api.json"; @@ -3159,7 +3159,7 @@ namespace ProxySU || String.Equals(ReceiveConfigurationParameters[0], "tcpTLSselfSigned") == true || String.Equals(ReceiveConfigurationParameters[0], "http2selfSigned") == true) { - string selfSignedCa = client.RunCommand("/usr/local/bin/v2ctl cert --ca").Result; + string selfSignedCa = client.RunCommand("/usr/local/bin/xray tls cert --ca").Result; JObject selfSignedCaJObject = JObject.Parse(selfSignedCa); jObjectJson["inbounds"][0]["streamSettings"]["tlsSettings"]["certificates"][0] = selfSignedCaJObject; } diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index b2b6bfc..bb9a8f7 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.5.1.0")] -[assembly: AssemblyFileVersion("2.5.1.0")] +[assembly: AssemblyVersion("2.5.2.0")] +[assembly: AssemblyFileVersion("2.5.2.0")] diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 8148101..fd169a5 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ