1
0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-22 21:26:09 +03:00

为V2Ray\Trojan\Trojan-go添加安装过程显示窗口

This commit is contained in:
ProxySU 2020-08-20 20:07:37 +08:00
parent b916412957
commit e18a6fbd0c
6 changed files with 3188 additions and 700 deletions

View File

@ -317,7 +317,6 @@
<Button x:Name="ButtonProofreadTime" Content="校对时间" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonProofreadTime_Click"/> <Button x:Name="ButtonProofreadTime" Content="校对时间" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonProofreadTime_Click"/>
<Button x:Name="ButtonClearOccupiedPorts" Content="释放80/443端口" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button> <Button x:Name="ButtonClearOccupiedPorts" Content="释放80/443端口" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button>
<Button x:Name="ButtonTestAndEnableBBR" Content="检测/启用BBR" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button> <Button x:Name="ButtonTestAndEnableBBR" Content="检测/启用BBR" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button>
<Button Content="Test" Grid.Column="0" Grid.Row="1" Margin="10" Click="Button_Click"></Button>
</Grid> </Grid>
</TabItem> </TabItem>
@ -412,7 +411,7 @@
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="程序版本1.8.2" Grid.Column="0" Grid.Row="0"></TextBlock> <TextBlock Text="程序版本1.8.3" Grid.Column="0" Grid.Row="0"></TextBlock>
</Grid> </Grid>

File diff suppressed because it is too large Load Diff

View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.2.0")] [assembly: AssemblyVersion("1.8.3.0")]
[assembly: AssemblyFileVersion("1.8.2.0")] [assembly: AssemblyFileVersion("1.8.3.0")]

Binary file not shown.

View File

@ -1,5 +1,8 @@
##domain## { :88 {
root * /usr/share/caddy root * /usr/share/caddy
file_server file_server
##sites## ##sites##
} }
##domain##:80 {
redir https://##domain##{uri}
}

View File

@ -3,7 +3,7 @@
"local_addr": "::", "local_addr": "::",
"local_port": 443, "local_port": 443,
"remote_addr": "127.0.0.1", "remote_addr": "127.0.0.1",
"remote_port": 80, "remote_port": 88,
"password": [ "password": [
"" ""
], ],