v2rayN/ServiceLib/Helper/SqliteHelper.cs

@@ -26,7 +26,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> InsertAllAsync(IEnumerable models)
     {
-        return await _dbAsync.InsertAllAsync(models, runInTransaction: true).ConfigureAwait(false);
+        return await _dbAsync.InsertAllAsync(models);
     }
 
     public async Task<int> InsertAsync(object model)
@@ -46,7 +46,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> UpdateAllAsync(IEnumerable models)
     {
-        return await _dbAsync.UpdateAllAsync(models, runInTransaction: true).ConfigureAwait(false);
+        return await _dbAsync.UpdateAllAsync(models);
     }
 
     public async Task<int> DeleteAsync(object model)

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

@@ -80,31 +80,25 @@ public partial class CoreConfigSingboxService
             hostsDns.predefined = Global.PredefinedHosts;
         }
 
-        if (simpleDNSItem.UseSystemHosts == true)
-        {
-            var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts != null && systemHosts.Count > 0)
-            {
-                foreach (var host in systemHosts)
-                {
-                    hostsDns.predefined.TryAdd(host.Key, new List<string> { host.Value });
-                }
-            }
-        }
-
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts
+            var userHostsMap = simpleDNSItem.Hosts?
                 .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
-                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
-                .Where(parts => parts.Length >= 2)
-                .GroupBy(parts => parts[0])
+                .Where(line => !string.IsNullOrWhiteSpace(line))
+                .Where(line => line.Contains(' '))
                 .ToDictionary(
-                    group => group.Key,
-                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
-                );
+                    line =>
+                    {
+                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        return parts[0];
+                    },
+                    line =>
+                    {
+                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        var values = parts.Skip(1).ToList();
+                        return values;
+                    }
+                ) ?? new Dictionary<string, List<string>>();
 
             foreach (var kvp in userHostsMap)
             {
@@ -112,6 +106,22 @@ public partial class CoreConfigSingboxService
             }
         }
 
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts.Count > 0)
+            {
+                foreach (var host in systemHosts)
+                {
+                    if (hostsDns.predefined[host.Key] != null)
+                    {
+                        continue;
+                    }
+                    hostsDns.predefined[host.Key] = new List<string> { host.Value };
+                }
+            }
+        }
+
         foreach (var host in hostsDns.predefined)
         {
             if (finalDns.server == host.Key)

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs

@@ -248,31 +248,43 @@ public partial class CoreConfigV2rayService
         if (simpleDNSItem.UseSystemHosts == true)
         {
             var systemHosts = Utils.GetSystemHosts();
-            var normalHost = v2rayConfig?.dns?.hosts;
-
-            if (normalHost != null && systemHosts?.Count > 0)
+            if (systemHosts.Count > 0)
             {
-                foreach (var host in systemHosts)
+                var normalHost = v2rayConfig.dns.hosts;
+                if (normalHost != null)
                 {
-                    normalHost.TryAdd(host.Key, new List<string> { host.Value });
+                    foreach (var host in systemHosts)
+                    {
+                        if (normalHost[host.Key] != null)
+                        {
+                            continue;
+                        }
+                        normalHost[host.Key] = new List<string> { host.Value };
+                    }
                 }
             }
         }
 
-        if (!simpleDNSItem.Hosts.IsNullOrEmpty())
-        {
-            var userHostsMap = simpleDNSItem.Hosts
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
-                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
-                .Where(parts => parts.Length >= 2)
-                .GroupBy(parts => parts[0])
-                .ToDictionary(
-                    group => group.Key,
-                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
-                );
+        var userHostsMap = simpleDNSItem.Hosts?
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Where(line => line.Contains(' '))
+            .ToDictionary(
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    return parts[0];
+                },
+                line =>
+                {
+                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                    var values = parts.Skip(1).ToList();
+                    return values;
+                }
+            );
 
+        if (userHostsMap != null)
+        {
             foreach (var kvp in userHostsMap)
             {
                 v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml

@@ -23,12 +23,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -23,12 +23,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -24,12 +24,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -329,7 +331,8 @@
                             <Button
                                 x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
                         </StackPanel>
                     </Grid>
 
@@ -412,7 +415,8 @@
                             <Button
                                 x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
                         </StackPanel>
                     </Grid>
 

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml

@@ -23,12 +23,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml

@@ -28,12 +28,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -24,12 +24,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -167,12 +167,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -27,20 +27,22 @@
         </StackPanel>
 
         <StackPanel
-            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Right"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -52,8 +54,8 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <StackPanel
                 Grid.Row="0"
@@ -65,27 +67,27 @@
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="300"
-                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
+                    Margin="{StaticResource Margin4}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
-                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
-                    Margin="{StaticResource Margin4}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Margin="{StaticResource Margin4}" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
             <StackPanel
                 Grid.Row="1"
@@ -96,8 +98,8 @@
                     Width="200"
                     Margin="{StaticResource Margin4}" />
                 <TextBlock
-                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
@@ -108,17 +110,17 @@
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvUrl}" />
             <TextBox
                 x:Name="txtUrl"
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="600"
-                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
 
             <!--
@@ -148,8 +150,8 @@
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center">
+                VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}">
                 <HyperlinkButton Classes="WithIcon" Click="linkCustomRulesetPath4Singbox">
                     <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
                 </HyperlinkButton>
@@ -159,9 +161,9 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="600"
-                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
+                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomRulesetPath4Singbox"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -35,12 +35,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -22,12 +22,14 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml

@@ -24,12 +24,14 @@
                     x:Name="btnSave"
                     Width="100"
                     Content="{x:Static resx:ResUI.TbConfirm}"
+                    Cursor="Hand"
                     IsDefault="True" />
                 <Button
                     x:Name="btnCancel"
                     Width="100"
                     Margin="{StaticResource MarginLr8}"
                     Content="{x:Static resx:ResUI.TbCancel}"
+                    Cursor="Hand"
                     IsCancel="True" />
             </StackPanel>
         </Border>

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -27,6 +27,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -34,6 +35,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -35,6 +35,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -42,6 +43,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -27,6 +27,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -34,6 +35,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
@@ -394,6 +396,7 @@
                                 x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin8}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
                                 Style="{StaticResource DefButton}" />
                         </StackPanel>
                     </Grid>
@@ -486,6 +489,7 @@
                                 x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin8}"
                                 Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
                                 Style="{StaticResource DefButton}" />
                         </StackPanel>
                     </Grid>

v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml

@@ -27,6 +27,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -34,6 +35,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -33,6 +33,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -40,6 +41,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -27,6 +27,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -34,6 +35,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -198,6 +198,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -205,6 +206,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -76,6 +76,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -83,6 +84,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -61,6 +61,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -68,6 +69,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -34,6 +34,7 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -41,6 +42,7 @@
                 Width="100"
                 Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>