Skip to content

Commit c42b105

Browse files
proxysuproxysu
committed
添加SSR+TLS+Caddy方案
1 parent 0cb5408 commit c42b105

11 files changed

+1865
-288
lines changed

‎ProxySU/MainWindow.xaml

+62-11
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.0.4" Height="625" Width="530">
8+
Title="ProxySU - v2.1.0" Height="625" Width="530">
99
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
1010
https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
1111
<Window.Resources>
@@ -126,7 +126,7 @@
126126
<ProgressBar x:Name="ProgressBarSetUpProcessing" Minimum="0" Maximum="100" Value="0" IsIndeterminate="False" Margin="7" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4"></ProgressBar>
127127
<TextBox x:Name="TextBoxMonitorCommandResults" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="4" Grid.RowSpan="5" Margin="30,0,30,10"></TextBox>
128128
<TabControl Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="3">
129-
<TabItem Header="V2Ray" Width="100" Height="30">
129+
<TabItem Header="V2Ray" Width="80" Height="30">
130130
<Grid>
131131
<Grid.ColumnDefinitions>
132132
<ColumnDefinition></ColumnDefinition>
@@ -185,7 +185,7 @@
185185
<Button x:Name="Button_canel" Content="{DynamicResource Button_canel}" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
186186
</Grid>
187187
</TabItem>
188-
<TabItem Header="Trojan-Go" Width="100" Height="30">
188+
<TabItem Header="Trojan-Go" Width="80" Height="30">
189189
<Grid>
190190
<Grid.ColumnDefinitions>
191191
<ColumnDefinition></ColumnDefinition>
@@ -238,7 +238,7 @@
238238
<Button x:Name="ButtonTrojanGoCancel" Content="{DynamicResource ButtonTrojanGoCancel}" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
239239
</Grid>
240240
</TabItem>
241-
<TabItem Header="Trojan" Width="100" Height="30">
241+
<TabItem Header="Trojan" Width="80" Height="30">
242242
<Grid>
243243
<Grid.ColumnDefinitions>
244244
<ColumnDefinition></ColumnDefinition>
@@ -277,9 +277,9 @@
277277
<TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5"></TextBlock>
278278
<TextBox x:Name="TextBoxTrojanPassword" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
279279
<Button x:Name="ButtonTrojanPassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonTrojanPassword_Click" ></Button>
280-
281-
<TextBlock Text="伪装网站：" Grid.Column="0" Grid.Row="3" Visibility="Collapsed"></TextBlock>
282-
<TextBox x:Name="TextBoxTrojanSites" Style="{StaticResource TitleText}" Tag="可以增加代理的隐蔽(可为空)" Grid.Column="1" Grid.Row="3" Margin="3" Visibility="Collapsed"></TextBox>
280+
281+
<TextBlock Text="{DynamicResource TextBlockV2RayMaskSites}" Grid.Column="0" Grid.Row="3" Visibility="Collapsed"></TextBlock>
282+
<TextBox x:Name="TextBoxTrojanSites" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxV2RayMaskSitesTag}" Grid.Column="1" Grid.Row="3" Margin="3" Visibility="Collapsed"></TextBox>
283283

284284
</Grid>
285285
</GroupBox>
@@ -294,7 +294,7 @@
294294
<Button x:Name="ButtonTrojanCancel" Content="{DynamicResource ButtonTrojanCancel}" Grid.Column="2" Grid.Row="2" Margin="10" Click="Button_canel_Click"></Button>
295295
</Grid>
296296
</TabItem>
297-
<TabItem x:Name="TabItemNaiveProxy" Header="NaiveProxy" Width="100" Height="30">
297+
<TabItem x:Name="TabItemNaiveProxy" Header="NaiveProxy" Width="80" Height="30">
298298
<Grid>
299299
<Grid.ColumnDefinitions>
300300
<ColumnDefinition></ColumnDefinition>
@@ -331,8 +331,8 @@
331331
<TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
332332
<TextBox x:Name="TextBoxNaivePassword" Grid.Column="1" Grid.Row="3" Margin="3"></TextBox>
333333
<Button x:Name="ButtonNaivePassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="3" Margin="2" Click="ButtonNaivePassword_Click"></Button>
334-
<TextBlock Text="伪装网站：" Grid.Column="0" Grid.Row="4" Visibility="Collapsed"></TextBlock>
335-
<TextBox x:Name="TextBoxNaiveSites" Style="{StaticResource TitleText}" Tag="可以增加代理的隐蔽(可为空)" Grid.Column="1" Grid.Row="4" Margin="3" Visibility="Collapsed"></TextBox>
334+
<TextBlock Text="{DynamicResource TextBlockV2RayMaskSites}" Grid.Column="0" Grid.Row="4" Visibility="Collapsed"></TextBlock>
335+
<TextBox x:Name="TextBoxNaiveSites" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxV2RayMaskSitesTag}" Grid.Column="1" Grid.Row="4" Margin="3" Visibility="Collapsed"></TextBox>
336336

337337
</Grid>
338338
</GroupBox>
@@ -343,6 +343,57 @@
343343
<Button x:Name="ButtonNaiveCancel" Content="{DynamicResource ButtonNaiveCancel}" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
344344
</Grid>
345345
</TabItem>
346+
<TabItem Header="SSR" Width="80" Height="30">
347+
<Grid>
348+
<Grid.ColumnDefinitions>
349+
<ColumnDefinition></ColumnDefinition>
350+
<ColumnDefinition></ColumnDefinition>
351+
<ColumnDefinition></ColumnDefinition>
352+
353+
</Grid.ColumnDefinitions>
354+
<Grid.RowDefinitions>
355+
<RowDefinition></RowDefinition>
356+
<RowDefinition></RowDefinition>
357+
<RowDefinition Height="60"></RowDefinition>
358+
359+
</Grid.RowDefinitions>
360+
<GroupBox Header="{DynamicResource GroupBoxHeaderParameterTrojan}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
361+
<Grid>
362+
<Grid.ColumnDefinitions>
363+
<ColumnDefinition Width="0.5*"></ColumnDefinition>
364+
<ColumnDefinition></ColumnDefinition>
365+
<ColumnDefinition Width="0.4*"></ColumnDefinition>
366+
367+
</Grid.ColumnDefinitions>
368+
<Grid.RowDefinitions>
369+
<RowDefinition></RowDefinition>
370+
<RowDefinition></RowDefinition>
371+
<RowDefinition></RowDefinition>
372+
<RowDefinition></RowDefinition>
373+
<RowDefinition></RowDefinition>
374+
</Grid.RowDefinitions>
375+
<TextBlock Text="{DynamicResource TextBlockSSRTemplateExplanation}" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
376+
<TextBlock Text="{DynamicResource TextBlockTrojanServerDomain}" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5"></TextBlock>
377+
<TextBox x:Name="TextBoxSSRHostDomain" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxDomainPrompt}" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
378+
<TextBlock Text="{DynamicResource TextBlockTrojanPort}" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
379+
<!--<TextBlock Text="用户名：" Grid.Column="0" Grid.Row="2"></TextBlock>
380+
<TextBox x:Name="TextBoxUser" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
381+
<Button x:Name="ButtonNaiveUser" Content="随机" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonNaiveUser_Click"></Button>-->
382+
<TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5"></TextBlock>
383+
<TextBox x:Name="TextBoxSSRPassword" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
384+
<Button x:Name="ButtonSSRPassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonSSRPassword_Click" ></Button>
385+
386+
<TextBlock Text="{DynamicResource TextBlockV2RayMaskSites}" Grid.Column="0" Grid.Row="3" Visibility="Collapsed"></TextBlock>
387+
<TextBox x:Name="TextBoxSSRSites" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxV2RayMaskSitesTag}" Grid.Column="1" Grid.Row="3" Margin="3" Visibility="Collapsed"></TextBox>
388+
389+
</Grid>
390+
</GroupBox>
391+
392+
<Button x:Name="ButtonSSRSetUp" Content="{DynamicResource ButtonSSRSetUp}" Grid.Column="0" Grid.Row="2" Margin="10" Click="ButtonSSRSetUp_Click"/>
393+
<!--<Button x:Name="ButtonUpdateTrojan" Content="{DynamicResource ButtonUpdateTrojan}" Grid.Column="1" Grid.Row="2" Margin="10" Click="ButtonUpdateTrojan_Click"></Button>-->
394+
<Button x:Name="ButtonSSRCancel" Content="{DynamicResource ButtonTrojanCancel}" Grid.Column="2" Grid.Row="2" Margin="10" Click="Button_canel_Click"></Button>
395+
</Grid>
396+
</TabItem>
346397
<!--<TabItem Header="三合一" Width="100" Height="30" Visibility="Collapsed">
347398
<Grid>
348399
<Grid.ColumnDefinitions>
@@ -413,7 +464,7 @@
413464
</Grid>
414465
</TabItem>-->
415466

416-
<TabItem Header="{DynamicResource TabItemHeaderSysTools}" Width="100" Height="30">
467+
<TabItem Header="{DynamicResource TabItemHeaderSysTools}" Width="80" Height="30">
417468
<Grid>
418469
<Grid.ColumnDefinitions>
419470
<ColumnDefinition></ColumnDefinition>

0 commit comments

Comments
 (0)