Refactor

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

@@ -72,6 +72,11 @@ public partial class CoreConfigSingboxService
             }
 
             var hostsDomains = new List<string>();
+            var systemHostsMap = Utils.GetSystemHosts();
+            foreach (var kvp in systemHostsMap)
+            {
+                hostsDomains.Add(kvp.Key);
+            }
             var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
             if (dnsItem == null || dnsItem.Enabled == false)
             {
@@ -84,23 +89,12 @@ public partial class CoreConfigSingboxService
                         hostsDomains.Add(kvp.Key);
                     }
                 }
-                if (simpleDNSItem.UseSystemHosts == true)
-                {
-                    var systemHostsMap = Utils.GetSystemHosts();
-                    foreach (var kvp in systemHostsMap)
-                    {
-                        hostsDomains.Add(kvp.Key);
-                    }
-                }
             }
-            if (hostsDomains.Count > 0)
+            singboxConfig.route.rules.Add(new()
             {
-                singboxConfig.route.rules.Add(new()
-                {
-                    action = "resolve",
-                    domain = hostsDomains,
-                });
-            }
+                action = "resolve",
+                domain = hostsDomains,
+            });
 
             singboxConfig.route.rules.Add(new()
             {

v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs

@@ -1,3 +1,4 @@
+using System.Data;
 using System.Reactive;
 using DynamicData.Binding;
 using ReactiveUI;

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Base;
 

v2rayN/v2rayN.Desktop/GlobalUsings.cs

@@ -1,9 +1,8 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
-global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.ViewModels;
+global using ServiceLib.ViewModels;

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -8,6 +8,7 @@ using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.ViewModels;
 

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -10,6 +10,7 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs

@@ -6,6 +6,7 @@ using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Views;
 

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -8,6 +8,7 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -6,6 +6,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs

@@ -2,6 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using CliWrap.Buffered;
 using DialogHostAvalonia;
+using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Views;
 

v2rayN/v2rayN/App.xaml.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Threading;
+using ServiceLib.Manager;
 
 namespace v2rayN;
 

v2rayN/v2rayN/Base/WindowBase.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Base;
 

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using ServiceLib.Manager;
 
 namespace v2rayN.Converters;
 

v2rayN/v2rayN/GlobalUsings.cs

@@ -1,9 +1,8 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
-global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.ViewModels;
+global using ServiceLib.ViewModels;

v2rayN/v2rayN/Manager/HotkeyManager.cs

@@ -4,6 +4,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
+using ServiceLib.Manager;
 
 namespace v2rayN.Manager;
 

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -9,6 +9,7 @@ using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using ServiceLib.Manager;
 
 namespace v2rayN.ViewModels;
 

v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using DynamicData;
 using ReactiveUI;
+using System.Reactive.Disposables;
+using DynamicData;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Manager;
 
 namespace v2rayN.Views;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Manager;
 

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 using v2rayN.Base;
 
 namespace v2rayN.Views;

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -8,6 +8,7 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Base;
 using Point = System.Windows.Point;

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -2,6 +2,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/StatusBarView.xaml.cs

@@ -3,6 +3,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
 using ReactiveUI;
+using ServiceLib.Manager;
 using Splat;
 using v2rayN.Manager;
 

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Windows;
 using System.Windows.Input;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using ServiceLib.Manager;
 
 namespace v2rayN.Views;