From 2047f3d480620f2d961bf60c5740dca387733444 Mon Sep 17 00:00:00 2001 From: test Date: Wed, 8 Nov 2023 09:40:44 +0800 Subject: [PATCH 1/3] update ssh.net 2023 --- ProxySuper.Core/ProxySuper.Core.csproj | 4 ++-- ProxySuper.Core/packages.config | 2 +- ProxySuper.WPF/ProxySuper.WPF.csproj | 4 ++-- ProxySuper.WPF/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ProxySuper.Core/ProxySuper.Core.csproj b/ProxySuper.Core/ProxySuper.Core.csproj index 2debdf5..ef7c082 100644 --- a/ProxySuper.Core/ProxySuper.Core.csproj +++ b/ProxySuper.Core/ProxySuper.Core.csproj @@ -47,8 +47,8 @@ ..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll - - ..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll + + ..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll diff --git a/ProxySuper.Core/packages.config b/ProxySuper.Core/packages.config index 3943ce6..5726ebf 100644 --- a/ProxySuper.Core/packages.config +++ b/ProxySuper.Core/packages.config @@ -3,7 +3,7 @@ - + diff --git a/ProxySuper.WPF/ProxySuper.WPF.csproj b/ProxySuper.WPF/ProxySuper.WPF.csproj index fcd8e88..ef0121c 100644 --- a/ProxySuper.WPF/ProxySuper.WPF.csproj +++ b/ProxySuper.WPF/ProxySuper.WPF.csproj @@ -44,8 +44,8 @@ ..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll - - ..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll + + ..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll diff --git a/ProxySuper.WPF/packages.config b/ProxySuper.WPF/packages.config index 85b846b..f86be38 100644 --- a/ProxySuper.WPF/packages.config +++ b/ProxySuper.WPF/packages.config @@ -4,7 +4,7 @@ - + From 03f015f8d47c4148c671aebeed3ce47a363f6432 Mon Sep 17 00:00:00 2001 From: test Date: Wed, 8 Nov 2023 12:00:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20xray=E4=B8=8D=E6=94=AF=E6=8C=81xtls-r?= =?UTF-8?q?prx-vision,none?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json b/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json index f996b07..17fa9ee 100644 --- a/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json +++ b/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json @@ -5,7 +5,7 @@ "clients": [ { "id": "", - "flow": "xtls-rprx-vision,none" + "flow": "xtls-rprx-vision" } ], "decryption": "none", From 201d3da3a5a7153e63c94bee9f85d4de4db57073 Mon Sep 17 00:00:00 2001 From: test Date: Thu, 9 Nov 2023 10:34:31 +0800 Subject: [PATCH 3/3] update config issue --- ProxySuper.Core/Services/XrayConfigBuilder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ProxySuper.Core/Services/XrayConfigBuilder.cs b/ProxySuper.Core/Services/XrayConfigBuilder.cs index 87d04a0..cbee313 100644 --- a/ProxySuper.Core/Services/XrayConfigBuilder.cs +++ b/ProxySuper.Core/Services/XrayConfigBuilder.cs @@ -79,7 +79,8 @@ namespace ProxySuper.Core.Services } var domain = parameters.MaskDomain .TrimStart("http://".ToCharArray()) - .TrimStart("https://".ToCharArray()); + .TrimStart("https://".ToCharArray()) + .TrimEnd('/'); caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n header_up Host {domain} \n }}"); } @@ -103,7 +104,7 @@ namespace ProxySuper.Core.Services } else { - flow = "xtls-rprx-vision,none";//兼容普通tls与xtls + flow = "xtls-rprx-vision";//兼容普通tls与xtls obj = new { id = id, flow = flow }; }