diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 99e6cc0..d8949e8 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.2 Beta1" Height="675" Width="660"> + Title="ProxySU - v2.5.2 Beta2" Height="675" Width="660"> diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml index 4eb0895..eede1c4 100644 --- a/ProxySU/ResultClientInformation.xaml +++ b/ProxySU/ResultClientInformation.xaml @@ -12,103 +12,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -202,6 +108,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs index e25e2d4..719ece9 100644 --- a/ProxySU/ResultClientInformation.xaml.cs +++ b/ProxySU/ResultClientInformation.xaml.cs @@ -712,7 +712,7 @@ namespace ProxySU XraySetVmessTcpTls(); GenerateXrayVmessTcpTlsShareQRcodeAndBase64Url(); - V2raySetVmessWsTls(); + XraySetVmessWsTls(); GenerateXrayVmessWsTlsShareQRcodeAndBase64Url(); GenerateXrayTrojanShareQRcodeAndBase64Url(); @@ -3445,12 +3445,12 @@ namespace ProxySU v2rayNjsonObject["net"] = TextBoxTransmissionXray.Text; //设置传输模式 v2rayNjsonObject["type"] = TextBoxCamouflageTypeXray.Text; //设置伪装类型 - if (TextBoxTransmission.Text.Contains("kcp") == true) + if (TextBoxTransmissionXray.Text.Contains("kcp") == true) { v2rayNjsonObject["path"] = TextBoxQuicKeyMkcpSeedPathXray.Text;//设置mKCP Seed v2rayNjsonObject["host"] = "";//设置Host } - else if (TextBoxTransmission.Text.Contains("quic") == true) + else if (TextBoxTransmissionXray.Text.Contains("quic") == true) { v2rayNjsonObject["path"] = TextBoxQuicKeyMkcpSeedPathXray.Text;//设置quic密钥 v2rayNjsonObject["host"] = TextBoxHostQuicEncryptionXray.Text;//Quic加密方式 @@ -3529,11 +3529,11 @@ namespace ProxySU v2rayNjsonObject["net"] = TextBoxTransmissionXray.Text; //设置传输模式 v2rayNjsonObject["type"] = TextBoxCamouflageTypeXray.Text; //设置伪装类型 - if (TextBoxTransmission.Text.Contains("kcp") == true) + if (TextBoxTransmissionXray.Text.Contains("kcp") == true) { v2rayNjsonObject["path"] = TextBoxQuicKeyMkcpSeedPathXray.Text;//设置mKCP Seed } - else if (TextBoxTransmission.Text.Contains("quic") == true) + else if (TextBoxTransmissionXray.Text.Contains("quic") == true) { v2rayNjsonObject["path"] = TextBoxQuicKeyMkcpSeedPathXray.Text;//设置quic密钥 v2rayNjsonObject["host"] = TextBoxHostQuicEncryptionXray.Text;//Quic加密方式 @@ -3557,14 +3557,12 @@ namespace ProxySU string configSavePath = CheckDir($"{configDomainSavePath}\\{plainSavePath}"); - //生成二维码与URL, + //生成二维码与URL TextBoxURLVmessWs = "vmess://" + ToBase64Encode(v2rayNjsonObject.ToString()); //TextBoxURL.Text = TextBoxURLVmessWs; using (StreamWriter sw = new StreamWriter($"{configSavePath}\\url.txt")) { - sw.WriteLine(TextBoxURLVmessWs); - } ImageShareQRcodeVmessWs = CreateQRCode(TextBoxURLVmessWs, $"{configSavePath}\\QR.bmp"); diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index fd169a5..25c386d 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ