diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 5b296f8..23456f1 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 Beta2" Height="675" Width="660"> + Title="ProxySU - v2.5.1" Height="675" Width="660"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index 0e4b9ef..1b4d1ed 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -1355,13 +1355,13 @@ namespace ProxySU //currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); //备份原来的文件 - //functionResult = FileCheckExists(client, @"/usr/local/etc/v2ray/config.json"); - //if (functionResult == true) - //{ + functionResult = FileCheckExists(client, @"/usr/local/etc/v2ray/config.json"); + if (functionResult == true) + { sshShellCommand = @"mv /usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json.1"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); - //} + } //读取配置文件各个模块 string logConfigJson = $"{pwdir}" + @"TemplateConfg\v2ray\server\00_log\00_log.json"; string apiConfigJson = $"{pwdir}" + @"TemplateConfg\v2ray\server\01_api\01_api.json"; @@ -1959,29 +1959,29 @@ namespace ProxySU { //复合方案所需要的配置文件 //VLESS over TCP with XTLS模式 - string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_xtls_client_config.json"; - using (StreamReader readerJson = File.OpenText(outboundsConfigJsons)) - { - JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson)); + //string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_xtls_client_config.json"; + //using (StreamReader readerJson = File.OpenText(outboundsConfigJsons)) + //{ + // JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson)); - //设置客户端的地址/端口/id - jObjectJson["outbounds"][0]["settings"]["vnext"][0]["address"] = ReceiveConfigurationParameters[4]; - jObjectJson["outbounds"][0]["settings"]["vnext"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]); - jObjectJson["outbounds"][0]["settings"]["vnext"][0]["users"][0]["id"] = ReceiveConfigurationParameters[2]; + // //设置客户端的地址/端口/id + // jObjectJson["outbounds"][0]["settings"]["vnext"][0]["address"] = ReceiveConfigurationParameters[4]; + // jObjectJson["outbounds"][0]["settings"]["vnext"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]); + // jObjectJson["outbounds"][0]["settings"]["vnext"][0]["users"][0]["id"] = ReceiveConfigurationParameters[2]; - clientJson["outbounds"] = jObjectJson["outbounds"]; - if (!Directory.Exists(@"v2ray_config\vless_tcp_xtls_client_config"))//如果不存在就创建file文件夹      - { - Directory.CreateDirectory(@"v2ray_config\vless_tcp_xtls_client_config");//创建该文件夹   - } - using (StreamWriter sw = new StreamWriter(@"v2ray_config\vless_tcp_xtls_client_config\config.json")) - { - sw.Write(clientJson.ToString()); - } - } + // clientJson["outbounds"] = jObjectJson["outbounds"]; + // if (!Directory.Exists(@"v2ray_config\vless_tcp_xtls_client_config"))//如果不存在就创建file文件夹      + // { + // Directory.CreateDirectory(@"v2ray_config\vless_tcp_xtls_client_config");//创建该文件夹   + // } + // using (StreamWriter sw = new StreamWriter(@"v2ray_config\vless_tcp_xtls_client_config\config.json")) + // { + // sw.Write(clientJson.ToString()); + // } + //} //VLESS over TCP with TLS模式 - outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_tls_caddy_cilent_config.json"; + string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_tls_caddy_cilent_config.json"; using (StreamReader readerJson = File.OpenText(outboundsConfigJsons)) { JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson)); diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml index a2d4646..4eb0895 100644 --- a/ProxySU/ResultClientInformation.xaml +++ b/ProxySU/ResultClientInformation.xaml @@ -13,7 +13,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs index 557d7c0..e25e2d4 100644 --- a/ProxySU/ResultClientInformation.xaml.cs +++ b/ProxySU/ResultClientInformation.xaml.cs @@ -61,6 +61,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Visible; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -382,7 +383,7 @@ namespace ProxySU GenerateV2rayVmessWsTlsShareQRcodeAndBase64Url(); GenerateV2rayTrojanShareQRcodeAndBase64Url(); - RadioButtonVlessTcpXtls.IsChecked = true; + RadioButtonVlessTcpTls.IsChecked = true; } } @@ -726,6 +727,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Visible; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -788,6 +790,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Visible; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -812,6 +815,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Visible; @@ -831,6 +835,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -861,6 +866,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Visible; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -967,6 +973,7 @@ namespace ProxySU GroupBoxClientQRandURL.Visibility = Visibility.Collapsed; GroupBoxClientSSpc.Visibility = Visibility.Collapsed; GroupBoxV2rayClient.Visibility = Visibility.Collapsed; + GroupBoxXrayClient.Visibility = Visibility.Collapsed; GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed; GroupBoxTrojanClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; @@ -1736,7 +1743,7 @@ namespace ProxySU //} - // ImageShareQRcodeDefault = CreateQRCode(TextBoxURLDefault, $"v2ray_config\\{saveFileFolder}\\QR.bmp"); + // ImageShareQRcodeDefault = CreateQRCode(TextBoxURLDefault, $"v2ray_config\\{saveFileFolder}\\QR.bmp"); // ImageShareQRcode.Source = ImageShareQRcodeDefault; @@ -4256,7 +4263,7 @@ namespace ProxySU #endregion - #region SSR相关 + #region SSR 相关 //生成SSR客户端资料 private void GenerateSSRShareQRcodeAndBase64Url() { @@ -4629,7 +4636,6 @@ namespace ProxySU #endregion - #region MTProto 界面控制 private void RadioButtonMtgIpv4_Checked(object sender, RoutedEventArgs e) { diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 2bb0379..8148101 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ diff --git a/TemplateConfg/v2ray/server/05_inbounds/vless_vmess_xtls_tcp_websocket_server_config.json b/TemplateConfg/v2ray/server/05_inbounds/vless_vmess_xtls_tcp_websocket_server_config.json index aa30373..4a5b0a6 100644 --- a/TemplateConfg/v2ray/server/05_inbounds/vless_vmess_xtls_tcp_websocket_server_config.json +++ b/TemplateConfg/v2ray/server/05_inbounds/vless_vmess_xtls_tcp_websocket_server_config.json @@ -6,8 +6,7 @@ "settings": { "clients": [ { - "id": null, - "flow": "xtls-rprx-direct" + "id": null } ], "decryption": "none", @@ -35,7 +34,7 @@ }, "streamSettings": { "network": "tcp", - "security": "xtls", + "security": "tls", "xtlsSettings": { "alpn": [ "http/1.1"