diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 9e56b12..f2eb0a9 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 - v1.8.6" Height="625" Width="530"> + Title="ProxySU - v2.0.1" Height="625" Width="530"> diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml index b366ac9..b19a722 100644 --- a/ProxySU/ResultClientInformation.xaml +++ b/ProxySU/ResultClientInformation.xaml @@ -13,7 +13,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs index 5b3c4f4..a35cf5e 100644 --- a/ProxySU/ResultClientInformation.xaml.cs +++ b/ProxySU/ResultClientInformation.xaml.cs @@ -33,6 +33,7 @@ namespace ProxySU if (String.Equals(MainWindow.proxyType, "V2Ray")) { + //显示V2Ray参数,隐藏其他 GroupBoxV2rayClient.Visibility = Visibility.Visible; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; @@ -57,7 +58,7 @@ namespace ProxySU TextBoxHost.Text = ""; //路径Path TextBoxPath.Text = MainWindow.ReceiveConfigurationParameters[3]; - //QUIC密钥 + //QUIC密钥/mKCP Seed TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLS2Web")) @@ -168,7 +169,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2SRTP")) { @@ -177,7 +178,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCPuTP")) { @@ -186,7 +187,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WechatVideo")) { @@ -195,7 +196,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2DTLS")) { @@ -204,7 +205,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WireGuard")) { @@ -213,7 +214,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示mKCP Seed } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicNone")) { @@ -222,7 +223,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicSRTP")) { @@ -231,7 +232,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "Quic2uTP")) { @@ -240,7 +241,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWechatVideo")) { @@ -249,7 +250,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicDTLS")) { @@ -258,7 +259,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWireGuard")) { @@ -267,7 +268,7 @@ namespace ProxySU TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6]; TextBoxTLS.Text = "none"; HidePath(); - ShowQuicKey(); + ShowQuicKey();//显示QUIC密钥 } else @@ -421,8 +422,12 @@ namespace ProxySU v2rayNjsonObject["aid"] = TextBoxUUIDextra.Text; //设置额外ID v2rayNjsonObject["net"] = TextBoxTransmission.Text; //设置传输模式 v2rayNjsonObject["type"] = TextBoxCamouflageType.Text; //设置伪装类型 - - if (TextBoxTransmission.Text.Contains("quic")==true) + + if (TextBoxTransmission.Text.Contains("kcp") == true) + { + v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置mKCP Seed + } + else if (TextBoxTransmission.Text.Contains("quic")==true) { v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置quic密钥 v2rayNjsonObject["host"] = "chacha20-poly1305"; diff --git a/ProxySU/Translations/ProxySU.en-US.xaml b/ProxySU/Translations/ProxySU.en-US.xaml index 52371ce..91fe0c6 100644 --- a/ProxySU/Translations/ProxySU.en-US.xaml +++ b/ProxySU/Translations/ProxySU.en-US.xaml @@ -71,8 +71,8 @@ Random If TLS encryption is used, please keep the default port 443 Use the existing UUID and paste it directly into the box - mKCP/QUIC key - Enable the mKCP key to enhance anti-recognition, leave it blank to disable it. Version 4.24.2 or above is required. V2rayN does not currently support + mKCP Seed/QUIC key + Enable the mKCP Seed key to enhance anti-recognition, leave it blank to disable it. Version 4.24.2 or above is required. V2rayN does not currently support Path: Domain name: Mask a website: @@ -130,7 +130,7 @@ Camouflage type: TLS: Path: - mKCP/QUIC key: + mKCP Seed/QUIC key: default auto QR/URL The above parameters can be entered into the client manually or by scanning. The configuration and related files used for the official client have been stored in the directory. Click the OK button to open diff --git a/ProxySU/Translations/ProxySU.zh-CN.xaml b/ProxySU/Translations/ProxySU.zh-CN.xaml index 7480391..8defebb 100644 --- a/ProxySU/Translations/ProxySU.zh-CN.xaml +++ b/ProxySU/Translations/ProxySU.zh-CN.xaml @@ -71,8 +71,8 @@ 随机选择 若使用TLS加密,请保持默认的443端口 使用已有UUID,直接粘贴到框中 - mKCP/QUIC密钥 - 启用mKCP密钥,可增强抗识别,留空则禁用,要求版本4.24.2以上,V2rayN暂不支持 + mKCP Seed/QUIC密钥 + 启用mKCP Seed密钥,可增强抗识别,留空则禁用,要求版本4.24.2以上,V2rayN暂不支持 路径: 域名: 伪装网站: @@ -130,7 +130,7 @@ 伪装类型: 是否使用TLS: 路径(Path): - mKCP/QUIC密钥: + mKCP Seed/QUIC密钥: 默认auto 二维码/URL 以上参数可以手动或扫描输入客户端,用于官方客户端的配置和相关文件已经存放入目录下,点击 确定 按扭可打开 diff --git a/ProxySU/Translations/ProxySU.zh-TW.xaml b/ProxySU/Translations/ProxySU.zh-TW.xaml index cdfec77..570d3b7 100644 --- a/ProxySU/Translations/ProxySU.zh-TW.xaml +++ b/ProxySU/Translations/ProxySU.zh-TW.xaml @@ -72,8 +72,8 @@ 隨機選擇 若使用TLS加密,請保持默認的443端口 使用已有UUID,直接粘貼到框中 - mKCP/QUIC密鑰 - 啟用mKCP密鑰,可增強抗識別,留空則禁用,要求版本4.24.2以上,V2rayN暫不支持 + mKCP Seed/QUIC密鑰 + 啟用mKCP Seed密鑰,可增強抗識別,留空則禁用,要求版本4.24.2以上,V2rayN暫不支持 路徑: 域名: 偽裝網站: @@ -131,7 +131,7 @@ 偽裝類型: 是否使用TLS: 路徑(Path): - mKCP/QUIC密鑰: + mKCP Seed/QUIC密鑰: 默認auto 二維碼/URL 以上參數可以手動或掃描輸入客戶端,用於官方客戶端的配置和相關文件已經存放入目錄下,點擊 確定 按扭可打開 diff --git a/ProxySU/V2RayTemplateWindow.xaml b/ProxySU/V2RayTemplateWindow.xaml index 4085009..d481434 100644 --- a/ProxySU/V2RayTemplateWindow.xaml +++ b/ProxySU/V2RayTemplateWindow.xaml @@ -233,7 +233,7 @@ - + diff --git a/ProxySU/V2RayTemplateWindow.xaml.cs b/ProxySU/V2RayTemplateWindow.xaml.cs index fd470f1..0d73703 100644 --- a/ProxySU/V2RayTemplateWindow.xaml.cs +++ b/ProxySU/V2RayTemplateWindow.xaml.cs @@ -257,6 +257,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCPNone"; MainWindow.ReceiveConfigurationParameters[5] = "none"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text)==false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -268,6 +269,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCP2SRTP"; MainWindow.ReceiveConfigurationParameters[5] = "srtp"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -279,6 +281,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCPuTP"; MainWindow.ReceiveConfigurationParameters[5] = "utp"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -290,6 +293,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WechatVideo"; MainWindow.ReceiveConfigurationParameters[5] = "wechat-video"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -301,6 +305,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCP2DTLS"; MainWindow.ReceiveConfigurationParameters[5] = "dtls"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -312,6 +317,7 @@ namespace ProxySU //传递模板类型 MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WireGuard"; MainWindow.ReceiveConfigurationParameters[5] = "wireguard"; + //传递mKCP Seed if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false) { MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text; @@ -643,7 +649,7 @@ namespace ProxySU Guid uuid = Guid.NewGuid(); TextBoxNewUUID.Text = uuid.ToString(); } - //产生QUIC密钥所用的UUID + //产生QUIC密钥/mKCP Seed所用的UUID private void ButtonQuicUUID_Click(object sender, RoutedEventArgs e) { Guid uuid = Guid.NewGuid(); diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 8936245..19a57da 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ diff --git a/TemplateConfg/3in1_config.caddyfile b/TemplateConfg/3in1_config.caddyfile deleted file mode 100644 index 9d8f8b8..0000000 --- a/TemplateConfg/3in1_config.caddyfile +++ /dev/null @@ -1,18 +0,0 @@ -##domain## { - log stdout - errors stderr - root /var/www - tls off - forwardproxy { - ##basicauth## - probe_resistance - hide_ip - hide_via - upstream http://127.0.0.1:8383 - } - ##sites## - proxy ##path## localhost:10000 { - websocket - header_upstream -Origin - } -} \ No newline at end of file