Merge from remote branch

2021-09-01 00:38:43 +08:00
parent 4cc16e0136 7d20097465
commit 48aef1829f
38 changed files with 583 additions and 272 deletions
--- a/hub/executor/executor.go
+++ b/hub/executor/executor.go
@ -131,9 +131,10 @@ func updateDNS(c *config.DNS, general *config.General) {
 		Pool:         c.FakeIPRange,
 		Hosts:        c.Hosts,
 		FallbackFilter: dns.FallbackFilter{
-			GeoIP:  c.FallbackFilter.GeoIP,
-			IPCIDR: c.FallbackFilter.IPCIDR,
-			Domain: c.FallbackFilter.Domain,
+			GeoIP:     c.FallbackFilter.GeoIP,
+			GeoIPCode: c.FallbackFilter.GeoIPCode,
+			IPCIDR:    c.FallbackFilter.IPCIDR,
+			Domain:    c.FallbackFilter.Domain,
 		},
 		Default: c.DefaultNameserver,
 		Policy:  c.NameServerPolicy,