Update groups and rulesets

subconverter/Dockerfile

@@ -1,4 +1,4 @@
-FROM tindy2013/subconverter
+FROM tindy2013/subconverter:0.7.1
 MAINTAINER Stille <[email protected]>
 
 ENV VERSION 0.7.1

subconverter/README.md

@@ -7,12 +7,12 @@ Docker [stilleshan/subconverter](https://hub.docker.com/r/stilleshan/subconverte
 ## 简介
 基于 [tindy2013/subconverter](https://github.com/tindy2013/subconverter) 项目的 docker 镜像.仅修改 **分组配置文件** 以解决以下问题.
 
-- **增加**`Netflix`分组
+- **增加**`Netflix，DisneyPlus`等分组.
 - **去除**`自动选择 url-test`以解决连接数爆涨问题.
-- **全球拦截** 增加`节点选择`,以满足`Google Analytics`等广告统计工具的访问需求.(新版本可能已解决此需求)
 - **修改时区** 镜像默认时区为 Asia/Shanghai
 
 ## 更新
+- **2021-12-20** 更新优化规则和分组
 - **2021-12-01** 添加`Disney+`规则分组
 - **2021-09-30** 更新`v0.7.1`版 docker 镜像
 - **2021-09-21** 更新`v0.7.0`版 docker 镜像

subconverter/groups.txt

@@ -1,15 +1,12 @@
-🔰 节点选择`select`[]🎯 全球直连`.*
-🎥 NETFLIX`select`[]🔰 节点选择`[]🎯 全球直连`.*
-🐰 Disney+`select`[]🔰 节点选择`[]🎯 全球直连`.*
-📲 电报信息`select`[]🔰 节点选择`[]🎯 全球直连`.*
-🌍 国外媒体`select`[]🔰 节点选择`[]🎯 全球直连`.*
-🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
-🍎 苹果服务`select`[]🎯 全球直连`[]🔰 节点选择`.*
-Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🔰 节点选择`.*
-🐟 漏网之鱼`select`[]🎯 全球直连`[]🔰 节点选择`.*
-🛑 全球拦截`select`[]REJECT`[]DIRECT`[]🔰 节点选择
-🎯 全球直连`select`[]DIRECT
-
-;♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-;⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
-;🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
+🔰 PROXY`select`[]🎯 DIRECT`.*
+🎬 Media`select`(香港|HK|hk|🇭🇰|台湾|TW|tw|新加坡|SG|sg|🇸🇬)
+▶️ YouTube`select`[]🔰 PROXY`[]🎬 Media`.*
+🍿 Netflix`select`[]🔰 PROXY`[]🎬 Media`.*
+🐰 DisneyPlus`select`[]🔰 PROXY`[]🎬 Media`.*
+📺 AppleTV`select`[]🔰 PROXY`[]🎬 Media`.*
+🍎 Apple`select`[]🎯 DIRECT`[]🔰 PROXY`.*
+Ⓜ️ Microsoft`select`[]🎯 DIRECT`[]🔰 PROXY`.*
+💰 PayPal`select`[]🎯 DIRECT`[]🔰 PROXY`.*
+🚫 AdBlock`select`[]🎯 DIRECT`[]🔰 PROXY`[]REJECT`.*
+🐟 Other`select`[]🎯 DIRECT`[]🔰 PROXY`.*
+🎯 DIRECT`select`[]DIRECT

subconverter/rulesets.txt

@@ -1,21 +1,16 @@
-🎯 全球直连,rules/LocalAreaNetwork.list
-Ⓜ️ 微软服务,rules/MSServices.list
-🎯 全球直连,rules/DivineEngine/Surge/Ruleset/Unbreak.list
-🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
-🛑 全球拦截,rules/DivineEngine/Surge/Ruleset/Guard/Hijacking.list
-🎥 NETFLIX,rules/DivineEngine/Surge/Ruleset/StreamingMedia/Video/Netflix.list
-🐰 Disney+,rules/DivineEngine/Surge/Ruleset/StreamingMedia/Video/DisneyPlus.list
-🌍 国外媒体,rules/DivineEngine/Surge/Ruleset/StreamingMedia/Streaming.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Bilibili.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/iQiyi.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Letv.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/MOO.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Tencent Video.list
-🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Youku.list
-📲 电报信息,rules/DivineEngine/Surge/Ruleset/Extra/Telegram/Telegram.list
-🔰 节点选择,rules/DivineEngine/Surge/Ruleset/Global.list
-🍎 苹果服务,rules/DivineEngine/Surge/Ruleset/Extra/Apple/Apple.list
-🎯 全球直连,rules/DivineEngine/Surge/Ruleset/China.list
-🎯 全球直连,rules/NobyDa/Surge/Download.list
-🎯 全球直连,[]GEOIP,CN
-🐟 漏网之鱼,[]FINAL
+🚫 AdBlock,https://raw.githubusercontent.com/NobyDa/Script/master/Surge/AdRule.list
+🚫 AdBlock,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Hijacking/Hijacking.list
+▶️ YouTube,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/YouTube/YouTube.list
+🍿 Netflix,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Netflix/Netflix.list
+🐰 DisneyPlus,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Disney/Disney.list
+💰 PayPal,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/PayPal/PayPal.list
+📺 AppleTV,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/AppleTV/AppleTV.list
+🍎 Apple,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Apple/Apple.list
+Ⓜ️ Microsoft,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Microsoft/Microsoft.list
+🔰 PROXY,https://git.jasuit.com/jh163888/Profiles/raw/branch/master/Surge/Ruleset/Global.list
+🎯 DIRECT,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/Lan/Lan.list
+🎯 DIRECT,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/China/China.list
+🎯 DIRECT,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/ChinaIPs/ChinaIPs.list
+🎯 DIRECT,https://git.jasuit.com/jh163888/ios_rule_script/raw/branch/master/rule/Surge/PrivateTracker/PrivateTracker.list
+🎯 DIRECT,[]GEOIP,CN
+🐟 Other,[]FINAL