From 502722218e24f9204e59edce7b06acb4023048df Mon Sep 17 00:00:00 2001 From: blackmatrix7 <27717518+blackmatrix7@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:11:39 +0000 Subject: [PATCH] Last updated 2021-06-18 02:11:38 --- rule/Clash/Advertising/Advertising.yaml | 6 +- .../Advertising/Advertising_Classical.yaml | 7 +- .../Clash/Advertising/Advertising_Domain.yaml | 7 +- rule/Clash/Advertising/README.md | 4 +- .../AdvertisingLite/AdvertisingLite.yaml | 6 +- .../AdvertisingLite_Classical.yaml | 7 +- .../AdvertisingLite_Domain.yaml | 7 +- rule/Clash/AdvertisingLite/README.md | 4 +- .../AdvertisingTest/AdvertisingTest.yaml | 6 +- .../AdvertisingTest_Classical.yaml | 7 +- .../AdvertisingTest_Domain.yaml | 7 +- rule/Clash/AdvertisingTest/README.md | 4 +- rule/Loon/Advertising/Advertising.list | 6 +- rule/Loon/Advertising/Advertising_Domain.list | 7 +- .../Loon/Advertising/Advertising_Resolve.list | 6 +- rule/Loon/Advertising/README.md | 4 +- .../Loon/AdvertisingLite/AdvertisingLite.list | 6 +- .../AdvertisingLite_Domain.list | 7 +- .../AdvertisingLite_Resolve.list | 6 +- rule/Loon/AdvertisingLite/README.md | 4 +- .../Loon/AdvertisingTest/AdvertisingTest.list | 6 +- .../AdvertisingTest_Domain.list | 7 +- .../AdvertisingTest_Resolve.list | 6 +- rule/Loon/AdvertisingTest/README.md | 4 +- rule/QuantumultX/Advertising/Advertising.list | 7 +- rule/QuantumultX/Advertising/README.md | 4 +- .../AdvertisingLite/AdvertisingLite.list | 7 +- rule/QuantumultX/AdvertisingLite/README.md | 4 +- .../AdvertisingTest/AdvertisingTest.list | 7 +- rule/QuantumultX/AdvertisingTest/README.md | 4 +- .../Shadowrocket/Advertising/Advertising.list | 6 +- .../Advertising/Advertising_Domain.list | 7 +- .../Advertising/Advertising_Resolve.list | 6 +- rule/Shadowrocket/Advertising/README.md | 4 +- .../AdvertisingLite/AdvertisingLite.list | 6 +- .../AdvertisingLite_Domain.list | 7 +- .../AdvertisingLite_Resolve.list | 6 +- rule/Shadowrocket/AdvertisingLite/README.md | 4 +- .../AdvertisingTest/AdvertisingTest.list | 6 +- .../AdvertisingTest_Domain.list | 7 +- .../AdvertisingTest_Resolve.list | 6 +- rule/Shadowrocket/AdvertisingTest/README.md | 4 +- rule/Surge/Advertising/Advertising.list | 6 +- .../Surge/Advertising/Advertising_Domain.list | 7 +- .../Advertising/Advertising_Resolve.list | 6 +- rule/Surge/Advertising/README.md | 4 +- .../AdvertisingLite/AdvertisingLite.list | 6 +- .../AdvertisingLite_Domain.list | 7 +- .../AdvertisingLite_Resolve.list | 6 +- rule/Surge/AdvertisingLite/README.md | 4 +- .../AdvertisingTest/AdvertisingTest.list | 6 +- .../AdvertisingTest_Domain.list | 7 +- .../AdvertisingTest_Resolve.list | 6 +- rule/Surge/AdvertisingTest/README.md | 4 +- .../468f015d9da1a01bf12975782203e978.js | 116 +++++------------- 55 files changed, 196 insertions(+), 232 deletions(-) diff --git a/rule/Clash/Advertising/Advertising.yaml b/rule/Clash/Advertising/Advertising.yaml index 52220c7f302..a364d917a3e 100644 --- a/rule/Clash/Advertising/Advertising.yaml +++ b/rule/Clash/Advertising/Advertising.yaml @@ -1,13 +1,13 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:20 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 68878 +# TOTAL: 68879 payload: - DOMAIN-KEYWORD,112wan - DOMAIN-KEYWORD,789htbet diff --git a/rule/Clash/Advertising/Advertising_Classical.yaml b/rule/Clash/Advertising/Advertising_Classical.yaml index 6a1e0d4bdd8..cc6c4bd973c 100644 --- a/rule/Clash/Advertising/Advertising_Classical.yaml +++ b/rule/Clash/Advertising/Advertising_Classical.yaml @@ -1,13 +1,13 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:20 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 68878 +# TOTAL: 68879 payload: - DOMAIN,0.nextyourcontent.com - DOMAIN,0.up.qingdaonews.com @@ -19750,6 +19750,7 @@ payload: - DOMAIN,wonchangvacuum.com.my - DOMAIN,wonderhacks.com - DOMAIN,wonderlandads.com + - DOMAIN,wood086.com - DOMAIN,woodlawnwt.com - DOMAIN,woodwindowspittsburgh.com - DOMAIN,woojeoung.com diff --git a/rule/Clash/Advertising/Advertising_Domain.yaml b/rule/Clash/Advertising/Advertising_Domain.yaml index dc0b1dfcfd2..2e37a7f5ce9 100644 --- a/rule/Clash/Advertising/Advertising_Domain.yaml +++ b/rule/Clash/Advertising/Advertising_Domain.yaml @@ -1,13 +1,13 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:19 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 68878 +# TOTAL: 68879 payload: - '0.nextyourcontent.com' - '0.up.qingdaonews.com' @@ -19750,6 +19750,7 @@ payload: - 'wonchangvacuum.com.my' - 'wonderhacks.com' - 'wonderlandads.com' + - 'wood086.com' - 'woodlawnwt.com' - 'woodwindowspittsburgh.com' - 'woojeoung.com' diff --git a/rule/Clash/Advertising/README.md b/rule/Clash/Advertising/README.md index 2c0879233b0..cca4b21ca9f 100644 --- a/rule/Clash/Advertising/README.md +++ b/rule/Clash/Advertising/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：68878 条。 +总计规则：68879 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 47844 | -| DOMAIN | 20694 | +| DOMAIN | 20695 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | ## 配置说明 diff --git a/rule/Clash/AdvertisingLite/AdvertisingLite.yaml b/rule/Clash/AdvertisingLite/AdvertisingLite.yaml index 4271931a678..ad2869e75c1 100644 --- a/rule/Clash/AdvertisingLite/AdvertisingLite.yaml +++ b/rule/Clash/AdvertisingLite/AdvertisingLite.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:19 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 -# TOTAL: 27527 +# TOTAL: 27528 payload: - DOMAIN-KEYWORD,admarvel - DOMAIN-KEYWORD,admaster diff --git a/rule/Clash/AdvertisingLite/AdvertisingLite_Classical.yaml b/rule/Clash/AdvertisingLite/AdvertisingLite_Classical.yaml index c2b714530e5..ecb6b8b5e4b 100644 --- a/rule/Clash/AdvertisingLite/AdvertisingLite_Classical.yaml +++ b/rule/Clash/AdvertisingLite/AdvertisingLite_Classical.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:19 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 -# TOTAL: 27527 +# TOTAL: 27528 payload: - DOMAIN,0.up.qingdaonews.com - DOMAIN,00-gov.cn @@ -4323,6 +4323,7 @@ payload: - DOMAIN,dabaoku.com - DOMAIN,dable.io - DOMAIN,dacounter.com + - DOMAIN,dadi.technology - DOMAIN,dadsatz.com - DOMAIN,dadsecs.com - DOMAIN,dadsecz.com diff --git a/rule/Clash/AdvertisingLite/AdvertisingLite_Domain.yaml b/rule/Clash/AdvertisingLite/AdvertisingLite_Domain.yaml index a8d9f3c6a74..af04da3d90a 100644 --- a/rule/Clash/AdvertisingLite/AdvertisingLite_Domain.yaml +++ b/rule/Clash/AdvertisingLite/AdvertisingLite_Domain.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:19 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 -# TOTAL: 27527 +# TOTAL: 27528 payload: - '0.up.qingdaonews.com' - '00-gov.cn' @@ -4323,6 +4323,7 @@ payload: - 'dabaoku.com' - 'dable.io' - 'dacounter.com' + - 'dadi.technology' - 'dadsatz.com' - 'dadsecs.com' - 'dadsecz.com' diff --git a/rule/Clash/AdvertisingLite/README.md b/rule/Clash/AdvertisingLite/README.md index 3ea7770d083..5fb8644edb2 100644 --- a/rule/Clash/AdvertisingLite/README.md +++ b/rule/Clash/AdvertisingLite/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：27527 条。 +总计规则：27528 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 28 | | DOMAIN-SUFFIX | 12707 | -| DOMAIN | 14633 | +| DOMAIN | 14634 | | IP-CIDR | 158 | | IP-CIDR6 | 1 | ## 配置说明 diff --git a/rule/Clash/AdvertisingTest/AdvertisingTest.yaml b/rule/Clash/AdvertisingTest/AdvertisingTest.yaml index 4808be0df2b..a28efcf4195 100644 --- a/rule/Clash/AdvertisingTest/AdvertisingTest.yaml +++ b/rule/Clash/AdvertisingTest/AdvertisingTest.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:20 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 91938 +# TOTAL: 91939 payload: - DOMAIN-KEYWORD,112wan - DOMAIN-KEYWORD,789htbet diff --git a/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml b/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml index 58d58219cba..58089ce360f 100644 --- a/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml +++ b/rule/Clash/AdvertisingTest/AdvertisingTest_Classical.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:20 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 91938 +# TOTAL: 91939 payload: - DOMAIN,0.up.qingdaonews.com - DOMAIN,0001.2waky.com @@ -13536,6 +13536,7 @@ payload: - DOMAIN,womsy.bobbutcher.net - DOMAIN,wonchangvacuum.com.my - DOMAIN,wonderhacks.com + - DOMAIN,wood086.com - DOMAIN,woodlawnwt.com - DOMAIN,woodwindowspittsburgh.com - DOMAIN,woojeoung.com diff --git a/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml b/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml index c379838083a..be90ff7c45f 100644 --- a/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml +++ b/rule/Clash/AdvertisingTest/AdvertisingTest_Domain.yaml @@ -1,13 +1,13 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:21 +# UPDATED: 2021-06-18 02:11:20 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 -# TOTAL: 91938 +# TOTAL: 91939 payload: - '0.up.qingdaonews.com' - '0001.2waky.com' @@ -13536,6 +13536,7 @@ payload: - 'womsy.bobbutcher.net' - 'wonchangvacuum.com.my' - 'wonderhacks.com' + - 'wood086.com' - 'woodlawnwt.com' - 'woodwindowspittsburgh.com' - 'woojeoung.com' diff --git a/rule/Clash/AdvertisingTest/README.md b/rule/Clash/AdvertisingTest/README.md index aa50227bf73..9b6d2fc78ce 100644 --- a/rule/Clash/AdvertisingTest/README.md +++ b/rule/Clash/AdvertisingTest/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：91938 条。 +总计规则：91939 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 77297 | -| DOMAIN | 14301 | +| DOMAIN | 14302 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | ## 配置说明 diff --git a/rule/Loon/Advertising/Advertising.list b/rule/Loon/Advertising/Advertising.list index 403fa630411..f5eeed19c1b 100644 --- a/rule/Loon/Advertising/Advertising.list +++ b/rule/Loon/Advertising/Advertising.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Loon/Advertising/Advertising_Domain.list b/rule/Loon/Advertising/Advertising_Domain.list index 2ccadbd91e1..917d056cace 100644 --- a/rule/Loon/Advertising/Advertising_Domain.list +++ b/rule/Loon/Advertising/Advertising_Domain.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 0.nextyourcontent.com 0.up.qingdaonews.com 0001.2waky.com @@ -19751,6 +19751,7 @@ womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com wonderlandads.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Loon/Advertising/Advertising_Resolve.list b/rule/Loon/Advertising/Advertising_Resolve.list index 85f591d36d7..e5b14ac53cb 100644 --- a/rule/Loon/Advertising/Advertising_Resolve.list +++ b/rule/Loon/Advertising/Advertising_Resolve.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Loon/Advertising/README.md b/rule/Loon/Advertising/README.md index aa1beeff3db..b71d54fb4e1 100644 --- a/rule/Loon/Advertising/README.md +++ b/rule/Loon/Advertising/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：69179 条。 +总计规则：69180 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 47844 | -| DOMAIN | 20694 | +| DOMAIN | 20695 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/rule/Loon/AdvertisingLite/AdvertisingLite.list b/rule/Loon/AdvertisingLite/AdvertisingLite.list index cfdd85f35bd..9d375821884 100644 --- a/rule/Loon/AdvertisingLite/AdvertisingLite.list +++ b/rule/Loon/AdvertisingLite/AdvertisingLite.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Loon/AdvertisingLite/AdvertisingLite_Domain.list b/rule/Loon/AdvertisingLite/AdvertisingLite_Domain.list index 128cf6aaef7..960902ea51d 100644 --- a/rule/Loon/AdvertisingLite/AdvertisingLite_Domain.list +++ b/rule/Loon/AdvertisingLite/AdvertisingLite_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 0.up.qingdaonews.com 00-gov.cn 0024aadd.com @@ -4324,6 +4324,7 @@ da6fda11b2b0ba.com dabaoku.com dable.io dacounter.com +dadi.technology dadsatz.com dadsecs.com dadsecz.com diff --git a/rule/Loon/AdvertisingLite/AdvertisingLite_Resolve.list b/rule/Loon/AdvertisingLite/AdvertisingLite_Resolve.list index c7e39dfa6b2..8248bc535a8 100644 --- a/rule/Loon/AdvertisingLite/AdvertisingLite_Resolve.list +++ b/rule/Loon/AdvertisingLite/AdvertisingLite_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Loon/AdvertisingLite/README.md b/rule/Loon/AdvertisingLite/README.md index 94b6d2ebffb..b0ba271c481 100644 --- a/rule/Loon/AdvertisingLite/README.md +++ b/rule/Loon/AdvertisingLite/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：27822 条。 +总计规则：27823 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 28 | | DOMAIN-SUFFIX | 12707 | -| DOMAIN | 14633 | +| DOMAIN | 14634 | | IP-CIDR | 158 | | IP-CIDR6 | 1 | | URL-REGEX | 295 | diff --git a/rule/Loon/AdvertisingTest/AdvertisingTest.list b/rule/Loon/AdvertisingTest/AdvertisingTest.list index 6b5d3b23912..dfe0fb6ad6d 100644 --- a/rule/Loon/AdvertisingTest/AdvertisingTest.list +++ b/rule/Loon/AdvertisingTest/AdvertisingTest.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list index 3b28a3b6b04..2259fb99173 100644 --- a/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list +++ b/rule/Loon/AdvertisingTest/AdvertisingTest_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 0.up.qingdaonews.com 0001.2waky.com 000lk3v.wcomhost.com @@ -13537,6 +13537,7 @@ womenzz.com womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Loon/AdvertisingTest/AdvertisingTest_Resolve.list b/rule/Loon/AdvertisingTest/AdvertisingTest_Resolve.list index 84f9fa802b4..785d32f88ad 100644 --- a/rule/Loon/AdvertisingTest/AdvertisingTest_Resolve.list +++ b/rule/Loon/AdvertisingTest/AdvertisingTest_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:19 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Loon/AdvertisingTest/README.md b/rule/Loon/AdvertisingTest/README.md index abaf24874fe..f10e5b9baf7 100644 --- a/rule/Loon/AdvertisingTest/README.md +++ b/rule/Loon/AdvertisingTest/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：92239 条。 +总计规则：92240 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 77297 | -| DOMAIN | 14301 | +| DOMAIN | 14302 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/rule/QuantumultX/Advertising/Advertising.list b/rule/QuantumultX/Advertising/Advertising.list index a12dffead99..5ebfce27f7d 100644 --- a/rule/QuantumultX/Advertising/Advertising.list +++ b/rule/QuantumultX/Advertising/Advertising.list @@ -1,13 +1,13 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:18 # HOST-KEYWORD: 86 # HOST-SUFFIX: 47844 -# HOST: 20694 +# HOST: 20695 # IP-CIDR: 253 # IP6-CIDR: 1 -# TOTAL: 68878 +# TOTAL: 68879 HOST,0.nextyourcontent.com,Advertising HOST,0.up.qingdaonews.com,Advertising HOST,0001.2waky.com,Advertising @@ -19749,6 +19749,7 @@ HOST,womsy.bobbutcher.net,Advertising HOST,wonchangvacuum.com.my,Advertising HOST,wonderhacks.com,Advertising HOST,wonderlandads.com,Advertising +HOST,wood086.com,Advertising HOST,woodlawnwt.com,Advertising HOST,woodwindowspittsburgh.com,Advertising HOST,woojeoung.com,Advertising diff --git a/rule/QuantumultX/Advertising/README.md b/rule/QuantumultX/Advertising/README.md index 33bf6fdfe8d..3e0ef30c9d2 100644 --- a/rule/QuantumultX/Advertising/README.md +++ b/rule/QuantumultX/Advertising/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：68878 条。 +总计规则：68879 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | HOST-KEYWORD | 86 | | HOST-SUFFIX | 47844 | -| HOST | 20694 | +| HOST | 20695 | | IP-CIDR | 253 | | IP6-CIDR | 1 | ## 配置说明 diff --git a/rule/QuantumultX/AdvertisingLite/AdvertisingLite.list b/rule/QuantumultX/AdvertisingLite/AdvertisingLite.list index 1d5b548256a..b82b30c8c5a 100644 --- a/rule/QuantumultX/AdvertisingLite/AdvertisingLite.list +++ b/rule/QuantumultX/AdvertisingLite/AdvertisingLite.list @@ -1,13 +1,13 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:18 # HOST-KEYWORD: 28 # HOST-SUFFIX: 12707 -# HOST: 14633 +# HOST: 14634 # IP-CIDR: 158 # IP6-CIDR: 1 -# TOTAL: 27527 +# TOTAL: 27528 HOST,0.up.qingdaonews.com,AdvertisingLite HOST,00-gov.cn,AdvertisingLite HOST,0024aadd.com,AdvertisingLite @@ -4322,6 +4322,7 @@ HOST,da6fda11b2b0ba.com,AdvertisingLite HOST,dabaoku.com,AdvertisingLite HOST,dable.io,AdvertisingLite HOST,dacounter.com,AdvertisingLite +HOST,dadi.technology,AdvertisingLite HOST,dadsatz.com,AdvertisingLite HOST,dadsecs.com,AdvertisingLite HOST,dadsecz.com,AdvertisingLite diff --git a/rule/QuantumultX/AdvertisingLite/README.md b/rule/QuantumultX/AdvertisingLite/README.md index b4f27f6116c..f36edb7cfce 100644 --- a/rule/QuantumultX/AdvertisingLite/README.md +++ b/rule/QuantumultX/AdvertisingLite/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：27527 条。 +总计规则：27528 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | HOST-KEYWORD | 28 | | HOST-SUFFIX | 12707 | -| HOST | 14633 | +| HOST | 14634 | | IP-CIDR | 158 | | IP6-CIDR | 1 | ## 配置说明 diff --git a/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list b/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list index 4f545f86987..3d9a6df058b 100644 --- a/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list +++ b/rule/QuantumultX/AdvertisingTest/AdvertisingTest.list @@ -1,13 +1,13 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:20 +# UPDATED: 2021-06-18 02:11:18 # HOST-KEYWORD: 86 # HOST-SUFFIX: 77297 -# HOST: 14301 +# HOST: 14302 # IP-CIDR: 253 # IP6-CIDR: 1 -# TOTAL: 91938 +# TOTAL: 91939 HOST,0.up.qingdaonews.com,AdvertisingTest HOST,0001.2waky.com,AdvertisingTest HOST,000lk3v.wcomhost.com,AdvertisingTest @@ -13535,6 +13535,7 @@ HOST,womenzz.com,AdvertisingTest HOST,womsy.bobbutcher.net,AdvertisingTest HOST,wonchangvacuum.com.my,AdvertisingTest HOST,wonderhacks.com,AdvertisingTest +HOST,wood086.com,AdvertisingTest HOST,woodlawnwt.com,AdvertisingTest HOST,woodwindowspittsburgh.com,AdvertisingTest HOST,woojeoung.com,AdvertisingTest diff --git a/rule/QuantumultX/AdvertisingTest/README.md b/rule/QuantumultX/AdvertisingTest/README.md index e88a169f074..3a677b24066 100644 --- a/rule/QuantumultX/AdvertisingTest/README.md +++ b/rule/QuantumultX/AdvertisingTest/README.md @@ -13,7 +13,7 @@ ## 规则统计 -总计规则：91938 条。 +总计规则：91939 条。 各类型规则统计： @@ -21,7 +21,7 @@ | ---- | ---- | | HOST-KEYWORD | 86 | | HOST-SUFFIX | 77297 | -| HOST | 14301 | +| HOST | 14302 | | IP-CIDR | 253 | | IP6-CIDR | 1 | ## 配置说明 diff --git a/rule/Shadowrocket/Advertising/Advertising.list b/rule/Shadowrocket/Advertising/Advertising.list index f2332445669..4b61c1e4ee5 100644 --- a/rule/Shadowrocket/Advertising/Advertising.list +++ b/rule/Shadowrocket/Advertising/Advertising.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Shadowrocket/Advertising/Advertising_Domain.list b/rule/Shadowrocket/Advertising/Advertising_Domain.list index 25a49381848..05c54d16ff2 100644 --- a/rule/Shadowrocket/Advertising/Advertising_Domain.list +++ b/rule/Shadowrocket/Advertising/Advertising_Domain.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 0.nextyourcontent.com 0.up.qingdaonews.com 0001.2waky.com @@ -19751,6 +19751,7 @@ womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com wonderlandads.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Shadowrocket/Advertising/Advertising_Resolve.list b/rule/Shadowrocket/Advertising/Advertising_Resolve.list index f23216c7901..9ad9387968f 100644 --- a/rule/Shadowrocket/Advertising/Advertising_Resolve.list +++ b/rule/Shadowrocket/Advertising/Advertising_Resolve.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Shadowrocket/Advertising/README.md b/rule/Shadowrocket/Advertising/README.md index 7db13e93a8f..33ade18f36a 100644 --- a/rule/Shadowrocket/Advertising/README.md +++ b/rule/Shadowrocket/Advertising/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：69179 条。 +总计规则：69180 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 47844 | -| DOMAIN | 20694 | +| DOMAIN | 20695 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite.list b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite.list index dcbba7bf083..13f5aa5868d 100644 --- a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite.list +++ b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Domain.list b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Domain.list index 9cdc263f631..ffe4728fd43 100644 --- a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Domain.list +++ b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 0.up.qingdaonews.com 00-gov.cn 0024aadd.com @@ -4324,6 +4324,7 @@ da6fda11b2b0ba.com dabaoku.com dable.io dacounter.com +dadi.technology dadsatz.com dadsecs.com dadsecz.com diff --git a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Resolve.list b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Resolve.list index 1c59ca59144..316c1448251 100644 --- a/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Resolve.list +++ b/rule/Shadowrocket/AdvertisingLite/AdvertisingLite_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Shadowrocket/AdvertisingLite/README.md b/rule/Shadowrocket/AdvertisingLite/README.md index 66f9b9d4cd9..bc9d2d75a0f 100644 --- a/rule/Shadowrocket/AdvertisingLite/README.md +++ b/rule/Shadowrocket/AdvertisingLite/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：27822 条。 +总计规则：27823 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 28 | | DOMAIN-SUFFIX | 12707 | -| DOMAIN | 14633 | +| DOMAIN | 14634 | | IP-CIDR | 158 | | IP-CIDR6 | 1 | | URL-REGEX | 295 | diff --git a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest.list b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest.list index f76c4cb765c..db0e6e04c19 100644 --- a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest.list +++ b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list index b6f8b386f1e..e4f778ecda4 100644 --- a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list +++ b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 0.up.qingdaonews.com 0001.2waky.com 000lk3v.wcomhost.com @@ -13537,6 +13537,7 @@ womenzz.com womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Resolve.list b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Resolve.list index a924ffde5af..c1ffeec1cd2 100644 --- a/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Resolve.list +++ b/rule/Shadowrocket/AdvertisingTest/AdvertisingTest_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:22 +# UPDATED: 2021-06-18 02:11:20 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Shadowrocket/AdvertisingTest/README.md b/rule/Shadowrocket/AdvertisingTest/README.md index 107972641ca..61dbfbf8759 100644 --- a/rule/Shadowrocket/AdvertisingTest/README.md +++ b/rule/Shadowrocket/AdvertisingTest/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：92239 条。 +总计规则：92240 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 77297 | -| DOMAIN | 14301 | +| DOMAIN | 14302 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/rule/Surge/Advertising/Advertising.list b/rule/Surge/Advertising/Advertising.list index f47dadf8189..5cfedde2429 100644 --- a/rule/Surge/Advertising/Advertising.list +++ b/rule/Surge/Advertising/Advertising.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Surge/Advertising/Advertising_Domain.list b/rule/Surge/Advertising/Advertising_Domain.list index 7b506a01378..c2352654ad6 100644 --- a/rule/Surge/Advertising/Advertising_Domain.list +++ b/rule/Surge/Advertising/Advertising_Domain.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 0.nextyourcontent.com 0.up.qingdaonews.com 0001.2waky.com @@ -19751,6 +19751,7 @@ womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com wonderlandads.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Surge/Advertising/Advertising_Resolve.list b/rule/Surge/Advertising/Advertising_Resolve.list index 1e14a5795ea..5a1f7a205d5 100644 --- a/rule/Surge/Advertising/Advertising_Resolve.list +++ b/rule/Surge/Advertising/Advertising_Resolve.list @@ -1,15 +1,15 @@ # NAME: Advertising # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 47844 -# DOMAIN: 20694 +# DOMAIN: 20695 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 69179 +# TOTAL: 69180 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Surge/Advertising/README.md b/rule/Surge/Advertising/README.md index d40a70d9140..d4424b7398c 100644 --- a/rule/Surge/Advertising/README.md +++ b/rule/Surge/Advertising/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：69179 条。 +总计规则：69180 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 47844 | -| DOMAIN | 20694 | +| DOMAIN | 20695 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/rule/Surge/AdvertisingLite/AdvertisingLite.list b/rule/Surge/AdvertisingLite/AdvertisingLite.list index e915b9df8bd..27d4bd17f67 100644 --- a/rule/Surge/AdvertisingLite/AdvertisingLite.list +++ b/rule/Surge/AdvertisingLite/AdvertisingLite.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Surge/AdvertisingLite/AdvertisingLite_Domain.list b/rule/Surge/AdvertisingLite/AdvertisingLite_Domain.list index 4b7c0898cd1..6a455d9d9f4 100644 --- a/rule/Surge/AdvertisingLite/AdvertisingLite_Domain.list +++ b/rule/Surge/AdvertisingLite/AdvertisingLite_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 0.up.qingdaonews.com 00-gov.cn 0024aadd.com @@ -4324,6 +4324,7 @@ da6fda11b2b0ba.com dabaoku.com dable.io dacounter.com +dadi.technology dadsatz.com dadsecs.com dadsecz.com diff --git a/rule/Surge/AdvertisingLite/AdvertisingLite_Resolve.list b/rule/Surge/AdvertisingLite/AdvertisingLite_Resolve.list index 680e0168da1..afebbe5bacb 100644 --- a/rule/Surge/AdvertisingLite/AdvertisingLite_Resolve.list +++ b/rule/Surge/AdvertisingLite/AdvertisingLite_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingLite # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 28 # DOMAIN-SUFFIX: 12707 -# DOMAIN: 14633 +# DOMAIN: 14634 # IP-CIDR: 158 # IP-CIDR6: 1 # URL-REGEX: 295 -# TOTAL: 27822 +# TOTAL: 27823 DOMAIN-KEYWORD,admarvel DOMAIN-KEYWORD,admaster DOMAIN-KEYWORD,adsage diff --git a/rule/Surge/AdvertisingLite/README.md b/rule/Surge/AdvertisingLite/README.md index 509cc5d7329..1f92a26f489 100644 --- a/rule/Surge/AdvertisingLite/README.md +++ b/rule/Surge/AdvertisingLite/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：27822 条。 +总计规则：27823 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 28 | | DOMAIN-SUFFIX | 12707 | -| DOMAIN | 14633 | +| DOMAIN | 14634 | | IP-CIDR | 158 | | IP-CIDR6 | 1 | | URL-REGEX | 295 | diff --git a/rule/Surge/AdvertisingTest/AdvertisingTest.list b/rule/Surge/AdvertisingTest/AdvertisingTest.list index 9986b22c5a0..a3273e8924d 100644 --- a/rule/Surge/AdvertisingTest/AdvertisingTest.list +++ b/rule/Surge/AdvertisingTest/AdvertisingTest.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list b/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list index b881bb5ceb0..293dbaeb5a6 100644 --- a/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list +++ b/rule/Surge/AdvertisingTest/AdvertisingTest_Domain.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 0.up.qingdaonews.com 0001.2waky.com 000lk3v.wcomhost.com @@ -13537,6 +13537,7 @@ womenzz.com womsy.bobbutcher.net wonchangvacuum.com.my wonderhacks.com +wood086.com woodlawnwt.com woodwindowspittsburgh.com woojeoung.com diff --git a/rule/Surge/AdvertisingTest/AdvertisingTest_Resolve.list b/rule/Surge/AdvertisingTest/AdvertisingTest_Resolve.list index 2b72c233288..b62ce2a99cb 100644 --- a/rule/Surge/AdvertisingTest/AdvertisingTest_Resolve.list +++ b/rule/Surge/AdvertisingTest/AdvertisingTest_Resolve.list @@ -1,15 +1,15 @@ # NAME: AdvertisingTest # AUTHOR: blackmatrix7 # REPO: https://github.com/blackmatrix7/ios_rule_script -# UPDATED: 2021-06-17 23:05:19 +# UPDATED: 2021-06-18 02:11:18 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用 # DOMAIN-KEYWORD: 86 # DOMAIN-SUFFIX: 77297 -# DOMAIN: 14301 +# DOMAIN: 14302 # IP-CIDR: 253 # IP-CIDR6: 1 # URL-REGEX: 301 -# TOTAL: 92239 +# TOTAL: 92240 DOMAIN-KEYWORD,112wan DOMAIN-KEYWORD,789htbet DOMAIN-KEYWORD,adashx diff --git a/rule/Surge/AdvertisingTest/README.md b/rule/Surge/AdvertisingTest/README.md index 50336f3afbd..e115fc6f6ce 100644 --- a/rule/Surge/AdvertisingTest/README.md +++ b/rule/Surge/AdvertisingTest/README.md @@ -18,7 +18,7 @@ ## 规则统计 -总计规则：92239 条。 +总计规则：92240 条。 各类型规则统计： @@ -26,7 +26,7 @@ | ---- | ---- | | DOMAIN-KEYWORD | 86 | | DOMAIN-SUFFIX | 77297 | -| DOMAIN | 14301 | +| DOMAIN | 14302 | | IP-CIDR | 253 | | IP-CIDR6 | 1 | | URL-REGEX | 301 | diff --git a/source/script/468f015d9da1a01bf12975782203e978.js b/source/script/468f015d9da1a01bf12975782203e978.js index f63688ae2ae..202a3e6b51f 100644 --- a/source/script/468f015d9da1a01bf12975782203e978.js +++ b/source/script/468f015d9da1a01bf12975782203e978.js @@ -2,7 +2,7 @@ 京东多合一签到脚本 -更新时间: 2021.05.12 18:50 v2.0.4 +更新时间: 2021.06.17 23:20 v2.0.5 有效接口: 30+ 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js 电报频道: @NobyDa @@ -119,13 +119,11 @@ async function all() { JingDongGetCash(stop), //京东领现金 JingDongShake(stop), //京东摇一摇 JDSecKilling(stop), //京东秒杀 - JingDongJingCai(stop), //京东精彩 - JingDongBuyCar(stop, '6cd8e0c2e84a421ebf4a39d502141861'), //京东汽车 - JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '4D25A6F482'), - JingRongDoll(stop, 'JRTwoDoll', '京东金融-签贰', '3A3E839252'), - JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'), + JingDongBuyCar(stop, '435c9611622e4135b436b9d73351be10'), //京东汽车 + // JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '4D25A6F482'), + // JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'), JingRongDoll(stop, 'JRFourDoll', '京东金融-签肆', '30C4F86264'), - JingRongDoll(stop, 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F') + // JingRongDoll(stop, 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F') ]); await Promise.all([ JDUserSignPre(stop, 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'), //京东内衣馆 @@ -139,7 +137,7 @@ async function all() { JDUserSignPre(stop, 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'), //京东女装馆 JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'), //京东图书 JingRongDoll(stop, 'JTDouble', '京东金贴-双签', '1DF13833F7'), //京东金融 金贴双签 - JingRongDoll(stop, 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin') //京东金融 现金双签 + // JingRongDoll(stop, 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin') //京东金融 现金双签 ]); await Promise.all([ JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'), //京东电竞 @@ -150,10 +148,10 @@ async function all() { JDUserSignPre(stop, 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'), //京东拍拍二手 JDUserSignPre(stop, 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'), //京东清洁馆 JDUserSignPre(stop, 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'), //京东个人护理馆 - JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'), //京东珠宝馆 + // JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'), //京东珠宝馆 // JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'), //京东美妆馆 JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'), //京东菜场 - JDUserSignPre(stop, 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ') //京东智能生活 + // JDUserSignPre(stop, 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ') //京东智能生活 ]); await JingRongDoll(stop, 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签 break; @@ -169,14 +167,12 @@ async function all() { await JingDongSubsidy(Wait(stop)); //京东金贴 await JingDongShake(Wait(stop)); //京东摇一摇 await JDSecKilling(Wait(stop)); //京东秒杀 - await JingDongJingCai(Wait(stop)); //京东精彩 - await JingDongBuyCar(Wait(stop), '6cd8e0c2e84a421ebf4a39d502141861'); //京东汽车 - await JingRongDoll(Wait(stop), 'JRTwoDoll', '京东金融-签贰', '3A3E839252'); - await JingRongDoll(Wait(stop), 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'); + await JingDongBuyCar(Wait(stop), '435c9611622e4135b436b9d73351be10'); //京东汽车 + // await JingRongDoll(Wait(stop), 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'); await JingRongDoll(Wait(stop), 'JRFourDoll', '京东金融-签肆', '30C4F86264'); - await JingRongDoll(Wait(stop), 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F'); - await JingRongDoll(Wait(stop), 'JRDoll', '京东金融-签壹', '4D25A6F482'); - await JingRongDoll(Wait(stop), 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin'); //京东金融 现金双签 + // await JingRongDoll(Wait(stop), 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F'); + // await JingRongDoll(Wait(stop), 'JRDoll', '京东金融-签壹', '4D25A6F482'); + // await JingRongDoll(Wait(stop), 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin'); //京东金融 现金双签 await JingRongDoll(Wait(stop), 'JTDouble', '京东金贴-双签', '1DF13833F7'); //京东金融 金贴双签 await JDUserSignPre(Wait(stop), 'JDCard', '京东商城-卡包', '7e5fRnma6RBATV9wNrGXJwihzcD'); //京东卡包 await JDUserSignPre(Wait(stop), 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'); //京东内衣馆 @@ -196,10 +192,10 @@ async function all() { // await JDUserSignPre(Wait(stop), 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'); //京东美妆馆 await JDUserSignPre(Wait(stop), 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'); //京东菜场 await JDUserSignPre(Wait(stop), 'JDaccompany', '京东商城-陪伴', 'kPM3Xedz1PBiGQjY4ZYGmeVvrts'); //京东陪伴 - await JDUserSignPre(Wait(stop), 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ'); //京东智能生活 + // await JDUserSignPre(Wait(stop), 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ'); //京东智能生活 await JDUserSignPre(Wait(stop), 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'); //京东清洁馆 await JDUserSignPre(Wait(stop), 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'); //京东个人护理馆 - await JDUserSignPre(Wait(stop), 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'); //京东珠宝馆 + // await JDUserSignPre(Wait(stop), 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'); //京东珠宝馆 await JingRongDoll(Wait(stop), 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签 break; } @@ -832,7 +828,7 @@ function JDUserSign1(s, key, title, body) { async function JDUserSign2(s, key, title, tid) { await new Promise(resolve => { $nobyda.get({ - url: `https://jdjoy.jd.com/api/turncard/channel/detail?turnTableId=${tid}&invokeKey=SkzHkBfmSJdn5rQS`, + url: `https://jdjoy.jd.com/api/turncard/channel/detail?turnTableId=${tid}&invokeKey=NRp8OPxZMFXmGkaE`, headers: { Cookie: KEY } @@ -844,7 +840,7 @@ async function JDUserSign2(s, key, title, tid) { return new Promise(resolve => { setTimeout(() => { const JDUrl = { - url: 'https://jdjoy.jd.com/api/turncard/channel/sign?invokeKey=SkzHkBfmSJdn5rQS', + url: 'https://jdjoy.jd.com/api/turncard/channel/sign?invokeKey=NRp8OPxZMFXmGkaE', headers: { Cookie: KEY }, @@ -864,18 +860,19 @@ async function JDUserSign2(s, key, title, tid) { merge[key].notify = `${title}: 成功, 明细: ${merge[key].bean || '无'}京豆 🐶` merge[key].success = 1 } else { - console.log(`\n${title}签到失败(2)${Details}`) + const captcha = /请进行验证/.test(data); if (data.match(/(已经签到|已经领取)/)) { merge[key].notify = `${title}: 失败, 原因: 已签过 ⚠️` } else if (data.match(/(不存在|已结束|未开始)/)) { merge[key].notify = `${title}: 失败, 原因: 活动已结束 ⚠️` } else if (data.match(/(没有登录|B0001)/)) { merge[key].notify = `${title}: 失败, 原因: Cookie失效‼️` - } else { + } else if (!captcha) { const ng = data.match(/\"(errorMessage|subCodeMsg)\":\"(.+?)\"/) merge[key].notify = `${title}: 失败, ${ng?ng[2]:`原因: 未知`} ⚠️` } - merge[key].fail = 1 + if (!captcha) merge[key].fail = 1; + console.log(`\n${title}签到失败(2)${captcha?`\n需要拼图验证, 跳过通知记录 ⚠️`:``}${Details}`) } } } catch (eor) { @@ -1022,7 +1019,8 @@ function JingDongCash(s) { } else if (data.match(/(\"busiCode\":\"3\"|未登录)/)) { merge.JDCash.notify = "京东现金-红包: 失败, 原因: Cookie失效‼️" } else { - merge.JDCash.notify = "京东现金-红包: 失败, 原因: 未知 ⚠️" + const msg = data.split(/\"msg\":\"([\u4e00-\u9fa5].+?)\"/)[1]; + merge.JDCash.notify = `京东现金-红包: 失败, ${msg||`原因: 未知`} ⚠️` } } } @@ -1143,7 +1141,7 @@ function JingDongSubsidy(s) { } else { const Details = LogDetails ? "response:\n" + data : ''; const cc = JSON.parse(data) - if (cc.resultCode == 0 && cc.resultData.data.thisAmount) { + if (cc.resultCode == 0 && cc.resultData.data && cc.resultData.data.thisAmount) { console.log("\n" + "京东商城-金贴签到成功 " + Details) merge.subsidy.subsidy = cc.resultData.data.thisAmountStr merge.subsidy.notify = `京东商城-金贴: 成功, 明细: ${merge.subsidy.subsidy||`无`}金贴 💰` @@ -1152,11 +1150,12 @@ function JingDongSubsidy(s) { console.log("\n" + "京东商城-金贴签到失败 " + Details) merge.subsidy.fail = 1 if (data.match(/已存在|"thisAmount":0/)) { - merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 已签过 ⚠️" + merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 无金贴 ⚠️" } else if (data.match(/请先登录/)) { merge.subsidy.notify = "京东商城-金贴: 失败, 原因: Cookie失效‼️" } else { - merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 未知 ⚠️" + const msg = data.split(/\"msg\":\"([\u4e00-\u9fa5].+?)\"/)[1]; + merge.subsidy.notify = `京东商城-金贴: 失败, ${msg||`原因: 未知`} ⚠️` } } } @@ -1345,7 +1344,7 @@ function JingDongStore(s) { }); } -function JDSecKilling(s) { +function JDSecKilling(s) { //领券中心 merge.JDSecKill = {}; return new Promise((resolve, reject) => { if (disable("JDSecKill")) return reject(); @@ -1356,7 +1355,7 @@ function JDSecKilling(s) { Cookie: KEY, Origin: 'https://h5.m.jd.com' }, - body: 'functionId=freshManHomePage&body=%7B%7D&client=wh5&appid=SecKill2020' + body: 'functionId=homePageV2&appid=SecKill2020' }, (error, response, data) => { try { if (error) throw new Error(error); @@ -1438,8 +1437,8 @@ function JingDongBuyCar(s, ActId) { if (cc.status && cc.data && cc.data.firstLoginStatus) { resolve() } else { - const qt = cc.status && cc.data && cc.data.firstLoginStatus === false ? `已签过` : cc.error && cc.error.code == 2000 ? `Cookie失效` : cc.error && cc.error.msg ? cc.error.msg : `未知` - merge.JDBuyCar.notify = `京东商城-汽车: 失败, 原因: ${qt}${cc.error&&cc.error.code==2000?`‼️`:` ⚠️`}` + const qt = cc.status && cc.data && cc.data.firstLoginStatus === false ? `原因: 已签过` : cc.error && cc.error.code == 2000 ? `原因: Cookie失效` : cc.error && cc.error.msg ? cc.error.msg : `原因: 未知`; + merge.JDBuyCar.notify = `京东商城-汽车: 失败, ${qt}${cc.error&&cc.error.code==2000?`‼️`:` ⚠️`}` merge.JDBuyCar.fail = 1; reject() } @@ -1483,59 +1482,6 @@ function JingDongBuyCar(s, ActId) { }, () => {}); } -function JingDongJingCai(s) { - merge.JDJingCai = {}; - return new Promise((resolve) => { - if (disable("JDJingCai")) return resolve() - setTimeout(() => { - const JingCaiUrl = { - url: "https://lop-proxy.jd.com/jiFenApi/signInAndGetReward", - headers: { - referrer: "https://jingcai-h5.jd.com/", - appparams: '{"appid":158,"ticket_type":"m"}', - "lop-dn": "jingcai.jd.com", - Cookie: KEY, - }, - body: '[{"userNo":"$cooMrdGatewayUid$"}]', - }; - $nobyda.post(JingCaiUrl, function(error, response, data) { - try { - if (error) { - throw new Error(error); - } else { - const cc = JSON.parse(data); - const Details = LogDetails ? "response:\n" + data : ""; - if (cc.code == 1) { - //data.match(/\"title\":\"(\d+)京豆\"/)[1] - console.log("\n" + "京东精彩-京豆签到成功 " + Details); - merge.JDJingCai.success = 1; - if (data.match(/\"title\":\"\d+京豆\"/)) { - merge.JDJingCai.bean = data.match(/\"title\":\"(\d+)京豆\"/)[1]; - } - merge.JDJingCai.notify = `京东精彩-京豆: 成功, 明细: ${merge.JDJingCai.bean||`无`}京豆 🐶`; - } else { - console.log("\n" + "京东精彩-京豆签到失败 " + Details); - merge.JDJingCai.fail = 1; - if (cc.code == -1 || data.match(/已经签到/)) { - merge.JDJingCai.notify = "京东精彩-京豆: 失败, 原因: 已签过 ⚠️"; - } else if (cc.error_response && cc.error_response.code == 143) { - merge.JDJingCai.notify = "京东精彩-京豆: 失败, 原因: Cookie失效‼️"; - } else { - merge.JDJingCai.notify = "京东精彩-京豆: 失败, 原因: 未知 ⚠️"; - } - } - } - } catch (eor) { - $nobyda.AnError("京东精彩-京豆", "JDJingCai", eor, response, data); - } finally { - resolve(); - } - }); - }, s); - if (out) setTimeout(resolve, out + s); - }); -} - function TotalSteel() { merge.TotalSteel = {}; return new Promise(resolve => {