mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-02-16 14:43:14 +03:00
排查bug1
This commit is contained in:
ProxySU
parent
298123e661
commit
2390a2b12e
@ -123,7 +123,7 @@
|
||||
</Grid.RowDefinitions>
|
||||
<Button x:Name="ButtonGuideConfiguration" Visibility="Visible" Content="启用向导" Grid.Column="0" Grid.Row="0" Click="ButtonGuideConfiguration_Click"></Button>
|
||||
<TextBlock Text="通过向导生成配置文件" Visibility="Visible" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonTemplateConfiguration" Content="打开模板库" Grid.Column="1" Grid.Row="0" Click="ButtonTemplateConfiguration_Click"></Button>
|
||||
<Button x:Name="ButtonTemplateConfiguration" Content="模板库" Grid.Column="1" Grid.Row="0" Click="ButtonTemplateConfiguration_Click"></Button>
|
||||
<TextBlock Text="模板库" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonAdvancedConfiguration" Visibility="Visible" Content="配置编辑器" Grid.Column="2" Grid.Row="0" Click="ButtonAdvancedConfiguration_Click"></Button>
|
||||
<TextBlock Text="配置文件高级生成器
（有经验用户可以使用）" Visibility="Visible" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
@ -172,7 +172,8 @@
|
||||
<Button x:Name="testPortOccupy" Content="测试端口占用" Grid.Column="0" Grid.Row="2" Margin="5" Click="TestPortOccupy_Click"></Button>
|
||||
<Button x:Name="testInstalledV2ray" Content="测试是否安装V2ray" Grid.Column="1" Grid.Row="0" Margin="5" Click="TestInstalledV2ray_Click"></Button>
|
||||
<Button x:Name="testsshCmd" Content="测试ssh命令" Grid.Column="1" Grid.Row="1" Margin="5" Click="TestsshCmd_Click"></Button>-->
|
||||
<Button Content="测试数组赋值" Grid.Column="2" Grid.Row="0" Margin="5" Click="Button_Click"></Button>
|
||||
<!--<Button Content="测试数组赋值" Grid.Column="2" Grid.Row="0" Margin="5" Click="Button_Click"></Button>-->
|
||||
<Button Content="test" Click="Button_Click_1"></Button>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
||||
@ -670,7 +670,7 @@ namespace ProxySU
|
||||
//除WebSocketTLSWeb模式外设置监听端口
|
||||
if (serverConfig.Contains("WebSocketTLSWeb") == false && serverConfig.Contains("http2Web") == false)
|
||||
{
|
||||
serverJson["inbounds"][0]["port"] = ReceiveConfigurationParameters[1];
|
||||
serverJson["inbounds"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]);
|
||||
}
|
||||
//TLS自签证书模式下
|
||||
if (serverConfig.Contains("selfSigned") == true)
|
||||
@ -865,7 +865,7 @@ namespace ProxySU
|
||||
JObject clientJson = (JObject)JToken.ReadFrom(new JsonTextReader(reader));
|
||||
|
||||
clientJson["outbounds"][0]["settings"]["vnext"][0]["address"] = ReceiveConfigurationParameters[4];
|
||||
clientJson["outbounds"][0]["settings"]["vnext"][0]["port"] = ReceiveConfigurationParameters[1];
|
||||
clientJson["outbounds"][0]["settings"]["vnext"][0]["port"] = int.Parse(ReceiveConfigurationParameters[1]);
|
||||
clientJson["outbounds"][0]["settings"]["vnext"][0]["users"][0]["id"] = ReceiveConfigurationParameters[2];
|
||||
if (clientConfig.Contains("WebSocket")==true)
|
||||
{
|
||||
@ -1085,7 +1085,7 @@ namespace ProxySU
|
||||
for (int i = 0; i != ReceiveConfigurationParameters.Length; i++)
|
||||
|
||||
{
|
||||
ReceiveConfigurationParameters[i] = i.ToString();
|
||||
ReceiveConfigurationParameters[i] = "";
|
||||
}
|
||||
WindowTemplateConfiguration windowTemplateConfiguration = new WindowTemplateConfiguration();
|
||||
windowTemplateConfiguration.ShowDialog();
|
||||
@ -1199,19 +1199,28 @@ namespace ProxySU
|
||||
}
|
||||
}
|
||||
|
||||
private void Button_Click(object sender, RoutedEventArgs e)
|
||||
//private void Button_Click(object sender, RoutedEventArgs e)
|
||||
//{
|
||||
// string[] testString = new string[6];
|
||||
// for (int i = 0; i != testString.Length; i++)
|
||||
|
||||
// {
|
||||
|
||||
// testString[i] = i.ToString();
|
||||
|
||||
// }
|
||||
// foreach (string str in testString)
|
||||
// {
|
||||
// MessageBox.Show(str);
|
||||
// }
|
||||
//}
|
||||
|
||||
private void Button_Click_1(object sender, RoutedEventArgs e)
|
||||
{
|
||||
string[] testString = new string[6];
|
||||
for (int i = 0; i != testString.Length; i++)
|
||||
for (int i = 0; i != ReceiveConfigurationParameters.Length; i++)
|
||||
|
||||
{
|
||||
|
||||
testString[i] = i.ToString();
|
||||
|
||||
}
|
||||
foreach (string str in testString)
|
||||
{
|
||||
MessageBox.Show(str);
|
||||
MessageBox.Show(ReceiveConfigurationParameters[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -72,7 +72,34 @@ namespace ProxySU
|
||||
HidePathAndTLS();
|
||||
HideQuicKey();
|
||||
}
|
||||
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "MkcpNone"))
|
||||
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "webSocket"))
|
||||
{
|
||||
TextBoxTransmission.Text = "ws";
|
||||
TextBoxCamouflageType.Text = "none";
|
||||
//TextBoxPath.Text = "/";
|
||||
TextBoxTLS.Text = "none";
|
||||
HidePathAndTLS();
|
||||
HideQuicKey();
|
||||
}
|
||||
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLS"))
|
||||
{
|
||||
TextBoxTransmission.Text = "ws";
|
||||
TextBoxCamouflageType.Text = "none";
|
||||
//TextBoxPath.Text = "/";
|
||||
TextBoxTLS.Text = "tls";
|
||||
HidePathAndTLS();
|
||||
HideQuicKey();
|
||||
}
|
||||
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLSselfSigned"))
|
||||
{
|
||||
TextBoxTransmission.Text = "ws";
|
||||
TextBoxCamouflageType.Text = "none";
|
||||
//TextBoxPath.Text = "/";
|
||||
TextBoxTLS.Text = "tls";
|
||||
HidePathAndTLS();
|
||||
HideQuicKey();
|
||||
}
|
||||
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCPNone"))
|
||||
{
|
||||
TextBoxTransmission.Text = "kcp";
|
||||
TextBoxCamouflageType.Text = "none";
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
<GroupBox Header="模板库" Grid.Row="0" Grid.RowSpan="3">
|
||||
<Grid>
|
||||
<TabControl x:Name="TabControlTemplate">
|
||||
<TabItem x:Name="TabItemHot" Header="热门方案" Width="110" Height="30">
|
||||
<TabItem Header="热门方案" Width="110" Height="30">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
@ -65,7 +65,7 @@
|
||||
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem x:Name="TabItemTcp" Header="TCP传输协议" Width="110" Height="30">
|
||||
<TabItem Header="TCP传输协议" Width="110" Height="30">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
@ -119,7 +119,7 @@
|
||||
<TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(需要域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
|
||||
<TextBlock Text="稳定性强，使用Caddy做伪装网站，隐藏代理，会被识别为访问网站的https流量，抗封锁识别最强。(需要域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonWebSocketTLSselfSigned" Content="WebSocket+TLS(自签证书)" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonWebSocketTLSselfSigned_Checked"></RadioButton>
|
||||
<RadioButton x:Name="RadioButtonWebSocketTLSselfSigned" Content="WebSocket+TLS(自签证书)" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonTCP2TLSnoDomain_Checked"></RadioButton>
|
||||
<TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(无需域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
|
||||
<TextBlock Text="Shadowrocket (ios)需要手动打开“允许不安全”选项" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" ></TextBlock>
|
||||
|
||||
@ -173,7 +173,7 @@
|
||||
<RowDefinition></RowDefinition>
|
||||
<RowDefinition></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<RadioButton x:Name="RadioButtonMkcpNoCamouflage" Content="mKCP(无伪装)" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked"></RadioButton>
|
||||
<RadioButton x:Name="RadioButtonMkcpNone" Content="mKCP(无伪装)" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked"></RadioButton>
|
||||
<TextBlock Text="数据加密传输，以增加流量消耗来加速，减少延迟，udp协议,无伪装，会被识别为udp流量" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
|
||||
<RadioButton x:Name="RadioButton2mKCP2SRTP" Content="mKCP+SRTP" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="2" Checked="RadioButtonTCP_Checked"></RadioButton>
|
||||
<TextBlock Text="同mKCP(无伪装)，增加伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
|
||||
|
||||
@ -22,7 +22,7 @@ namespace ProxySU
|
||||
public WindowTemplateConfiguration()
|
||||
{
|
||||
InitializeComponent();
|
||||
RadioButtonTCP.IsChecked = true;
|
||||
//RadioButtonTCP.IsChecked = true;
|
||||
}
|
||||
//取消不在当前活动选项卡中的其他所有选项卡中的所有RadioBuuton的选中状态
|
||||
//代码参考网址：https://blog.csdn.net/weixin_42583999/article/details/103468857
|
||||
@ -88,7 +88,7 @@ namespace ProxySU
|
||||
|
||||
}
|
||||
//webSocket模式被选中
|
||||
if (RadioButtonWebSocket.IsChecked == true)
|
||||
else if (RadioButtonWebSocket.IsChecked == true)
|
||||
{
|
||||
//传递模板类型
|
||||
MainWindow.ReceiveConfigurationParameters[0] = "webSocket";
|
||||
@ -212,7 +212,7 @@ namespace ProxySU
|
||||
|
||||
}
|
||||
//mKCP无伪装模式被选中
|
||||
else if (RadioButtonMkcpNoCamouflage.IsChecked == true)
|
||||
else if (RadioButtonMkcpNone.IsChecked == true)
|
||||
{
|
||||
//传递模板类型
|
||||
MainWindow.ReceiveConfigurationParameters[0] = "mKCPNone";
|
||||
@ -413,10 +413,10 @@ namespace ProxySU
|
||||
//ButtonServerListenPort.Visibility = Visibility.Visible;
|
||||
TextBoxServerListenPort.Text = "443";
|
||||
//显示Path
|
||||
TextBlockPath.Visibility = Visibility.Visible;
|
||||
TextBoxPath.Visibility = Visibility.Visible;
|
||||
TextBoxPath.Text = "/ray";
|
||||
ButtonPath.Visibility = Visibility.Visible;
|
||||
TextBlockPath.Visibility = Visibility.Collapsed;
|
||||
TextBoxPath.Visibility = Visibility.Collapsed;
|
||||
//TextBoxPath.Text = "/ray";
|
||||
ButtonPath.Visibility = Visibility.Collapsed;
|
||||
//显示域名
|
||||
TextBlockDomain.Visibility = Visibility.Visible;
|
||||
TextBoxDomain.Visibility = Visibility.Visible;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user