diff --git a/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml b/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml
index 9d25862b2..3b0492a0c 100644
--- a/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml
+++ b/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml
@@ -16046,6 +16046,7 @@ payload:
   - DOMAIN-SUFFIX,592man.com
   - DOMAIN-SUFFIX,593pi.cn
   - DOMAIN-SUFFIX,59519.com
+  - DOMAIN-SUFFIX,596317de3d.com
   - DOMAIN-SUFFIX,59a8e0d6fa2.com
   - DOMAIN-SUFFIX,59cn7.com
   - DOMAIN-SUFFIX,59e6ea7248001c.com
@@ -16449,6 +16450,7 @@ payload:
   - DOMAIN-SUFFIX,77wanmei.com
   - DOMAIN-SUFFIX,77xtv.com
   - DOMAIN-SUFFIX,77zhuan.com
+  - DOMAIN-SUFFIX,781ca8a804e.com
   - DOMAIN-SUFFIX,7839e0482307b9276b.com
   - DOMAIN-SUFFIX,788111.com
   - DOMAIN-SUFFIX,788xj.com
@@ -34400,6 +34402,7 @@ payload:
   - DOMAIN-SUFFIX,d7s3muv.cn
   - DOMAIN-SUFFIX,d8.sina.com.cn
   - DOMAIN-SUFFIX,d8.sinaimg.cn
+  - DOMAIN-SUFFIX,d80ca4cff3.com
   - DOMAIN-SUFFIX,d81mfvml8p5ml.cloudfront.net
   - DOMAIN-SUFFIX,d824d7f5cbcb0e00.com
   - DOMAIN-SUFFIX,d830x8j3o1b2k.cloudfront.net
diff --git a/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml b/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml
index 228b9689f..b66fe4ade 100644
--- a/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml
+++ b/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml
@@ -16046,6 +16046,7 @@ payload:
   - '.592man.com'
   - '.593pi.cn'
   - '.59519.com'
+  - '.596317de3d.com'
   - '.59a8e0d6fa2.com'
   - '.59cn7.com'
   - '.59e6ea7248001c.com'
@@ -16449,6 +16450,7 @@ payload:
   - '.77wanmei.com'
   - '.77xtv.com'
   - '.77zhuan.com'
+  - '.781ca8a804e.com'
   - '.7839e0482307b9276b.com'
   - '.788111.com'
   - '.788xj.com'
@@ -34400,6 +34402,7 @@ payload:
   - '.d7s3muv.cn'
   - '.d8.sina.com.cn'
   - '.d8.sinaimg.cn'
+  - '.d80ca4cff3.com'
   - '.d81mfvml8p5ml.cloudfront.net'
   - '.d824d7f5cbcb0e00.com'
   - '.d830x8j3o1b2k.cloudfront.net'
diff --git a/rule/Clash/TikTok/README.md b/rule/Clash/TikTok/README.md
index 88073c97c..69af71746 100644
--- a/rule/Clash/TikTok/README.md
+++ b/rule/Clash/TikTok/README.md
@@ -10,13 +10,13 @@
 
 ## 规则统计
 
-总计规则：15 条。
+总计规则：14 条。
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
-| DOMAIN-SUFFIX | 13 |
+| DOMAIN-SUFFIX | 12 |
 | DOMAIN-KEYWORD | 1 |
 | DOMAIN | 1 |
 ## 配置说明
diff --git a/rule/Clash/TikTok/TikTok.yaml b/rule/Clash/TikTok/TikTok.yaml
index 4a97d0a9d..b515470e2 100644
--- a/rule/Clash/TikTok/TikTok.yaml
+++ b/rule/Clash/TikTok/TikTok.yaml
@@ -5,10 +5,9 @@
 # DOMAIN-SUFFIX: 13
 # DOMAIN-KEYWORD: 1
 # DOMAIN: 1
-# TOTAL: 15
+# TOTAL: 14
 payload:
   - DOMAIN,p16-tiktokcdn-com.akamaized.net
-  - DOMAIN-SUFFIX,amemv.com
   - DOMAIN-SUFFIX,byteoversea.com
   - DOMAIN-SUFFIX,ibytedtos.com
   - DOMAIN-SUFFIX,ibyteimg.com
diff --git a/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list
index fde1832c4..21e407531 100644
--- a/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list
+++ b/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list
@@ -16047,6 +16047,7 @@ zzz.clickbank.net
 .592man.com
 .593pi.cn
 .59519.com
+.596317de3d.com
 .59a8e0d6fa2.com
 .59cn7.com
 .59e6ea7248001c.com
@@ -16450,6 +16451,7 @@ zzz.clickbank.net
 .77wanmei.com
 .77xtv.com
 .77zhuan.com
+.781ca8a804e.com
 .7839e0482307b9276b.com
 .788111.com
 .788xj.com
@@ -34401,6 +34403,7 @@ zzz.clickbank.net
 .d7s3muv.cn
 .d8.sina.com.cn
 .d8.sinaimg.cn
+.d80ca4cff3.com
 .d81mfvml8p5ml.cloudfront.net
 .d824d7f5cbcb0e00.com
 .d830x8j3o1b2k.cloudfront.net
diff --git a/rule/Loon/Global/README.md b/rule/Loon/Global/README.md
index ee5bf85bc..6964c688e 100644
--- a/rule/Loon/Global/README.md
+++ b/rule/Loon/Global/README.md
@@ -15,15 +15,25 @@ Global分流规则中含有URL-REGEX类型，此类的规则对于HTTPS请求需
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：28395 条。
+=======
 总计规则：28176 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| DOMAIN | 47 |
+| DOMAIN-SUFFIX | 28125 |
+| USER-AGENT | 49 |
+=======
 | DOMAIN | 48 |
 | DOMAIN-SUFFIX | 27906 |
 | USER-AGENT | 48 |
+>>>>>>> upstream/master
 | DOMAIN-KEYWORD | 42 |
 | IP-CIDR | 128 |
 | IP-CIDR6 | 3 |
diff --git a/rule/Loon/Proxy/Proxy.list b/rule/Loon/Proxy/Proxy.list
index c72143c02..6a9c74bad 100644
--- a/rule/Loon/Proxy/Proxy.list
+++ b/rule/Loon/Proxy/Proxy.list
@@ -1,14 +1,24 @@
 # NAME: Proxy
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# DOMAIN: 42
+# DOMAIN-SUFFIX: 28110
+=======
 # UPDATED: 2021-04-19 11:34:35
 # DOMAIN: 43
 # DOMAIN-SUFFIX: 27926
+>>>>>>> upstream/master
 # USER-AGENT: 11
 # DOMAIN-KEYWORD: 29
 # IP-CIDR: 88
 # IP-CIDR6: 3
+<<<<<<< HEAD
+# TOTAL: 28283
+=======
 # TOTAL: 28100
+>>>>>>> upstream/master
 DOMAIN-KEYWORD,-tiktokcdn-com
 DOMAIN-KEYWORD,1drv
 DOMAIN-KEYWORD,1e100
diff --git a/rule/Loon/Proxy/Proxy_Domain.list b/rule/Loon/Proxy/Proxy_Domain.list
index 95070e34b..a528c04ad 100644
--- a/rule/Loon/Proxy/Proxy_Domain.list
+++ b/rule/Loon/Proxy/Proxy_Domain.list
@@ -1,14 +1,24 @@
 # NAME: Proxy
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# DOMAIN: 42
+# DOMAIN-SUFFIX: 28110
+=======
 # UPDATED: 2021-04-19 11:34:35
 # DOMAIN: 43
 # DOMAIN-SUFFIX: 27926
+>>>>>>> upstream/master
 # USER-AGENT: 11
 # DOMAIN-KEYWORD: 29
 # IP-CIDR: 88
 # IP-CIDR6: 3
+<<<<<<< HEAD
+# TOTAL: 28283
+=======
 # TOTAL: 28100
+>>>>>>> upstream/master
 amp.akamaized.net
 apple.com.akadns.net
 assets-priconne-redive-us.akamaized.net
@@ -317,11 +327,19 @@ www-cdn.icloud.com.akadns.net
 .1665tt.com
 .1678.com
 .167ee.net
+<<<<<<< HEAD
+=======
 .167gg.net
+>>>>>>> upstream/master
 .167nnn.net
 .167ooo.net
 .167qqq.net
 .167rrr.net
+<<<<<<< HEAD
+.167uu.net
+.167zzz.net
+=======
+>>>>>>> upstream/master
 .168.cr.rs
 .1680101kai.co
 .1680101kai.com
@@ -1196,6 +1214,10 @@ www-cdn.icloud.com.akadns.net
 .669d.tv
 .66dofan.com
 .66go.vip
+<<<<<<< HEAD
+.66let.com
+=======
+>>>>>>> upstream/master
 .66van.com
 .677.biz.tm
 .677324.com
@@ -14289,6 +14311,10 @@ www-cdn.icloud.com.akadns.net
 .maiio.net
 .mail-163-cloud-document.serveftp.com
 .mail-archive.com
+<<<<<<< HEAD
+.mail.barrowsonline.com
+=======
+>>>>>>> upstream/master
 .mail.cod.edu
 .mail.com
 .mail.cyberpower.com
@@ -23911,7 +23937,10 @@ www-cdn.icloud.com.akadns.net
 .www.88bs88.com
 .www.88fanya.com
 .www.88gpz.com
+<<<<<<< HEAD
+=======
 .www.88kf.com
+>>>>>>> upstream/master
 .www.88lilai.com
 .www.88lo.com
 .www.88msc.com
diff --git a/rule/Loon/Proxy/Proxy_Resolve.list b/rule/Loon/Proxy/Proxy_Resolve.list
index 69eba4227..4df797c89 100644
--- a/rule/Loon/Proxy/Proxy_Resolve.list
+++ b/rule/Loon/Proxy/Proxy_Resolve.list
@@ -1,14 +1,24 @@
 # NAME: Proxy
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# DOMAIN: 42
+# DOMAIN-SUFFIX: 28110
+=======
 # UPDATED: 2021-04-19 11:34:35
 # DOMAIN: 43
 # DOMAIN-SUFFIX: 27926
+>>>>>>> upstream/master
 # USER-AGENT: 11
 # DOMAIN-KEYWORD: 29
 # IP-CIDR: 88
 # IP-CIDR6: 3
+<<<<<<< HEAD
+# TOTAL: 28283
+=======
 # TOTAL: 28100
+>>>>>>> upstream/master
 DOMAIN-KEYWORD,-tiktokcdn-com
 DOMAIN-KEYWORD,1drv
 DOMAIN-KEYWORD,1e100
diff --git a/rule/Loon/Proxy/README.md b/rule/Loon/Proxy/README.md
index b6b0c5841..96e3ab18a 100644
--- a/rule/Loon/Proxy/README.md
+++ b/rule/Loon/Proxy/README.md
@@ -10,14 +10,23 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：28283 条。
+=======
 总计规则：28100 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| DOMAIN | 42 |
+| DOMAIN-SUFFIX | 28110 |
+=======
 | DOMAIN | 43 |
 | DOMAIN-SUFFIX | 27926 |
+>>>>>>> upstream/master
 | USER-AGENT | 11 |
 | DOMAIN-KEYWORD | 29 |
 | IP-CIDR | 88 |
diff --git a/rule/Loon/TikTok/README.md b/rule/Loon/TikTok/README.md
index afed43a31..8475e9c01 100644
--- a/rule/Loon/TikTok/README.md
+++ b/rule/Loon/TikTok/README.md
@@ -10,14 +10,19 @@
 
 ## 规则统计
 
-总计规则：16 条。
+总计规则：15 条。
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| USER-AGENT | 1 |
+| DOMAIN-SUFFIX | 12 |
+=======
 | DOMAIN-SUFFIX | 13 |
 | USER-AGENT | 1 |
+>>>>>>> upstream/master
 | DOMAIN-KEYWORD | 1 |
 | DOMAIN | 1 |
 ## 配置说明
diff --git a/rule/Loon/TikTok/TikTok.list b/rule/Loon/TikTok/TikTok.list
index f47229aa0..62c9c2365 100644
--- a/rule/Loon/TikTok/TikTok.list
+++ b/rule/Loon/TikTok/TikTok.list
@@ -1,14 +1,19 @@
 # NAME: TikTok
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# USER-AGENT: 1
+# DOMAIN-SUFFIX: 12
+=======
 # UPDATED: 2021-04-19 11:34:35
 # DOMAIN-SUFFIX: 13
 # USER-AGENT: 1
+>>>>>>> upstream/master
 # DOMAIN-KEYWORD: 1
 # DOMAIN: 1
-# TOTAL: 16
+# TOTAL: 15
 DOMAIN,p16-tiktokcdn-com.akamaized.net
-DOMAIN-SUFFIX,amemv.com
 DOMAIN-SUFFIX,byteoversea.com
 DOMAIN-SUFFIX,ibytedtos.com
 DOMAIN-SUFFIX,ibyteimg.com
diff --git a/rule/QuantumultX/Advertising/Advertising.list b/rule/QuantumultX/Advertising/Advertising.list
index d1c6ab241..9c9da747c 100644
--- a/rule/QuantumultX/Advertising/Advertising.list
+++ b/rule/QuantumultX/Advertising/Advertising.list
@@ -1,6 +1,15 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:35
+# HOST-KEYWORD: 59
+# HOST-SUFFIX: 44846
+# HOST: 20750
+# IP-CIDR: 247
+# IP6-CIDR: 1
+# TOTAL: 65903
+=======
 # UPDATED: 2021-04-19 02:19:15
 # HOST-KEYWORD: 59
 # HOST-SUFFIX: 44389
@@ -8,6 +17,7 @@
 # IP-CIDR: 247
 # IP6-CIDR: 1
 # TOTAL: 65429
+>>>>>>> upstream/master
 HOST,0.nextyourcontent.com,Advertising
 HOST,0.up.qingdaonews.com,Advertising
 HOST,0001.2waky.com,Advertising
diff --git a/rule/QuantumultX/Advertising/README.md b/rule/QuantumultX/Advertising/README.md
index ad1c53423..b7f97b73f 100644
--- a/rule/QuantumultX/Advertising/README.md
+++ b/rule/QuantumultX/Advertising/README.md
@@ -13,15 +13,24 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：65903 条。
+=======
 总计规则：65429 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
 | HOST-KEYWORD | 59 |
+<<<<<<< HEAD
+| HOST-SUFFIX | 44846 |
+| HOST | 20750 |
+=======
 | HOST-SUFFIX | 44389 |
 | HOST | 20733 |
+>>>>>>> upstream/master
 | IP-CIDR | 247 |
 | IP6-CIDR | 1 |
 ## 配置说明
diff --git a/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list b/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list
index ca4ac1ae2..0de2f76b3 100644
--- a/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list
+++ b/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list
@@ -1,6 +1,15 @@
 # NAME: AdvertisingTest
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:35
+# HOST-KEYWORD: 59
+# HOST-SUFFIX: 73323
+# HOST: 14384
+# IP-CIDR: 247
+# IP6-CIDR: 1
+# TOTAL: 88014
+=======
 # UPDATED: 2021-04-19 11:34:34
 # HOST-KEYWORD: 59
 # HOST-SUFFIX: 73369
@@ -8,6 +17,7 @@
 # IP-CIDR: 247
 # IP6-CIDR: 1
 # TOTAL: 88042
+>>>>>>> upstream/master
 HOST,0.up.qingdaonews.com,AdvertisingTest
 HOST,0001.2waky.com,AdvertisingTest
 HOST,000lk3v.wcomhost.com,AdvertisingTest
@@ -16045,6 +16055,7 @@ HOST-SUFFIX,59-106-20-39.r-bl100.sakura.ne.jp,AdvertisingTest
 HOST-SUFFIX,592man.com,AdvertisingTest
 HOST-SUFFIX,593pi.cn,AdvertisingTest
 HOST-SUFFIX,59519.com,AdvertisingTest
+HOST-SUFFIX,596317de3d.com,AdvertisingTest
 HOST-SUFFIX,59a8e0d6fa2.com,AdvertisingTest
 HOST-SUFFIX,59cn7.com,AdvertisingTest
 HOST-SUFFIX,59e6ea7248001c.com,AdvertisingTest
@@ -16448,6 +16459,7 @@ HOST-SUFFIX,77vip.wang,AdvertisingTest
 HOST-SUFFIX,77wanmei.com,AdvertisingTest
 HOST-SUFFIX,77xtv.com,AdvertisingTest
 HOST-SUFFIX,77zhuan.com,AdvertisingTest
+HOST-SUFFIX,781ca8a804e.com,AdvertisingTest
 HOST-SUFFIX,7839e0482307b9276b.com,AdvertisingTest
 HOST-SUFFIX,788111.com,AdvertisingTest
 HOST-SUFFIX,788xj.com,AdvertisingTest
@@ -22701,6 +22713,10 @@ HOST-SUFFIX,af.fukuishimbun.co.jp,AdvertisingTest
 HOST-SUFFIX,af201768865.com,AdvertisingTest
 HOST-SUFFIX,af755b27b5e472.com,AdvertisingTest
 HOST-SUFFIX,af89dacd-4aec-4ac1-9d52-2a66ce5e4fb5.prmutv.co,AdvertisingTest
+<<<<<<< HEAD
+HOST-SUFFIX,af8b6ea633ad1c.com,AdvertisingTest
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,afa9bdfa63bf7.com,AdvertisingTest
 HOST-SUFFIX,afaeqxnbylkxp.com,AdvertisingTest
 HOST-SUFFIX,afairweb.com,AdvertisingTest
@@ -34399,6 +34415,7 @@ HOST-SUFFIX,d7dza8s7j2am6.cloudfront.net,AdvertisingTest
 HOST-SUFFIX,d7s3muv.cn,AdvertisingTest
 HOST-SUFFIX,d8.sina.com.cn,AdvertisingTest
 HOST-SUFFIX,d8.sinaimg.cn,AdvertisingTest
+HOST-SUFFIX,d80ca4cff3.com,AdvertisingTest
 HOST-SUFFIX,d81mfvml8p5ml.cloudfront.net,AdvertisingTest
 HOST-SUFFIX,d824d7f5cbcb0e00.com,AdvertisingTest
 HOST-SUFFIX,d830x8j3o1b2k.cloudfront.net,AdvertisingTest
diff --git a/rule/QuantumultX/AdvertisingTest/README.md b/rule/QuantumultX/AdvertisingTest/README.md
index 0b9fc8ba0..ce88a0d6a 100644
--- a/rule/QuantumultX/AdvertisingTest/README.md
+++ b/rule/QuantumultX/AdvertisingTest/README.md
@@ -13,15 +13,24 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：88014 条。
+=======
 总计规则：88042 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
 | HOST-KEYWORD | 59 |
+<<<<<<< HEAD
+| HOST-SUFFIX | 73323 |
+| HOST | 14384 |
+=======
 | HOST-SUFFIX | 73369 |
 | HOST | 14366 |
+>>>>>>> upstream/master
 | IP-CIDR | 247 |
 | IP6-CIDR | 1 |
 ## 配置说明
diff --git a/rule/QuantumultX/ChinaTest/ChinaTest.list b/rule/QuantumultX/ChinaTest/ChinaTest.list
index 2f52312a9..ff0a4fb61 100644
--- a/rule/QuantumultX/ChinaTest/ChinaTest.list
+++ b/rule/QuantumultX/ChinaTest/ChinaTest.list
@@ -1,14 +1,23 @@
 # NAME: ChinaTest
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# HOST-SUFFIX: 70565
+=======
 # UPDATED: 2021-04-19 11:34:34
 # HOST-SUFFIX: 70540
+>>>>>>> upstream/master
 # USER-AGENT: 32
 # HOST: 76
 # IP-CIDR: 57
 # HOST-KEYWORD: 10
 # IP6-CIDR: 4
+<<<<<<< HEAD
+# TOTAL: 70744
+=======
 # TOTAL: 70719
+>>>>>>> upstream/master
 HOST,265.com,ChinaTest
 HOST,2mdn.net,ChinaTest
 HOST,adservice.google.com,ChinaTest
@@ -61622,6 +61631,10 @@ HOST-SUFFIX,www-175345.com,ChinaTest
 HOST-SUFFIX,www-222890.com,ChinaTest
 HOST-SUFFIX,www-4620.com,ChinaTest
 HOST-SUFFIX,www-63608.com,ChinaTest
+<<<<<<< HEAD
+HOST-SUFFIX,www-657000.com,ChinaTest
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,www.adobe.com,ChinaTest
 HOST-SUFFIX,www.agoda.com,ChinaTest
 HOST-SUFFIX,www.akamai.com,ChinaTest
diff --git a/rule/QuantumultX/ChinaTest/README.md b/rule/QuantumultX/ChinaTest/README.md
index 5484af3d1..e5301a62f 100644
--- a/rule/QuantumultX/ChinaTest/README.md
+++ b/rule/QuantumultX/ChinaTest/README.md
@@ -10,13 +10,21 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：70744 条。
+=======
 总计规则：70719 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| HOST-SUFFIX | 70565 |
+=======
 | HOST-SUFFIX | 70540 |
+>>>>>>> upstream/master
 | USER-AGENT | 32 |
 | HOST | 76 |
 | IP-CIDR | 57 |
diff --git a/rule/QuantumultX/Global/Global.list b/rule/QuantumultX/Global/Global.list
index f5099a42d..4113073f9 100644
--- a/rule/QuantumultX/Global/Global.list
+++ b/rule/QuantumultX/Global/Global.list
@@ -1,6 +1,16 @@
 # NAME: Global
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# HOST: 47
+# HOST-SUFFIX: 28125
+# USER-AGENT: 49
+# HOST-KEYWORD: 42
+# IP-CIDR: 128
+# IP6-CIDR: 3
+# TOTAL: 28394
+=======
 # UPDATED: 2021-04-19 11:34:34
 # HOST: 48
 # HOST-SUFFIX: 27906
@@ -9,6 +19,7 @@
 # IP-CIDR: 128
 # IP6-CIDR: 3
 # TOTAL: 28175
+>>>>>>> upstream/master
 HOST,amp.akamaized.net,Global
 HOST,apple.com.akadns.net,Global
 HOST,assets-priconne-redive-us.akamaized.net,Global
@@ -322,11 +333,19 @@ HOST-SUFFIX,1665kf.com,Global
 HOST-SUFFIX,1665tt.com,Global
 HOST-SUFFIX,1678.com,Global
 HOST-SUFFIX,167ee.net,Global
+<<<<<<< HEAD
+=======
 HOST-SUFFIX,167gg.net,Global
+>>>>>>> upstream/master
 HOST-SUFFIX,167nnn.net,Global
 HOST-SUFFIX,167ooo.net,Global
 HOST-SUFFIX,167qqq.net,Global
 HOST-SUFFIX,167rrr.net,Global
+<<<<<<< HEAD
+HOST-SUFFIX,167uu.net,Global
+HOST-SUFFIX,167zzz.net,Global
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,168.cr.rs,Global
 HOST-SUFFIX,1680101kai.co,Global
 HOST-SUFFIX,1680101kai.com,Global
@@ -1202,6 +1221,10 @@ HOST-SUFFIX,668ww668.com,Global
 HOST-SUFFIX,669d.tv,Global
 HOST-SUFFIX,66dofan.com,Global
 HOST-SUFFIX,66go.vip,Global
+<<<<<<< HEAD
+HOST-SUFFIX,66let.com,Global
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,66van.com,Global
 HOST-SUFFIX,677.biz.tm,Global
 HOST-SUFFIX,677324.com,Global
@@ -14289,6 +14312,10 @@ HOST-SUFFIX,maif,Global
 HOST-SUFFIX,maiio.net,Global
 HOST-SUFFIX,mail-163-cloud-document.serveftp.com,Global
 HOST-SUFFIX,mail-archive.com,Global
+<<<<<<< HEAD
+HOST-SUFFIX,mail.barrowsonline.com,Global
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,mail.cod.edu,Global
 HOST-SUFFIX,mail.com,Global
 HOST-SUFFIX,mail.cyberpower.com,Global
@@ -23907,7 +23934,10 @@ HOST-SUFFIX,www.888funcity.com,Global
 HOST-SUFFIX,www.88bs88.com,Global
 HOST-SUFFIX,www.88fanya.com,Global
 HOST-SUFFIX,www.88gpz.com,Global
+<<<<<<< HEAD
+=======
 HOST-SUFFIX,www.88kf.com,Global
+>>>>>>> upstream/master
 HOST-SUFFIX,www.88lilai.com,Global
 HOST-SUFFIX,www.88lo.com,Global
 HOST-SUFFIX,www.88msc.com,Global
diff --git a/rule/QuantumultX/Global/README.md b/rule/QuantumultX/Global/README.md
index 852eebf02..8e4230b14 100644
--- a/rule/QuantumultX/Global/README.md
+++ b/rule/QuantumultX/Global/README.md
@@ -10,15 +10,25 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：28394 条。
+=======
 总计规则：28175 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| HOST | 47 |
+| HOST-SUFFIX | 28125 |
+| USER-AGENT | 49 |
+=======
 | HOST | 48 |
 | HOST-SUFFIX | 27906 |
 | USER-AGENT | 48 |
+>>>>>>> upstream/master
 | HOST-KEYWORD | 42 |
 | IP-CIDR | 128 |
 | IP6-CIDR | 3 |
diff --git a/rule/QuantumultX/Proxy/Proxy.list b/rule/QuantumultX/Proxy/Proxy.list
index f4949b553..59728031f 100644
--- a/rule/QuantumultX/Proxy/Proxy.list
+++ b/rule/QuantumultX/Proxy/Proxy.list
@@ -1,14 +1,24 @@
 # NAME: Proxy
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# HOST: 42
+# HOST-SUFFIX: 28110
+=======
 # UPDATED: 2021-04-19 11:34:34
 # HOST: 43
 # HOST-SUFFIX: 27926
+>>>>>>> upstream/master
 # USER-AGENT: 11
 # HOST-KEYWORD: 29
 # IP-CIDR: 88
 # IP6-CIDR: 3
+<<<<<<< HEAD
+# TOTAL: 28283
+=======
 # TOTAL: 28100
+>>>>>>> upstream/master
 HOST,amp.akamaized.net,Proxy
 HOST,apple.com.akadns.net,Proxy
 HOST,assets-priconne-redive-us.akamaized.net,Proxy
@@ -317,11 +327,19 @@ HOST-SUFFIX,1665kf.com,Proxy
 HOST-SUFFIX,1665tt.com,Proxy
 HOST-SUFFIX,1678.com,Proxy
 HOST-SUFFIX,167ee.net,Proxy
+<<<<<<< HEAD
+=======
 HOST-SUFFIX,167gg.net,Proxy
+>>>>>>> upstream/master
 HOST-SUFFIX,167nnn.net,Proxy
 HOST-SUFFIX,167ooo.net,Proxy
 HOST-SUFFIX,167qqq.net,Proxy
 HOST-SUFFIX,167rrr.net,Proxy
+<<<<<<< HEAD
+HOST-SUFFIX,167uu.net,Proxy
+HOST-SUFFIX,167zzz.net,Proxy
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,168.cr.rs,Proxy
 HOST-SUFFIX,1680101kai.co,Proxy
 HOST-SUFFIX,1680101kai.com,Proxy
@@ -1196,6 +1214,10 @@ HOST-SUFFIX,668ww668.com,Proxy
 HOST-SUFFIX,669d.tv,Proxy
 HOST-SUFFIX,66dofan.com,Proxy
 HOST-SUFFIX,66go.vip,Proxy
+<<<<<<< HEAD
+HOST-SUFFIX,66let.com,Proxy
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,66van.com,Proxy
 HOST-SUFFIX,677.biz.tm,Proxy
 HOST-SUFFIX,677324.com,Proxy
@@ -14289,6 +14311,10 @@ HOST-SUFFIX,maif,Proxy
 HOST-SUFFIX,maiio.net,Proxy
 HOST-SUFFIX,mail-163-cloud-document.serveftp.com,Proxy
 HOST-SUFFIX,mail-archive.com,Proxy
+<<<<<<< HEAD
+HOST-SUFFIX,mail.barrowsonline.com,Proxy
+=======
+>>>>>>> upstream/master
 HOST-SUFFIX,mail.cod.edu,Proxy
 HOST-SUFFIX,mail.com,Proxy
 HOST-SUFFIX,mail.cyberpower.com,Proxy
@@ -23911,7 +23937,10 @@ HOST-SUFFIX,www.888funcity.com,Proxy
 HOST-SUFFIX,www.88bs88.com,Proxy
 HOST-SUFFIX,www.88fanya.com,Proxy
 HOST-SUFFIX,www.88gpz.com,Proxy
+<<<<<<< HEAD
+=======
 HOST-SUFFIX,www.88kf.com,Proxy
+>>>>>>> upstream/master
 HOST-SUFFIX,www.88lilai.com,Proxy
 HOST-SUFFIX,www.88lo.com,Proxy
 HOST-SUFFIX,www.88msc.com,Proxy
diff --git a/rule/QuantumultX/Proxy/README.md b/rule/QuantumultX/Proxy/README.md
index 41c1365b1..1eddd76ac 100644
--- a/rule/QuantumultX/Proxy/README.md
+++ b/rule/QuantumultX/Proxy/README.md
@@ -10,14 +10,23 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：28283 条。
+=======
 总计规则：28100 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| HOST | 42 |
+| HOST-SUFFIX | 28110 |
+=======
 | HOST | 43 |
 | HOST-SUFFIX | 27926 |
+>>>>>>> upstream/master
 | USER-AGENT | 11 |
 | HOST-KEYWORD | 29 |
 | IP-CIDR | 88 |
diff --git a/rule/QuantumultX/TikTok/README.md b/rule/QuantumultX/TikTok/README.md
index c02568197..0f6b4a7e6 100644
--- a/rule/QuantumultX/TikTok/README.md
+++ b/rule/QuantumultX/TikTok/README.md
@@ -10,14 +10,19 @@
 
 ## 规则统计
 
-总计规则：16 条。
+总计规则：15 条。
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
+<<<<<<< HEAD
+| USER-AGENT | 1 |
+| HOST-SUFFIX | 12 |
+=======
 | HOST-SUFFIX | 13 |
 | USER-AGENT | 1 |
+>>>>>>> upstream/master
 | HOST-KEYWORD | 1 |
 | HOST | 1 |
 ## 配置说明
diff --git a/rule/QuantumultX/TikTok/TikTok.list b/rule/QuantumultX/TikTok/TikTok.list
index 02d1280a0..9c2fbc16b 100644
--- a/rule/QuantumultX/TikTok/TikTok.list
+++ b/rule/QuantumultX/TikTok/TikTok.list
@@ -1,14 +1,19 @@
 # NAME: TikTok
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:36
+# USER-AGENT: 1
+# HOST-SUFFIX: 12
+=======
 # UPDATED: 2021-04-19 11:34:34
 # HOST-SUFFIX: 13
 # USER-AGENT: 1
+>>>>>>> upstream/master
 # HOST-KEYWORD: 1
 # HOST: 1
-# TOTAL: 16
+# TOTAL: 15
 HOST,p16-tiktokcdn-com.akamaized.net,TikTok
-HOST-SUFFIX,amemv.com,TikTok
 HOST-SUFFIX,byteoversea.com,TikTok
 HOST-SUFFIX,ibytedtos.com,TikTok
 HOST-SUFFIX,ibyteimg.com,TikTok
diff --git a/rule/Shadowrocket/Advertising/Advertising.list b/rule/Shadowrocket/Advertising/Advertising.list
index 94f9cb425..8c3547829 100644
--- a/rule/Shadowrocket/Advertising/Advertising.list
+++ b/rule/Shadowrocket/Advertising/Advertising.list
@@ -1,6 +1,17 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:37
+# DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
+# DOMAIN-KEYWORD: 59
+# DOMAIN-SUFFIX: 44846
+# DOMAIN: 20750
+# IP-CIDR: 247
+# IP-CIDR6: 1
+# URL-REGEX: 302
+# TOTAL: 66205
+=======
 # UPDATED: 2021-04-19 02:19:17
 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
 # DOMAIN-KEYWORD: 59
@@ -10,6 +21,7 @@
 # IP-CIDR6: 1
 # URL-REGEX: 302
 # TOTAL: 65731
+>>>>>>> upstream/master
 DOMAIN-KEYWORD,adashx
 DOMAIN-KEYWORD,admarvel
 DOMAIN-KEYWORD,admaster
diff --git a/rule/Shadowrocket/Advertising/Advertising_Domain.list b/rule/Shadowrocket/Advertising/Advertising_Domain.list
index 55ad567de..8fb515690 100644
--- a/rule/Shadowrocket/Advertising/Advertising_Domain.list
+++ b/rule/Shadowrocket/Advertising/Advertising_Domain.list
@@ -1,6 +1,17 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:37
+# DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
+# DOMAIN-KEYWORD: 59
+# DOMAIN-SUFFIX: 44846
+# DOMAIN: 20750
+# IP-CIDR: 247
+# IP-CIDR6: 1
+# URL-REGEX: 302
+# TOTAL: 66205
+=======
 # UPDATED: 2021-04-19 02:19:17
 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
 # DOMAIN-KEYWORD: 59
@@ -10,6 +21,7 @@
 # IP-CIDR6: 1
 # URL-REGEX: 302
 # TOTAL: 65731
+>>>>>>> upstream/master
 0.nextyourcontent.com
 0.up.qingdaonews.com
 0001.2waky.com
diff --git a/rule/Shadowrocket/Advertising/Advertising_Resolve.list b/rule/Shadowrocket/Advertising/Advertising_Resolve.list
index e5d853aaa..40b408c95 100644
--- a/rule/Shadowrocket/Advertising/Advertising_Resolve.list
+++ b/rule/Shadowrocket/Advertising/Advertising_Resolve.list
@@ -1,6 +1,17 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:37
+# DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
+# DOMAIN-KEYWORD: 59
+# DOMAIN-SUFFIX: 44846
+# DOMAIN: 20750
+# IP-CIDR: 247
+# IP-CIDR6: 1
+# URL-REGEX: 302
+# TOTAL: 66205
+=======
 # UPDATED: 2021-04-19 02:19:17
 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
 # DOMAIN-KEYWORD: 59
@@ -10,6 +21,7 @@
 # IP-CIDR6: 1
 # URL-REGEX: 302
 # TOTAL: 65731
+>>>>>>> upstream/master
 DOMAIN-KEYWORD,adashx
 DOMAIN-KEYWORD,admarvel
 DOMAIN-KEYWORD,admaster
diff --git a/rule/Shadowrocket/Advertising/README.md b/rule/Shadowrocket/Advertising/README.md
index e2878cd9b..b73d93b80 100644
--- a/rule/Shadowrocket/Advertising/README.md
+++ b/rule/Shadowrocket/Advertising/README.md
@@ -18,15 +18,24 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：66205 条。
+=======
 总计规则：65731 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
 | DOMAIN-KEYWORD | 59 |
+<<<<<<< HEAD
+| DOMAIN-SUFFIX | 44846 |
+| DOMAIN | 20750 |
+=======
 | DOMAIN-SUFFIX | 44389 |
 | DOMAIN | 20733 |
+>>>>>>> upstream/master
 | IP-CIDR | 247 |
 | IP-CIDR6 | 1 |
 | URL-REGEX | 302 |
diff --git a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list
index 66b875a94..4d85a57c2 100644
--- a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list
+++ b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list
@@ -16047,6 +16047,7 @@ zzz.clickbank.net
 .592man.com
 .593pi.cn
 .59519.com
+.596317de3d.com
 .59a8e0d6fa2.com
 .59cn7.com
 .59e6ea7248001c.com
@@ -16450,6 +16451,7 @@ zzz.clickbank.net
 .77wanmei.com
 .77xtv.com
 .77zhuan.com
+.781ca8a804e.com
 .7839e0482307b9276b.com
 .788111.com
 .788xj.com
@@ -34401,6 +34403,7 @@ zzz.clickbank.net
 .d7s3muv.cn
 .d8.sina.com.cn
 .d8.sinaimg.cn
+.d80ca4cff3.com
 .d81mfvml8p5ml.cloudfront.net
 .d824d7f5cbcb0e00.com
 .d830x8j3o1b2k.cloudfront.net
diff --git a/rule/Shadowrocket/TikTok/README.md b/rule/Shadowrocket/TikTok/README.md
index f44d8c7b2..43a225d79 100644
--- a/rule/Shadowrocket/TikTok/README.md
+++ b/rule/Shadowrocket/TikTok/README.md
@@ -10,7 +10,7 @@
 
 ## 规则统计
 
-总计规则：16 条。
+总计规则：15 条。
 
 各类型规则统计：
 
diff --git a/rule/Shadowrocket/TikTok/TikTok.list b/rule/Shadowrocket/TikTok/TikTok.list
index bcf7798c7..90926a18c 100644
--- a/rule/Shadowrocket/TikTok/TikTok.list
+++ b/rule/Shadowrocket/TikTok/TikTok.list
@@ -6,9 +6,8 @@
 # USER-AGENT: 1
 # DOMAIN-KEYWORD: 1
 # DOMAIN: 1
-# TOTAL: 16
+# TOTAL: 15
 DOMAIN,p16-tiktokcdn-com.akamaized.net
-DOMAIN-SUFFIX,amemv.com
 DOMAIN-SUFFIX,byteoversea.com
 DOMAIN-SUFFIX,ibytedtos.com
 DOMAIN-SUFFIX,ibyteimg.com
diff --git a/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list
index d3a35722a..d9d31e08e 100644
--- a/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list
+++ b/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list
@@ -16047,6 +16047,7 @@ zzz.clickbank.net
 .592man.com
 .593pi.cn
 .59519.com
+.596317de3d.com
 .59a8e0d6fa2.com
 .59cn7.com
 .59e6ea7248001c.com
@@ -16450,6 +16451,7 @@ zzz.clickbank.net
 .77wanmei.com
 .77xtv.com
 .77zhuan.com
+.781ca8a804e.com
 .7839e0482307b9276b.com
 .788111.com
 .788xj.com
@@ -34401,6 +34403,7 @@ zzz.clickbank.net
 .d7s3muv.cn
 .d8.sina.com.cn
 .d8.sinaimg.cn
+.d80ca4cff3.com
 .d81mfvml8p5ml.cloudfront.net
 .d824d7f5cbcb0e00.com
 .d830x8j3o1b2k.cloudfront.net
diff --git a/rule/Surge/TikTok/README.md b/rule/Surge/TikTok/README.md
index f14136285..4c2547bc0 100644
--- a/rule/Surge/TikTok/README.md
+++ b/rule/Surge/TikTok/README.md
@@ -10,7 +10,7 @@
 
 ## 规则统计
 
-总计规则：16 条。
+总计规则：15 条。
 
 各类型规则统计：
 
diff --git a/rule/Surge/TikTok/TikTok.list b/rule/Surge/TikTok/TikTok.list
index e399521af..d37611090 100644
--- a/rule/Surge/TikTok/TikTok.list
+++ b/rule/Surge/TikTok/TikTok.list
@@ -6,9 +6,8 @@
 # USER-AGENT: 1
 # DOMAIN-KEYWORD: 1
 # DOMAIN: 1
-# TOTAL: 16
+# TOTAL: 15
 DOMAIN,p16-tiktokcdn-com.akamaized.net
-DOMAIN-SUFFIX,amemv.com
 DOMAIN-SUFFIX,byteoversea.com
 DOMAIN-SUFFIX,ibytedtos.com
 DOMAIN-SUFFIX,ibyteimg.com
diff --git a/script/bilibili/bilibili_plus.js b/script/bilibili/bilibili_plus.js
index c06e6c2e5..9f4d4b2e9 100644
--- a/script/bilibili/bilibili_plus.js
+++ b/script/bilibili/bilibili_plus.js
@@ -1,6 +1,18 @@
 const scriptName = 'BiliBili';
 const storyAidKey = 'story_aid';
 let magicJS = MagicJS(scriptName, 'INFO');
+const blackKey = 'blackmatrix7_bilibili_feed_black';
+
+//Customize blacklist
+let blacklist = [];
+if (magicJS.read(blackKey)){
+  blacklist = magicJS.read(blackKey).split(';');
+} else {
+  const defaultList = '';
+  magicJS.write(blackKey, defaultList);
+  blacklist = defaultList.split(';');
+}
+
 ;(() => {
   let body = null;
   if (magicJS.isResponse){
@@ -24,7 +36,12 @@ let magicJS = MagicJS(scriptName, 'INFO');
                 items.push(item);
               }
             }
-            else if (!item.hasOwnProperty('ad_info') && (item['card_type'] === 'small_cover_v2' || item['card_type'] === 'large_cover_v1')){
+            else if (
+              !item.hasOwnProperty('ad_info') &&
+              !blacklist.includes(item['args']['up_name']) &&
+              item.card_goto.indexOf('ad') === -1 &&
+              (item['card_type'] === 'small_cover_v2' || item['card_type'] === 'large_cover_v1')
+            ){
               items.push(item);
             }
           }
diff --git a/script/boxjs.json b/script/boxjs.json
new file mode 100644
index 000000000..c241a21e2
--- /dev/null
+++ b/script/boxjs.json
@@ -0,0 +1,238 @@
+{
+  "id": "blackmatrix7.app.sub",
+  "name": "blackmatrix7 应用订阅",
+  "author": "@blackmatrix7",
+  "icon": "https://avatars.githubusercontent.com/u/27717518?v=4",
+  "repo": "https://github.com/blackmatrix7/ios_rule_script",
+  "apps": [
+    {
+      "id": "blackmatrix7.10010",
+      "name": "联通每日签到与抽奖",
+      "keys": ["unicom_user_cookie", "unicom_mobile", "unicom_encrypt_mobile", "city_code"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/10010",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/10010.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/10010.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/10010/unicom_signin.js"
+    },
+    {
+      "id": "blackmatrix7.bilibili",
+      "name": "哔哩哔哩去广告",
+      "keys": ["story_aid", "blackmatrix7_bilibili_feed_black"],
+      "settings": [
+        {
+          "id": "blackmatrix7_bilibili_feed_black",
+          "name": "首页UP主黑名单",
+          "val": "",
+          "type": "textarea",
+          "placeholder": "UP主名称1;UP主名称2",
+          "autoGrow": true,
+          "rows": 5,
+          "desc": "以英文逗号分隔多个号码"
+        }
+      ],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/bilibili",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/bilibili.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/bilibili.png"
+      ]
+    },
+    {
+      "id": "blackmatrix7.didachuxing",
+      "name": "嘀嗒出行",
+      "keys": ["dida_cid", "dida_cookie", "dida_useragent", "dida_access_token"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/didachuxing",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/didachuxing/didachuxing.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/didachuxing/didachuxing.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/didachuxing/didachuxing_plus.js"
+    },
+    {
+      "id": "blackmatrix7.didichuxing",
+      "name": "滴滴出行",
+      "keys": [
+        "didi_token",
+        "didi_city_id",
+        "didi_lottery_id",
+        "didi_my_source_id",
+        "didi_group_id",
+        "didi_finance_channel_id",
+        "didi_finance_activity_id"
+      ],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/didichuxing",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/didi.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/didi.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/didichuxing/didi_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.dingdong",
+      "name": "叮咚买菜",
+      "keys": ["dingdongmaicai_checkin_cookie", "dingdongmaicai_checkin_body"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/dingdong",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/dingdong/dingdong.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/dingdong/dingdong.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/dingdong/dingdong_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.eleme",
+      "name": "饿了么",
+      "keys": ["eleme_app_cookie", "eleme_app_longitude", "eleme_app_latitude"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/eleme",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/elem.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/elem.png"
+      ],
+      "scripts": [
+        {
+          "name": "领取吃货豆",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/eleme/eleme_daily.js"
+        },
+        {
+          "name": "领取会员任务",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/eleme/eleme_mission.js"
+        }
+      ]
+    },
+    {
+      "id": "blackmatrix7.famijia",
+      "name": "Fa米家",
+      "keys": ["famijia_checkin_cookie", "famijia_device_id_cookie", "famijia_black_box"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/famijia",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/famijia/famijia.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/famijia/famijia.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/famijia/famijia_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.luka",
+      "name": "Luka阅读养成",
+      "keys": ["luka_checkin_cookie", "luka_signin_auth"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/luka",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/luka/luka.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/luka/luka.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/luka/luka_signin.js"
+    },
+    {
+      "id": "blackmatrix7.manmanbuy",
+      "name": "慢慢买",
+      "keys": ["manmanbuy_checkin_cookie", "manmanbuy_login_body", "manmanbuy_username", "manmanbuy_deviceid"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/manmanbuy",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/manmanbuy/manmanmai.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/manmanbuy/manmanmai.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/manmanbuy/manmanbuy_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.meituan",
+      "name": "美团买菜",
+      "keys": [
+        "meituan_mall_cookie",
+        "meituan_mall_t",
+        "meituan_mall_querystring",
+        "meituan_mall_uuid",
+        "meituan_mall_userid",
+        "meituan_mall_body"
+      ],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/meituan",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/meituan/maicai.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/meituan/maicai.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/meituan/maicai_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.smzdm",
+      "name": "什么值得买",
+      "keys": ["smzdm_cookie", "smzdm_session"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/smzdm",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/smzdm.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/smzdm.png"
+      ],
+      "scripts": [
+        {
+          "name": "每日自动任务",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/smzdm/smzdm_mission.js"
+        },
+        {
+          "name": "每日自动签到",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/smzdm/smzdm_signin.js"
+        }
+      ]
+    },
+    {
+      "id": "blackmatrix7.tieba",
+      "name": "百度贴吧",
+      "keys": ["tieba_cookie_key"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/tieba",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/tieba.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/tieba.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.wanda",
+      "name": "万达电影",
+      "keys": ["wanda_checkin_cookie", "wanda_activitycode"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/wanda",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/wanda.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/wanda.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/wanda/wanda_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.youpin",
+      "name": "小米有品",
+      "keys": ["youpin_checkin_cookie"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/youpin",
+      "icons": [
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/xiaomiyp.png",
+        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/xiaomiyp.png"
+      ],
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/youpin/youpin_checkin.js"
+    },
+    {
+      "id": "blackmatrix7.zhihu",
+      "name": "知乎助手",
+      "keys": ["zhihu_blocked_users", "zhihu_current_userinfo", "zhihu_keyword_block"],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/zhihu",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/zhihu/zhihu.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/zhihu/zhihu.png"
+      ],
+      "scripts": [
+        {
+          "name": "知乎助手数据清理",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/zhihu/zhihu_plus.js"
+        }
+      ]
+    }
+  ]
+}