Skip to content

Commit 3d0a177

Browse files
proxysuproxysu
committed
更新跟进Trojan-go最新分享链接标准
1 parent 7e9fb34 commit 3d0a177

13 files changed

+163
-85
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.4.0" Height="675" Width="650">
8+
Title="ProxySU - v2.4.1" Height="675" Width="650">
99
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
1010
https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
1111
<Window.Resources>

‎ProxySU/MainWindow.xaml.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public class LanguageInfo
4545
//ReceiveConfigurationParameters[0]----模板类型
4646
//ReceiveConfigurationParameters[1]----服务端口
4747
//ReceiveConfigurationParameters[2]----V2Ray uuid/(naive/Trojan-go/Trojan/SSR/SS)' Password
48-
//ReceiveConfigurationParameters[3]----QUIC加密方式/SSR 加密方法/naive'user/VLESS ws Path
48+
//ReceiveConfigurationParameters[3]----QUIC加密方式/SSR 加密方法/SS 加密方式/naive'user/VLESS ws Path
4949
//ReceiveConfigurationParameters[4]----Domain
5050
//ReceiveConfigurationParameters[5]----伪装类型/插件名称
51-
//ReceiveConfigurationParameters[6]----Websocket'Path/http2'Path/QUIC密钥/mKCP Seed/SS 加密方式/VMESS ws Path
51+
//ReceiveConfigurationParameters[6]----V2Ray&Trojan-go&SS--Websocket'Path/http2'Path/QUIC密钥/mKCP Seed/VMESS ws Path
5252
//ReceiveConfigurationParameters[7]----伪装网站
5353
//ReceiveConfigurationParameters[8]----方案名称
5454
//ReceiveConfigurationParameters[9]----插件参数选项/VMESS tcp Path
@@ -3595,7 +3595,7 @@ private void windowTrojanGoTemplateConfigurationClosed(object sender, System.Eve
35953595
TextBlockTrojanGoCurrentlySelectedPlanPassword.Visibility = Visibility.Visible;
35963596

35973597
TextBlockTrojanGoShowPath.Text = "WebSocket Path:";
3598-
TextBlockTrojanGoCurrentlySelectedPlanPathSeedKey.Text = ReceiveConfigurationParameters[3]; //mKCP Seed\Quic Key\Path
3598+
TextBlockTrojanGoCurrentlySelectedPlanPathSeedKey.Text = ReceiveConfigurationParameters[6]; //mKCP Seed\Quic Key\Path
35993599

36003600

36013601
TextBlockTrojanGoShowPath.Visibility = Visibility.Visible;
@@ -4281,7 +4281,7 @@ private void StartSetUpTrojanGo(ConnectionInfo connectionInfo, TextBlock textBlo
42814281
if (String.Equals(ReceiveConfigurationParameters[0], "TrojanGoWebSocketTLS2Web"))
42824282
{
42834283
serverJson["websocket"]["enabled"] = true;
4284-
serverJson["websocket"]["path"] = ReceiveConfigurationParameters[3];
4284+
serverJson["websocket"]["path"] = ReceiveConfigurationParameters[6];
42854285
}
42864286

42874287
using (StreamWriter sw = new StreamWriter(@"config.json"))
@@ -4880,7 +4880,7 @@ private void StartSetUpTrojanGo(ConnectionInfo connectionInfo, TextBlock textBlo
48804880
if (String.Equals(ReceiveConfigurationParameters[0], "TrojanGoWebSocketTLS2Web"))
48814881
{
48824882
clientJson["websocket"]["enabled"] = true;
4883-
clientJson["websocket"]["path"] = ReceiveConfigurationParameters[3];
4883+
clientJson["websocket"]["path"] = ReceiveConfigurationParameters[6];
48844884
}
48854885

48864886
using (StreamWriter sw = new StreamWriter(@"trojan-go_config\config.json"))
@@ -9279,9 +9279,9 @@ private void windowTemplateConfigurationSSClosed(object sender, System.EventArgs
92799279
TextBlockCurrentlySelectedPlanSS.Text = ReceiveConfigurationParameters[8]; //所选方案名称
92809280
TextBlockCurrentlySelectedPlanPortSS.Text = ReceiveConfigurationParameters[1]; //服务器端口
92819281
TextBlockCurrentlySelectedPlanUUIDSS.Text = ReceiveConfigurationParameters[2]; //密码
9282-
TextBlockCurrentlySelectedPlanMethodSS.Text = ReceiveConfigurationParameters[6]; //加密方法
9282+
TextBlockCurrentlySelectedPlanMethodSS.Text = ReceiveConfigurationParameters[3]; //加密方法
92839283
TextBlockCurrentlySelectedPlanDomainSS.Text = ReceiveConfigurationParameters[4]; //域名
9284-
TextBlockCurrentlySelectedPlanPathSS.Text = ReceiveConfigurationParameters[3]; //WebSocket Path
9284+
TextBlockCurrentlySelectedPlanPathSS.Text = ReceiveConfigurationParameters[6]; //WebSocket Path
92859285
TextBlockCurrentlySelectedPlanFakeWebsite.Text = ReceiveConfigurationParameters[7]; //伪装网站
92869286

92879287
if (String.Equals(ReceiveConfigurationParameters[0], "NonePluginSS")
@@ -10135,7 +10135,7 @@ private void StartSetUpSS(ConnectionInfo connectionInfo, TextBlock textBlockName
1013510135
//设置监听端口
1013610136
serverJson["server_port"]= int.Parse(ReceiveConfigurationParameters[1]);
1013710137
//设置加密方式
10138-
serverJson["method"] = ReceiveConfigurationParameters[6];
10138+
serverJson["method"] = ReceiveConfigurationParameters[3];
1013910139
//产生伪装Web的监听端口
1014010140
randomCaddyListenPort = GetRandomPort();
1014110141

@@ -10172,11 +10172,11 @@ private void StartSetUpSS(ConnectionInfo connectionInfo, TextBlock textBlockName
1017210172
{
1017310173
serverJson["server_port"] = 10000;
1017410174
serverJson["plugin"] = @"v2ray-plugin";
10175-
serverJson["plugin_opts"] = $"server;host={ReceiveConfigurationParameters[4]};path={ReceiveConfigurationParameters[3]}";
10175+
serverJson["plugin_opts"] = $"server;host={ReceiveConfigurationParameters[4]};path={ReceiveConfigurationParameters[6]}";
1017610176

1017710177
//客户端项
1017810178
ReceiveConfigurationParameters[5] = @"v2ray-plugin";
10179-
ReceiveConfigurationParameters[9] = $"tls;host={ReceiveConfigurationParameters[4]};path={ReceiveConfigurationParameters[3]}";
10179+
ReceiveConfigurationParameters[9] = $"tls;host={ReceiveConfigurationParameters[4]};path={ReceiveConfigurationParameters[6]}";
1018010180
}
1018110181
else if (String.Equals(ReceiveConfigurationParameters[0], "QuicSS") == true)
1018210182
{

‎ProxySU/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
5252
// 方法是按如下所示使用“*”: :
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2.4.0.0")]
55-
[assembly: AssemblyFileVersion("2.4.0.0")]
54+
[assembly: AssemblyVersion("2.4.1.0")]
55+
[assembly: AssemblyFileVersion("2.4.1.0")]

‎ProxySU/ResultClientInformation.xaml

+11-6
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="Visible" Grid.Row="0">
16+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Collapsed" Grid.Row="0">
1717
<Grid >
1818
<Grid.ColumnDefinitions>
1919
<ColumnDefinition Width="0.5*"></ColumnDefinition>
@@ -93,7 +93,7 @@
9393
</Grid>
9494
</GroupBox>
9595
<!-- Trojan-Go客户端配置参数 -->
96-
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxTrojanGoClient" Visibility="Collapsed" Grid.Row="0">
96+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxTrojanGoClient" Visibility="Visible" Grid.Row="0">
9797
<Grid >
9898
<Grid.ColumnDefinitions>
9999
<ColumnDefinition Width="0.5*"></ColumnDefinition>
@@ -106,6 +106,7 @@
106106
<RowDefinition Height="30"></RowDefinition>
107107
<RowDefinition Height="30"></RowDefinition>
108108
<RowDefinition Height="30"></RowDefinition>
109+
<RowDefinition Height="30"></RowDefinition>
109110
<RowDefinition></RowDefinition>
110111
</Grid.RowDefinitions>
111112
<TextBlock Text="{DynamicResource TextBlockServerAddress}" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" ></TextBlock>
@@ -116,11 +117,15 @@
116117
<TextBlock Grid.Column="2" Grid.Row="2"></TextBlock>
117118
<TextBlock Text="{DynamicResource TextBlockHostPassword}" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
118119
<TextBox x:Name="TextBoxTrojanGoServerPassword" IsReadOnly="True" Grid.Column="1" Grid.Row="3" Margin="4" MouseDoubleClick="TextBoxTrojanGoServerPassword_MouseDoubleClick"></TextBox>
119-
<TextBlock Grid.Column="2" Grid.Row="3"></TextBlock>
120-
<TextBlock x:Name="TextBlockTrojanGoWebSocketPath" Text="{DynamicResource TextBlockTrojanGoWebSocketPath}" Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
121-
<TextBox x:Name="TextBoxTrojanGoWSPath" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="4" MouseDoubleClick="TextBoxTrojanGoWSPath_MouseDoubleClick"></TextBox>
120+
121+
<TextBlock Text="Type:" Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
122+
<TextBox x:Name="TextBoxTrojanGoType" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="4" MouseDoubleClick="TextBoxTrojanGoType_MouseDoubleClick"></TextBox>
123+
124+
<TextBlock x:Name="TextBlockTrojanGoWebSocketPath" Text="{DynamicResource TextBlockTrojanGoWebSocketPath}" Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
125+
<TextBox x:Name="TextBoxTrojanGoWSPath" IsReadOnly="True" Grid.Column="1" Grid.Row="5" Margin="4" MouseDoubleClick="TextBoxTrojanGoWSPath_MouseDoubleClick"></TextBox>
122126
<TextBlock x:Name="TextBlockTrojanGoCaption" Grid.Column="2" Grid.Row="4"></TextBlock>
123-
<TextBlock Text="{DynamicResource TextBlockCopyToClipExplain}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" Margin="5" VerticalAlignment="Center"></TextBlock>
127+
128+
<TextBlock Text="{DynamicResource TextBlockCopyToClipExplain}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" Margin="5" VerticalAlignment="Center"></TextBlock>
124129
</Grid>
125130
</GroupBox>
126131
<!-- Trojan客户端配置参数 -->

0 commit comments

Comments
 (0)