Merge 69d027840e into b5800f7dfc

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -187,10 +187,10 @@ public static class CoreConfigHandler
         var newItems = new List<ProfileItem> { node };
         if (node.ConfigType.IsGroupType())
         {
-            var groupChildList = await GroupProfileManager.GetAllChildProfileItems(node);
+            var (groupChildList, _) = await GroupProfileManager.GetChildProfileItems(node);
-            foreach (var childItem in groupChildList)
+            foreach (var childItem in groupChildList.Where(childItem => !context.AllProxiesMap.ContainsKey(childItem.IndexId)))
             {
-                context.AllProxiesMap[childItem.IndexId] = childItem;
+                await FillNodeContext(context, childItem, false);
             }
             node.SetProtocolExtra(node.GetProtocolExtra() with
             {

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

@@ -433,15 +433,17 @@ public partial class CoreConfigSingboxService
     {
         GenDnsProtectCustom();
 
-        var localDnsServer = _coreConfig.dns?.servers?.FirstOrDefault(s => s.tag == Global.SingboxLocalDNSTag);
+        _coreConfig.dns?.servers?.RemoveAll(s => s.tag == Global.SingboxLocalDNSTag);
-        if (localDnsServer == null)
-        {
-            return;
-        }
-        localDnsServer.type = null;
-        localDnsServer.server = null;
         var dnsItem = context.RawDnsItem;
-        localDnsServer.address = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dnsItem?.DomainDNSAddress;
+        var localDnsServer = new Server4Sbox()
+        {
+            address = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress)
+                ? Global.DomainPureIPDNSAddress.FirstOrDefault()
+                : dnsItem?.DomainDNSAddress,
+            tag = Global.SingboxLocalDNSTag,
+            detour = Global.DirectTag,
+        };
+        _coreConfig.dns?.servers?.Add(localDnsServer);
     }
 
     private Rule4Sbox BuildProtectDomainRule()