Update

5 years ago · 4b736b9d30
parent 76c95697b2
commit 4b736b9d30
10 changed files with 558 additions and 10944 deletions
--- a/Clash/Head_dns.yaml
+++ b/Clash/Head_dns.yaml
@ -4,22 +4,25 @@ mixed-port: 8899
 allow-lan: true
 mode: Rule
 log-level: info
-external-controller: 127.0.0.1:6170
+external-controller: '127.0.0.1:6170'
 experimental:
  ignore-resolve-fail: true
 dns:
  enable: true
  ipv6: false
-  listen: 127.0.0.1:5450
+  listen: '0.0.0.0:5450'
-  enhanced-mode: redir-host
+  enhanced-mode: fake-ip
  default-nameserver:
    - 119.29.29.29
    - 119.28.28.28
    - 1.2.4.8
  fake-ip-filter:
    - '*.lan'
    - localhost.ptlogin2.qq.com
  nameserver:
-    - https://dns.alidns.com/dns-query
+    - 'https://dns.alidns.com/dns-query'
-    - https://1.1.1.1/dns-query
+    - 'https://1.1.1.1/dns-query'
-    - tls://dns.adguard.com:853
+    - 'tls://dns.adguard.com:853'
 clash-for-android: 
  # append-system-dns: true # 追加系统 DNS 到 nameserver 
  ui-subtitle-pattern: "[\u4e00-\u9fa5]{2,4}"
--- a/Clash/Head_tap.yaml
+++ b/Clash/Head_tap.yaml
@ -4,13 +4,13 @@ mixed-port: 8899
 allow-lan: true
 mode: Rule
 log-level: info
-external-controller: 127.0.0.1:6170
+external-controller: '127.0.0.1:6170'
 experimental:
  ignore-resolve-fail: true
 dns:
  enable: true
  ipv6: false
-  listen: 127.0.0.1:53
+  listen: '0.0.0.0:53'
  enhanced-mode: fake-ip
  default-nameserver:
    - 119.29.29.29
@ -20,9 +20,9 @@ dns:
    - '*.lan'
    - localhost.ptlogin2.qq.com
  nameserver:
-    - https://dns.alidns.com/dns-query
+    - 'https://dns.alidns.com/dns-query'
-    - https://1.1.1.1/dns-query
+    - 'https://1.1.1.1/dns-query'
-    - tls://dns.adguard.com:853
+    - 'tls://dns.adguard.com:853'
  # experimental:
  # interface-name: WLAN
 clash-for-android: 
--- a/Clash/Provider/Reject.yaml
+++ b/Clash/Provider/Reject.yaml
@ -8329,159 +8329,48 @@ payload:
  #  - URL-REGEX,https?://server-\w+.imrworldwide.com
  #  - URL-REGEX,https?://www.bldimg.com/(background|splash)/.+.png$
-  - IP-CIDR,1.3.0.10/32,no-resolve
+  - IP-CIDR,39.107.15.115/32
-  - IP-CIDR,10.72.25.0/24,no-resolve
+  - IP-CIDR,47.89.59.182/32
-  - IP-CIDR,101.201.29.182/32,no-resolve
+  - IP-CIDR,103.49.209.27/32
-  - IP-CIDR,101.251.211.235/32,no-resolve
+  - IP-CIDR,123.56.152.96/32
-  - IP-CIDR,103.249.254.113/32,no-resolve
+
-  - IP-CIDR,104.195.62.12/32,no-resolve
+# > China Net
-  - IP-CIDR,104.197.140.120/32,no-resolve
+  - IP-CIDR,61.160.200.223/32
-  - IP-CIDR,104.198.198.188/32,no-resolve
+  - IP-CIDR,61.160.200.242/32
-  - IP-CIDR,106.187.95.251/32,no-resolve
+  - IP-CIDR,61.160.200.252/32
-  - IP-CIDR,106.75.65.90/32,no-resolve
+  - IP-CIDR,61.174.50.214/32
-  - IP-CIDR,106.75.65.92/32,no-resolve
+  - IP-CIDR,111.175.220.163/32
-  - IP-CIDR,107.21.113.76/32,no-resolve
+  - IP-CIDR,111.175.220.164/32
-  - IP-CIDR,108.171.248.234/32,no-resolve
+  - IP-CIDR,124.232.160.178/32
-  - IP-CIDR,111.175.220.160/29,no-resolve
+  - IP-CIDR,175.6.223.15/32
-  - IP-CIDR,111.175.220.164/32,no-resolve
+  - IP-CIDR,183.59.53.237/32
-  - IP-CIDR,111.206.22.0/24,no-resolve
+  - IP-CIDR,218.93.127.37/32
-  - IP-CIDR,111.30.135.167/32,no-resolve
+  - IP-CIDR,221.228.17.152/32
-  - IP-CIDR,111.63.135.0/24,no-resolve
+  - IP-CIDR,221.231.6.79/32
-  - IP-CIDR,111.73.45.147/32,no-resolve
+  - IP-CIDR,222.186.61.91/32
-  - IP-CIDR,112.124.115.215/32,no-resolve
+  - IP-CIDR,222.186.61.95/32
-  - IP-CIDR,112.74.95.46/32,no-resolve
+  - IP-CIDR,222.186.61.96/32
-  - IP-CIDR,113.207.57.24/32,no-resolve
+  - IP-CIDR,222.186.61.97/32
-  - IP-CIDR,113.57.230.88/32,no-resolve
+
-  - IP-CIDR,114.247.28.96/32,no-resolve
+# > China Unicom
-  - IP-CIDR,114.55.123.44/32,no-resolve
+  - IP-CIDR,106.75.231.48/32
-  - IP-CIDR,114.95.102.77/32,no-resolve
+  - IP-CIDR,119.4.249.166/32
-  - IP-CIDR,115.182.16.79/32,no-resolve
+  - IP-CIDR,220.196.52.141/32
-  - IP-CIDR,115.29.141.121/32,no-resolve
+  - IP-CIDR,221.6.4.148/32
-  - IP-CIDR,115.29.247.48/32,no-resolve
+
-  - IP-CIDR,116.206.22.7/32,no-resolve
+# > China Mobile
-  - IP-CIDR,116.55.227.242/32,no-resolve
+  - IP-CIDR,114.247.28.96/32
-  - IP-CIDR,117.144.242.32/32,no-resolve
+  - IP-CIDR,221.179.131.72/32
-  - IP-CIDR,117.25.133.209/32,no-resolve
+  - IP-CIDR,221.179.140.145/32
-  - IP-CIDR,118.144.88.126/32,no-resolve
+
-  - IP-CIDR,118.144.88.215/28,no-resolve
+# > Dr.Peng
-  - IP-CIDR,118.144.88.215/32,no-resolve
+  - IP-CIDR,10.72.25.0/24
-  - IP-CIDR,119.188.13.0/24,no-resolve
+  - IP-CIDR,115.182.16.79/32
-  - IP-CIDR,119.4.249.166/32,no-resolve
+  - IP-CIDR,118.144.88.126/32
-  - IP-CIDR,120.132.57.41/32,no-resolve
+  - IP-CIDR,118.144.88.215/32
-  - IP-CIDR,120.132.63.203/32,no-resolve
+  - IP-CIDR,120.76.189.132/32
-  - IP-CIDR,120.197.89.239/32,no-resolve
+  - IP-CIDR,124.14.21.147/32
-  - IP-CIDR,120.198.116.0/24,no-resolve
+  - IP-CIDR,124.14.21.151/32
-  - IP-CIDR,120.26.151.246/32,no-resolve
+  - IP-CIDR,180.166.52.24/32
-  - IP-CIDR,120.27.34.156/32,no-resolve
+  - IP-CIDR,220.115.251.25/32
-  - IP-CIDR,120.55.199.139/32,no-resolve
+  - IP-CIDR,222.73.156.235/32
  - IP-CIDR,120.76.189.132/32,no-resolve
  - IP-CIDR,120.80.57.123/32,no-resolve
  - IP-CIDR,121.15.207.243/32,no-resolve
  - IP-CIDR,121.199.73.185/32,no-resolve
  - IP-CIDR,121.201.108.2/32,no-resolve
  - IP-CIDR,121.201.11.95/32,no-resolve
  - IP-CIDR,121.251.255.0/24,no-resolve
  - IP-CIDR,121.43.75.169/32,no-resolve
  - IP-CIDR,122.225.103.120/32,no-resolve
  - IP-CIDR,122.226.223.163/32,no-resolve
  - IP-CIDR,122.227.254.195/32,no-resolve
  - IP-CIDR,122.228.236.165/32,no-resolve
  - IP-CIDR,123.125.111.0/24,no-resolve
  - IP-CIDR,123.139.154.201/24,no-resolve
  - IP-CIDR,123.56.152.96/32,no-resolve
  - IP-CIDR,123.57.162.39/32,no-resolve
  - IP-CIDR,123.57.94.184/32,no-resolve
  - IP-CIDR,123.59.152.170/32,no-resolve
  - IP-CIDR,123.59.78.229/32,no-resolve
  - IP-CIDR,124.14.21.147/32,no-resolve
  - IP-CIDR,124.14.21.151/32,no-resolve
  - IP-CIDR,124.160.194.11/32,no-resolve
  - IP-CIDR,124.232.160.178/32,no-resolve
  - IP-CIDR,125.46.61.28/32,no-resolve
  - IP-CIDR,125.89.69.5/32,no-resolve
  - IP-CIDR,139.159.32.82/32,no-resolve
  - IP-CIDR,139.196.239.52/32,no-resolve
  - IP-CIDR,139.224.26.92/32,no-resolve
  - IP-CIDR,139.224.74.148/32,no-resolve
  - IP-CIDR,146.148.85.61/32,no-resolve
  - IP-CIDR,162.212.181.32/32,no-resolve
  - IP-CIDR,173.208.177.227/32,no-resolve
  - IP-CIDR,175.6.223.15/32,no-resolve
  - IP-CIDR,180.166.52.24/32,no-resolve
  - IP-CIDR,180.76.155.58/32,no-resolve
  - IP-CIDR,180.76.162.60/32,no-resolve
  - IP-CIDR,180.76.171.28/32,no-resolve
  - IP-CIDR,180.76.172.149/32,no-resolve
  - IP-CIDR,180.76.181.213/32,no-resolve
  - IP-CIDR,182.92.81.104/32,no-resolve
  - IP-CIDR,183.131.79.130/32,no-resolve
  - IP-CIDR,183.131.79.30/32,no-resolve
  - IP-CIDR,183.59.53.187/29,no-resolve
  - IP-CIDR,183.59.53.237/32,no-resolve
  - IP-CIDR,183.6.188.226/29,no-resolve
  - IP-CIDR,198.40.52.11/32,no-resolve
  - IP-CIDR,202.104.1.27/32,no-resolve
  - IP-CIDR,202.105.165.202/32,no-resolve
  - IP-CIDR,205.209.138.102/32,no-resolve
  - IP-CIDR,211.103.159.32/32,no-resolve
  - IP-CIDR,211.137.132.89/32,no-resolve
  - IP-CIDR,211.139.178.49/32,no-resolve
  - IP-CIDR,211.149.225.23/32,no-resolve
  - IP-CIDR,211.167.105.131/32,no-resolve
  - IP-CIDR,211.98.71.195/29,no-resolve
  - IP-CIDR,218.25.246.118/32,no-resolve
  - IP-CIDR,218.93.127.37/32,no-resolve
  - IP-CIDR,219.234.83.60/32,no-resolve
  - IP-CIDR,220.115.251.25/32,no-resolve
  - IP-CIDR,220.196.52.141/32,no-resolve
  - IP-CIDR,221.179.140.0/24,no-resolve
  - IP-CIDR,221.179.183.0/24,no-resolve
  - IP-CIDR,221.179.191.0/24,no-resolve
  - IP-CIDR,221.179.46.190/25,no-resolve
  - IP-CIDR,221.204.213.222/32,no-resolve
  - IP-CIDR,221.228.17.152/32,no-resolve
  - IP-CIDR,221.228.214.101/32,no-resolve
  - IP-CIDR,221.231.6.79/32,no-resolve
  - IP-CIDR,222.186.61.91/32,no-resolve
  - IP-CIDR,222.186.61.95/32,no-resolve
  - IP-CIDR,222.186.61.96/32,no-resolve
  - IP-CIDR,222.186.61.97/32,no-resolve
  - IP-CIDR,222.187.226.96/32,no-resolve
  - IP-CIDR,222.73.156.235/32,no-resolve
  - IP-CIDR,223.6.255.99/32,no-resolve
  - IP-CIDR,23.235.156.167/32,no-resolve
  - IP-CIDR,23.42.186.24/32,no-resolve
  - IP-CIDR,23.66.147.48/32,no-resolve
  - IP-CIDR,27.255.67.120/32,no-resolve
  - IP-CIDR,42.51.146.207/32,no-resolve
  - IP-CIDR,45.34.240.72/32,no-resolve
  - IP-CIDR,46.165.197.153/32,no-resolve
  - IP-CIDR,46.165.197.231/32,no-resolve
  - IP-CIDR,47.89.59.182/32,no-resolve
  - IP-CIDR,47.90.50.177/32,no-resolve
  - IP-CIDR,47.93.103.196/32,no-resolve
  - IP-CIDR,47.94.89.32/32,no-resolve
  - IP-CIDR,47.96.162.122/32,no-resolve
  - IP-CIDR,58.215.179.159/32,no-resolve
  - IP-CIDR,58.221.28.166/32,no-resolve
  - IP-CIDR,60.19.29.21/28,no-resolve
  - IP-CIDR,60.190.139.164/32,no-resolve
  - IP-CIDR,60.191.124.196/32,no-resolve
  - IP-CIDR,60.210.17.12/24,no-resolve
  - IP-CIDR,61.129.70.132/32,no-resolve
  - IP-CIDR,61.132.216.232/32,no-resolve
  - IP-CIDR,61.132.221.146/32,no-resolve
  - IP-CIDR,61.132.255.212/32,no-resolve
  - IP-CIDR,61.132.255.222/25,no-resolve
  - IP-CIDR,61.147.184.18/32,no-resolve
  - IP-CIDR,61.152.223.15/32,no-resolve
  - IP-CIDR,61.160.200.223/32,no-resolve
  - IP-CIDR,61.160.200.242/32,no-resolve
  - IP-CIDR,61.160.200.252/32,no-resolve
  - IP-CIDR,61.174.50.167/25,no-resolve
  - IP-CIDR,61.191.12.74/32,no-resolve
  - IP-CIDR,61.191.206.4/32,no-resolve
  - IP-CIDR,67.229.224.28/32,no-resolve
  - IP-CIDR,69.28.57.245/32,no-resolve
  - IP-CIDR,74.117.182.77/32,no-resolve
  - IP-CIDR,78.140.131.214/32,no-resolve
--- a/Clash/Provider/Special.yaml
+++ b/Clash/Provider/Special.yaml
@ -89,3 +89,11 @@ payload:
  - DOMAIN-KEYWORD,torrent
  - DOMAIN-SUFFIX,smtp
  # - URL-REGEX,(Subject|HELO|SMTP)
  - DOMAIN-SUFFIX,local
  - IP-CIDR,127.0.0.0/8
  - IP-CIDR,172.16.0.0/12
  - IP-CIDR,192.168.0.0/16
  - IP-CIDR,10.0.0.0/8
  - IP-CIDR,17.0.0.0/8
  - IP-CIDR,100.64.0.0/10
--- a/Clash/Rule.yaml
+++ b/Clash/Rule.yaml
--- a/2/Rule.conf
+++ b/2/Rule.conf
@ -8331,51 +8331,51 @@ URL-REGEX,https?:\/\/sax\w?.sina.com.cn,AdBlock
 URL-REGEX,https?:\/\/server-\w+.imrworldwide.com,AdBlock
 URL-REGEX,https?:\/\/www.bldimg.com/(background|splash)/.+.png$,AdBlock
-IP-CIDR,39.107.15.115/32,AdBlock,no-resolve
+IP-CIDR,39.107.15.115/32,REJECT,no-resolve
-IP-CIDR,47.89.59.182/32,AdBlock,no-resolve
+IP-CIDR,47.89.59.182/32,REJECT,no-resolve
-IP-CIDR,103.49.209.27/32,AdBlock,no-resolve
+IP-CIDR,103.49.209.27/32,REJECT,no-resolve
-IP-CIDR,123.56.152.96/32,AdBlock,no-resolve
+IP-CIDR,123.56.152.96/32,REJECT,no-resolve
 # > China Net
-IP-CIDR,61.160.200.223/32,AdBlock,no-resolve
+IP-CIDR,61.160.200.223/32,REJECT,no-resolve
-IP-CIDR,61.160.200.242/32,AdBlock,no-resolve
+IP-CIDR,61.160.200.242/32,REJECT,no-resolve
-IP-CIDR,61.160.200.252/32,AdBlock,no-resolve
+IP-CIDR,61.160.200.252/32,REJECT,no-resolve
-IP-CIDR,61.174.50.214/32,AdBlock,no-resolve
+IP-CIDR,61.174.50.214/32,REJECT,no-resolve
-IP-CIDR,111.175.220.163/32,AdBlock,no-resolve
+IP-CIDR,111.175.220.163/32,REJECT,no-resolve
-IP-CIDR,111.175.220.164/32,AdBlock,no-resolve
+IP-CIDR,111.175.220.164/32,REJECT,no-resolve
-IP-CIDR,124.232.160.178/32,AdBlock,no-resolve
+IP-CIDR,124.232.160.178/32,REJECT,no-resolve
-IP-CIDR,175.6.223.15/32,AdBlock,no-resolve
+IP-CIDR,175.6.223.15/32,REJECT,no-resolve
-IP-CIDR,183.59.53.237/32,AdBlock,no-resolve
+IP-CIDR,183.59.53.237/32,REJECT,no-resolve
-IP-CIDR,218.93.127.37/32,AdBlock,no-resolve
+IP-CIDR,218.93.127.37/32,REJECT,no-resolve
-IP-CIDR,221.228.17.152/32,AdBlock,no-resolve
+IP-CIDR,221.228.17.152/32,REJECT,no-resolve
-IP-CIDR,221.231.6.79/32,AdBlock,no-resolve
+IP-CIDR,221.231.6.79/32,REJECT,no-resolve
-IP-CIDR,222.186.61.91/32,AdBlock,no-resolve
+IP-CIDR,222.186.61.91/32,REJECT,no-resolve
-IP-CIDR,222.186.61.95/32,AdBlock,no-resolve
+IP-CIDR,222.186.61.95/32,REJECT,no-resolve
-IP-CIDR,222.186.61.96/32,AdBlock,no-resolve
+IP-CIDR,222.186.61.96/32,REJECT,no-resolve
-IP-CIDR,222.186.61.97/32,AdBlock,no-resolve
+IP-CIDR,222.186.61.97/32,REJECT,no-resolve
 # > China Unicom
-IP-CIDR,106.75.231.48/32,AdBlock,no-resolve
+IP-CIDR,106.75.231.48/32,REJECT,no-resolve
-IP-CIDR,119.4.249.166/32,AdBlock,no-resolve
+IP-CIDR,119.4.249.166/32,REJECT,no-resolve
-IP-CIDR,220.196.52.141/32,AdBlock,no-resolve
+IP-CIDR,220.196.52.141/32,REJECT,no-resolve
-IP-CIDR,221.6.4.148/32,AdBlock,no-resolve
+IP-CIDR,221.6.4.148/32,REJECT,no-resolve
 # > China Mobile
-IP-CIDR,114.247.28.96/32,AdBlock,no-resolve
+IP-CIDR,114.247.28.96/32,REJECT,no-resolve
-IP-CIDR,221.179.131.72/32,AdBlock,no-resolve
+IP-CIDR,221.179.131.72/32,REJECT,no-resolve
-IP-CIDR,221.179.140.145/32,AdBlock,no-resolve
+IP-CIDR,221.179.140.145/32,REJECT,no-resolve
 # > Dr.Peng
-IP-CIDR,10.72.25.0/24,AdBlock,no-resolve
+IP-CIDR,10.72.25.0/24,REJECT,no-resolve
-IP-CIDR,115.182.16.79/32,AdBlock,no-resolve
+IP-CIDR,115.182.16.79/32,REJECT,no-resolve
-IP-CIDR,118.144.88.126/32,AdBlock,no-resolve
+IP-CIDR,118.144.88.126/32,REJECT,no-resolve
-IP-CIDR,118.144.88.215/32,AdBlock,no-resolve
+IP-CIDR,118.144.88.215/32,REJECT,no-resolve
-IP-CIDR,120.76.189.132/32,AdBlock,no-resolve
+IP-CIDR,120.76.189.132/32,REJECT,no-resolve
-IP-CIDR,124.14.21.147/32,AdBlock,no-resolve
+IP-CIDR,124.14.21.147/32,REJECT,no-resolve
-IP-CIDR,124.14.21.151/32,AdBlock,no-resolve
+IP-CIDR,124.14.21.151/32,REJECT,no-resolve
-IP-CIDR,180.166.52.24/32,AdBlock,no-resolve
+IP-CIDR,180.166.52.24/32,REJECT,no-resolve
-IP-CIDR,220.115.251.25/32,AdBlock,no-resolve
+IP-CIDR,220.115.251.25/32,REJECT,no-resolve
-IP-CIDR,222.73.156.235/32,AdBlock,no-resolve
+IP-CIDR,222.73.156.235/32,REJECT,no-resolve
@ -8490,6 +8490,33 @@ DOMAIN-SUFFIX,api.mob.app.letv.com,AsianTV
 USER-AGENT,MOO*,AsianTV
 USER-AGENT,TencentMidasConnect*,AsianTV
 # > Netease Music
 DOMAIN,apm.music.163.com,AsianTV
 DOMAIN,apm3.music.163.com,AsianTV
 DOMAIN,interface.music.163.com,AsianTV
 DOMAIN,interface3.music.163.com,AsianTV
 DOMAIN,music.126.net,AsianTV
 DOMAIN,music.163.com,AsianTV
 IP-CIDR,101.71.154.241/32,AsianTV,no-resolve
 IP-CIDR,103.126.92.132/32,AsianTV,no-resolve
 IP-CIDR,103.126.92.133/32,AsianTV,no-resolve
 IP-CIDR,112.13.119.17/32,AsianTV,no-resolve
 IP-CIDR,112.13.122.1/32,AsianTV,no-resolve
 IP-CIDR,115.236.118.33/32,AsianTV,no-resolve
 IP-CIDR,115.236.121.1/32,AsianTV,no-resolve
 IP-CIDR,118.24.63.156/32,AsianTV,no-resolve
 IP-CIDR,193.112.159.225/32,AsianTV,no-resolve
 IP-CIDR,223.252.199.66/32,AsianTV,no-resolve
 IP-CIDR,223.252.199.67/32,AsianTV,no-resolve
 IP-CIDR,39.105.63.80/32,AsianTV,no-resolve
 IP-CIDR,45.254.48.1/32,AsianTV,no-resolve
 IP-CIDR,47.100.127.239/32,AsianTV,no-resolve
 IP-CIDR,59.111.160.195/32,AsianTV,no-resolve
 IP-CIDR,59.111.160.197/32,AsianTV,no-resolve
 IP-CIDR,59.111.181.35/32,AsianTV,no-resolve
 IP-CIDR,59.111.181.38/32,AsianTV,no-resolve
 IP-CIDR,59.111.181.60/32,AsianTV,no-resolve
 # > Tencent Video
 DOMAIN-SUFFIX,v.smtcdns.com,AsianTV
 DOMAIN-SUFFIX,vv.video.qq.com,AsianTV
@ -9581,18 +9608,18 @@ DOMAIN-SUFFIX,spotify.com,Spotify
 DOMAIN-SUFFIX,spotifycdn.net,Spotify
 # > Youtube Music
-USER-AGENT,*YouTubeMusic*,Youtube
+USER-AGENT,*YouTubeMusic*,YouTube
-USER-AGENT,*com.google.ios.youtubemusic*,Youtube
+USER-AGENT,*com.google.ios.youtubemusic*,YouTube
 # > Youtube
-USER-AGENT,*youtube*,Youtube
+USER-AGENT,*youtube*,YouTube
-USER-AGENT,YouTube*,Youtube
+USER-AGENT,YouTube*,YouTube
-DOMAIN-KEYWORD,youtube,Youtube
+DOMAIN-KEYWORD,youtube,YouTube
-DOMAIN,yt3.ggpht.com,Youtube
+DOMAIN,yt3.ggpht.com,YouTube
-DOMAIN-SUFFIX,googlevideo.com,Youtube
+DOMAIN-SUFFIX,googlevideo.com,YouTube
-DOMAIN-SUFFIX,gvt2.com,Youtube
+DOMAIN-SUFFIX,gvt2.com,YouTube
-DOMAIN-SUFFIX,youtu.be,Youtube
+DOMAIN-SUFFIX,youtu.be,YouTube
-DOMAIN-SUFFIX,ytimg.com,Youtube
+DOMAIN-SUFFIX,ytimg.com,YouTube
@ -9652,35 +9679,6 @@ DOMAIN-SUFFIX,xboxlive.com,Microsoft
 # > Netease Music
 DOMAIN,apm.music.163.com,Netease Music
 DOMAIN,apm3.music.163.com,Netease Music
 DOMAIN,interface.music.163.com,Netease Music
 DOMAIN,interface3.music.163.com,Netease Music
 DOMAIN,music.126.net,Netease Music
 DOMAIN,music.163.com,Netease Music
 IP-CIDR,101.71.154.241/32,Netease Music,no-resolve
 IP-CIDR,103.126.92.132/32,Netease Music,no-resolve
 IP-CIDR,103.126.92.133/32,Netease Music,no-resolve
 IP-CIDR,112.13.119.17/32,Netease Music,no-resolve
 IP-CIDR,112.13.122.1/32,Netease Music,no-resolve
 IP-CIDR,115.236.118.33/32,Netease Music,no-resolve
 IP-CIDR,115.236.121.1/32,Netease Music,no-resolve
 IP-CIDR,118.24.63.156/32,Netease Music,no-resolve
 IP-CIDR,193.112.159.225/32,Netease Music,no-resolve
 IP-CIDR,223.252.199.66/32,Netease Music,no-resolve
 IP-CIDR,223.252.199.67/32,Netease Music,no-resolve
 IP-CIDR,39.105.63.80/32,Netease Music,no-resolve
 IP-CIDR,45.254.48.1/32,Netease Music,no-resolve
 IP-CIDR,47.100.127.239/32,Netease Music,no-resolve
 IP-CIDR,59.111.160.195/32,Netease Music,no-resolve
 IP-CIDR,59.111.160.197/32,Netease Music,no-resolve
 IP-CIDR,59.111.181.35/32,Netease Music,no-resolve
 IP-CIDR,59.111.181.38/32,Netease Music,no-resolve
 IP-CIDR,59.111.181.60/32,Netease Music,no-resolve
 # > TestFlight
 DOMAIN,testflight.apple.com,Proxy
--- a/3/Head.conf
+++ b/3/Head.conf
@ -29,6 +29,7 @@ network-framework = false
 show-error-page-for-reject = true
 tls-provider = default
 use-default-policy-if-wifi-not-primary = false
 // wifi-assist = true
 [Replica]
 hide-apple-request = true
--- a/3/Module/Common_port.sgmodule
+++ b/3/Module/Common_port.sgmodule
@ -1,5 +1,5 @@
 #!name=Proxy for Common Port Only
-#!desc=对非常用端口使用直连策略，用以减少将Surge 用于网关模式时，局域网内的其他设备将 BitTorrent 数据包发送到代理网络的概率。这并不可能完全过滤BitTorrent 数据包，因此仍然需要为BitTorrent 下载/做种设备设置单独的分流规则。
+#!desc=对非常用端口使用直连策略
 [Rule]
-AND,((NOT,((DEST-PORT,21))), (NOT,((DEST-PORT,22))), (NOT,((DEST-PORT,23))), (NOT,((DEST-PORT,53))), (NOT,((DEST-PORT,80))), (NOT,((DEST-PORT,123))), (NOT,((DEST-PORT,194))), (NOT,((DEST-PORT,443))), (NOT,((DEST-PORT,465))), (NOT,((DEST-PORT,587))), (NOT,((DEST-PORT,993))), (NOT,((DEST-PORT,995))), (NOT,((DEST-PORT,2052))), (NOT,((DEST-PORT,2053))), (NOT,((DEST-PORT,2082))), (NOT,((DEST-PORT,2083))), (NOT,((DEST-PORT,2086))), (NOT,((DEST-PORT,2095))), (NOT,((DEST-PORT,2096))), (NOT,((DEST-PORT,5228))), (NOT,((DEST-PORT,5229))), (NOT,((DEST-PORT,5230))), (NOT,((DEST-PORT,8080))), (NOT,((DEST-PORT,8443))), (NOT,((DEST-PORT,8880)))),DIRECT
+AND,((NOT,((DEST-PORT,21))), (NOT,((DEST-PORT,22))), (NOT,((DEST-PORT,23))), (NOT,((DEST-PORT,53))), (NOT,((DEST-PORT,80))), (NOT,((DEST-PORT,123))), (NOT,((DEST-PORT,194))), (NOT,((DEST-PORT,443))), (NOT,((DEST-PORT,465))), (NOT,((DEST-PORT,587))), (NOT,((DEST-PORT,853))), (NOT,((DEST-PORT,993))), (NOT,((DEST-PORT,995))), (NOT,((DEST-PORT,998))), (NOT,((DEST-PORT,2052))), (NOT,((DEST-PORT,2053))), (NOT,((DEST-PORT,2082))), (NOT,((DEST-PORT,2083))), (NOT,((DEST-PORT,2086))), (NOT,((DEST-PORT,2095))), (NOT,((DEST-PORT,2096))), (NOT,((DEST-PORT,5222))), (NOT,((DEST-PORT,5228))), (NOT,((DEST-PORT,5229))), (NOT,((DEST-PORT,5230))), (NOT,((DEST-PORT,8080))), (NOT,((DEST-PORT,8443))), (NOT,((DEST-PORT,8880))), (NOT,((DEST-PORT,8888))), (NOT,((DEST-PORT,8889)))),DIRECT
--- a/3/Provider/Special.list
+++ b/3/Provider/Special.list
@ -87,7 +87,5 @@ DOMAIN-SUFFIX,springsunday.net
 DOMAIN-SUFFIX,tjupt.org
 DOMAIN-SUFFIX,totheglory.im
 DOMAIN-KEYWORD,announce
 DOMAIN-KEYWORD,torrent
 DOMAIN-SUFFIX,smtp
 URL-REGEX,(Subject|HELO|SMTP)
--- a/3/Rule.conf
+++ b/3/Rule.conf
@ -6,13 +6,14 @@ RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Pr
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Netflix.list,Netflix
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Spotify.list,Spotify
-RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube%20Music.list,Youtube
+RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube%20Music.list,YouTube
-RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube.list,Youtube
+RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube.list,YouTube
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Bilibili.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/iQiyi.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Letv.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/MOO.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Netease%20Music.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Tencent%20Video.list,AsianTV
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Youku.list,AsianTV
@ -48,7 +49,6 @@ RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Pr
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Speedtest.list,Speedtest
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/PayPal.list,PayPal
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Microsoft.list,Microsoft
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Netease%20Music.list,Netease Music
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Proxy.list,Proxy
 RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Domestic.list,Domestic