mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2025-04-11 05:00:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'proxysu:master' into master

Browse source
This commit is contained in:
Stklv 2023-12-16 20:47:56 +08:00 • committed by GitHub
commit ae5344b792
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ProxySuper.Core/ProxySuper.Core.csproj
View file

@ -47,8 +47,8 @@
<Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL"> <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath> <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
</Reference> </Reference>
<Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"> <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath> <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

5
ProxySuper.Core/Services/XrayConfigBuilder.cs
View file

@ -79,7 +79,8 @@ namespace ProxySuper.Core.Services
} }
var domain = parameters.MaskDomain var domain = parameters.MaskDomain
.TrimStart("http://".ToCharArray()) .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 }}"); caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n header_up Host {domain} \n }}");
} }
@ -103,7 +104,7 @@ namespace ProxySuper.Core.Services
} }
else else
{ {
flow = "xtls-rprx-vision,none";//兼容普通tls与xtls flow = "xtls-rprx-vision";//兼容普通tls与xtls
obj = new { id = id, flow = flow }; obj = new { id = id, flow = flow };
} }

2
ProxySuper.Core/packages.config
View file

@ -3,7 +3,7 @@
<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" /> <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
<package id="MvvmCross" version="8.0.2" targetFramework="net472" /> <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
<package id="QRCoder" version="1.4.3" targetFramework="net472" /> <package id="QRCoder" version="1.4.3" targetFramework="net472" />
<package id="SSH.NET" version="2020.0.2" targetFramework="net472" /> <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" /> <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Console" version="4.3.1" targetFramework="net461" /> <package id="System.Console" version="4.3.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" /> <package id="System.Memory" version="4.5.5" targetFramework="net472" />

4
ProxySuper.WPF/ProxySuper.WPF.csproj
View file

@ -44,8 +44,8 @@
<Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL"> <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath> <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
</Reference> </Reference>
<Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"> <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath> <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

2
ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
View file

@ -5,7 +5,7 @@
"clients": [ "clients": [
{ {
"id": "", "id": "",
"flow": "xtls-rprx-vision,none" "flow": "xtls-rprx-vision"
} }
], ],
"decryption": "none", "decryption": "none",

2
ProxySuper.WPF/packages.config
View file

@ -4,7 +4,7 @@
<package id="MvvmCross" version="8.0.2" targetFramework="net472" /> <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
<package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" /> <package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" />
<package id="QRCoder" version="1.4.3" targetFramework="net472" /> <package id="QRCoder" version="1.4.3" targetFramework="net472" />
<package id="SSH.NET" version="2020.0.2" targetFramework="net472" /> <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" /> <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Console" version="4.3.1" targetFramework="net461" /> <package id="System.Console" version="4.3.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" /> <package id="System.Memory" version="4.5.5" targetFramework="net472" />