From decbcd4cff6d5b2a9f7849dd0bdbbd2fcc90dbed Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Tue, 19 May 2020 23:13:32 +0800
Subject: [PATCH] update whitelist . fixed #136

---
 adblock-for-dnsmasq.conf  | 11 ++++++++---
 anti-ad-domains.txt       |  5 ++---
 anti-ad-easylist.txt      |  9 ++++++---
 anti-ad-smartdns.conf     | 11 ++++++++---
 anti-ad-surge.txt         | 11 ++++++++---
 lib/white_domain_list.php |  1 +
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf
index 562a1921..3d6b3b4b 100644
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200519151016
+#VER=20200519151257
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=34754
+#TOTAL_LINES=34759
 address=/00-gov.cn/
 address=/kwcdn.000dn.com/
 address=/kwcscdn.000dn.com/
@@ -791,9 +791,11 @@ address=/s.so.360.cn/
 address=/s.union.360.cn/
 address=/sayhi.360.cn/
 address=/tf.360.cn/
-address=/shouji.360.cn/
+address=/act.commercial.shouji.360.cn/
 address=/ad.dev.360.cn/
 address=/ad.gamebox.360.cn/
+address=/adapi.shouji.360.cn/
+address=/adapter.shouji.360.cn/
 address=/agd.p.360.cn/
 address=/agd2.p.360.cn/
 address=/api.shuaji.360.cn/
@@ -801,15 +803,18 @@ address=/api.so.lianmeng.360.cn/
 address=/click.stat.hao.360.cn/
 address=/cm.dmp.360.cn/
 address=/cm.lianmeng.360.cn/
+address=/commercial.shouji.360.cn/
 address=/dev.tg.wan.360.cn/
 address=/down.360.cn/
 address=/sdk.look.360.cn/
 address=/h5.mse.360.cn/
 address=/huid.ad.360.cn/
+address=/huodong.ios.shouji.360.cn/
 address=/huodong.mobilem.360.cn/
 address=/iad.e.360.cn/
 address=/leak.360.cn/
 address=/mbs.hao.360.cn/
+address=/msg.shouji.360.cn/
 address=/msoftdl.360.cn/
 address=/openbox.mobilem.360.cn/
 address=/pub.se.360.cn/
diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt
index f991089f..b3d65ca0 100644
--- a/anti-ad-domains.txt
+++ b/anti-ad-domains.txt
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200519151016
+#VER=20200519151257
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=39837
+#TOTAL_LINES=39836
 00-gov.cn
 kwcdn.000dn.com
 kwcscdn.000dn.com
@@ -906,7 +906,6 @@ s.so.360.cn
 s.union.360.cn
 sayhi.360.cn
 tf.360.cn
-shouji.360.cn
 act.commercial.shouji.360.cn
 ad.dev.360.cn
 ad.gamebox.360.cn
diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index ad934ce4..34365a73 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,7 +1,7 @@
 !TITLE=anti-AD
-!VER=20200519151016
+!VER=20200519151257
 !URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=33166
+!TOTAL_LINES=33169
 ||*serror*.wo.com.cn^
 ||201*.myhard.com^
 ||8*.tianya.cn^
@@ -847,21 +847,24 @@
 ||s.union.360.cn^
 ||sayhi.360.cn^
 ||tf.360.cn^
-||shouji.360.cn^
+||act.commercial.shouji.360.cn^
 ||agd.p.360.cn^
 ||agd2.p.360.cn^
 ||api.shuaji.360.cn^
 ||api.so.lianmeng.360.cn^
 ||cm.dmp.360.cn^
 ||cm.lianmeng.360.cn^
+||commercial.shouji.360.cn^
 ||dev.tg.wan.360.cn^
 ||down.360.cn^
 ||sdk.look.360.cn^
 ||h5.mse.360.cn^
+||huodong.ios.shouji.360.cn^
 ||huodong.mobilem.360.cn^
 ||iad.e.360.cn^
 ||leak.360.cn^
 ||mbs.hao.360.cn^
+||msg.shouji.360.cn^
 ||msoftdl.360.cn^
 ||openbox.mobilem.360.cn^
 ||pub.se.360.cn^
diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf
index 057f8f6d..af4fffef 100644
--- a/anti-ad-smartdns.conf
+++ b/anti-ad-smartdns.conf
@@ -1,7 +1,7 @@
 #TITLE=anti-AD for SmartDNS
-#VER=20200519151016
+#VER=20200519151257
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=34754
+#TOTAL_LINES=34759
 address /00-gov.cn/#
 address /kwcdn.000dn.com/#
 address /kwcscdn.000dn.com/#
@@ -791,9 +791,11 @@ address /s.so.360.cn/#
 address /s.union.360.cn/#
 address /sayhi.360.cn/#
 address /tf.360.cn/#
-address /shouji.360.cn/#
+address /act.commercial.shouji.360.cn/#
 address /ad.dev.360.cn/#
 address /ad.gamebox.360.cn/#
+address /adapi.shouji.360.cn/#
+address /adapter.shouji.360.cn/#
 address /agd.p.360.cn/#
 address /agd2.p.360.cn/#
 address /api.shuaji.360.cn/#
@@ -801,15 +803,18 @@ address /api.so.lianmeng.360.cn/#
 address /click.stat.hao.360.cn/#
 address /cm.dmp.360.cn/#
 address /cm.lianmeng.360.cn/#
+address /commercial.shouji.360.cn/#
 address /dev.tg.wan.360.cn/#
 address /down.360.cn/#
 address /sdk.look.360.cn/#
 address /h5.mse.360.cn/#
 address /huid.ad.360.cn/#
+address /huodong.ios.shouji.360.cn/#
 address /huodong.mobilem.360.cn/#
 address /iad.e.360.cn/#
 address /leak.360.cn/#
 address /mbs.hao.360.cn/#
+address /msg.shouji.360.cn/#
 address /msoftdl.360.cn/#
 address /openbox.mobilem.360.cn/#
 address /pub.se.360.cn/#
diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt
index 3d38d3e6..f2517490 100644
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200519151016
+#VER=20200519151257
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=34754
+#TOTAL_LINES=34759
 DOMAIN-SUFFIX,00-gov.cn
 DOMAIN-SUFFIX,kwcdn.000dn.com
 DOMAIN-SUFFIX,kwcscdn.000dn.com
@@ -791,9 +791,11 @@ DOMAIN-SUFFIX,s.so.360.cn
 DOMAIN-SUFFIX,s.union.360.cn
 DOMAIN-SUFFIX,sayhi.360.cn
 DOMAIN-SUFFIX,tf.360.cn
-DOMAIN-SUFFIX,shouji.360.cn
+DOMAIN-SUFFIX,act.commercial.shouji.360.cn
 DOMAIN-SUFFIX,ad.dev.360.cn
 DOMAIN-SUFFIX,ad.gamebox.360.cn
+DOMAIN-SUFFIX,adapi.shouji.360.cn
+DOMAIN-SUFFIX,adapter.shouji.360.cn
 DOMAIN-SUFFIX,agd.p.360.cn
 DOMAIN-SUFFIX,agd2.p.360.cn
 DOMAIN-SUFFIX,api.shuaji.360.cn
@@ -801,15 +803,18 @@ DOMAIN-SUFFIX,api.so.lianmeng.360.cn
 DOMAIN-SUFFIX,click.stat.hao.360.cn
 DOMAIN-SUFFIX,cm.dmp.360.cn
 DOMAIN-SUFFIX,cm.lianmeng.360.cn
+DOMAIN-SUFFIX,commercial.shouji.360.cn
 DOMAIN-SUFFIX,dev.tg.wan.360.cn
 DOMAIN-SUFFIX,down.360.cn
 DOMAIN-SUFFIX,sdk.look.360.cn
 DOMAIN-SUFFIX,h5.mse.360.cn
 DOMAIN-SUFFIX,huid.ad.360.cn
+DOMAIN-SUFFIX,huodong.ios.shouji.360.cn
 DOMAIN-SUFFIX,huodong.mobilem.360.cn
 DOMAIN-SUFFIX,iad.e.360.cn
 DOMAIN-SUFFIX,leak.360.cn
 DOMAIN-SUFFIX,mbs.hao.360.cn
+DOMAIN-SUFFIX,msg.shouji.360.cn
 DOMAIN-SUFFIX,msoftdl.360.cn
 DOMAIN-SUFFIX,openbox.mobilem.360.cn
 DOMAIN-SUFFIX,pub.se.360.cn
diff --git a/lib/white_domain_list.php b/lib/white_domain_list.php
index fa1bb978..6efd92db 100644
--- a/lib/white_domain_list.php
+++ b/lib/white_domain_list.php
@@ -125,6 +125,7 @@ return array(
     'pp.ua' => 0, // #131
     'search.video.iqiyi.com' => 0, // #132
     'wanproxy.127.net' => 0, // #137
+    'shouji.360.cn' => 0, // #136