mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-24 22:26:07 +03:00
Code Issues Projects Releases Wiki Activity

update v4.1.5

Browse Source
This commit is contained in:
abc 2022-02-28 10:07:34 +08:00
parent d815152d2d
commit 4d9890c797
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProxySuper.Core/Services/ServiceBase.cs
View File

@ -198,7 +198,7 @@ namespace ProxySuper.Core.Services
Progress.Desc = ($"本机IP({IPv6})"); Progress.Desc = ($"本机IP({IPv6})");
if (IPv6 != domainIP) if (IPv6 != domainIP)
{ {
throw new Exception("域名解析地址与服务器IP不匹配！"); //throw new Exception("域名解析地址与服务器IP不匹配！");
} }
} }
else else
@ -207,7 +207,7 @@ namespace ProxySuper.Core.Services
Progress.Desc = ($"域名IP({domainIP})"); Progress.Desc = ($"域名IP({domainIP})");
if (IPv4 != domainIP) if (IPv4 != domainIP)
{ {
throw new Exception("域名解析地址与服务器IP不匹配！"); //throw new Exception("域名解析地址与服务器IP不匹配！");
} }
} }
} }

5
ProxySuper.Core/Services/V2rayConfigBuilder.cs
View File

@ -110,8 +110,9 @@ namespace ProxySuper.Core.Services
public static string BuildV2rayConfig(V2raySettings parameters) public static string BuildV2rayConfig(V2raySettings parameters)
{ {
var uuidList = parameters.MulitUUID; var uuidList = new List<string>();
uuidList.Insert(0, parameters.UUID); uuidList.Add(parameters.UUID);
uuidList.AddRange(parameters.MulitUUID);
var xrayConfig = LoadV2rayConfig(); var xrayConfig = LoadV2rayConfig();

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

@ -113,8 +113,9 @@ namespace ProxySuper.Core.Services
public static string BuildXrayConfig(XraySettings parameters) public static string BuildXrayConfig(XraySettings parameters)
{ {
var uuidList = parameters.MulitUUID; var uuidList = new List<string>();
uuidList.Insert(0, parameters.UUID); uuidList.Add(parameters.UUID);
uuidList.AddRange(parameters.MulitUUID);
var xrayConfig = LoadXrayConfig(); var xrayConfig = LoadXrayConfig();

3
ProxySuper.Core/ViewModels/V2rayEditorViewModel.cs
View File

@ -139,7 +139,8 @@ namespace ProxySuper.Core.ViewModels
set set
{ {
var input = value.Replace('，', ','); var input = value.Replace('，', ',');
var arr = input.Split(',').ToList(); var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
arr.RemoveAll(x => x == this.UUID);
Settings.MulitUUID = arr; Settings.MulitUUID = arr;
RaisePropertyChanged("MultiUUID"); RaisePropertyChanged("MultiUUID");
} }

3
ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
View File

@ -134,7 +134,8 @@ namespace ProxySuper.Core.ViewModels
set set
{ {
var input = value.Replace('，', ','); var input = value.Replace('，', ',');
var arr = input.Split(',').ToList(); var arr = input.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
arr.RemoveAll(x => x == this.UUID);
Settings.MulitUUID = arr; Settings.MulitUUID = arr;
RaisePropertyChanged("MultiUUID"); RaisePropertyChanged("MultiUUID");
} }