增加一个失效白名单规则的特性，针对引入外部白名单时，可以单条控制是否生效

adblock-for-dnsmasq.conf

@@ -1,4 +1,4 @@
-#VER=20200210094143
+#VER=20200211041026
 #URL=https://github.com/privacy-protection-tools/anti-AD
 #TOTAL_COUNT=31361
 address=/0024aaaa.com/
@@ -7510,7 +7510,7 @@ address=/cpl1.ru/
 address=/cpm.amateurcommunity.com/
 address=/cpm.amateurcommunity.de/
 address=/cpm.biz/
-address=/cm.kankan.com/
+address=/cpm.cm.kankan.com/
 address=/biz5.kankan.com/
 address=/stat.kankan.com/
 address=/kkpgv.kankan.com/

anti-ad-domains.txt

@@ -1,6 +1,6 @@
-#VER=20200210094143
+#VER=20200211041028
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_COUNT=35851
+#TOTAL_COUNT=35849
 0024aaaa.com
 0026645142c89aeb1.com
 003store.com
@@ -796,9 +796,9 @@ m.4qn1k.cn
 50258bd2b243b24df.com
 50bang.org
 app.50bang.org
+union2.50bang.org
 guess.union2.50bang.org
 js.50bang.org
-union2.50bang.org
 50zera.com
 51.la
 ia.51.la
@@ -1610,10 +1610,10 @@ img.yangshengtang123.com
 a.yixie8.com
 a.yl-taikang.com
 a.youdao.com
+clkservice.youdao.com
 b.clkservice.youdao.com
 clkservice.mail.youdao.com
 clkservice.union.youdao.com
-clkservice.youdao.com
 clkservice2.dict.youdao.com
 conv.youdao.com
 d.clkservice.youdao.com
@@ -1636,6 +1636,7 @@ impservice.youdao.com
 impservice2.youdao.com
 log.yex.youdao.com
 m.clkservice.youdao.com
+corp.youdao.com
 nc004x.corp.youdao.com
 nc045x.corp.youdao.com
 p.clkservice.youdao.com
@@ -1645,7 +1646,6 @@ s.clkservice.youdao.com
 tb060x.corp.youdao.com
 tb104x.corp.youdao.com
 ydpushserver.youdao.com
-corp.youdao.com
 a.yuzhainan.com
 a.zuowenxuan.cn
 a013.com
@@ -1987,11 +1987,11 @@ acxiomapac.com
 ad-apac.doubleclick.net
 ad-emea.doubleclick.net
 ad.doubleclick.net
+g.doubleclick.net
 bid.g.doubleclick.net
 cm.g.doubleclick.net
 doubleclick.net
 ff.doubleclick.net
-g.doubleclick.net
 gan.doubleclick.net
 googleads.g.doubleclick.net
 iv.doubleclick.net
@@ -2875,9 +2875,9 @@ img-x.jd.com
 jrad.jd.com
 stat.m.jd.com
 u-x.jd.com
+x.jd.com
 u.x.jd.com
 wn.x.jd.com
-x.jd.com
 mercury.jd.com
 ads.bridgetrack.com
 bridgetrack.com
@@ -2888,12 +2888,12 @@ dc.ads.linkedin.com
 px.ads.linkedin.com
 ads.mp.mydas.mobi
 ads.mydas.mobi
+lp.mydas.mobi
 aio.lp.mydas.mobi
 androidsdk.ads.mp.mydas.mobi
 cvt.mydas.mobi
 golds.lp.mydas.mobi
 lp.mp.mydas.mobi
-lp.mydas.mobi
 media.mydas.mobi
 suo.lp.mydas.mobi
 mydas.mobi
@@ -2958,6 +2958,7 @@ adss.yahoo.com
 analytics.yahoo.com
 bats.video.yahoo.com
 beap-bc.yahoo.com
+gemini.yahoo.com
 beap.gemini.yahoo.com
 cookiex.ngd.yahoo.com
 ganon.yahoo.com
@@ -2976,7 +2977,6 @@ aliunion.cn.yahoo.com
 analytics.query.yahoo.com
 beap.adss.yahoo.com
 cm.p4p.cn.yahoo.com
-gemini.yahoo.com
 js-apac-ss.ysm.yahoo.com
 n.gemini.yahoo.com
 na.ads.yahoo.com
@@ -3963,8 +3963,8 @@ c.autohome.com.cn
 cmx.autohome.com.cn
 comm.app.autohome.com.cn
 dspmnt.autohome.com.cn
-h.pcd.autohome.com.cn
 pcd.autohome.com.cn
+h.pcd.autohome.com.cn
 pcmx.autohome.com.cn
 public.app.autohome.com.cn
 push.app.autohome.com.cn
@@ -4083,6 +4083,7 @@ alltagcloud.info
 alltracked.com
 allxin.com
 allyes.com
+adsina.allyes.com
 1100.adsina.allyes.com
 114.allyes.com
 1148.adsina.allyes.com
@@ -4095,7 +4096,6 @@ allyes.com
 45.adsina.allyes.com
 60.adsina.allyes.com
 a3.allyes.com
-adsina.allyes.com
 adzjvnet.allyes.com
 allyesbjafa.allyes.com
 allyesshafa.allyes.com
@@ -4277,6 +4277,7 @@ adsview2.qq.com
 adv.app.qq.com
 adver.qq.com
 aeventlog.beacon.qq.com
+bugly.qq.com
 aexception.bugly.qq.com
 android.bugly.qq.com
 android.rqd.qq.com
@@ -4295,6 +4296,7 @@ cb.l.qq.com
 cdn.ark.qq.com
 cfg.imtt.qq.com
 client.show.qq.com
+e.qq.com
 cm.e.qq.com
 cm.l.qq.com
 d.gdt.qq.com
@@ -4302,7 +4304,6 @@ d3g.qq.com
 dir.minigame.qq.com
 download.sj.qq.com
 dp3.qq.com
-e.qq.com
 etg.qq.com
 eventlog.beacon.qq.com
 ex.qq.com
@@ -4408,13 +4409,13 @@ v.gdt.qq.com
 v2.gdt.qq.com
 vd.l.qq.com
 video.ureport.push.qq.com
+wap.mpush.qq.com
 video.wap.mpush.qq.com
 vlive.qqvideo.tc.qq.com
 vmindhls.tc.qq.com
 vpic.video.qq.com
 vr.gdt.qq.com
 w.l.qq.com
-wap.mpush.qq.com
 win.gdt.qq.com
 ws.sj.qq.com
 wxa.wxs.qq.com
@@ -4424,7 +4425,6 @@ wxsnsdy.wxs.qq.com
 wxsnsdythumb.wxs.qq.com
 x.adnet.qq.com
 xc.gdt.qq.com
-bugly.qq.com
 openmsf.3g.qq.com
 mtrace.qq.com
 mark.l.qq.com
@@ -4468,9 +4468,9 @@ record.kuai.xunlei.com
 stat.download.xunlei.com
 adsp.xunlei.com
 api-shoulei-ssl.xunlei.com
+live.xunlei.com
 biz.live.xunlei.com
 ct.niu.xunlei.com
-live.xunlei.com
 mou.niu.xunlei.com
 scene.vip.xunlei.com
 analytics.30m.com
@@ -4809,6 +4809,7 @@ anquan.baidu.com
 antivirus.baidu.com
 api.cpu.baidu.com
 api.share.baidu.com
+tuisong.baidu.com
 api.tuisong.baidu.com
 api0.tuisong.baidu.com
 api1.tuisong.baidu.com
@@ -4926,7 +4927,6 @@ wm.baidu.com
 wn.pos.baidu.com
 yingxiao.baidu.com
 znsv.baidu.com
-tuisong.baidu.com
 usp1.baidu.com
 plugin.mobopay.baidu.com
 anti-cheat.info
@@ -5622,12 +5622,12 @@ dressimage.img-cn-beijing.aliyuncs.com
 fs-uc-nearme-com-cn.oss-cn-hangzhou.aliyuncs.com
 img-dsp.oss-cn-beijing.aliyuncs.com
 jiayi1.oss-cn-shanghai.aliyuncs.com
+log.aliyuncs.com
 jsadsdisplay.cn-beijing.log.aliyuncs.com
 mobaders.oss-cn-beijing.aliyuncs.com
 ruikeja-mobileoffice.oss-cn-hangzhou.aliyuncs.com
 ttjx-online.cn-hangzhou.log.aliyuncs.com
 xz-development.oss-cn-beijing.aliyuncs.com
-log.aliyuncs.com
 badge.facebook.com
 pixel.facebook.com
 badges.alltop.com
@@ -5661,8 +5661,8 @@ baiduace.com
 baiduada.babihu.com
 baiduappu.top
 baiduccdn1.com
-baiducom.bj.bcebos.com
 bj.bcebos.com
+baiducom.bj.bcebos.com
 cpu-baidu-com-block.cdn.bcebos.com
 dd713.bj.bcebos.com
 hzyd.cdn.bcebos.com
@@ -5920,13 +5920,13 @@ ggcode.2345.com
 bdsearch.2345.com
 dl.2345.com
 download.2345.com
+wan.2345.com
 g.wan.2345.com
 houtai.2345.com
 jifen.2345.com
 minipage.2345.com
 tg.jifen.2345.com
 update.minipage.2345.com
-wan.2345.com
 zhushou.2345.com
 2345.com
 bdcode.35d1.com
@@ -6038,10 +6038,12 @@ d2.sina.com.cn
 d3.sina.com.cn
 d4.sina.com.cn
 d5.sina.com.cn
+interest.mix.sina.com.cn
 log.interest.mix.sina.com.cn
 matwbp.iask.sina.com.cn
 p4p.sina.com.cn
 pfp.sina.com.cn
+sax.sina.com.cn
 r.sax.sina.com.cn
 ad2.sina.com.cn
 ad3.sina.com.cn
@@ -6059,7 +6061,6 @@ dcads.sina.com.cn
 img.adbox.sina.com.cn
 img.amp.ad.sina.com.cn
 int.dpool.sina.com.cn
-interest.mix.sina.com.cn
 log.mix.sina.com.cn
 m.beacon.sina.com.cn
 mg.games.sina.com.cn
@@ -6067,7 +6068,6 @@ motu.p4p.sina.com.cn
 r.dmp.sina.com.cn
 rm.sina.com.cn
 s.img.mix.sina.com.cn
-sax.sina.com.cn
 sax1.sina.com.cn
 sax2.sina.com.cn
 sax3.sina.com.cn
@@ -6118,8 +6118,8 @@ becode.qiushibaike.com
 fzb01.qiushibaike.com
 becode.xiao84.com
 salary.xiao84.com
-become.successfultogether.co.uk
 successfultogether.co.uk
+become.successfultogether.co.uk
 becoquin.com
 bedhdig.cn
 m.bedhdig.cn
@@ -7046,13 +7046,13 @@ r.msn.com
 rel.msn.com
 srtb.msn.com
 0.r.msn.com
+ads1.msn.com
 a.ads1.msn.com
+ads2.msn.com
 a.ads2.msn.com
 ac3.msn.com
 ads.eu.msn.com
 ads.msn.com
-ads1.msn.com
-ads2.msn.com
 adsyndication.msn.com
 analytics.msn.com
 analytics.msnbc.msn.com
@@ -7900,6 +7900,7 @@ acs.wapa.taobao.com
 openjmacs.m.taobao.com
 click.tv.repubblica.it
 click.udimg.com
+uol.com.br
 click.uol.com.br
 dna.uol.com.br
 logger.rm.uol.com.br
@@ -7907,7 +7908,6 @@ logger.uol.com.br
 metrics.uol.com.br
 tm.uol.com.br
 tracker.bt.uol.com.br
-uol.com.br
 click.vgnett.no
 click2.cafepress.com
 click4assistance.co.uk
@@ -9010,6 +9010,7 @@ cpl1.ru
 cpm.amateurcommunity.com
 cpm.amateurcommunity.de
 cpm.biz
+cpm.cm.kankan.com
 20200201.logic.cpm.cm.kankan.com
 20200202.logic.cpm.cm.kankan.com
 20200203.logic.cpm.cm.kankan.com
@@ -9043,12 +9044,11 @@ cpm.biz
 20200231.logic.cpm.cm.kankan.com
 biz5.kankan.com
 count.cpm.cm.kankan.com
+stat.kankan.com
 distf.stat.kankan.com
 kkpgv.kankan.com
 kkpgv2.kankan.com
-cm.kankan.com
 float.kankan.com
-stat.kankan.com
 cpm10.com
 cpm360.com
 cpmadvisors.com
@@ -9122,8 +9122,8 @@ cqwqxapujf.com
 cqyfjodshwuici.com
 cqyhd.com
 cr-nielsen.com
-q.s.cr-nielsen.com
 s.cr-nielsen.com
+q.s.cr-nielsen.com
 t.cr-nielsen.com
 crabbychin.com
 cracataum.com
@@ -9139,11 +9139,11 @@ crayon.meishichina.com
 crazyad.net
 crazyclickstats.com
 crazyegg.com
+staging2.crazyegg.com
 editor.staging2.crazyegg.com
 player.staging2.crazyegg.com
 script.crazyegg.com
 shopify.staging2.crazyegg.com
-staging2.crazyegg.com
 vcr.staging2.crazyegg.com
 youso.crazyegg.com
 crazyhell.com
@@ -9777,8 +9777,8 @@ d93nzb.cn
 da-ads.com
 as.mgtv.com
 audit.aaa.mgtv.com
-cdn.cmop.mgtv.com
 cmop.mgtv.com
+cdn.cmop.mgtv.com
 imgaliyun.da.mgtv.com
 imgaliyun.res.mgtv.com
 m2.da.mgtv.com
@@ -10390,9 +10390,9 @@ dj-updates.com
 dj.renren.com
 ebp.renren.com
 s.renren.com
+jebe.renren.com
 bolt.jebe.renren.com
 click.jebe.renren.com
-jebe.renren.com
 shaft.jebe.renren.com
 static.jebe.renren.com
 xray.jebe.renren.com
@@ -11421,17 +11421,18 @@ pb.i.sogou.com
 pingback.sogou.com
 wuliao.epro.sogou.com
 123.sogou.com
+cpc.sogou.com
 a1click.cpc.sogou.com
 adsence.sogou.com
+brand.sogou.com
 alpha.brand.sogou.com
+wan.sogou.com
 athena.wan.sogou.com
 bazinga.mse.sogou.com
-brand.sogou.com
 bsiet.husky.sogou.com
 cjroq.bealge.sogou.com
 config.push.sogou.com
 cpc.brand.sogou.com
-cpc.sogou.com
 data.haoma.sogou.com
 download.zhushou.sogou.com
 dsp.brand.sogou.com
@@ -11484,7 +11485,6 @@ sy.brand.sogou.com
 union.sogou.com
 vjoz.lu.sogou.com
 vps.inte.sogou.com
-wan.sogou.com
 wb.brand.sogou.com
 web.sogou.com
 xtruh.uranus.sogou.com
@@ -13181,9 +13181,9 @@ gg.gw032.com
 gg.jkmeishi.com
 ads.service.kugou.com
 adserviceretry.kugou.com
+fanxing.kugou.com
 channel.fanxing.kugou.com
 d.kugou.com
-fanxing.kugou.com
 install.kugou.com
 install2.kugou.com
 kgmobilestat.kugou.com
@@ -13339,12 +13339,14 @@ glaumtok.com
 glauptan.net
 glawheejoushpush.com
 glbdns.microsoft.com
+telemetry.microsoft.com
 alpha.telemetry.microsoft.com
 bingads.microsoft.com
 choice.microsoft.com
 crl.microsoft.com
 df.telemetry.microsoft.com
 diagnostics.support.microsoft.com
+vortex-win.data.microsoft.com
 eu.vortex-win.data.microsoft.com
 i1.services.social.microsoft.com
 ieonline.microsoft.com
@@ -13359,16 +13361,14 @@ sqm.df.telemetry.microsoft.com
 sqm.telemetry.microsoft.com
 statsfe1.ws.microsoft.com
 statsfe2.ws.microsoft.com
+watson.microsoft.com
 survey.watson.microsoft.com
 telecommand.telemetry.microsoft.com
-telemetry.microsoft.com
 telemetry.urs.microsoft.com
 us.vortex-win.data.microsoft.com
 vortex-sandbox.data.microsoft.com
 vortex-win-sandbox.data.microsoft.com
-vortex-win.data.microsoft.com
 vortex.data.microsoft.com
-watson.microsoft.com
 watson.ppe.telemetry.microsoft.com
 watson.telemetry.microsoft.com
 wes.df.telemetry.microsoft.com
@@ -17342,8 +17342,8 @@ lindon-pool.win
 linezing.com
 acookie.linezing.com
 hidden-master.linezing.com
-js.tongji.linezing.com
 tongji.linezing.com
+js.tongji.linezing.com
 www.linezing.com
 linformanceder.info
 lingdian98.com
@@ -17797,6 +17797,7 @@ ltnkbvcm.com
 ltnvnvxzetvhk.com
 ltzjkjxx.com
 lu.sogoucdn.com
+theta.sogoucdn.com
 art.theta.sogoucdn.com
 bite.theta.sogoucdn.com
 cdn.lu.sogoucdn.com
@@ -17808,7 +17809,6 @@ jpg.inte.sogoucdn.com
 moka.inte.sogoucdn.com
 omg.inte.sogoucdn.com
 png.lu.sogoucdn.com
-theta.sogoucdn.com
 wds.inte.sogoucdn.com
 luagrcmjnovjp.com
 lucidcommerce.com
@@ -18575,6 +18575,7 @@ miaozhen.com
 a.ads.cn.miaozhen.com
 a.cn.miaozhen.com
 a.tac.miaozhen.com
+sitemonitor.cn.miaozhen.com
 alicdnv2.sitemonitor.cn.miaozhen.com
 baofeng.m.cn.miaozhen.com
 c.m.cn.miaozhen.com
@@ -18602,7 +18603,6 @@ msg.cn.miaozhen.com
 msg.mbm.cn.miaozhen.com
 pptv.m.cn.miaozhen.com
 qq.m.cn.miaozhen.com
-sitemonitor.cn.miaozhen.com
 sohutv.m.cn.miaozhen.com
 stm-cdn.cn.miaozhen.com
 stm-collect.cn.miaozhen.com
@@ -19093,10 +19093,10 @@ ms.computerbild.de
 ms758.com
 cz01016102.ms758.com
 msads.net
+global.msads.net
 a.global.msads.net
 ads1.msads.net
 ads2.msads.net
-global.msads.net
 msbftyajwu.com
 mscimg.com
 mse2v5oglm.com
@@ -19120,9 +19120,9 @@ hotchat-im.iqiyi.com
 ifacelog.iqiyi.com
 mbdlog.iqiyi.com
 msga.cupid.iqiyi.com
+notice.iqiyi.com
 nl.notice.iqiyi.com
 nl.rcd.iqiyi.com
-notice.iqiyi.com
 paopao.iqiyi.com
 policy.video.iqiyi.com
 puma-api.iqiyi.com
@@ -22971,8 +22971,8 @@ recognified.net
 recomendedsite.com
 recommendation.24.com
 recommendedbookies.co.uk
-record.sportsbetaffiliates.com.au
 sportsbetaffiliates.com.au
+record.sportsbetaffiliates.com.au
 recoset.com
 recreativ.ru
 track.recreativ.ru
@@ -23162,8 +23162,8 @@ revbigo.com
 revcatch.com
 revcontent.com
 revdepo.com
-cdn1.srv.revdepo.com
 srv.revdepo.com
+cdn1.srv.revdepo.com
 tags4.revdepo.com
 revdn.net
 revenue.com
@@ -23621,6 +23621,7 @@ s.360.cn
 s.so.360.cn
 s.union.360.cn
 tf.360.cn
+shouji.360.cn
 act.commercial.shouji.360.cn
 ad.dev.360.cn
 ad.gamebox.360.cn
@@ -23638,6 +23639,7 @@ cpull.360.cn
 dev.tg.wan.360.cn
 down.360.cn
 e.tf.360.cn
+sdk.look.360.cn
 g.sdk.look.360.cn
 guess.tf.360.cn
 h5.mse.360.cn
@@ -23655,15 +23657,13 @@ pub.se.360.cn
 qstore.inner.api.sj.360.cn
 rd.wan.360.cn
 s.lianmeng.360.cn
+stat.lianmeng.360.cn
 s1.stat.lianmeng.360.cn
-sdk.look.360.cn
 service.jiagu.360.cn
 shake.360.cn
 shake.f.360.cn
-shouji.360.cn
 show.look.360.cn
 soft.data.weather.360.cn
-stat.lianmeng.360.cn
 stat.m.360.cn
 stat.tf.360.cn
 stats.guess.tf.360.cn
@@ -27766,6 +27766,7 @@ utokapa.com
 utorido.com
 utpgxaylxurhbc.com
 utrack.hexun.com
+hxsame.hexun.com
 h01.hxsame.hexun.com
 h02.hxsame.hexun.com
 h03.hxsame.hexun.com
@@ -27776,7 +27777,6 @@ h07.hxsame.hexun.com
 h08.hxsame.hexun.com
 h09.hxsame.hexun.com
 h10.hxsame.hexun.com
-hxsame.hexun.com
 itv.hexun.com
 hexun.com
 utrehter.com
@@ -31199,12 +31199,12 @@ zzwflxs.com
 zzxlukodff.com
 zzxosget.com
 zzyonghao.com
+up.qingdaonews.com
 0.up.qingdaonews.com
 1.up.qingdaonews.com
 2.up.qingdaonews.com
 3.up.qingdaonews.com
 4.up.qingdaonews.com
-up.qingdaonews.com
 018520.com
 01daa.lubih.com
 01daa.lutci.com
@@ -31214,8 +31214,8 @@ up.qingdaonews.com
 e98fe.luytr.com
 01daa.luzdz.com
 0x5.me
-1.allyes.com.cn
 allyes.com.cn
+1.allyes.com.cn
 1.bashenghuo.com
 2.bashenghuo.com
 1.chcx.cn
@@ -31275,6 +31275,7 @@ www.sinawap.com
 3dns-3.adobe.com
 activate-sea.adobe.com
 activate-sjc0.adobe.com
+wip3.adobe.com
 activate.wip3.adobe.com
 adobe-dns-2.adobe.com
 adobe-dns-3.adobe.com
@@ -31284,7 +31285,6 @@ geo2.adobe.com
 get3.adobe.com
 hl2rcv.adobe.com
 practivate.adobe.com
-wip3.adobe.com
 wwis-dubc1-vip60.adobe.com
 3gmimo.com
 product.3gmimo.com
@@ -31368,9 +31368,9 @@ cb.alimama.cn
 img.alimama.cn
 tw.alimama.cn
 alimama.cn
+api.ad-locus.com
 a.api.ad-locus.com
 ad-locus.com
-api.ad-locus.com
 user.ad-locus.com
 a.appcpa.net
 a.appjiagu.com
@@ -31455,6 +31455,7 @@ mis.g.mi.com
 mivideo.g.mi.com
 sg.a.stat.mi.com
 staging.admin.e.mi.com
+static.youmi.net
 a.img.static.youmi.net
 a1.img.static.youmi.net
 a2.img.static.youmi.net
@@ -31463,13 +31464,12 @@ aos.wall.youmi.net
 apk.static.youmi.net
 au.youmi.net
 banner.img.static.youmi.net
+stat.gw.youmi.net
 cf8d.stat.gw.youmi.net
 notifiter.youmi.net
 pkg-cdn.youmi.net
 r.youmi.net
 s.youmi.net
-stat.gw.youmi.net
-static.youmi.net
 t.youmi.net
 track.dmp.youmi.net
 www.youmi.net
@@ -31486,10 +31486,10 @@ qq.irs01.com
 rest.irs01.com
 sohu.irs01.com
 v.irs01.com
+z.irs01.com
 v12-r0566gbscjw.z.irs01.com
 v13-6173431.z.irs01.com
 yyt.irs01.com
-z.irs01.com
 a.itiexue.net
 jph.itiexue.net
 a.jyeoo.com
@@ -31520,6 +31520,7 @@ a.shangz99991.com
 a.slsbc.cn
 a.stat.xiaomi.com
 abtest.mistat.xiaomi.com
+ad.xiaomi.com
 api.ad.xiaomi.com
 bss.pandora.xiaomi.com
 cdn.ad.xiaomi.com
@@ -31535,6 +31536,7 @@ m.track.ad.xiaomi.com
 notice.game.xiaomi.com
 o2o.api.xiaomi.com
 ppurifier.game.xiaomi.com
+ad.intl.xiaomi.com
 sdkconfig.ad.intl.xiaomi.com
 sdkconfig.ad.xiaomi.com
 shenghuo.xiaomi.com
@@ -31555,8 +31557,6 @@ wtradv.market.xiaomi.com
 zeus.ad.xiaomi.com
 data.mistat.intl.xiaomi.com
 adv.sec.miui.com
-ad.intl.xiaomi.com
-ad.xiaomi.com
 admob.xiaomi.com
 a.tujidao.com
 www.tujidao.com
@@ -31613,6 +31613,7 @@ houyi.logger.baofeng.com
 iphonelog.shouji.baofeng.com
 log.ltype.baofeng.com
 log.nvwa.baofeng.com
+vdinfo.baofeng.com
 log.vdinfo.baofeng.com
 logger.treexml.baofeng.com
 midinfo.baofeng.com
@@ -31625,7 +31626,6 @@ subo.logger.baofeng.com
 timelog.moviebox.baofeng.com
 tips.logger.baofeng.com
 tree.logger.baofeng.com
-vdinfo.baofeng.com
 videodown.baofeng.com
 vvlog.moviebox.baofeng.com
 track.easeus.com
@@ -31887,7 +31887,6 @@ valf.atm.cp31.ott.cibntv.net
 adinf.voole.com
 apkinfo.voole.com
 adinfo.ra1.xlmc.sec.miui.com
-adv.sec.miui.com
 api.ra2.xlmc.sec.miui.com
 api.sec.miui.com
 api.tw06.xlmc.sec.miui.com
@@ -31895,6 +31894,7 @@ api.xk.miui.com
 calopenupdate.comm.miui.com
 etl.xlmc.sec.miui.com
 fb.xk.miui.com
+tracking.miui.com
 fcanr.tracking.miui.com
 hot.browser.miui.com
 info.analysis.kp.sec.miui.com
@@ -31905,7 +31905,6 @@ proxy.sec.miui.com
 r.browser.miui.com
 reader.browser.miui.com
 security.browser.miui.com
-tracking.miui.com
 update.avlyun.sec.miui.com
 hot.browser.intl.miui.com
 activity.browser.intl.miui.com
@@ -32149,8 +32148,8 @@ counter.m1905.com
 agn.aty.snmsohu.aisee.tv
 m.aty.snmsohu.aisee.tv
 mmg.aty.snmsohu.aisee.tv
-agtr.ahksqc.com.cn
 ahksqc.com.cn
+agtr.ahksqc.com.cn
 ahh8.cn
 ai.yimg.jp
 yads.c.yimg.jp
@@ -32909,8 +32908,8 @@ choice.microsoft.com.nsatc.net
 sqm.telemetry.microsoft.com.nsatc.net
 chuantu.biz
 cilidaquan.pw
-cjiv.chengjie168.com.cn
 chengjie168.com.cn
+cjiv.chengjie168.com.cn
 ckjyck.qxs.la
 ddkkrrla.m.qxs.la
 ddrrccck.m.qxs.la
@@ -32960,10 +32959,10 @@ clk.uunt.com
 cloud.codenow.cn
 codenow.cn
 www.codenow.cn
+dopa.com.cn
 cloudcdn.dopa.com.cn
 mm.dopa.com.cn
 pd.dopa.com.cn
-dopa.com.cn
 cloudservice12.kingsoft-office-service.com
 cloudservice13.kingsoft-office-service.com
 cloudservice22.kingsoft-office-service.com
@@ -32982,10 +32981,10 @@ cms.quantserve.com
 edge.quantserve.com
 pixel.quantserve.com
 secure.quantserve.com
+v5.juzi.cn
 cms.v5.juzi.cn
 id.juzi.cn
 iu.juzi.cn
-v5.juzi.cn
 www.juzi.cn
 cmshow.gtimg.cn
 discuz.gtimg.cn
@@ -33037,8 +33036,8 @@ coro.benbaisteel.com
 dfc1.benbaisteel.com
 hyfh.benbaisteel.com
 couchcoaster.jp
-count.game.pps.tv
 game.pps.tv
+count.game.pps.tv
 count.knowsky.com
 count.wk2.com
 counter.kingsoft.com
@@ -33123,8 +33122,8 @@ shouji.yd126.com
 www.yd126.com
 db.cjtcc.cn
 db.xiaoshuofuwuqi.com
-dbnw.jyzmsy.com.cn
 jyzmsy.com.cn
+dbnw.jyzmsy.com.cn
 dc.liuliang100.com
 dc.meitustat.com
 mdc.meitustat.com
@@ -33158,12 +33157,12 @@ display.adhudong.com
 dl-vip.pcfaster.baidu.co.th
 dl.360safe.com
 down.360safe.com
+update.360safe.com
 ini.update.360safe.com
 inst.360safe.com
 kuaikan.netmon.360safe.com
-pdown.stat.360safe.com
 stat.360safe.com
-update.360safe.com
+pdown.stat.360safe.com
 dl.jianshunrui.com
 dl.kinbest.cn
 dl.sybspools.com
@@ -33587,8 +33586,8 @@ g.hutao1.cn
 g.koowo.com
 g.szdn1ms.com
 g.w5b454.com
-g.wan.douyu.com
 wan.douyu.com
+g.wan.douyu.com
 g.x.evolife.cn
 g.zhangaiwan.com
 g.zhoukaika.com
@@ -34213,11 +34212,11 @@ m.w7xj7.cn
 m.wbanv.com
 m.wgewj.cn
 m.wnxcg.com
+wooboo.com.cn
 m.wooboo.com.cn
 static.wooboo.com.cn
 wap.wooboo.com.cn
 www.wooboo.com.cn
-wooboo.com.cn
 m.wuqutu.com
 m.wxjrd.cn
 m.xingxd.com
@@ -34467,8 +34466,8 @@ pc.yingshi.tcclick.1kxun.mobi
 pclog.suishenyun.net
 pdfexpert.cc
 www.pdfexpert.cc
-www.xiazai.pdfexpert.cc
 xiazai.pdfexpert.cc
+www.xiazai.pdfexpert.cc
 pgdt.ugdtimg.com
 pgg.huabojnxdd.com
 photo.188kc.cn
@@ -35545,7 +35544,6 @@ crosspromo.voodoo.io
 adtilt.com
 activity.m.duiba.com.cn
 activity.tuiapple.com
-ad.api.3g.tudou.com
 api.tatagou.com.cn
 app.shandjj.com
 tj.koudaitong.com

anti-ad-surge.txt

@@ -1,4 +1,4 @@
-#VER=20200210094143
+#VER=20200211041027
 #URL=https://github.com/privacy-protection-tools/anti-AD
 #TOTAL_COUNT=31361
 DOMAIN-SUFFIX,0024aaaa.com
@@ -7510,7 +7510,7 @@ DOMAIN-SUFFIX,cpl1.ru
 DOMAIN-SUFFIX,cpm.amateurcommunity.com
 DOMAIN-SUFFIX,cpm.amateurcommunity.de
 DOMAIN-SUFFIX,cpm.biz
-DOMAIN-SUFFIX,cm.kankan.com
+DOMAIN-SUFFIX,cpm.cm.kankan.com
 DOMAIN-SUFFIX,biz5.kankan.com
 DOMAIN-SUFFIX,stat.kankan.com
 DOMAIN-SUFFIX,kkpgv.kankan.com

lib/addressMaker.class.php

@@ -200,6 +200,10 @@ class addressMaker{
                 continue;
             }
 
+            if(isset($arr_whitelist[$main_domain]) && (-1 === $arr_whitelist[$main_domain])){
+                unset($arr_whitelist[$main_domain]);
+            }
+
             $arr_subdomains = array_unique($arr_subdomains);
 
             if(
@@ -230,6 +234,10 @@ class addressMaker{
                 for($pos = 3; $pos <= $tmp_domain_len; $pos ++){
                     $arr_tmp = array_slice($arr_tmp_domain, -1 * $pos);
                     $tmp = implode('.', $arr_tmp);
+                    if(isset($arr_whitelist[$tmp]) && (-1 === $arr_whitelist[$tmp])){
+                        unset($arr_whitelist[$tmp]);
+                    }
+
                     if(array_key_exists($tmp, $arr_whitelist)){
                         $matched_flag = $arr_whitelist[$tmp] === 1;
                         if($matched_flag){

lib/black_domain_list.php

@@ -84,7 +84,7 @@ return array(
     'behe.com' => array('behe.com'),
     'dnset.com' => array('dnset.com'),
     'yiqifa.com' => array('yiqifa.com'),
-    'kankan.com' => array('cm.kankan.com', 'float.kankan.com', 'stat.kankan.com'),
+    'kankan.com' => array('cpm.cm.kankan.com', 'float.kankan.com', 'stat.kankan.com'),
     'oadz.com' => array('oadz.com'),
     'dopa.com' => array('dopa.com'),
     'dopa.com.cn' => array('dopa.com.cn'),

lib/white_domain_list.php

@@ -2,6 +2,7 @@
 //white_domain_list
 //白名单机制...，白名单是
 //@date 2018年12月23日
+//value=-1,代表失效本条规则，暂只支持单域名（针对引入外部白名单时的精确控制）
 //value=0,代表仅加白单条域名
 //value=1,代表其下级域名全部加白（例如3级域名，则其4级子域名全部加白）
 //value=2,代表仅加白主域名及其子域名，即如果是主域名，加白全部，如果是子域名，加白命中的单条
@@ -49,6 +50,7 @@ return array(
     'tanx.com' => 0, //饿了么店铺异常
     'promotion.aliyun.com' => 0, //阿里云控制台
 
+
     'herokuapp.com' => 0,
     'vidoza.net' => 0,
     'nahnoji.cz' => 1,
@@ -78,4 +80,8 @@ return array(
     'techsmith.com' => 1,
     'binaryage.com' => 1,
     'wisecleaner.com' => 1,
+
+
+    'cpm.cm.kankan.com' => -1, //-1 失效本条规则，保持现状，即不加白本域名
+
 );