diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index 5974734..d77ea5f 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -123,7 +123,7 @@
-
+
@@ -172,7 +172,8 @@
-->
-
+
+
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index 6380fe1..e5e32a3 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -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]);
}
}
diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs
index 6737d31..698d73d 100644
--- a/ProxySU/ResultClientInformation.xaml.cs
+++ b/ProxySU/ResultClientInformation.xaml.cs
@@ -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";
diff --git a/ProxySU/TemplateConfiguration.xaml b/ProxySU/TemplateConfiguration.xaml
index 97c9425..3f97281 100644
--- a/ProxySU/TemplateConfiguration.xaml
+++ b/ProxySU/TemplateConfiguration.xaml
@@ -42,7 +42,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
diff --git a/ProxySU/TemplateConfiguration.xaml.cs b/ProxySU/TemplateConfiguration.xaml.cs
index 616bc4a..f84dbcb 100644
--- a/ProxySU/TemplateConfiguration.xaml.cs
+++ b/ProxySU/TemplateConfiguration.xaml.cs
@@ -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;
diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe
index 8677e32..f18b754 100644
Binary files a/ProxySU/bin/Release/ProxySU.exe and b/ProxySU/bin/Release/ProxySU.exe differ
diff --git a/ProxySU/bin/Release/Release.zip b/ProxySU/bin/Release/Release.zip
index e012a99..0781301 100644
Binary files a/ProxySU/bin/Release/Release.zip and b/ProxySU/bin/Release/Release.zip differ