diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 08988a8..55a5b89 100644 --- a/ProxySU/MainWindow.xaml +++ b/ProxySU/MainWindow.xaml @@ -296,7 +296,6 @@ @@ -411,7 +410,7 @@ - + diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index 51275ac..171e93e 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -2280,9 +2280,14 @@ namespace ProxySU //设置证书 serverJson["ssl"]["cert"] = "/etc/trojan-go/trojan-go.crt"; serverJson["ssl"]["key"] = "/etc/trojan-go/trojan-go.key"; - serverJson["ssl"]["cert"] = "/etc/trojan-go/trojan-go.crt"; serverJson["ssl"]["sni"] = ReceiveConfigurationParameters[4]; + if (ReceiveConfigurationParameters[0].Contains("WebSocket")) + { + serverJson["websocket"]["enabled"] = true; + serverJson["websocket"]["path"] = ReceiveConfigurationParameters[3]; + } + using (StreamWriter sw = new StreamWriter(@"config.json")) { sw.Write(serverJson.ToString()); @@ -2470,6 +2475,12 @@ namespace ProxySU clientJson["remote_port"] = 443; clientJson["password"][0] = ReceiveConfigurationParameters[2]; + if (ReceiveConfigurationParameters[0].Contains("WebSocket")) + { + clientJson["websocket"]["enabled"] = true; + clientJson["websocket"]["path"] = ReceiveConfigurationParameters[3]; + } + using (StreamWriter sw = new StreamWriter(@"trojan-go_config\config.json")) { sw.Write(clientJson.ToString()); diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index a5ff342..6dd97a4 100644 --- a/ProxySU/Properties/AssemblyInfo.cs +++ b/ProxySU/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.0.0")] -[assembly: AssemblyFileVersion("1.7.0.0")] +[assembly: AssemblyVersion("1.7.1.0")] +[assembly: AssemblyFileVersion("1.7.1.0")] diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 7402aad..29b95d6 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ