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

Merge pull request #10 from proxysu/master

Browse Source 
update
This commit is contained in:
xnxy2012 2022-03-25 14:27:35 +08:00 committed by GitHub
commit 072b3286ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 11 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})");
if (IPv6 != domainIP)
{
throw new Exception("域名解析地址与服务器IP不匹配！");
//throw new Exception("域名解析地址与服务器IP不匹配！");
}
}
else
@ -207,7 +207,7 @@ namespace ProxySuper.Core.Services
Progress.Desc = ($"域名IP({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)
{
var uuidList = parameters.MulitUUID;
uuidList.Insert(0, parameters.UUID);
var uuidList = new List<string>();
uuidList.Add(parameters.UUID);
uuidList.AddRange(parameters.MulitUUID);
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)
{
var uuidList = parameters.MulitUUID;
uuidList.Insert(0, parameters.UUID);
var uuidList = new List<string>();
uuidList.Add(parameters.UUID);
uuidList.AddRange(parameters.MulitUUID);
var xrayConfig = LoadXrayConfig();

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

@ -139,7 +139,8 @@ namespace ProxySuper.Core.ViewModels
set
{
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;
RaisePropertyChanged("MultiUUID");
}

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

@ -134,7 +134,8 @@ namespace ProxySuper.Core.ViewModels
set
{
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;
RaisePropertyChanged("MultiUUID");
}

6
ProxySuper.WPF/App.xaml
View File

@ -8,10 +8,10 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!--Languages-->
<!--Language-->
<ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
<!--styles-->
<!--style-->
<ResourceDictionary>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="5,2" />
@ -24,7 +24,7 @@
</Style>
</ResourceDictionary>
<!--components styles-->
<!--component style-->
<ResourceDictionary Source="/Resources/Styles/DataGridStyle.xaml" />
</ResourceDictionary.MergedDictionaries>

1
README.md
View File

@ -114,3 +114,4 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram