diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index c8b280b..314dc16 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -39,7 +39,9 @@ namespace ProxySU
RadioButtonProxyNoLogin.IsChecked = true;
RadioButtonSocks4.Visibility = Visibility.Collapsed;
ReceiveConfigurationParameters = new string[6];
-
+ //ReceiveConfigurationParameters[4] = "domaintext";
+
+
}
//开始布署安装
//System.Diagnostics.Process exitProgram = System.Diagnostics.Process.GetProcessById(System.Diagnostics.Process.GetCurrentProcess().Id);
@@ -208,8 +210,13 @@ namespace ProxySU
appConfig = "TemplateConfg\\TLS_server_config.json";
clientConfig = "TemplateConfg\\tcp_client_config.json";
}
- Task task = new Task(() => StartSetUpRemoteHost(connectionInfo, TextBlockSetUpProcessing, ProgressBarSetUpProcessing, appConfig, clientConfig, upLoadPath));
- task.Start();
+ //Thread thread
+ Thread thread = new Thread(() => StartSetUpRemoteHost(connectionInfo, TextBlockSetUpProcessing, ProgressBarSetUpProcessing, appConfig, clientConfig, upLoadPath));
+ thread.SetApartmentState(ApartmentState.STA);
+ thread.Start();
+ // Task task = new Task(() => StartSetUpRemoteHost(connectionInfo, TextBlockSetUpProcessing, ProgressBarSetUpProcessing, appConfig, clientConfig, upLoadPath));
+ //task.Start();
+
}
#region 端口数字防错代码，密钥选择代码
@@ -516,10 +523,11 @@ namespace ProxySU
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
Thread.Sleep(1000);
- //MessageBox.Show("客户端配置文件已保存在config文件夹中");
+ //显示服务端连接参数
+ //MessageBox.Show("用于V2ray官方客户端的配置文件已保存在config文件夹中");
ResultClientInformation resultClientInformation = new ResultClientInformation();
resultClientInformation.ShowDialog();
-
+
return;
}
}
diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml
index faacc36..fe58065 100644
--- a/ProxySU/ResultClientInformation.xaml
+++ b/ProxySU/ResultClientInformation.xaml
@@ -26,29 +26,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs
index d603342..98a642d 100644
--- a/ProxySU/ResultClientInformation.xaml.cs
+++ b/ProxySU/ResultClientInformation.xaml.cs
@@ -21,6 +21,54 @@ namespace ProxySU
public ResultClientInformation()
{
InitializeComponent();
+ //主机地址
+ TextBoxHostAddress.Text = MainWindow.ReceiveConfigurationParameters[4];
+ //主机端口
+ TextBoxPort.Text = MainWindow.ReceiveConfigurationParameters[1];
+ //用户ID(uuid)
+ TextBoxUUID.Text = MainWindow.ReceiveConfigurationParameters[2];
+ //路径Path
+ TextBoxPath.Text = MainWindow.ReceiveConfigurationParameters[3];
+ //加密方式，一般都为auto
+ TextBoxEncryption.Text = "auto";
+ //伪装类型
+ TextBoxCamouflageType.Text = MainWindow.ReceiveConfigurationParameters[5];
+
+ if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "TCP"))
+ {
+ TextBoxTransmission.Text = "tcp";
+ }
+ else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLS2Web"))
+ {
+ TextBoxTransmission.Text = "WebSocket(ws)";
+ }
+ else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "TCPhttp"))
+ {
+ TextBoxTransmission.Text = "tcp";
+
+ }
+ else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "MkcpNone") || String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2SRTP") || String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCPuTP") || String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WechatVideo") || String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2DTLS") || String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WireGuard"))
+ {
+ TextBoxTransmission.Text = "mKCP(kcp)";
+ }
+
+ else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "HTTP2"))
+ {
+ TextBoxTransmission.Text = "h2";
+ }
+ else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "TLS"))
+ {
+ TextBoxTransmission.Text = "";
+ }
+
+
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ string openFolderPath = @"config";
+ System.Diagnostics.Process.Start("explorer.exe", openFolderPath);
+ this.Close();
}
}
}
diff --git a/ProxySU/TemplateConfiguration.xaml.cs b/ProxySU/TemplateConfiguration.xaml.cs
index a79fb54..6b4c835 100644
--- a/ProxySU/TemplateConfiguration.xaml.cs
+++ b/ProxySU/TemplateConfiguration.xaml.cs
@@ -43,6 +43,7 @@ namespace ProxySU
{
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "TCPhttp";
+ MainWindow.ReceiveConfigurationParameters[5] = "http";
}
else if (RadioButtonMkcpNoCamouflage.IsChecked == true)
{
diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe
index 51bc638..5f058d3 100644
Binary files a/ProxySU/bin/Release/ProxySU.exe and b/ProxySU/bin/Release/ProxySU.exe differ