Merge pull request #10 from proxysu/master

update

ProxySuper.Core/Services/ServiceBase.cs

@@ -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不匹配！");
                 }
             }
         }

ProxySuper.Core/Services/V2rayConfigBuilder.cs

@@ -110,8 +110,9 @@ namespace ProxySuper.Core.Services
 
         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();
 

ProxySuper.Core/Services/XrayConfigBuilder.cs

@@ -113,8 +113,9 @@ namespace ProxySuper.Core.Services
 
         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();
 

ProxySuper.Core/ViewModels/V2rayEditorViewModel.cs

@@ -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");
             }

ProxySuper.Core/ViewModels/XrayEditorViewModel.cs

@@ -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");
             }

ProxySuper.WPF/App.xaml

@@ -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>

README.md

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