From b283a6d7fcf9117b9cd7ff72906a6fbdcd015a96 Mon Sep 17 00:00:00 2001
From: xishang0128 <xishang02@gmail.com>
Date: Sun, 21 Jul 2024 14:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/example/conf.md | 556 +++++++++++++++++++++++++++++--------------
 docs/example/geox    | 181 +++++++++-----
 docs/example/text    | 191 ++++++++++-----
 docs/example/yaml    | 191 ++++++++++-----
 4 files changed, 759 insertions(+), 360 deletions(-)

diff --git a/docs/example/conf.md b/docs/example/conf.md
index 3537cd4b9..5442de15d 100644
--- a/docs/example/conf.md
+++ b/docs/example/conf.md
@@ -1,28 +1,32 @@
 === "GeoX"
     === "config"
         ```{.yaml linenums="1"}
-        ######### 锚点 start #######
-        # 策略组相关
-        pr: &pr {type: select, proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]}
-
-        #这里是订阅更新和延迟测试相关的
-        p: &p {type: http, interval: 3600, health-check: {enable: true, url: https://www.gstatic.com/generate_204, interval: 300}}
-
-        ######### 锚点 end #######
-
         # url 里填写自己的订阅,名称不能重复
         proxy-providers:
           provider1:
-            <<: *p
             url: ""
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204", interval: 300}
+            override:
+              additional-prefix: "[provider1]"
 
           provider2:
-            <<: *p
             url: ""
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+            override:
+              additional-prefix: "[provider2]"
 
+        proxies: 
+          - name: "直连"
+            type: direct
+            udp: true
+
+        mixed-port: 7890
         ipv6: true
         allow-lan: true
-        mixed-port: 7890
         unified-delay: false
         tcp-concurrent: true
         external-controller: 127.0.0.1:9090
@@ -34,6 +38,7 @@
           geoip: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat"
           geosite: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
           mmdb: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country-lite.mmdb"
+          asn: "https://mirror.ghproxy.com/https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb"
 
         find-process-mode: strict
         global-client-fingerprint: chrome
@@ -54,72 +59,134 @@
               ports: [443, 8443]
           skip-domain:
             - "Mijia Cloud"
+            - "+.push.apple.com"
 
         tun:
           enable: true
           stack: mixed
           dns-hijack:
             - "any:53"
+            - "tcp://any:53"
           auto-route: true
+          auto-redirect: true
           auto-detect-interface: true
 
         dns:
           enable: true
-          listen: :1053
           ipv6: true
+          respect-rules: true
           enhanced-mode: fake-ip
           fake-ip-filter:
             - "*"
             - "+.lan"
             - "+.local"
+            - "+.market.xiaomi.com"
           nameserver:
-            - https://doh.pub/dns-query
-            - https://dns.alidns.com/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           proxy-server-nameserver:
-            - https://doh.pub/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           nameserver-policy:
             "geosite:cn,private":
-              - https://doh.pub/dns-query
-              - https://dns.alidns.com/dns-query
+              - https://120.53.53.53/dns-query
+              - https://223.5.5.5/dns-query
             "geosite:geolocation-!cn":
-              - "https://dns.cloudflare.com/dns-query#dns"
-              - "https://dns.google/dns-query#dns"
-        proxies:
-        - name: "直连"
-          type: direct
-          udp: true
+              - "https://dns.cloudflare.com/dns-query"
+              - "https://dns.google/dns-query"
+
         proxy-groups:
-          - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: Google, <<: *pr}
-          - {name: Telegram, <<: *pr}
-          - {name: Twitter, <<: *pr}
-          - {name: Pixiv, <<: *pr}
-          - {name: ehentai, <<: *pr}
-          - {name: 哔哩哔哩, <<: *pr}
-          - {name: 哔哩东南亚, <<: *pr}
-          - {name: 巴哈姆特, <<: *pr}
-          - {name: YouTube, <<: *pr}
-          - {name: NETFLIX, <<: *pr}
-          - {name: Spotify, <<: *pr}
-          - {name: Github, <<: *pr}
-          - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-          - {name: 其他, <<: *pr}
-
-        #分隔,下面是地区分组
-          - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-          - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-          - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-          - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-          - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-          - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-          - {name: 全部节点, type: select , include-all-providers: true}
-          - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
+
+          - name: 默认
+            type: select
+            proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+
+          - name: Google
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Telegram
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Twitter
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 哔哩哔哩
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 巴哈姆特
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: YouTube
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: NETFLIX
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Spotify
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Github
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 国内
+            type: select
+            proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+
+          - name: 其他
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          #分隔,下面是地区分组
+          - name: 香港
+            type: select
+            include-all: true
+            filter: "(?i)港|hk|hongkong|hong kong"
+
+          - name: 台湾
+            type: select
+            include-all: true
+            filter: "(?i)台|tw|taiwan"
+
+          - name: 日本
+            type: select
+            include-all: true
+            filter: "(?i)日|jp|japan"
+
+          - name: 美国
+            type: select
+            include-all: true
+            filter: "(?i)美|us|unitedstates|united states"
+
+          - name: 新加坡
+            type: select
+            include-all: true
+            filter: "(?i)(新|sg|singapore)"
+
+          - name: 其它地区
+            type: select
+            include-all: true
+            filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+
+          - name: 全部节点
+            type: select
+            include-all: true
+
+          - name: 自动选择
+            type: url-test
+            include-all: true
+            tolerance: 10
 
         rules:
           - GEOIP,lan,直连,no-resolve
-          - GEOSITE,biliintl,哔哩东南亚
-          - GEOSITE,ehentai,ehentai
           - GEOSITE,github,Github
           - GEOSITE,twitter,Twitter
           - GEOSITE,youtube,YouTube
@@ -129,7 +196,6 @@
           - GEOSITE,bilibili,哔哩哔哩
           - GEOSITE,bahamut,巴哈姆特
           - GEOSITE,spotify,Spotify
-          - GEOSITE,pixiv,Pixiv
           - GEOSITE,CN,国内
           - GEOSITE,geolocation-!cn,其他
 
@@ -148,41 +214,45 @@
 === "RULE-SET(yaml)"
     === "config"
         ```{.yaml linenums="1"}
-        ######### 锚点 start #######
-        # 策略组相关
-        pr: &pr {type: select, proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]}
-
-        #这里是订阅更新和延迟测试相关的
-        p: &p {type: http, interval: 3600, health-check: {enable: true, url: https://www.gstatic.com/generate_204, interval: 300}}
-
-        ######### 锚点 end #######
-
         # url 里填写自己的订阅,名称不能重复
         proxy-providers:
           provider1:
-            <<: *p
             url: ""
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+            override:
+              additional-prefix: "[provider1]"
 
           provider2:
-            <<: *p
             url: ""
-
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+            override:
+              additional-prefix: "[provider2]"
+        
+        proxies: 
+          - name: "直连"
+            type: direct
+            udp: true
+        
+        mixed-port: 7890
         ipv6: true
         allow-lan: true
-        mixed-port: 7890
         unified-delay: false
         tcp-concurrent: true
         external-controller: 127.0.0.1:9090
         external-ui: ui
         external-ui-url: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip"
-
+        
         find-process-mode: strict
         global-client-fingerprint: chrome
-
+        
         profile:
           store-selected: true
           store-fake-ip: true
-
+        
         sniffer:
           enable: true
           sniff:
@@ -195,74 +265,134 @@
               ports: [443, 8443]
           skip-domain:
             - "Mijia Cloud"
+            - "+.push.apple.com"
+        
         tun:
           enable: true
           stack: mixed
           dns-hijack:
             - "any:53"
+            - "tcp://any:53"
           auto-route: true
+          auto-redirect: true
           auto-detect-interface: true
-
+        
         dns:
           enable: true
-          listen: :1053
           ipv6: true
+          respect-rules: true
           enhanced-mode: fake-ip
-          fake-ip-range: 28.0.0.1/8
           fake-ip-filter:
             - "*"
             - "+.lan"
             - "+.local"
-          default-nameserver:
-            - 223.5.5.5
+            - "+.market.xiaomi.com"
           nameserver:
-            - https://doh.pub/dns-query
-            - https://dns.alidns.com/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           proxy-server-nameserver:
-            - https://doh.pub/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           nameserver-policy:
-            "rule-set:cn_domain,private":
-              - https://doh.pub/dns-query
-              - https://dns.alidns.com/dns-query
+            "rule-set:cn_domain,private_domain":
+              - https://120.53.53.53/dns-query
+              - https://223.5.5.5/dns-query
             "rule-set:geolocation-!cn":
-              - "https://dns.cloudflare.com/dns-query#dns"
-              - "https://dns.google/dns-query#dns"
-        proxies:
-        - name: "直连"
-          type: direct
-          udp: true
+              - "https://dns.cloudflare.com/dns-query"
+              - "https://dns.google/dns-query"
+        
         proxy-groups:
-          - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: Google, <<: *pr}
-          - {name: Telegram, <<: *pr}
-          - {name: Twitter, <<: *pr}
-          - {name: Pixiv, <<: *pr}
-          - {name: ehentai, <<: *pr}
-          - {name: 哔哩哔哩, <<: *pr}
-          - {name: 哔哩东南亚, <<: *pr}
-          - {name: 巴哈姆特, <<: *pr}
-          - {name: YouTube, <<: *pr}
-          - {name: NETFLIX, <<: *pr}
-          - {name: Spotify, <<: *pr}
-          - {name: Github, <<: *pr}
-          - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-          - {name: 其他, <<: *pr}
-
+        
+          - name: 默认
+            type: select
+            proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+        
+          - name: Google
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: Telegram
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: Twitter
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: 哔哩哔哩
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: 巴哈姆特
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: YouTube
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: NETFLIX
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: Spotify
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: Github
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
+          - name: 国内
+            type: select
+            proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+        
+          - name: 其他
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+        
           #分隔,下面是地区分组
-          - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-          - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-          - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-          - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-          - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-          - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-          - {name: 全部节点, type: select , include-all-providers: true}
-          - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
-
+          - name: 香港
+            type: select
+            include-all: true
+            filter: "(?i)港|hk|hongkong|hong kong"
+        
+          - name: 台湾
+            type: select
+            include-all: true
+            filter: "(?i)台|tw|taiwan"
+        
+          - name: 日本
+            type: select
+            include-all: true
+            filter: "(?i)日|jp|japan"
+        
+          - name: 美国
+            type: select
+            include-all: true
+            filter: "(?i)美|us|unitedstates|united states"
+        
+          - name: 新加坡
+            type: select
+            include-all: true
+            filter: "(?i)(新|sg|singapore)"
+        
+          - name: 其它地区
+            type: select
+            include-all: true
+            filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+        
+          - name: 全部节点
+            type: select
+            include-all: true
+        
+          - name: 自动选择
+            type: url-test
+            include-all: true
+            tolerance: 10
+        
         rules:
-          - GEOIP,lan,直连,no-resolve
-          - RULE-SET,biliintl_domain,哔哩东南亚
-          - RULE-SET,ehentai_domain,ehentai
+          - RULE-SET,private_ip,直连,no-resolve
           - RULE-SET,github_domain,Github
           - RULE-SET,twitter_domain,Twitter
           - RULE-SET,youtube_domain,YouTube
@@ -272,22 +402,21 @@
           - RULE-SET,bilibili_domain,哔哩哔哩
           - RULE-SET,bahamut_domain,巴哈姆特
           - RULE-SET,spotify_domain,Spotify
-          - RULE-SET,pixiv_domain,Pixiv
           - RULE-SET,cn_domain,国内
           - RULE-SET,geolocation-!cn,其他
-
+        
           - RULE-SET,google_ip,Google
           - RULE-SET,netflix_ip,NETFLIX
           - RULE-SET,telegram_ip,Telegram
           - RULE-SET,twitter_ip,Twitter
           - RULE-SET,cn_ip,国内
           - MATCH,其他
-
+        
         rule-anchor:
           ip: &ip {type: http, interval: 86400, behavior: ipcidr, format: yaml}
           domain: &domain {type: http, interval: 86400, behavior: domain, format: yaml}
         rule-providers:
-          private:
+          private_domain:
             <<: *domain
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/private.yaml"
           cn_domain:
@@ -332,7 +461,10 @@
           geolocation-!cn:
             <<: *domain
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/geolocation-!cn.yaml"
-
+        
+          private_ip:
+            <<: *ip
+            url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/private.yaml"
           cn_ip:
             <<: *ip
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/cn.yaml"
@@ -357,28 +489,32 @@
 === "RULE-SET(text)"
     === "config"
         ```{.yaml linenums="1"}
-        ######### 锚点 start #######
-        # 策略组相关
-        pr: &pr {type: select, proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]}
-
-        #这里是订阅更新和延迟测试相关的
-        p: &p {type: http, interval: 3600, health-check: {enable: true, url: https://www.gstatic.com/generate_204, interval: 300}}
-
-        ######### 锚点 end #######
-
         # url 里填写自己的订阅,名称不能重复
         proxy-providers:
           provider1:
-            <<: *p
             url: ""
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+            override:
+              additional-prefix: "[provider1]"
 
           provider2:
-            <<: *p
             url: ""
+            type: http
+            interval: 86400
+            health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+            override:
+              additional-prefix: "[provider2]"
+
+        proxies: 
+          - name: "直连"
+            type: direct
+            udp: true
 
+        mixed-port: 7890
         ipv6: true
         allow-lan: true
-        mixed-port: 7890
         unified-delay: false
         tcp-concurrent: true
         external-controller: 127.0.0.1:9090
@@ -404,74 +540,134 @@
               ports: [443, 8443]
           skip-domain:
             - "Mijia Cloud"
+            - "+.push.apple.com"
+
         tun:
           enable: true
           stack: mixed
           dns-hijack:
             - "any:53"
+            - "tcp://any:53"
           auto-route: true
+          auto-redirect: true
           auto-detect-interface: true
 
         dns:
           enable: true
-          listen: :1053
           ipv6: true
+          respect-rules: true
           enhanced-mode: fake-ip
-          fake-ip-range: 28.0.0.1/8
           fake-ip-filter:
             - "*"
             - "+.lan"
             - "+.local"
-          default-nameserver:
-            - 223.5.5.5
+            - "+.market.xiaomi.com"
           nameserver:
-            - https://doh.pub/dns-query
-            - https://dns.alidns.com/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           proxy-server-nameserver:
-            - https://doh.pub/dns-query
+            - https://120.53.53.53/dns-query
+            - https://223.5.5.5/dns-query
           nameserver-policy:
-            "rule-set:cn_domain,private":
-              - https://doh.pub/dns-query
-              - https://dns.alidns.com/dns-query
+            "rule-set:cn_domain,private_domain":
+              - https://120.53.53.53/dns-query
+              - https://223.5.5.5/dns-query
             "rule-set:geolocation-!cn":
-              - "https://dns.cloudflare.com/dns-query#dns"
-              - "https://dns.google/dns-query#dns"
-        proxies:
-        - name: "直连"
-          type: direct
-          udp: true
+              - "https://dns.cloudflare.com/dns-query"
+              - "https://dns.google/dns-query"
+
         proxy-groups:
-          - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-          - {name: Google, <<: *pr}
-          - {name: Telegram, <<: *pr}
-          - {name: Twitter, <<: *pr}
-          - {name: Pixiv, <<: *pr}
-          - {name: ehentai, <<: *pr}
-          - {name: 哔哩哔哩, <<: *pr}
-          - {name: 哔哩东南亚, <<: *pr}
-          - {name: 巴哈姆特, <<: *pr}
-          - {name: YouTube, <<: *pr}
-          - {name: NETFLIX, <<: *pr}
-          - {name: Spotify, <<: *pr}
-          - {name: Github, <<: *pr}
-          - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-          - {name: 其他, <<: *pr}
-
-        #分隔,下面是地区分组
-          - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-          - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-          - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-          - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-          - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-          - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-          - {name: 全部节点, type: select , include-all-providers: true}
-          - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
+
+          - name: 默认
+            type: select
+            proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+
+          - name: Google
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Telegram
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Twitter
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 哔哩哔哩
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 巴哈姆特
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: YouTube
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: NETFLIX
+            type: select
+            proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Spotify
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: Github
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          - name: 国内
+            type: select
+            proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+
+          - name: 其他
+            type: select
+            proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+          #分隔,下面是地区分组
+          - name: 香港
+            type: select
+            include-all: true
+            filter: "(?i)港|hk|hongkong|hong kong"
+
+          - name: 台湾
+            type: select
+            include-all: true
+            filter: "(?i)台|tw|taiwan"
+
+          - name: 日本
+            type: select
+            include-all: true
+            filter: "(?i)日|jp|japan"
+
+          - name: 美国
+            type: select
+            include-all: true
+            filter: "(?i)美|us|unitedstates|united states"
+
+          - name: 新加坡
+            type: select
+            include-all: true
+            filter: "(?i)(新|sg|singapore)"
+
+          - name: 其它地区
+            type: select
+            include-all: true
+            filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+
+          - name: 全部节点
+            type: select
+            include-all: true
+
+          - name: 自动选择
+            type: url-test
+            include-all: true
+            tolerance: 10
 
         rules:
-          - GEOIP,lan,直连,no-resolve
-          - RULE-SET,biliintl_domain,哔哩东南亚
-          - RULE-SET,ehentai_domain,ehentai
+          - RULE-SET,private_ip,直连,no-resolve
           - RULE-SET,github_domain,Github
           - RULE-SET,twitter_domain,Twitter
           - RULE-SET,youtube_domain,YouTube
@@ -481,7 +677,6 @@
           - RULE-SET,bilibili_domain,哔哩哔哩
           - RULE-SET,bahamut_domain,巴哈姆特
           - RULE-SET,spotify_domain,Spotify
-          - RULE-SET,pixiv_domain,Pixiv
           - RULE-SET,cn_domain,国内
           - RULE-SET,geolocation-!cn,其他
 
@@ -496,7 +691,7 @@
           ip: &ip {type: http, interval: 86400, behavior: ipcidr, format: text}
           domain: &domain {type: http, interval: 86400, behavior: domain, format: text}
         rule-providers:
-          private:
+          private_domain:
             <<: *domain
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/private.list"
           cn_domain:
@@ -542,6 +737,9 @@
             <<: *domain
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/geolocation-!cn.list"
 
+          private_ip:
+            <<: *ip
+            url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/private.list"
           cn_ip:
             <<: *ip
             url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/cn.list"
diff --git a/docs/example/geox b/docs/example/geox
index 8585d8c00..6f94e3ff5 100644
--- a/docs/example/geox
+++ b/docs/example/geox
@@ -1,24 +1,29 @@
-######### 锚点 start #######
-# 策略组相关
-pr: &pr {type: select, proxies: [默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择, 直连]}
-#这里是订阅更新和延迟测试相关的
-p: &p {type: http, interval: 3600, health-check: {enable: true, url: 'https://www.gstatic.com/generate_204', interval: 300}}
-######### 锚点 end #######
-
-
 # url 里填写自己的订阅,名称不能重复
 proxy-providers:
   provider1:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider1]"
 
   provider2:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider2]"
 
+proxies: 
+  - name: "直连"
+    type: direct
+    udp: true
+
+mixed-port: 7890
 ipv6: true
 allow-lan: true
-mixed-port: 7890
 unified-delay: false
 tcp-concurrent: true
 external-controller: 127.0.0.1:9090
@@ -30,6 +35,7 @@ geox-url:
   geoip: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat"
   geosite: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
   mmdb: "https://mirror.ghproxy.com/https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country-lite.mmdb"
+  asn: "https://mirror.ghproxy.com/https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb"
 
 find-process-mode: strict
 global-client-fingerprint: chrome
@@ -50,72 +56,134 @@ sniffer:
       ports: [443, 8443]
   skip-domain:
     - "Mijia Cloud"
+    - "+.push.apple.com"
 
 tun:
   enable: true
   stack: mixed
   dns-hijack:
-    - 'any:53'
+    - "any:53"
+    - "tcp://any:53"
   auto-route: true
+  auto-redirect: true
   auto-detect-interface: true
 
 dns:
   enable: true
-  listen: :1053
   ipv6: true
+  respect-rules: true
   enhanced-mode: fake-ip
   fake-ip-filter:
-    - '*'
-    - '+.lan'
-    - '+.local'
+    - "*"
+    - "+.lan"
+    - "+.local"
+    - "+.market.xiaomi.com"
   nameserver:
-    - https://doh.pub/dns-query
-    - https://dns.alidns.com/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   proxy-server-nameserver:
-    - https://doh.pub/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   nameserver-policy:
     "geosite:cn,private":
-      - https://doh.pub/dns-query
-      - https://dns.alidns.com/dns-query
+      - https://120.53.53.53/dns-query
+      - https://223.5.5.5/dns-query
     "geosite:geolocation-!cn":
-      - 'https://dns.cloudflare.com/dns-query#dns'
-      - 'https://dns.google/dns-query#dns'
-proxies:
-- name: "直连"
-  type: direct
-  udp: true
+      - "https://dns.cloudflare.com/dns-query"
+      - "https://dns.google/dns-query"
+
 proxy-groups:
-  - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: Google, <<: *pr}
-  - {name: Telegram, <<: *pr}
-  - {name: Twitter, <<: *pr}
-  - {name: Pixiv, <<: *pr}
-  - {name: ehentai, <<: *pr}
-  - {name: 哔哩哔哩, <<: *pr}
-  - {name: 哔哩东南亚, <<: *pr}
-  - {name: 巴哈姆特, <<: *pr}
-  - {name: YouTube, <<: *pr}
-  - {name: NETFLIX, <<: *pr}
-  - {name: Spotify, <<: *pr}
-  - {name: Github, <<: *pr}
-  - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-  - {name: 其他, <<: *pr}
-
-#分隔,下面是地区分组
-  - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-  - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-  - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-  - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-  - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-  - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-  - {name: 全部节点, type: select , include-all-providers: true}
-  - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
+
+  - name: 默认
+    type: select
+    proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+
+  - name: Google
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Telegram
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Twitter
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 哔哩哔哩
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 巴哈姆特
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: YouTube
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: NETFLIX
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Spotify
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Github
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 国内
+    type: select
+    proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+
+  - name: 其他
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  #分隔,下面是地区分组
+  - name: 香港
+    type: select
+    include-all: true
+    filter: "(?i)港|hk|hongkong|hong kong"
+
+  - name: 台湾
+    type: select
+    include-all: true
+    filter: "(?i)台|tw|taiwan"
+
+  - name: 日本
+    type: select
+    include-all: true
+    filter: "(?i)日|jp|japan"
+
+  - name: 美国
+    type: select
+    include-all: true
+    filter: "(?i)美|us|unitedstates|united states"
+
+  - name: 新加坡
+    type: select
+    include-all: true
+    filter: "(?i)(新|sg|singapore)"
+
+  - name: 其它地区
+    type: select
+    include-all: true
+    filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+
+  - name: 全部节点
+    type: select
+    include-all: true
+
+  - name: 自动选择
+    type: url-test
+    include-all: true
+    tolerance: 10
 
 rules:
   - GEOIP,lan,直连,no-resolve
-  - GEOSITE,biliintl,哔哩东南亚
-  - GEOSITE,ehentai,ehentai
   - GEOSITE,github,Github
   - GEOSITE,twitter,Twitter
   - GEOSITE,youtube,YouTube
@@ -125,7 +193,6 @@ rules:
   - GEOSITE,bilibili,哔哩哔哩
   - GEOSITE,bahamut,巴哈姆特
   - GEOSITE,spotify,Spotify
-  - GEOSITE,pixiv,Pixiv
   - GEOSITE,CN,国内
   - GEOSITE,geolocation-!cn,其他
 
@@ -134,4 +201,4 @@ rules:
   - GEOIP,telegram,Telegram
   - GEOIP,twitter,Twitter
   - GEOIP,CN,国内
-  - MATCH,其他
\ No newline at end of file
+  - MATCH,其他
diff --git a/docs/example/text b/docs/example/text
index de02b723c..e43692ed8 100644
--- a/docs/example/text
+++ b/docs/example/text
@@ -1,24 +1,29 @@
-######### 锚点 start #######
-# 策略组相关
-pr: &pr {type: select, proxies: [默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择, 直连]}
-#这里是订阅更新和延迟测试相关的
-p: &p {type: http, interval: 3600, health-check: {enable: true, url: 'https://www.gstatic.com/generate_204', interval: 300}}
-######### 锚点 end #######
-
-
 # url 里填写自己的订阅,名称不能重复
 proxy-providers:
   provider1:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider1]"
 
   provider2:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider2]"
 
+proxies: 
+  - name: "直连"
+    type: direct
+    udp: true
+
+mixed-port: 7890
 ipv6: true
 allow-lan: true
-mixed-port: 7890
 unified-delay: false
 tcp-concurrent: true
 external-controller: 127.0.0.1:9090
@@ -44,74 +49,134 @@ sniffer:
       ports: [443, 8443]
   skip-domain:
     - "Mijia Cloud"
+    - "+.push.apple.com"
+
 tun:
   enable: true
   stack: mixed
   dns-hijack:
-    - 'any:53'
+    - "any:53"
+    - "tcp://any:53"
   auto-route: true
+  auto-redirect: true
   auto-detect-interface: true
 
 dns:
   enable: true
-  listen: :1053
   ipv6: true
+  respect-rules: true
   enhanced-mode: fake-ip
-  fake-ip-range: 28.0.0.1/8
   fake-ip-filter:
-    - '*'
-    - '+.lan'
-    - '+.local'
-  default-nameserver:
-    - 223.5.5.5
+    - "*"
+    - "+.lan"
+    - "+.local"
+    - "+.market.xiaomi.com"
   nameserver:
-    - https://doh.pub/dns-query
-    - https://dns.alidns.com/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   proxy-server-nameserver:
-    - https://doh.pub/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   nameserver-policy:
-    "rule-set:cn_domain,private":
-      - https://doh.pub/dns-query
-      - https://dns.alidns.com/dns-query
+    "rule-set:cn_domain,private_domain":
+      - https://120.53.53.53/dns-query
+      - https://223.5.5.5/dns-query
     "rule-set:geolocation-!cn":
-      - 'https://dns.cloudflare.com/dns-query#dns'
-      - 'https://dns.google/dns-query#dns'
-proxies:
-- name: "直连"
-  type: direct
-  udp: true
+      - "https://dns.cloudflare.com/dns-query"
+      - "https://dns.google/dns-query"
+
 proxy-groups:
-  - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: Google, <<: *pr}
-  - {name: Telegram, <<: *pr}
-  - {name: Twitter, <<: *pr}
-  - {name: Pixiv, <<: *pr}
-  - {name: ehentai, <<: *pr}
-  - {name: 哔哩哔哩, <<: *pr}
-  - {name: 哔哩东南亚, <<: *pr}
-  - {name: 巴哈姆特, <<: *pr}
-  - {name: YouTube, <<: *pr}
-  - {name: NETFLIX, <<: *pr}
-  - {name: Spotify, <<: *pr}
-  - {name: Github, <<: *pr}
-  - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-  - {name: 其他, <<: *pr}
-
-#分隔,下面是地区分组
-  - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-  - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-  - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-  - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-  - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-  - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-  - {name: 全部节点, type: select , include-all-providers: true}
-  - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
+
+  - name: 默认
+    type: select
+    proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+
+  - name: Google
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Telegram
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Twitter
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 哔哩哔哩
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 巴哈姆特
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: YouTube
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: NETFLIX
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Spotify
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Github
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 国内
+    type: select
+    proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+
+  - name: 其他
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  #分隔,下面是地区分组
+  - name: 香港
+    type: select
+    include-all: true
+    filter: "(?i)港|hk|hongkong|hong kong"
+
+  - name: 台湾
+    type: select
+    include-all: true
+    filter: "(?i)台|tw|taiwan"
+
+  - name: 日本
+    type: select
+    include-all: true
+    filter: "(?i)日|jp|japan"
+
+  - name: 美国
+    type: select
+    include-all: true
+    filter: "(?i)美|us|unitedstates|united states"
+
+  - name: 新加坡
+    type: select
+    include-all: true
+    filter: "(?i)(新|sg|singapore)"
+
+  - name: 其它地区
+    type: select
+    include-all: true
+    filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+
+  - name: 全部节点
+    type: select
+    include-all: true
+
+  - name: 自动选择
+    type: url-test
+    include-all: true
+    tolerance: 10
 
 rules:
-  - GEOIP,lan,直连,no-resolve
-  - RULE-SET,biliintl_domain,哔哩东南亚
-  - RULE-SET,ehentai_domain,ehentai
+  - RULE-SET,private_ip,直连,no-resolve
   - RULE-SET,github_domain,Github
   - RULE-SET,twitter_domain,Twitter
   - RULE-SET,youtube_domain,YouTube
@@ -121,7 +186,6 @@ rules:
   - RULE-SET,bilibili_domain,哔哩哔哩
   - RULE-SET,bahamut_domain,巴哈姆特
   - RULE-SET,spotify_domain,Spotify
-  - RULE-SET,pixiv_domain,Pixiv
   - RULE-SET,cn_domain,国内
   - RULE-SET,geolocation-!cn,其他
 
@@ -136,7 +200,7 @@ rule-anchor:
   ip: &ip {type: http, interval: 86400, behavior: ipcidr, format: text}
   domain: &domain {type: http, interval: 86400, behavior: domain, format: text}
 rule-providers:
-  private:
+  private_domain:
     <<: *domain
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/private.list"
   cn_domain:
@@ -182,6 +246,9 @@ rule-providers:
     <<: *domain
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/geolocation-!cn.list"
 
+  private_ip:
+    <<: *ip
+    url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/private.list"
   cn_ip:
     <<: *ip
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/cn.list"
diff --git a/docs/example/yaml b/docs/example/yaml
index e18fb6cd4..b1c2082c6 100644
--- a/docs/example/yaml
+++ b/docs/example/yaml
@@ -1,24 +1,29 @@
-######### 锚点 start #######
-# 策略组相关
-pr: &pr {type: select, proxies: [默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择, 直连]}
-#这里是订阅更新和延迟测试相关的
-p: &p {type: http, interval: 3600, health-check: {enable: true, url: 'https://www.gstatic.com/generate_204', interval: 300}}
-######### 锚点 end #######
-
-
 # url 里填写自己的订阅,名称不能重复
 proxy-providers:
   provider1:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider1]"
 
   provider2:
-    <<: *p
     url: ""
+    type: http
+    interval: 86400
+    health-check: {enable: true,url: "https://www.gstatic.com/generate_204",interval: 300}
+    override:
+      additional-prefix: "[provider2]"
 
+proxies: 
+  - name: "直连"
+    type: direct
+    udp: true
+
+mixed-port: 7890
 ipv6: true
 allow-lan: true
-mixed-port: 7890
 unified-delay: false
 tcp-concurrent: true
 external-controller: 127.0.0.1:9090
@@ -44,74 +49,134 @@ sniffer:
       ports: [443, 8443]
   skip-domain:
     - "Mijia Cloud"
+    - "+.push.apple.com"
+
 tun:
   enable: true
   stack: mixed
   dns-hijack:
-    - 'any:53'
+    - "any:53"
+    - "tcp://any:53"
   auto-route: true
+  auto-redirect: true
   auto-detect-interface: true
 
 dns:
   enable: true
-  listen: :1053
   ipv6: true
+  respect-rules: true
   enhanced-mode: fake-ip
-  fake-ip-range: 28.0.0.1/8
   fake-ip-filter:
-    - '*'
-    - '+.lan'
-    - '+.local'
-  default-nameserver:
-    - 223.5.5.5
+    - "*"
+    - "+.lan"
+    - "+.local"
+    - "+.market.xiaomi.com"
   nameserver:
-    - https://doh.pub/dns-query
-    - https://dns.alidns.com/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   proxy-server-nameserver:
-    - https://doh.pub/dns-query
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
   nameserver-policy:
-    "rule-set:cn_domain,private":
-      - https://doh.pub/dns-query
-      - https://dns.alidns.com/dns-query
+    "rule-set:cn_domain,private_domain":
+      - https://120.53.53.53/dns-query
+      - https://223.5.5.5/dns-query
     "rule-set:geolocation-!cn":
-      - 'https://dns.cloudflare.com/dns-query#dns'
-      - 'https://dns.google/dns-query#dns'
-proxies:
-- name: "直连"
-  type: direct
-  udp: true
+      - "https://dns.cloudflare.com/dns-query"
+      - "https://dns.google/dns-query"
+
 proxy-groups:
-  - {name: 默认, type: select, proxies: [自动选择, 直连, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: dns, type: select, proxies: [自动选择, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点]}
-  - {name: Google, <<: *pr}
-  - {name: Telegram, <<: *pr}
-  - {name: Twitter, <<: *pr}
-  - {name: Pixiv, <<: *pr}
-  - {name: ehentai, <<: *pr}
-  - {name: 哔哩哔哩, <<: *pr}
-  - {name: 哔哩东南亚, <<: *pr}
-  - {name: 巴哈姆特, <<: *pr}
-  - {name: YouTube, <<: *pr}
-  - {name: NETFLIX, <<: *pr}
-  - {name: Spotify, <<: *pr}
-  - {name: Github, <<: *pr}
-  - {name: 国内, type: select, proxies: [直连, 默认, 香港, 台湾, 日本, 新加坡, 美国, 其它地区, 全部节点, 自动选择]}
-  - {name: 其他, <<: *pr}
-
-#分隔,下面是地区分组
-  - {name: 香港, type: select , include-all-providers: true, filter: "(?i)港|hk|hongkong|hong kong"}
-  - {name: 台湾, type: select , include-all-providers: true, filter: "(?i)台|tw|taiwan"}
-  - {name: 日本, type: select , include-all-providers: true, filter: "(?i)日|jp|japan"}
-  - {name: 美国, type: select , include-all-providers: true, filter: "(?i)美|us|unitedstates|united states"}
-  - {name: 新加坡, type: select , include-all-providers: true, filter: "(?i)(新|sg|singapore)"}
-  - {name: 其它地区, type: select , include-all-providers: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"}
-  - {name: 全部节点, type: select , include-all-providers: true}
-  - {name: 自动选择, type: url-test, include-all-providers: true, tolerance: 10}
+
+  - name: 默认
+    type: select
+    proxies: [自动选择,直连,香港,台湾,日本,新加坡,美国,其它地区,全部节点]
+
+  - name: Google
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Telegram
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Twitter
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 哔哩哔哩
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 巴哈姆特
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: YouTube
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: NETFLIX
+    type: select
+    proxies: [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Spotify
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: Github
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  - name: 国内
+    type: select
+    proxies:  [直连,默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择]
+
+  - name: 其他
+    type: select
+    proxies:  [默认,香港,台湾,日本,新加坡,美国,其它地区,全部节点,自动选择,直连]
+
+  #分隔,下面是地区分组
+  - name: 香港
+    type: select
+    include-all: true
+    filter: "(?i)港|hk|hongkong|hong kong"
+
+  - name: 台湾
+    type: select
+    include-all: true
+    filter: "(?i)台|tw|taiwan"
+
+  - name: 日本
+    type: select
+    include-all: true
+    filter: "(?i)日|jp|japan"
+
+  - name: 美国
+    type: select
+    include-all: true
+    filter: "(?i)美|us|unitedstates|united states"
+
+  - name: 新加坡
+    type: select
+    include-all: true
+    filter: "(?i)(新|sg|singapore)"
+
+  - name: 其它地区
+    type: select
+    include-all: true
+    filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
+
+  - name: 全部节点
+    type: select
+    include-all: true
+
+  - name: 自动选择
+    type: url-test
+    include-all: true
+    tolerance: 10
 
 rules:
-  - GEOIP,lan,直连,no-resolve
-  - RULE-SET,biliintl_domain,哔哩东南亚
-  - RULE-SET,ehentai_domain,ehentai
+  - RULE-SET,private_ip,直连,no-resolve
   - RULE-SET,github_domain,Github
   - RULE-SET,twitter_domain,Twitter
   - RULE-SET,youtube_domain,YouTube
@@ -121,7 +186,6 @@ rules:
   - RULE-SET,bilibili_domain,哔哩哔哩
   - RULE-SET,bahamut_domain,巴哈姆特
   - RULE-SET,spotify_domain,Spotify
-  - RULE-SET,pixiv_domain,Pixiv
   - RULE-SET,cn_domain,国内
   - RULE-SET,geolocation-!cn,其他
 
@@ -136,7 +200,7 @@ rule-anchor:
   ip: &ip {type: http, interval: 86400, behavior: ipcidr, format: yaml}
   domain: &domain {type: http, interval: 86400, behavior: domain, format: yaml}
 rule-providers:
-  private:
+  private_domain:
     <<: *domain
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/private.yaml"
   cn_domain:
@@ -182,6 +246,9 @@ rule-providers:
     <<: *domain
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/geolocation-!cn.yaml"
 
+  private_ip:
+    <<: *ip
+    url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/private.yaml"
   cn_ip:
     <<: *ip
     url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geoip/cn.yaml"