重新上线不带广告过滤的版本，修复维基百科代理问题，规则模板更新

删除失效的优酷广告规则，readMe更新

factory/build_confs.py

@@ -8,7 +8,8 @@ import time
 # except sr_head and sr_foot
 confs_names = [
     'sr_top500_banlist_ad',
-    'sr_top500_whitelist_ad'
+    'sr_top500_whitelist_ad',
+    'sr_top500_whitelist'
 ]
 
 

factory/index.sh.bat

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd factory
+
+python ad.py
+python build_confs.py

factory/manual_proxy.txt

@@ -13,8 +13,7 @@
 149.154.168.0/22
 149.154.172.0/22
 
-#for http://www.bbc.com/zhongwen/simp
-#28
+#28 for http://www.bbc.com/zhongwen/simp
 bbc.com
 
 #instagram
@@ -22,7 +21,9 @@ cdninstagram.com
 
 gist.github.com
 
-#开车
-#20
+# 首页直连，但中文的维基百科必须翻墙
+wikipedia.org
+
+#20 开车
 t66y.com
 91porn.com

factory/manual_reject.txt

@@ -3,17 +3,6 @@
 #淘宝联盟
 atanx.alicdn.com
 
-#优酷
-actives.youku.com
-ad.api.3g.youku.com
-c.yes.youku.com
-lstat.youku.com
-lvip.youku.com
-p.l.youku.com
-r.l.youku.com
-stat.youku.com
-static.lstat.youku.com
-
 #爱奇艺
 rcd.iqiyi.com
 ad.m.iqiyi.com

factory/resultant/ad.list

@@ -1,4 +1,4 @@
-# adblock rules refresh time: 2017-06-28 23:48:41
+# adblock rules refresh time: 2017-07-04 10:12:30
 000dn.com
 00880808.com
 00oo00.com
@@ -17,6 +17,7 @@
 1.3.0.10
 1.feihua.com
 1.hao123.com
+1.jeasyui.net
 1.mgff.com
 1.panduoduo.net
 1.rengshu.com
@@ -31,6 +32,7 @@
 104.198.198.188
 106.187.95.251
 108.171.248.234
+11.hydcd.com
 111.73.45.147
 111111qb.com
 112.74.95.46
@@ -44,6 +46,7 @@
 120.27.34.156
 122.227.254.195
 122.228.236.165
+1224.dxsbb.com
 12306media.com
 1234xm.com
 12365chia.com
@@ -99,6 +102,7 @@
 2a.com.cn
 2m2n.com
 3.guidaye.com
+3.ssqzj.com
 31.media.tumblr.com
 33.pcpop.com
 336.com
@@ -138,8 +142,10 @@
 4wad.com
 504pk.com
 51.la
+5125129.com
 517m.cn
 51ads.com
+51gxqm.com
 51jumintong.com
 51weidashi.com
 51xumei.com
@@ -152,13 +158,16 @@
 58.215.179.159
 592man.com
 5imoney.com
+5jcom.com.cn
 5y9nfpes.52pk.com
+60.190.139.164
 61.147.184.18
 61.152.223.15
 61.174.50.211
 654mmm.com
 66san.com
 6711.com
+6728812.com
 685wo.com
 68665565.com
 69.28.57.245
@@ -243,12 +252,16 @@ a.baomihua.com
 a.cdngeek.net
 a.ckm.iqiyi.com
 a.clipconverter.cc
+a.duanmeiwen.com
+a.eporner.com
 a.fengyx.com
 a.giantrealm.com
+a.kejixun.com
 a.kickass.to
 a.livesportmedia.eu
 a.lolwot.com
 a.solarmovie.is
+a.thefreethoughtproject.com
 a.ucoz.net
 a.xizi.com
 a.xywy.com
@@ -257,6 +270,8 @@ a0b11.com
 a0b22.com
 a0b33.com
 a0c66.com
+a1.0s.net.cn
+a1.liuxue86.com
 a2.b310.com
 a3p4.net
 a4.yeshj.com
@@ -282,6 +297,7 @@ ad.digitimes.com.tw
 ad.directmirror.com
 ad.download.cnet.com
 ad.duga.jp
+ad.eporner.com
 ad.evozi.com
 ad.flux.com
 ad.fnnews.com
@@ -312,9 +328,12 @@ ad.reklamport.com
 ad.search.ch
 ad.sensismediasmart.com.au
 ad.services.distractify.com
+ad.slutload.com
 ad.smartclip.net
 ad.spielothek.so
 ad.spreaker.com
+ad.thisav.com
+ad.userporn.com
 ad.vidaroo.com
 ad.walkgame.com
 ad.winningpartner.com
@@ -339,6 +358,7 @@ adgeo.163.com
 adhai.com
 adhome.1fangchan.com
 adingo.jp.eimg.jp
+adjb.5nd.com
 adk.funshion.com
 adkongjian.com
 adlink.shopsafe.co.nz
@@ -371,6 +391,7 @@ ads.pof.com
 ads.tremorhub.com
 ads.uc.cn
 ads.videosz.com
+ads.xxxbunker.com
 ads.yahoo.com
 ads.zynga.com
 ads360.cn
@@ -405,6 +426,7 @@ aff.svjump.com
 affil.mupromo.com
 affiliateprogram.keywordspy.com
 affiliates.allposters.com
+affiliates.goodvibes.com
 affiliates.thrixxx.com
 affiliatesmedia.sbobet.com
 affiliation.fotovista.com
@@ -423,6 +445,7 @@ airpushmarketing.s3.amazonaws.com
 ais.abacast.com
 aishang.bid
 aishiguolong.com
+aiwen.cc
 ajaxcdn.org
 ajhdf.com
 ajnad.aljazeera.net
@@ -444,6 +467,7 @@ amz.steamprices.com
 analytics.disneyinternational.com
 analytics.mmosite.com
 andmejs.com
+ann5.net
 anreson.net
 aoodoo.weiphone.com
 apkdo.com
@@ -474,6 +498,8 @@ b.baiy.net
 b.livesport.eu
 b.localpages.com
 b.thefile.me
+b.xcafe.com
+b1.51scw.net
 b7nkd.cn
 b92.putniktravel.com
 b9377h.com
@@ -493,8 +519,10 @@ banner.europacasino.com
 banner.itweb.co.za
 banner.telefragged.com
 banner.titancasino.com
+banner1.pornhost.com
 banners.beevpn.com
 banners.beted.com
+banners.cams.com
 banners.clubworldgroup.com
 banners.expressindia.com
 banners.itweb.co.za
@@ -504,9 +532,13 @@ base.filedot.xyz
 bb.tuku.cc
 bccyyc.com
 bd1.nxing.cn
+bd1.xiangha.com
+bdcode.youke.com
 bdjs.120askimages.com
+bdjs.99.com.cn
 bdjs.ixiumei.com
 bdjs.jb51.net
+bdlncs1.familydoctor.com.cn
 bdpuaw.com
 bdtongfei.cn
 beacon.sina.com.cn
@@ -529,10 +561,12 @@ biz.weibo.com
 biz37.net
 bizanti.youwatch.org
 bjcathay.com
+bjs.9669.cn
 bl.wavecdn.de
 blaaaa12.googlecode.com
 bluhostedbanners.blucigs.com
 bnrs.ilm.ee
+bob.crazyshit.com
 bobo.163.com
 bosiwangzi.cn
 box.anchorfree.net
@@ -540,8 +574,9 @@ boyxu.cn
 br.blackfling.com
 br.fling.com
 br.realitykings.com
+brcache.madthumbs.com
 breezily168.com
-bskchina.cn
+bstatic.diyifanwen.com
 btn.onlylady.com
 btn.pchome.net
 btr.domywife.com
@@ -565,6 +600,7 @@ cadvv.heraldm.com
 cadvv.koreaherald.com
 caiyifz.com
 caliyuna.cn
+cams.pornrabbit.com
 cangnews.com
 canvas.thenextweb.com
 caob5.info
@@ -624,6 +660,7 @@ cnpinzhuo.com
 cnscdj.com
 cnsjx.net
 cnxad.net
+cnzhqs.com
 cnzz.com.so
 cnzzlink.com
 code.kaixinjiehun.com
@@ -649,6 +686,7 @@ cpm.cm.sandai.net
 cpms.cc
 cpro.baidu.com
 cpro.baidustatic.com
+cpu.baidu.com
 cpv.channelray
 cpv6.com
 cpva.cc
@@ -658,8 +696,10 @@ cqhnm.com
 cqyhd.com
 crdrjs.info
 cre99.com
+creatives.cliphunter.com
 creatives.inmotionhosting.com
 creatives.livejasmin.com
+creatives.pichunter.com
 creatives.summitconnect.co.uk
 crl.microsoft.com
 crs.baidu.com
@@ -683,6 +723,7 @@ d.businessinsider.com
 d.gossipcenter.com
 d.taomato.com
 d.thelocal.com
+d.xinshipu.com
 d0.xcar.com.cn
 d1.sina.com.cn
 d13czkep7ax7nj.cloudfront.net
@@ -715,6 +756,7 @@ d1pdpbxj733bb1.cloudfront.net
 d1rguclfwp7nc8.cloudfront.net
 d1spb7fplenrp4.cloudfront.net
 d1vbm0eveofcle.cloudfront.net
+d1wi563t0137vz.cloudfront.net
 d1zgderxoe1a.cloudfront.net
 d2.sina.com.cn
 d21j20wsoewvjq.cloudfront.net
@@ -752,6 +794,7 @@ d2oallm7wrqvmi.cloudfront.net
 d2omcicc3a4zlg.cloudfront.net
 d2pgy8h4i30on1.cloudfront.net
 d2plxos94peuwp.cloudfront.net
+d2q52i8yx3j68p.cloudfront.net
 d2qz7ofajpstv5.cloudfront.net
 d2r359adnh3sfn.cloudfront.net
 d2s64zaa9ua7uv.cloudfront.net
@@ -775,6 +818,7 @@ d34rdvn2ky3gnm.cloudfront.net
 d37kzqe5knnh6t.cloudfront.net
 d38pxm3dmrdu6d.cloudfront.net
 d38r21vtgndgb1.cloudfront.net
+d39hdzmeufnl50.cloudfront.net
 d39xqloz8t5a6x.cloudfront.net
 d3al52d8cojds7.cloudfront.net
 d3bvcf24wln03d.cloudfront.net
@@ -849,7 +893,9 @@ de.as.pptv.com
 deals.ledgertranscript.com
 deliver.ifeng.com
 delivery.playallvideos.com
+delivery.porn.com
 delivery.thebloggernetwork.com
+delivery.wasu.cn
 desk.cmix.org
 detuns.com
 dew9ckzjyt2gn.cloudfront.net
@@ -884,8 +930,10 @@ dlzjdesign.com
 dm.92to.com
 dm.aizhan.com
 dm.jb51.net
+dm.jy135.com
 dm.sanwen.net
 dm.ws8.org
+dm.yjbys.com
 dm0acvguygm9h.cloudfront.net
 dm1.tom61.com
 dm8srf206hien.cloudfront.net
@@ -894,6 +942,8 @@ dmtrck.com
 dn7788.com
 dnvus.com
 dontblockme.modaco.com
+dot.eporner.com
+dot2.eporner.com
 dou777.com
 doubleclick.tv002.com
 doudao.cn
@@ -936,6 +986,7 @@ dy48bnzanqw0v.cloudfront.net
 dycpc40hvg4ki.cloudfront.net
 dydab.com
 dyl3p6so5yozo.cloudfront.net
+dyn.tnaflix.com
 dzjzg.com
 e.yycqc.com
 e7001.com
@@ -970,6 +1021,7 @@ euwidget.imshopping.com
 eva.ucas.com
 evefashion.cn
 events.kalooga.com
+exit.macandbumble.com
 exoclick.com
 expo123.net
 ext.theglobalweb.com
@@ -979,6 +1031,7 @@ eyouv.cn
 ez33.org.cn
 ezucods.cn
 f1.bizhiku.net
+f1.meishichina.com
 f1190.com
 f2zd.com
 f6ce.com
@@ -1033,9 +1086,11 @@ g.hsw.cn
 g.mnw.cn
 g.ousns.net
 g1.0573ren.com
+g1.taijuba.com
 g1c5.com
 g1f5.com
 g2.ousns.net
+gadwhy.com
 gameads.digyourowngrave.com
 ganjituiguang.ganji.com
 gateway.fortunelounge.com
@@ -1069,6 +1124,7 @@ gg.gao7.com
 gg.kugou.com
 gg.sonhoo.com
 gg.uuu9.com
+gg.xingzuo360.cn
 gg.yxdown.com
 gg2.dss9927.com
 gg570.com
@@ -1089,6 +1145,7 @@ googlealiyun.cn
 googlesyndication.com
 googletakes.com
 goto.www.iciba.com
+gotourl.xyz
 gouzhibao.cn
 govgift.com
 govids.net
@@ -1120,6 +1177,7 @@ haiwengji.net
 haiyunpush.com
 hanju18.net
 hao123rt.com
+hao61.net
 haohaowan8.com
 haolew.com
 hascosafety.com
@@ -1146,6 +1204,8 @@ hk9600.com
 hkfuy.com
 hm.baidu.com
 hmp33.com
+hmttoly.com
+hmyangshengji.com
 hnctsm.com
 hnol.net
 hnyny.com
@@ -1244,6 +1304,8 @@ jhzl001.com
 jiajv.net
 jianbaimei.com
 jianmei123.com
+jiaoben.eastday.com
+jiaoben.ganji.cn
 jiathis.com
 jiawen88.com
 jiehunmishu.com
@@ -1274,6 +1336,7 @@ js.cncrk.com
 js.duotegame.com
 js.hkslg520.com
 jsadt.com
+jsm.39yst.com
 jsm.9939.com
 jsmwd.com
 jspg.cc
@@ -1344,6 +1407,7 @@ lhengilin.com
 lhusy.com
 liangziweixg.com
 lianmeng.360.cn
+libs.tvmao.cn
 life.e0575.com
 life.imagepix.org
 lightson.vpsboard.com
@@ -1364,11 +1428,13 @@ londonprivaterentals.standard.co.uk
 looky.hyves.org
 lovestyl.com
 ls.webmd.com
+ltcprtc.com
 lthxz.cn
 lu.sogou.com
 lu.sogoucdn.com
 lubosheng.cn
 lucting.cn
+lw1.cdmediaworld.com
 lw2.gamecopyworld.com
 lx167.com
 lxting.com
@@ -1377,6 +1443,7 @@ lyhdream.com
 lyrymy.com
 lzmm8.com
 m.aty.sohu.com
+ma1.meishij.net
 mads.aol.com
 mads.dailymail.co.uk
 maibahe300cc.com
@@ -1394,6 +1461,7 @@ marketingsolutions.yahoo.com
 maskbaby.com.cn
 mb.hockeybuzz.com
 mb.zam.com
+mbs.weathercn.com
 mealsandsteals.sandiego6.com
 media8.cn
 mediamgr.ugo.com
@@ -1412,6 +1480,7 @@ mingysh.com
 mini.hao123.com
 miniye.xjts.cn
 mlt01.com
+mmcc.yxlady.com
 mnwan.com
 mnxtu.com
 mobiorg8.com
@@ -1492,6 +1561,7 @@ odin.goo.mx
 officeme.cn
 oikxlcv.wang
 ok.432kkk.com
+okkkk.com
 okm918.com
 okokw.com
 olcdn.com
@@ -1499,6 +1569,7 @@ on.maxspeedcdn.com
 onclickads.net
 onetad.com
 onlifjj.net
+oomyv.com
 ooss.oss.aliyuncs.com
 optimix.asia
 orchidscape.net
@@ -1522,6 +1593,7 @@ partner.bargaindomains.com
 partner.catchy.com
 partner.premiumdomains.com
 partners.fshealth.com
+partners.keezmovies.com
 partners.optiontide.com
 partners.pornerbros.com
 partners.rochen.com
@@ -1578,6 +1650,7 @@ pub.betclick.com
 pub.chinadailyasia.com
 pub.funshion.com
 pub.mop.com
+pub1.cope.es
 pubbirdf.com
 public6.com
 publish.ad.youth.cn
@@ -1585,6 +1658,7 @@ pubs.hiddennetwork.com
 pups.bdimg.com
 pyzkk.com
 qbyy010.com
+qcrx.cn
 qd.dhzw.org
 qd.js.sanjiangge.com
 qd.x4399.com
@@ -1621,6 +1695,7 @@ qytyf.com
 qzdag.com
 qzdfc.com
 qzkxt.com
+r.radikal.ru
 rack.bauermedia.co.uk
 rad.microsoft.com
 rad.msn.com
@@ -1637,6 +1712,7 @@ res.hunantv.com
 res3.feedsportal.com
 resetgey.com
 resource.baomihua.com
+rev.fapdu.com
 revealads.appspot.com
 rh.qq.com
 rhgyg.com
@@ -1655,6 +1731,7 @@ runiman.com
 ruxianke.com
 rwjfs.com
 rxwan.com
+s.abcache.com
 s1.hiapk.com
 s1.qiuyi.cn
 s400cc.com
@@ -1693,6 +1770,7 @@ shbywsd.cn
 shenleyuni.com
 shenyian.net
 shiftrro.com
+shili.wanyx.com
 shoppingpartners2.futurenet.com
 show.kc.taotaosou.com
 show.qx15.com
@@ -1707,6 +1785,7 @@ sicentlife.com
 sigbusa.com
 sinaalicdn.com
 sinaaliyun.cn
+site.img.4tube.com
 sitemobia.com
 skatehot.net
 slot.union.ucweb.com
@@ -1727,6 +1806,7 @@ spt.dictionary.com
 sqext.com
 squarespace.evyy.net
 srv.thespacereporter.com
+ss.shicimingju.com
 sscefsol.com
 ssdaili.com
 ssjpx.com
@@ -1736,6 +1816,7 @@ sstc360.com
 staqnet.com
 star8.net
 statcounter.com
+static.kinghost.com
 static.oh100.com
 static.tucsonsentinel.com
 stats.hosting24.com
@@ -1763,6 +1844,7 @@ synacast.com
 syndication.jsadapi.com
 syndication1.viraladnetwork.net
 syofew6o.net
+sytsr.com
 sytz1288.com
 szdzbx.com
 szfaq.com
@@ -1799,6 +1881,7 @@ th21333.com
 thejesperbay.com
 themis.yahoo.com
 thescenseproject.com
+thetestpage.39.net
 thxnr.com
 thyvjboy.com
 ti.tradetracker.net
@@ -1885,7 +1968,9 @@ vupload.duowan.com
 vvvulqn7.com
 vwws6.net
 w.homes.yahoo.net
+w.xiaopiaoyou.com
 w3989.com
+w5sac788c1.360doc.cn
 w65p.com
 w8.com.cn
 wa.gtimg.com
@@ -1930,6 +2015,7 @@ wodhid.com
 wole.us
 womenwan.com
 wowips.com
+wpwdf.com
 wqsph.net
 ws341.com
 ws7j.com
@@ -1948,7 +2034,9 @@ wyhzzy.com
 wyttech.cn
 wzjijia.com
 x.castanet.net
+x.eroticity.net
 x.jd.com
+x.vipergirls.to
 x9377a.com
 xa9t.com
 xabaitai.com
@@ -2053,6 +2141,7 @@ yk0712.com
 ykbei.com
 ykjmy.com
 yktj.yzz.cn
+ykxwn.com
 ymcqb.com
 yndianju.com
 ynmbz.com
@@ -2074,6 +2163,7 @@ yunjiasu.com
 yunshipei.com
 ywjxsp168.cn
 yxhxs.com
+yxjad.com
 yxszy.com
 yxxwyz.com
 yy58ju.com
@@ -2096,11 +2186,13 @@ zgyemy.com
 zhanzhang.net
 zhao258.com
 zhihei.com
+zhihu.xmcimg.com
 zhiong.net
 zhuba8.com
 zhudiaosz.com
 zhybzp.cn
 zisunion.com
+zizcy.com
 zjbdt.com
 zkrdy.com
 znsv.baidu.com
@@ -2113,6 +2205,7 @@ zt2088.com
 ztidu.com
 ztxbd.com
 zuche321.com
+zuiceshi.net
 zws.avvo.com
 zybpj.com
 zymro.com

factory/template/sr_top500_banlist_ad.txt

@@ -1,24 +1,22 @@
-
 #
 # 黑名单中包含了境外网站中无法访问的那些，对不确定的网站则尽可能地直连。
 #
 # 代理：top500 网站中不可直连的境外网站
-# 直连：境外其余网站、中国网站
+# 直连：默认直连境外其余网站、中国网站
 # 包含广告过滤
 #
 
 
-{{top500_proxy}}
-
-{{manual_proxy}}
-
 {{ad}}
-
 {{manual_reject}}
 
-
+{{top500_proxy}}
 DOMAIN-KEYWORD,google,Proxy
 
+{{manual_direct}}
+{{manual_proxy}}
+
+
 IP-CIDR,192.168.0.0/16,DIRECT
 IP-CIDR,10.0.0.0/8,DIRECT
 IP-CIDR,172.16.0.0/12,DIRECT

factory/template/sr_top500_whitelist.txt

@@ -0,0 +1,24 @@
+#
+# 白名单中包含了境外网站中可以访问的那些，对不确定的网站则尽可能地代理。
+#
+# 直连：top500 网站中可直连的境外网站、中国网站
+# 代理：默认代理其余的所有境外网站
+# 不包含广告过滤
+#
+
+
+{{top500_direct}}
+DOMAIN-SUFFIX,cn,DIRECT
+
+{{manual_proxy}}
+{{manual_direct}}
+
+
+IP-CIDR,192.168.0.0/16,DIRECT
+IP-CIDR,10.0.0.0/8,DIRECT
+IP-CIDR,172.16.0.0/12,DIRECT
+IP-CIDR,127.0.0.0/8,DIRECT
+
+GEOIP,CN,DIRECT
+
+FINAL,proxy

factory/template/sr_top500_whitelist_ad.txt

@@ -1,24 +1,22 @@
-
 #
 # 白名单中包含了境外网站中可以访问的那些，对不确定的网站则尽可能地代理。
 #
 # 直连：top500 网站中可直连的境外网站、中国网站
-# 代理：其余的所有境外网站
+# 代理：默认代理其余的所有境外网站
 # 包含广告过滤
 #
 
 
-{{top500_direct}}
-
-{{manual_direct}}
-
 {{ad}}
-
 {{manual_reject}}
 
-
+{{top500_direct}}
 DOMAIN-SUFFIX,cn,DIRECT
 
+{{manual_proxy}}
+{{manual_direct}}
+
+
 IP-CIDR,192.168.0.0/16,DIRECT
 IP-CIDR,10.0.0.0/8,DIRECT
 IP-CIDR,172.16.0.0/12,DIRECT