Skip to content

Commit 55c7abf

Browse files
proxysuproxysu
committed
v2.5.1
1 parent e79607b commit 55c7abf

File tree

6 files changed

+38
-33
lines changed

6 files changed

+38
-33
lines changed

‎ProxySU/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:ProxySU"
77
mc:Ignorable="d"
8-
Title="ProxySU - v2.5.1 Beta2" Height="675" Width="660">
8+
Title="ProxySU - v2.5.1" Height="675" Width="660">
99
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
1010
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
1111
<Window.Resources>

‎ProxySU/MainWindow.xaml.cs

+23-23
Original file line numberDiff line numberDiff line change
@@ -1355,13 +1355,13 @@ private bool GenerateServerConfigurationV2Ray(SshClient client)
13551355
//currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
13561356

13571357
//备份原来的文件
1358-
//functionResult = FileCheckExists(client, @"/usr/local/etc/v2ray/config.json");
1359-
//if (functionResult == true)
1360-
//{
1358+
functionResult = FileCheckExists(client, @"/usr/local/etc/v2ray/config.json");
1359+
if (functionResult == true)
1360+
{
13611361

13621362
sshShellCommand = @"mv /usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json.1";
13631363
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
1364-
//}
1364+
}
13651365
//读取配置文件各个模块
13661366
string logConfigJson = $"{pwdir}" + @"TemplateConfg\v2ray\server\00_log\00_log.json";
13671367
string apiConfigJson = $"{pwdir}" + @"TemplateConfg\v2ray\server\01_api\01_api.json";
@@ -1959,29 +1959,29 @@ private bool GenerateClientConfigurationV2Ray()
19591959
{
19601960
//复合方案所需要的配置文件
19611961
//VLESS over TCP with XTLS模式
1962-
string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_xtls_client_config.json";
1963-
using (StreamReader readerJson = File.OpenText(outboundsConfigJsons))
1964-
{
1965-
JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson));
1962+
//string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_xtls_client_config.json";
1963+
//using (StreamReader readerJson = File.OpenText(outboundsConfigJsons))
1964+
//{
1965+
// JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson));
19661966

1967-
//设置客户端的地址/端口/id
1968-
jObjectJson["outbounds"][0]["settings"]["vnext"][0]["address"] = ReceiveConfigurationParameters[4];
1969-
jObjectJson["outbounds"][0]["settings"]["vnext"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]);
1970-
jObjectJson["outbounds"][0]["settings"]["vnext"][0]["users"][0]["id"] = ReceiveConfigurationParameters[2];
1967+
// //设置客户端的地址/端口/id
1968+
// jObjectJson["outbounds"][0]["settings"]["vnext"][0]["address"] = ReceiveConfigurationParameters[4];
1969+
// jObjectJson["outbounds"][0]["settings"]["vnext"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]);
1970+
// jObjectJson["outbounds"][0]["settings"]["vnext"][0]["users"][0]["id"] = ReceiveConfigurationParameters[2];
19711971

1972-
clientJson["outbounds"] = jObjectJson["outbounds"];
1973-
if (!Directory.Exists(@"v2ray_config\vless_tcp_xtls_client_config"))//如果不存在就创建file文件夹　　 　　
1974-
{
1975-
Directory.CreateDirectory(@"v2ray_config\vless_tcp_xtls_client_config");//创建该文件夹　　
1976-
}
1977-
using (StreamWriter sw = new StreamWriter(@"v2ray_config\vless_tcp_xtls_client_config\config.json"))
1978-
{
1979-
sw.Write(clientJson.ToString());
1980-
}
1981-
}
1972+
// clientJson["outbounds"] = jObjectJson["outbounds"];
1973+
// if (!Directory.Exists(@"v2ray_config\vless_tcp_xtls_client_config"))//如果不存在就创建file文件夹　　 　　
1974+
// {
1975+
// Directory.CreateDirectory(@"v2ray_config\vless_tcp_xtls_client_config");//创建该文件夹　　
1976+
// }
1977+
// using (StreamWriter sw = new StreamWriter(@"v2ray_config\vless_tcp_xtls_client_config\config.json"))
1978+
// {
1979+
// sw.Write(clientJson.ToString());
1980+
// }
1981+
//}
19821982

19831983
//VLESS over TCP with TLS模式
1984-
outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_tls_caddy_cilent_config.json";
1984+
string outboundsConfigJsons = $"{pwdir}" + @"TemplateConfg\v2ray\client\06_outbounds\vless_tcp_tls_caddy_cilent_config.json";
19851985
using (StreamReader readerJson = File.OpenText(outboundsConfigJsons))
19861986
{
19871987
JObject jObjectJson = (JObject)JToken.ReadFrom(new JsonTextReader(readerJson));

‎ProxySU/ResultClientInformation.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RowDefinition Height="0.12*"></RowDefinition>
1414
</Grid.RowDefinitions>
1515
<!-- V2Ray客户端配置参数 -->
16-
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Collapsed" Grid.Row="0">
16+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Visible" Grid.Row="0">
1717
<Grid >
1818
<Grid.ColumnDefinitions>
1919
<ColumnDefinition Width="0.5*"></ColumnDefinition>
@@ -108,7 +108,7 @@
108108
</GroupBox>
109109

110110
<!-- Xray客户端配置参数 -->
111-
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxXrayClient" Visibility="Visible" Grid.Row="0">
111+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxXrayClient" Visibility="Collapsed" Grid.Row="0">
112112
<Grid >
113113
<Grid.ColumnDefinitions>
114114
<ColumnDefinition Width="0.5*"></ColumnDefinition>

‎ProxySU/ResultClientInformation.xaml.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public ResultClientInformation()
6161
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
6262
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
6363
GroupBoxV2rayClient.Visibility = Visibility.Visible;
64+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
6465
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
6566
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
6667
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -382,7 +383,7 @@ public ResultClientInformation()
382383
GenerateV2rayVmessWsTlsShareQRcodeAndBase64Url();
383384

384385
GenerateV2rayTrojanShareQRcodeAndBase64Url();
385-
RadioButtonVlessTcpXtls.IsChecked = true;
386+
RadioButtonVlessTcpTls.IsChecked = true;
386387
}
387388

388389
}
@@ -726,6 +727,7 @@ public ResultClientInformation()
726727
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
727728
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
728729
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
730+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
729731
GroupBoxTrojanGoClient.Visibility = Visibility.Visible;
730732
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
731733
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -788,6 +790,7 @@ public ResultClientInformation()
788790
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
789791
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
790792
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
793+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
791794
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
792795
GroupBoxTrojanClient.Visibility = Visibility.Visible;
793796
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -812,6 +815,7 @@ public ResultClientInformation()
812815
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
813816
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
814817
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
818+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
815819
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
816820
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
817821
GroupBoxNaiveProxyClient.Visibility = Visibility.Visible;
@@ -831,6 +835,7 @@ public ResultClientInformation()
831835
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
832836
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
833837
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
838+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
834839
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
835840
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
836841
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -861,6 +866,7 @@ public ResultClientInformation()
861866
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
862867
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
863868
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
869+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
864870
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
865871
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
866872
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -967,6 +973,7 @@ public ResultClientInformation()
967973
GroupBoxClientQRandURL.Visibility = Visibility.Collapsed;
968974
GroupBoxClientSSpc.Visibility = Visibility.Collapsed;
969975
GroupBoxV2rayClient.Visibility = Visibility.Collapsed;
976+
GroupBoxXrayClient.Visibility = Visibility.Collapsed;
970977
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
971978
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
972979
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
@@ -1736,7 +1743,7 @@ private void GenerateV2rayVlessTcpXtlsShareQRcodeAndBase64Url()
17361743

17371744
//}
17381745

1739-
// ImageShareQRcodeDefault = CreateQRCode(TextBoxURLDefault, $"v2ray_config\\{saveFileFolder}\\QR.bmp");
1746+
// ImageShareQRcodeDefault = CreateQRCode(TextBoxURLDefault, $"v2ray_config\\{saveFileFolder}\\QR.bmp");
17401747
// ImageShareQRcode.Source = ImageShareQRcodeDefault;
17411748

17421749

@@ -4256,7 +4263,7 @@ private void TextBoxNaivePassword_MouseDoubleClick(object sender, MouseButtonEve
42564263

42574264
#endregion
42584265

4259-
#region SSR相关
4266+
#region SSR 相关
42604267
//生成SSR客户端资料
42614268
private void GenerateSSRShareQRcodeAndBase64Url()
42624269
{
@@ -4629,7 +4636,6 @@ private void TextBoxURLpcSS_MouseDoubleClick(object sender, MouseButtonEventArgs
46294636

46304637
#endregion
46314638

4632-
46334639
#region MTProto 界面控制
46344640
private void RadioButtonMtgIpv4_Checked(object sender, RoutedEventArgs e)
46354641
{

‎ProxySU/bin/Beta/Beta.zip

169 Bytes
Binary file not shown.

‎TemplateConfg/v2ray/server/05_inbounds/vless_vmess_xtls_tcp_websocket_server_config.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"settings": {
77
"clients": [
88
{
9-
"id": null,
10-
"flow": "xtls-rprx-direct"
9+
"id": null
1110
}
1211
],
1312
"decryption": "none",
@@ -35,7 +34,7 @@
3534
},
3635
"streamSettings": {
3736
"network": "tcp",
38-
"security": "xtls",
37+
"security": "tls",
3938
"xtlsSettings": {
4039
"alpn": [
4140
"http/1.1"

0 commit comments

Comments
 (0)