Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	changelog.md
This commit is contained in:
gently 2019-12-21 23:32:00 +08:00
commit 20bf3dd587
31 changed files with 345118 additions and 57117 deletions

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
optimize-dns.conf
.gitignore
.idea/
origin-files/split-tmp-list_*
origin-files/*.php
tools/*.out

View File

@ -1,43 +1,48 @@
# anti-AD v4.0
### 基于dnsmasq服务的广告封杀、恶意网站屏蔽、隐私保护工具
##### anti-AD是综合著名广告过滤列表的高效广告屏蔽、隐私保护工具。能主动探测域名支持国内外广告分开屏蔽现已支持AdGuardHomednsmasq SurgePi-Hole等优秀的网络组件。
#### 4.0 changelog
#### v4.0 (2019.12.14)
- 开始支持检查无效域名,进一步降低最终生成文件的体积
- 分离国内域名和海外域名,可以选择不同屏蔽等级
- 分离出国内域名的精简配置(`dist/anti-ad-basic.conf`)和优化后的完整配置(`dist/anti-ad-full.conf`),可以选择不同等级了
- 代码重构工程化分离class分离工具逻辑更清晰
#### 3.0 changlog
- 严格匹配域名,增强生成列表的有效性
- 黑名单逻辑优化
- 重复域名剔除算法优化,进一步精简列表
- 代码bug修复
## 快速使用
1. 下载[adblock-for-dnsmasq.conf](https://raw.githubusercontent.com/gentlyxu/anti-AD/master/adblock-for-dnsmasq.conf) ([国内加速](https://anti-ad.oss-cn-shanghai.aliyuncs.com/adblock-for-dnsmasq.conf)), 保存到你的dnsmasq配置的正确目录下
### 1. dnsmasq
1. 下载[adblock-for-dnsmasq.conf](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/adblock-for-dnsmasq.conf) ([jsDelivr加速](https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/adblock-for-dnsmasq.conf)), 保存到你的dnsmasq配置的正确目录下
2. 重启dnsmasq服务
3. 已经生效了enjoy it
### 2. AdGuardHome
1. 进入AdGuardHome过滤器页面选择添加过滤器
2. 输入名称 `anti-AD`url地址`https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-easylist.txt`([jsDelivr加速](https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/anti-ad-easylist.txt))
3. 点击确认后即生效
### 3. Pi-Hole
1. 进入Pi-Hole的配置界面
2. 添加 `https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-easylist.txt`([jsDelivr加速](https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/anti-ad-easylist.txt)) 作为新的过滤器
3. 保存后生效
## jsDelivr镜像
感谢 [@rufengsuixing](https://github.com/rufengsuixing) 的建议
1. `adblock-for-dnsmasq.conf`: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/adblock-for-dnsmasq.conf
2. `anti-ad-easylist.txt`: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-easylist.txt
3. `anti-ad-surge.txt`: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-surge.txt
## 个性化
运行start.sh,会去下载easylist,yhosts,neohosts,cjxlist等其他大神维护的屏蔽列表然后整理合并成一个文件。拿着这个文件放入到例如/etc/dnsmasq.d/的目录下然后重启dnsmasq进程就能加载。更新依赖于其他大神的内容更新了。
* `adblock-for-dnsmasq.conf` - 这个是最终生成的配置文件大约每月更新4次,所以如果你打算直接下载我维护的这个文件不需要太高的pull频率
* `make-addr.php` - 是php脚本的主文件,执行php make-addr.php将更新配置文件
* `black_domain_list.php` - 是用来配置域名黑名单,这个威力巨大,谨慎使用
* `white_domain_list.php` - 白名单,优先级低于黑名单,即一个域名同时出现在黑白名单中时,将采用黑名单规则
* `block_domains.root.conf` - 这个文件是用来配置无论别人怎么更新,你都要保留的配置的,满足个性化需求,随心所欲。
* `lib/black_domain_list.php` - 是用来配置域名黑名单,这个威力巨大,谨慎使用
* `lib/white_domain_list.php` - 白名单,优先级低于黑名单,即一个域名同时出现在黑白名单中时,将采用黑名单规则
## 欢迎提意见

File diff suppressed because it is too large Load Diff

48315
anti-ad-easylist.txt Normal file

File diff suppressed because it is too large Load Diff

48316
anti-ad-surge.txt Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,5 @@
#个人特别要屏蔽的一些域名,不一定是广告域名
address=/msn.com/
address=/hm.baidu.com/
address=/conf.v.xunlei.com/
address=/kkpgv3.xunlei.com/
address=/rcgi.video.qq.com/
address=/report.qq.com/
address=/duote.com/
@ -26,11 +23,8 @@ address=/aginomoto.com/
address=/atianqi.com/
address=/moguv.com/
address=/kodmp.com/
address=/esw.dangbei.com/
address=/adash.m.taobao.com/
address=/update.ott.cp61.ott.cibntv.net/
address=/market.ott.cdn.cp61.ott.cibntv.net/
address=/tms.api.cp61.ott.cibntv.net/
address=/ads.data.cp61.ott.cibntv.net/
address=/dangbei.com/
address=/getui.net/
address=/gepush.com/
address=/logserver.ztjy61.cn/
address=/aliapp.org/

View File

@ -1,424 +0,0 @@
#TIME=20191214111257
#URL=https://github.com/gentlyxu/anti-AD
address=/uchaoqiang.top/
address=/0082tv.net/
address=/008844.cc/
address=/02123s.com/
address=/023hysj.com/
address=/025suyu.com/
address=/04zl.cn/
address=/0756j.com/
address=/0796gou.com/
address=/100fenlm.com/
address=/114lm.com/
address=/114yeah.com/
address=/116b.com/
address=/1188.com/
address=/12291.com/
address=/123hala.com/
address=/138lm.com/
address=/139site.com/
address=/176um.com/
address=/1kmb.cn/
address=/1x3x.com/
address=/217wo.com/
address=/235123.net/
address=/2898.com/
address=/2f.com/
address=/31365y.com/
address=/321tui.cn/
address=/321tui.com/
address=/3324.cn/
address=/333dm.com/
address=/7clink.com/
address=/88shu.cn/
address=/cnzz.net/
address=/adpush.cn/
address=/adsage.com/
address=/behe.com/
address=/icast.cn/
address=/miaozhen.com/
address=/openxt.cn/
address=/2345.com/
address=/hexun.com/
address=/dopa.com/
address=/dftoutiao.com/
address=/bsmakeup.com.cn/
address=/chinaqirun.cn/
address=/hihufu.cn/
address=/3393.com/
address=/778669.com/
address=/adk2x.com/
address=/adnxs.com/
address=/adsame.com/
address=/alimama.com/
address=/allyes.com/
address=/amazon-adsystem.com/
address=/fastclick.net/
address=/doubleclick.net/
address=/rubiconproject.com/
address=/smartadserver.com/
address=/zedo.com/
address=/admob.com/
address=/inmobi.com/
address=/advertising.com/
address=/51.la/
address=/cnzz.com/
address=/wrating.com/
address=/oadz.com/
address=/allyes.com.cn/
address=/admaster.com.cn/
address=/ok365.com/
address=/youmi.net/
address=/adwo.com/
address=/alimama.cn/
address=/appjiagu.com/
address=/mmstat.com/
address=/linezing.com/
address=/atdmt.com/
address=/adview.cn/
address=/flurry.com/
address=/adfuture.cn/
address=/cooguo.com/
address=/domob.cn/
address=/adsmogo.com/
address=/analysys.cn/
address=/umengcloud.com/
address=/umeng.co/
address=/umeng.com/
address=/appsflyer.com/
address=/authedmine.com/
address=/coin-hive.com/
address=/coinhive.com/
address=/igexin.com/
address=/tanx.com/
address=/inmobi.cn/
address=/51yes.com/
address=/crsspxl.com/
address=/imrworldwide.com/
address=/yiqifa.com/
address=/mob.com/
address=/wooboo.com.cn/
address=/ahksqc.com.cn/
address=/chengjie168.com.cn/
address=/jyzmsy.com.cn/
address=/chuanmen.mobi/
address=/qianyilamian.cn/
address=/jiaxinkang.cn/
address=/55.la/
address=/baifendian.com/
address=/banmamedia.com/
address=/cnzz.cn/
address=/aliapp.org/
address=/ddns.name/
address=/allyes.cn/
address=/dnset.com/
address=/tourstogo.us/
address=/barginginfrance.net/
address=/butlerelectricsupply.com/
address=/cruisingsmallship.com/
address=/frost-electric-supply.com/
address=/iptvdeals.com/
address=/011211.cn/
address=/013572.cn/
address=/020wujin.cn/
address=/0512pifa.com.cn/
address=/0591jiajiao.com.cn/
address=/1357902.cn/
address=/1haows.cn/
address=/4008813318.com.cn/
address=/431.red/
address=/43gw.cn/
address=/467.red/
address=/51juejinjie.com.cn/
address=/555vps.cn/
address=/58xiao.cn/
address=/77av.cn/
address=/77tianxu.cn/
address=/77vip.wang/
address=/7ssw.cn/
address=/7x-star.info/
address=/8020home.com.cn/
address=/805.red/
address=/815ss.cn/
address=/8pay.wang/
address=/964ka.cn/
address=/98hx.cn/
address=/aaayc.cn/
address=/abtao.wang/
address=/ahxhny.cn/
address=/aibantian.cn/
address=/aiia.xin/
address=/aiks.wang/
address=/aipu.mobi/
address=/aivento.cn/
address=/aiwenyisheng.mobi/
address=/aixintou.com.cn/
address=/amao.mobi/
address=/aup.mobi/
address=/baichuanbi.wang/
address=/barrister.org.cn/
address=/baseniao.com.cn/
address=/baxt.mobi/
address=/beiyu.xin/
address=/benniuluntai.cn/
address=/bjhjw.com.cn/
address=/blood23.cn/
address=/bzcjy.cn/
address=/calarm.info/
address=/callmewx.cn/
address=/cangshu.info/
address=/canwi.mobi/
address=/cdshusen.cn/
address=/cdxjt.mobi/
address=/chaoxianleather.ltd/
address=/chenyayun.com.cn/
address=/china-oxygen.cn/
address=/china99315.cn/
address=/chinae.mobi/
address=/chinapsj.com.cn/
address=/chinapulverizer.com.cn/
address=/chinaso.red/
address=/chinaxiedu.cn/
address=/codetips.wang/
address=/cqmjjx.cn/
address=/crystalmart.cn/
address=/cs-bailing.com.cn/
address=/cstmedia.com.cn/
address=/curtainsky.wang/
address=/cxlm.net.cn/
address=/cyp889.cn/
address=/cz4444.cn/
address=/dashantechan.cn/
address=/dat.red/
address=/dhouse.mobi/
address=/diaoguoshi.mobi/
address=/dinuojixie.com.cn/
address=/dnjj.mobi/
address=/dspack.com.cn/
address=/dzhss.cn/
address=/edmontonlife.info/
address=/eduace.com.cn/
address=/eyewand.cn/
address=/fadian.xin/
address=/fanjis.cn/
address=/fashion-hat.cn/
address=/fdkjt.cn/
address=/feiyun.info/
address=/fhfg.net.cn/
address=/fjs043.cn/
address=/fjs056.cn/
address=/forgot.mobi/
address=/freestudio.info/
address=/fy6x8o.cn/
address=/fzojq.info/
address=/getmos.cn/
address=/gjh111.cn/
address=/glnvdc.cn/
address=/gpscard.cn/
address=/greenprints.org.cn/
address=/gsgqwl.wang/
address=/gtlp.net.cn/
address=/gzjtfzs.cn/
address=/gzmcjt.cn/
address=/gzqczl.cn/
address=/gzsadlmy.cn/
address=/hanhooo.cn/
address=/haoduoyi1688.cn/
address=/haoeat.info/
address=/haoyangmao.ltd/
address=/haoyoushuo.cn/
address=/hbyinzhibao.cn/
address=/hccwwz.cn/
address=/heimi.red/
address=/helove.xyz/
address=/hktedu.site/
address=/hnwlyy.com.cn/
address=/hongze.info/
address=/hot-stories.cn/
address=/hskj88.cn/
address=/htnote.info/
address=/huanbao110.com.cn/
address=/huanbaoxiangmu.xyz/
address=/huangdao.info/
address=/huaqikonggu.com.cn/
address=/huaqiss.cn/
address=/huayiav.cn/
address=/huha.ink/
address=/huilian.info/
address=/hundun.mobi/
address=/hupuzhibo.cn/
address=/hygqtz.cn/
address=/hzdhr.cn/
address=/ib00.cn/
address=/imzhide.net.cn/
address=/iqyewu.cn/
address=/iyumiao.com.cn/
address=/japheth.com.cn/
address=/jbcbio.cn/
address=/jhbsq.cn/
address=/jingyixueyuan.cn/
address=/jinlanqiangyi.cn/
address=/jiuaixianzhi.mobi/
address=/jmait.cn/
address=/jmogo.cn/
address=/jnykjgs.cn/
address=/jpuv.cn/
address=/jqki.cn/
address=/jsjs.pro/
address=/judantech.site/
address=/jxqfu.cn/
address=/jxss88.mobi/
address=/kcvc.com.cn/
address=/kedeng.xin/
address=/king-oak.cn/
address=/kocom.mobi/
address=/kuaica.info/
address=/kuaidifeng.cn/
address=/l520.ltd/
address=/lafontainedessenterue.cn/
address=/lcr.kim/
address=/lcyt.info/
address=/ledian.pro/
address=/lightblue.red/
address=/lilangdianqi.cn/
address=/limkokwing-edu.cn/
address=/lindawei.cn/
address=/littlebee.site/
address=/liuguoyu.wang/
address=/lixincxy.cn/
address=/llanotextiles.cn/
address=/lningcity.com.cn/
address=/lnjseq.info/
address=/lnsbhzy.cn/
address=/lovecar.net.cn/
address=/lulumao.com.cn/
address=/lumeo.cn/
address=/luomanzhubao.cn/
address=/lvxingxian.cn/
address=/lwfw88.cn/
address=/lygnasa.cn/
address=/lytrjx.cn/
address=/lyzon.com.cn/
address=/meigeer.com.cn/
address=/menghuanzhilv.cn/
address=/mifun.mobi/
address=/murroliving.com.cn/
address=/myzhuanghe.cn/
address=/nankuan.xin/
address=/newweb.top/
address=/newwiesdom.com.cn/
address=/newzheng.cn/
address=/ngtraveler.com.cn/
address=/opai.red/
address=/opto-22.com.cn/
address=/oxi23.cn/
address=/pdiinfo.com.cn/
address=/pdsxp.cn/
address=/penglei.info/
address=/phjml.cn/
address=/pilipala.info/
address=/pszs388.cn/
address=/qhsyg.top/
address=/qianwei.wang/
address=/qichacha.ink/
address=/qincai.info/
address=/qishituan.top/
address=/qiyeit.com.cn/
address=/qkxlyg.cn/
address=/qmin.xin/
address=/qnvljz.info/
address=/qqwlfm.cn/
address=/qrtjwa.cn/
address=/samevay.com.cn/
address=/sapwells.info/
address=/scdcd333.cn/
address=/scfans.cn/
address=/scfw.wang/
address=/scifc.mobi/
address=/sdlzmm.cn/
address=/sdyongyan.com.cn/
address=/shanyi.info/
address=/shinedaily.cn/
address=/shkunjia.com.cn/
address=/shoujiawang.cn/
address=/shouyili.mobi/
address=/sjdjcn.cn/
address=/smart-way2.com.cn/
address=/smmx3.cn/
address=/sobin.wang/
address=/spreadable.com.cn/
address=/sscjchina.com.cn/
address=/steeltrader.com.cn/
address=/sunderport.com.cn/
address=/suntechauto.com.cn/
address=/sxjcjdc.cn/
address=/sxltfj.cn/
address=/szmpc.cn/
address=/taihe2002.cn/
address=/tanzhen.info/
address=/taogou.site/
address=/tastevision.cn/
address=/techkey.com.cn/
address=/tianhuicun.com.cn/
address=/titan-solar.cn/
address=/tkmly.cn/
address=/todayjiaxiang.cn/
address=/tradesoul.cn/
address=/tuoens.cn/
address=/txtxz.org.cn/
address=/udr26c.cn/
address=/uk8866.cn/
address=/vaniok.cn/
address=/vpkq.cn/
address=/wangjinhu.wang/
address=/wangzhichao.info/
address=/weilang.site/
address=/wimaxnetworks.cn/
address=/wojiacanting.info/
address=/wpe.red/
address=/wtorain.red/
address=/wucheng.info/
address=/wzfjsh.cn/
address=/wzhagc.cn/
address=/x1ka.cn/
address=/xcvf.info/
address=/xiaocai-rookie.info/
address=/xiaomeihq.info/
address=/xinshengchuanmei.cn/
address=/xinyikeji.red/
address=/xmglass.cn/
address=/xuexingkeji.cn/
address=/xxdlg.cn/
address=/xz518.cn/
address=/xztyzs.cn/
address=/yanhao.red/
address=/yaxujiancai.cn/
address=/ych168.cn/
address=/ycreateam.cn/
address=/ycx.kim/
address=/yglhcn.cn/
address=/ygpd.wang/
address=/yimingxiang.com.cn/
address=/yiqifaxian.wang/
address=/yiqiu.mobi/
address=/yisheng120.info/
address=/yizhongyi.info/
address=/ynyfcz.cn/
address=/yppw666.cn/
address=/yucefa.cn/
address=/yw78.cn/
address=/yybeast.mobi/
address=/zghs.net.cn/
address=/zgjckgys.com.cn/
address=/zhaowaibao.mobi/
address=/zhougong.info/
address=/zhuren.site/
address=/zioe.com.cn/
address=/ziyouxiaoyuan.cn/
address=/zq-hk.cn/
address=/zsdzcpw.mobi/
address=/zswhcsfww.mobi/
address=/zszgjiejuw.mobi/
address=/zzasj.cn/
address=/zzhssy.cn/

5689
dist/anti-ad-dnsmasq-basic.conf vendored Normal file

File diff suppressed because it is too large Load Diff

29097
dist/anti-ad-dnsmasq-full.conf vendored Normal file

File diff suppressed because it is too large Load Diff

5689
dist/anti-ad-easylist-basic.txt vendored Normal file

File diff suppressed because it is too large Load Diff

29097
dist/anti-ad-easylist-full.conf vendored Normal file

File diff suppressed because it is too large Load Diff

34360
dist/anti-ad-full.conf vendored

File diff suppressed because it is too large Load Diff

5690
dist/anti-ad-surge-basic.txt vendored Normal file

File diff suppressed because it is too large Load Diff

29098
dist/anti-ad-surge-full.txt vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@ -8,10 +8,11 @@
*
*
*/
!defined('ROOT_DIR') && die('Access Denied.');
class addressMaker {
const LINK_URL = 'https://github.com/privacy-protection-tools/anti-AD';
/**
* 分离域名
*
@ -37,8 +38,8 @@ class addressMaker {
$str_reg .= ')';
$str_reg .= '(\.cn|\.hk|\.tw|\.uk|\.jp|\.kr|\.th|\.au|\.ua|\.so|\.br|\.sg|\.pt|\.ec|\.ar|\.my|\.tr|\.bd|\.mk|\.za|\.mt)?)$/';
if(preg_match($str_reg, $str_domain, $matchs)){
return strval($matchs[1]);
if(preg_match($str_reg, $str_domain, $matches)){
return strval($matches[1]);
}
return "";
@ -73,15 +74,15 @@ class addressMaker {
continue;
}
if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*(image|third-party|script)?$/', $line, $matchs)){
if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)\^(\$([^=]+?,)?(image|third-party|script)(,[^=]+)?)?$/', $line, $matches)){
if(substr($matchs[1], 0, 4) == 'www.'){
$row = substr($matchs[1], 4);
if(substr($matches[1], 0, 4) == 'www.'){
$row = substr($matches[1], 4);
}else{
$row = $matchs[1];
$row = $matches[1];
}
$arr_domains[self::extract_main_domain($matchs[1])][] = $row;
$arr_domains[self::extract_main_domain($matches[1])][] = $row;
}
}
@ -96,7 +97,7 @@ class addressMaker {
*/
public static function get_domain_list($str_hosts){
$strlen = strlen($str_hosts);
if($strlen < 10){
if($strlen < 3){
return array();
}
@ -123,18 +124,22 @@ class addressMaker {
if(strpos($row[1], '.') === false){
continue;
}
$arr_domains[self::extract_main_domain($row[1])][] = $row[1];
}
return $arr_domains;
}
public static function write_to_conf($arr_result, $str_file){
private static function write_conf_header($fp, $header){
$header = str_replace('{DATE}', date('YmdHis'), $header);
$header = str_replace('{URL}', self::LINK_URL, $header);
return fwrite($fp, $header);
}
$fp = fopen($str_file, 'w');
$write_len = fwrite($fp, '#TIME=' . date('YmdHis') . "\n");
$write_len += fwrite($fp, '#URL=https://github.com/gentlyxu/anti-AD' . "\n");
public static function write_to_conf($arr_result, $formatObj){
$fp = fopen(ROOT_DIR . $formatObj['filename'], 'w');
$write_len = self::write_conf_header($fp, $formatObj['header']);
foreach($arr_result as $rk => $rv){
@ -143,7 +148,7 @@ class addressMaker {
}
if(empty($rk)){//遗漏的域名,不会写入到最终的配置里
// print_r($rv);
// print_r($rv);
continue;
}
@ -151,14 +156,14 @@ class addressMaker {
if(array_key_exists($rv, $GLOBALS['arr_whitelist'])){//单个域名的白名单检查
continue;
}
$write_len += fwrite($fp, 'address=/' . $rv . '/' . "\n");
$write_len += fwrite($fp, str_replace('{DOMAIN}', $rv, $formatObj['format']) . "\n");
continue;
}
$rv = array_unique($rv);
if(in_array('.' . $rk, $rv) || in_array('www.' . $rk, $rv) || in_array($rk, $rv)){
$write_len += fwrite($fp, 'address=/' . $rk . '/' . "\n");
$write_len += fwrite($fp, str_replace('{DOMAIN}', $rk, $formatObj['format']) . "\n");
continue;
}
@ -181,7 +186,7 @@ class addressMaker {
if(array_key_exists(implode('.', $tmp_arr2), $GLOBALS['arr_whitelist'])){
continue;
}
$write_len += fwrite($fp, 'address=/' . implode('.', $tmp_arr2) . '/' . "\n");
$write_len += fwrite($fp, str_replace('{DOMAIN}', implode('.', $tmp_arr2), $formatObj['format']) . "\n");
}
$written_flag = true;
break;
@ -194,7 +199,7 @@ class addressMaker {
}
$arr_written[] = $rvv;
$write_len += fwrite($fp, 'address=/' . $rvv . '/' . "\n");
$write_len += fwrite($fp, str_replace('{DOMAIN}', $rvv, $formatObj['format']) . "\n");
}
}

View File

@ -5,13 +5,15 @@
//对于个性化屏蔽的域名全部移动到block_domains.root.conf中管理
return array(
'f2pool.com' => array('openvpn.f2pool.com'),
'gepush.com' => array('gepush.com'),
'cnzz.com' => array('cnzz.com'),
'cnzz.net' => array('cnzz.net'),
'cnzz.cn' => array('cnzz.cn'),
'inmobi.cn' => array('inmobi.cn'),
'aliapp.org' => array('aliapp.org'),
'snssdk.com' => array('is.snssdk.com', 'bds.snssdk.com'),
'qq.com' => array('bugly.qq.com', 'openmsf.3g.qq.com'),
'snssdk.com' => array('is.snssdk.com', 'bds.snssdk.com', 'xlog.snssdk.com'),
'qq.com' => array('bugly.qq.com', 'openmsf.3g.qq.com', 'mtrace.qq.com', 'btrace.qq.com', 'mark.l.qq.com'),
'analysys.cn' => array('analysys.cn'),
'aliyuncs.com' => array('log.aliyuncs.com'),
'mob.com' => array('mob.com'),
@ -29,7 +31,6 @@ return array(
'2345.com' => array('2345.com'),
'51.la' => array('51.la'),
'55.la' => array('55.la'),
'778669.com' => array('778669.com'), //恶意网站
'ddns.name' => array('ddns.name'),
'7clink.com' => array('7clink.com'),
'88shu.cn' => array('88shu.cn'),
@ -92,6 +93,31 @@ return array(
'baidu.com' => array('tuisong.baidu.com'),
'youdao.com' => array('corp.youdao.com'),
'crsspxl.com' => array('crsspxl.com'),
'xiaomi.com' => array(
'data.mistat.intl.xiaomi.com',
'data.mistat.xiaomi.com',
'o2o.api.xiaomi.com',
'adv.sec.intl.miui.com',
'adv.sec.miui.com',
'api.ad.intl.xiaomi.com',
'api.ad.xiaomi.com'
),
'miui.com' => array('hot.browser.intl.miui.com'),
'yuncheapp.cn' => array('client-log.yuncheapp.cn'),
'mop.com' => array('motionlog.mop.com', 'ydadyunkong.mop.com', 'log.mop.com'),
'amap.com' => array('logs.amap.com'),
'tt114.net' => array('tt114.net'),
'ip138.com' => array('api.ip138.com', 'cache.ip138.com'),
'taobao.com' => array('ip.taobao.com', 'fourier.taobao.com'),
'aiclk.com' => array('aiclk.com'),
'5ubei.com' => array('5ubei.com'),
'jpush.cn' => array('jpush.cn'),
'jpush.io' => array('jpush.io'),
'jiguang.cn' => array('jiguang.cn'),
'getui.com' => array('getui.com'),
'getui.net' => array('getui.net'),
'ebjvu.cn' => array('ebjvu.cn'),
'jumei.com' => array('adxapi.jumei.com', 'sd.int.jumei.com', 'sd.jumei.com'),
'011211.cn' => array('.011211.cn'),
'013572.cn' => array('.013572.cn'),
@ -405,4 +431,4 @@ return array(
'zszgjiejuw.mobi' => array('.zszgjiejuw.mobi'),
'zzasj.cn' => array('.zzasj.cn'),
'zzhssy.cn' => array('.zzhssy.cn'),
);
);

View File

@ -11,7 +11,10 @@ return array(
'b.bdstatic.com' => true,
'googleadapis.l.google.com' => true, //解决google字体下载异常
'gstaticadssl.l.google.com' => true, //解决google字体下载异常
'gvt10.com' => true,
'gvt1.com' => true,
'gvt2.com' => true,
'gvt3.com' => true,
'wangbase.com' => true,
'l.qq.com' => true, //解决腾讯视频无法播放
'g.csdnimg.cn' => true, //csdn阅读更多

View File

@ -0,0 +1,36 @@
<?php
/**
* 定义输出格式
*
*
*/
!defined('ROOT_DIR') && die('Access Denied.');
class writerFormat{
/*dnsmasq支持格式的屏蔽广告列表*/
const DNSMASQ = array(
'format' => 'address=/{DOMAIN}/',
'header' => "#TIME={DATE}\n#URL={URL}\n",
'name' => 'dnsmasq',
'filename' => 'adblock-for-dnsmasq.conf'
);
/*easylist 兼容格式的屏蔽广告列表*/
const EASYLIST = array(
'format' => '||{DOMAIN}^',
'header' => "#TIME={DATE}\n#URL={URL}\n",
'name' => 'easylist',
'filename' => 'anti-ad-easylist.txt'
);
/*Surge 兼容格式的屏蔽广告列表*/
const SURGE = array(
'format' => 'DOMAIN-SUFFIX,{DOMAIN},REJECT',
'header' => "#TIME={DATE}\n#URL={URL}\n[RULE]\n",
'name' => 'surge',
'filename' => 'anti-ad-surge.txt'
);
/*and etc...*/
}

View File

@ -9,43 +9,37 @@
*
*/
define('ROOT_DIR', __DIR__ . '/');
set_time_limit(600);
error_reporting(0);
if(PHP_SAPI != 'cli'){
die('nothing.');
}
require('./lib/addressMaker.class.php');
$arr_blacklist = require('./lib/black_domain_list.php');
$arr_whitelist = require('./lib/white_domain_list.php');
require ROOT_DIR . 'lib/writerFormat.class.php';
require ROOT_DIR . 'lib/addressMaker.class.php';
$arr_blacklist = require ROOT_DIR . 'lib/black_domain_list.php';
$arr_whitelist = require ROOT_DIR . 'lib/white_domain_list.php';
$arr_result = array();
$easylist = file_get_contents('./origin-files/base-src-easylist.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_from_easylist($easylist));
$easylist1 = file_get_contents('./origin-files/easylistchina+easylist.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_from_easylist($easylist1));
$easylist2 = file_get_contents('./origin-files/cjx-annoyance.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_from_easylist($easylist2));
$easylist3 = file_get_contents('./origin-files/fanboy-annoyance.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_from_easylist($easylist3));
$host1 = file_get_contents('./origin-files/hosts1');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($host1));
$host2 = file_get_contents('./origin-files/hosts2');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($host2));
$host3 = file_get_contents('./origin-files/hosts3');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($host3));
$hosts = file_get_contents('./origin-files/base-src-hosts.txt');
$arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($hosts));
$arr_result = array_merge_recursive($arr_result, $arr_blacklist);
echo 'Written file size:';
echo addressMaker::write_to_conf($arr_result, './adblock-for-dnsmasq.conf', 'q-filter.conf');
$reflect = new ReflectionClass('writerFormat');
$formatterList = $reflect->getConstants();
$arr_output = array();
foreach ($formatterList as $name => $formatObj){
$arr_output[] = '['. $name . ']' . addressMaker::write_to_conf($arr_result, $formatObj);
}
echo implode('---', $arr_output);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
[Adblock Plus 2.0]
! Version: 201912121331
! Version: 201912171906
! Title: CJX's Annoyance List
! Last modified: 2019/12/12 13:31 +0800
! Last modified: 2019/12/17 19:06 +0800
! Expires: 4 days (update frequency)
! Homepage: http://abpchina.org/forum/forum.php?mod=viewthread&tid=29667
!
@ -26,6 +26,7 @@
/z.zolapp.
=Ad_ZPlusGoods&
!------------------------General element hiding rules-------------------------!
##.siteAnn1
###SOHU_MAIN > .module-cmt-float-bar
###appBottomIn
###appIn
@ -315,7 +316,6 @@
||china.cn/js/common/daniel_pop/
||chinaacc.com/lamu/*dl-
||chinaacc.com/lamu/*piao
||zol.com.cn/js/ask/ask.js
||xhd.cn/topic/leyu-piaofu/
||zol.com.cn/index.php?c=Api_JumpApi&
||jjwxc.net/adsmanage.
@ -351,7 +351,6 @@
||28.com/public/js/w3c_float.js
||chinaacc.com/upload/js/cia_mjy_pf/
||kmf.com/da/do
||autohome.com.cn/Topic/RobotVideo?
||daiyanbao.com/flash/md
||banzou.name/qq/qq2.js
||baidu.com/se/static/wiseatom/banner/pack_
@ -365,6 +364,11 @@
||baidu.com/xpage/form/getform?id=wk_pc_skin
||bdimg.com^*/popOperationView_*.js
!------------------------Specific element hiding rules------------------------!
csdn.net##.blog-column-pay
qidian.com,~game.qidian.com##A[href*="game.qidian.com"]
zuhaowan.com##.zhw-bottom-ad
tmtpost.com##.open-app
kuman.com##.guide-download-footer-box
baidu.com##.guidetowkOperationwg-root
hamibook.com.tw##.custom-banners-cycle-slideshow
zmz2019.com##.corner > LI > A[href="http://hd.zmz2019.com/"]

View File

@ -1,7 +1,7 @@
[Adblock Plus 2.0]
! Version: 201912130416
! Version: 201912190207
! Title: Fanboy's Annoyance List
! Last modified: 13 Dec 2019 04:16 UTC
! Last modified: 19 Dec 2019 02:07 UTC
! Expires: 4 days (update frequency)
! License: http://creativecommons.org/licenses/by/3.0/
! Please report any unblocked content or problems by email or in our forums
@ -101,6 +101,7 @@
/recommendations-widget/*
/sailthru-
/sailthru/*
/script/snow.js
/show-join-email.jsonp?
/signup_widget.js
/signup_widget.min.js
@ -1371,6 +1372,7 @@ _backToTop.
/facebookred.
/facebookShare-
/facebookshare.
/facebooksharebutton.
/FacebookShares?
/facebooksmall2.
/facebooksocialplugins.
@ -2156,6 +2158,7 @@ _backToTop.
/instagram-icon.
/instagram-logo-
/instagram-logo.
/instagram-widget-
/instagram.svg
/instagram1.gif
/instagram_48.
@ -3980,6 +3983,7 @@ _youtube_social_
/consent-manager.js
/consent.min.js?
/consent/manager/*$script
/consent/message.js
/consentUI/*
/cookie-accept.js
/cookie-alert.
@ -4098,6 +4102,7 @@ _youtube_social_
/cookieaccept.
/CookieAccept/*
/cookieacceptance.
/cookieAgree.
/cookiealert.
/CookieAlertBootStrapper.
/cookiebadge.
@ -4279,6 +4284,7 @@ _youtube_social_
/custom/cookies.
/dc-cookie-
/dg-cookie.
/didomi.js
/disagreeCookie.
/dist/gdpr-
/divascookies_
@ -4386,6 +4392,7 @@ _youtube_social_
/hi-cookie-
/homepage-cookie-
/i_CookieConsent.
/iab-vendorlist.
/ibeugdpr.
/icit-cookie-law/*
/ico.cookie.
@ -4465,6 +4472,7 @@ _youtube_social_
/privacy-banner.
/privacy-bar/*
/privacy-consent-$script
/privacy-cookie.
/privacy-cookies.js
/privacy-manager.js
/privacy-modal.js
@ -4543,6 +4551,7 @@ _youtube_social_
/type-cookies.
/ubmcookieconsent-
/uecomscore_cmp.
/uk-cookie-
/ukcookie.
/um-gdpr.
/uploads/GDPR-
@ -4571,6 +4580,7 @@ _youtube_social_
/XCookieConsent.
/z7_cookiemanager.
/zdconsent.
/zebra_cookie.
=cookie-overlay/
?getCookieConsent=
_alert_cookie/
@ -6365,6 +6375,7 @@ _site_cookie_
##.newsletter-call-to-action
##.newsletter-callout
##.newsletter-capture
##.newsletter-card
##.newsletter-center-form
##.newsletter-col
##.newsletter-compact
@ -6982,6 +6993,7 @@ _site_cookie_
! wix sites
###WIX_ADS
! ---------- Push Notifications ----------
###NotificationsAskMsg
###SubscribePush
###SubscribePushNotificationPanel
###Znotify_Prompt
@ -7417,6 +7429,7 @@ _site_cookie_
###buttonScrollTop
###category-page-back-to-top
###cb-to-top
###cw_to_top
###divGoTop
###div_gotop_outer
###dynamic-to-top
@ -7515,16 +7528,17 @@ _site_cookie_
###scrollup:not(body)
###scrollup_button
###site-scroll-top
###siteBackToTop_small_box
###spnGoTop
###sticky-back-to-top
###sttotop
###tab-to-top
###theme-go-to-top
###to-the-top
###to-top
###to-top-button
###to-top-container
###to-top-link
###to-top:not(body)
###toPagetop
###toTo_button
###toTop
@ -7546,6 +7560,7 @@ _site_cookie_
###uix_jumpToTopFixed
###ultra-go-top
###up_scroll_arrow
###volver-arriba
###w2b-StoTop
###wp-smooth-scroll
###wpfront-scroll-top-container
@ -7666,6 +7681,7 @@ _site_cookie_
##.fi-back-to-top
##.fjs-scroll-to-top
##.fk-ui-goTop
##.fk_siteBackToTop
##.footer--scrolltop
##.footer-back-to-top
##.footer-back-top
@ -8475,6 +8491,7 @@ _site_cookie_
###desktop-share-wrapper
###desktop-social-buttons
###detailHeadlineStickySocial
###details-share-icon-link
###dhSocial
###diaspora-button-container
###digg-widget
@ -16019,6 +16036,7 @@ _site_cookie_
##.post-share-panel
##.post-share-pt
##.post-share-row
##.post-share-toolbar
##.post-share-twitter
##.post-share-widget
##.post-sharebox
@ -16746,6 +16764,7 @@ _site_cookie_
##.share-tw
##.share-twitter
##.share-twitter-icon
##.share-via-facebook
##.share-viber
##.share-video
##.share-video-link
@ -22179,6 +22198,7 @@ _site_cookie_
###consentAccepted
###consentBanner
###consentBar
###consentComponentContainer
###consentContainer
###consentCookieDiv
###consentDialog
@ -25257,6 +25277,7 @@ _site_cookie_
###infocookies
###inforCookieWallPopup
###inforcwp
###inform-cookies
###informacionSobreCookies
###informacja-o-cookies
###informacjaOCiasteczkach
@ -25735,6 +25756,7 @@ _site_cookie_
###nld_cookies
###no-cookie
###no-cookie-doorkeeper
###noConsentAlertModal
###nocookie
###nocookieaktiv
###non-blocking-consent-notification
@ -27506,6 +27528,7 @@ _site_cookie_
##.c-floating.c-window
##.c-fnd-cookie-acceptance
##.c-footer__cookies
##.c-gdprbar
##.c-headband-cookies
##.c-info--cookie
##.c-info-bar.-cookies
@ -30611,6 +30634,7 @@ _site_cookie_
##.oly-web-ui_cookie-container
##.om-cookie-agreement
##.omnium_cookies_popup_wrapper
##.on.cookie
##.once-upon-ga-consent
##.one-alert--cookie
##.oneindia-cookie-notification
@ -32631,6 +32655,7 @@ _site_cookie_
||mediafire.com/images/backgrounds/download/*promo
||mg.co.za^*/iabsa_
||moneytalksnews.com/wp-content/themes/mtn/assets/js/mtn-modal.$script
||moviespur.pw/tabtest.php
||netdna-cdn.com/wp-content/plugins/omg-magnific/magnific.min.js?$domain=omgchrome.com
||newegg.com/newegg/survey/
||newyorker.com^*/failsafe/
@ -33908,6 +33933,7 @@ aig.co.uk###policyMessage
ign.com###policyNotice
slate.com###policy_announcement
macys.com###pollingWidget
gamecodeur.fr###pop-last-user-glob
thenextweb.com###pop-up
techpresident.com###pop1
break.com###popInModule-sigma
@ -34893,7 +34919,7 @@ core77.com##.fade_in
realitypod.com##.fan_box
definitelydiy.com,foodbabe.com,indexwp.com,panampost.com,pet.co.nz,rangerup.com,usnews.com,vocativ.com,whenonearth.net##.fancybox-overlay
clientsfromhell.net,definitelydiy.com,foodbabe.com,indexwp.com,panampost.com,psdisasters.com,rangerup.com,trailspace.com,usnews.com,vocativ.com,whenonearth.net##.fancybox-wrap
webmd.com##.fb
moviespur.pw,webmd.com##.fb
slideshare.net##.fb-global-msg-container
hotair.com##.fb-header
pcworld.com##.fb-login
@ -36578,6 +36604,7 @@ classic-trader.com##.cui-lightbox
classic-trader.com##.cui-lightbox-container
classic-trader.com##.cui-overlay-shape
thenation.com##.current-issue
thewirecutter.com##.d2db3d8f
qz.com##.daily-brief-inline
iol.co.za##.daily-news-signup-form
onlymyhealth.com##.daily-wellness
@ -36799,7 +36826,7 @@ weta.org##.news_signup
la-croix.com##.news_w_02
newsbtc.com##.newsform
dnaindia.com##.newsletTab
2gb.com,9to5mac.com,aawsat.com,about.com,algemeiner.com,antlionaudio.com,apracticalwedding.com,arab24.com,arabnews.com,atimes.com,atlantadailyworld.com,autoguide.com,automotive-fleet.com,autoweek.com,bostonmagazine.com,brooklynbased.com,businessfleet.com,cheapies.nz,chicagodefender.com,clickhole.com,cnet.com,completesportsnigeria.com,complex.com,computerworld.com,consumerreports.org,csoonline.com,defensenews.com,designntrend.com,digiday.com,discoverymedia.com,egyptiangazette.net.eg,elpais.com,emirates247.com,engadget.com,epicurious.com,essentialbaby.com.au,essentialkids.com.au,euractiv.com,eventfinda.co.nz,fashionotes.com,fivethirtyeight.com,fleetfinancials.com,geek.com,gizchina.com,goodfood.com.au,goodnet.org,government-fleet.com,grantland.com,graziadaily.co.uk,greatbritishchefs.com,greenbot.com,guyism.com,haaretz.com,hdwallpapers.in,healthday.com,hellomagazine.com,higherperspectives.com,hightimes.com,hodinkee.com,hottopics.ht,huffingtonpost.com,indypendent.org,infoq.com,infoworld.com,investopedia.com,israeltoday.co.il,itechpost.com,itworld.com,javaworld.com,jewishjournal.com,jns.org,jstor.org,kpfa.org,lctmag.com,life.com,lifehack.org,maplin.co.uk,maritimejobs.com,massivesci.com,maxim.com,michiganchronicle.com,muckrock.com,multichannel.com,muslimnews.co.uk,nationalinterest.org,ndtv.com,nerve.com,networkworld.com,newframe.com,newpittsburghcourier.com,newrepublic.com,newsdeeply.com,npr.org,nymag.com,out-law.com,paidcontent.org,pbs.org,peoplesworld.org,piriform.com,pomade.com,popdust.com,presstv.com,propublica.org,psfk.com,recombu.com,redsharknews.com,revealnews.org,rsf.org,rumorfix.com,schoolbusfleet.com,screencrush.com,silicon.co.uk,singularityhub.com,slate.com,speedcafe.com,stylecaster.com,swingbyswing.com,talkandroid.com,techbeat.com,techly.com.au,techtimes.com,the-star.co.ke,thebaffler.com,thedailybeast.com,thedrinknation.com,theepochtimes.com,themeshreport.com,thenevadaindependent.com,thenextweb.com,theregister.co.nz,theregister.co.uk,thetruthaboutcars.com,topdocumentaryfilms.com,travelweekly.com,truckinginfo.com,truthdig.com,tvquran.com,twice.com,twitchy.com,variety.com,vice.com,vulture.com,weeklystandard.com,wgnamerica.com,wikitribune.com,worktruckonline.com,yahoo.com##.newsletter
2gb.com,9to5mac.com,aawsat.com,about.com,algemeiner.com,antlionaudio.com,apracticalwedding.com,arab24.com,arabnews.com,atimes.com,atlantadailyworld.com,autoguide.com,automotive-fleet.com,autoweek.com,bostonmagazine.com,brooklynbased.com,businessfleet.com,cheapies.nz,chicagodefender.com,clickhole.com,cnet.com,completesportsnigeria.com,complex.com,computerworld.com,consumerreports.org,csoonline.com,defensenews.com,designntrend.com,digiday.com,discoverymedia.com,elpais.com,emirates247.com,engadget.com,epicurious.com,essentialbaby.com.au,essentialkids.com.au,euractiv.com,eventfinda.co.nz,fashionotes.com,fivethirtyeight.com,fleetfinancials.com,geek.com,gizchina.com,goodfood.com.au,goodnet.org,government-fleet.com,grantland.com,graziadaily.co.uk,greatbritishchefs.com,greenbot.com,guyism.com,haaretz.com,hdwallpapers.in,healthday.com,hellomagazine.com,higherperspectives.com,hightimes.com,hodinkee.com,hottopics.ht,huffingtonpost.com,indypendent.org,infoq.com,infoworld.com,investopedia.com,israeltoday.co.il,itechpost.com,itworld.com,javaworld.com,jewishjournal.com,jns.org,jstor.org,kpfa.org,lctmag.com,life.com,lifehack.org,maplin.co.uk,maritimejobs.com,massivesci.com,maxim.com,michiganchronicle.com,muckrock.com,multichannel.com,muslimnews.co.uk,nationalinterest.org,ndtv.com,nerve.com,networkworld.com,newframe.com,newpittsburghcourier.com,newrepublic.com,newsdeeply.com,npr.org,nymag.com,out-law.com,paidcontent.org,pbs.org,peoplesworld.org,piriform.com,pomade.com,popdust.com,presstv.com,propublica.org,psfk.com,recombu.com,redsharknews.com,revealnews.org,rsf.org,rumorfix.com,schoolbusfleet.com,screencrush.com,silicon.co.uk,singularityhub.com,slate.com,speedcafe.com,stylecaster.com,swingbyswing.com,talkandroid.com,techbeat.com,techly.com.au,techtimes.com,the-star.co.ke,thebaffler.com,thedailybeast.com,thedrinknation.com,theepochtimes.com,themeshreport.com,thenevadaindependent.com,thenextweb.com,theregister.co.nz,theregister.co.uk,thetruthaboutcars.com,topdocumentaryfilms.com,travelweekly.com,truckinginfo.com,truthdig.com,tvquran.com,twice.com,twitchy.com,variety.com,vice.com,vulture.com,weeklystandard.com,wgnamerica.com,wikitribune.com,worktruckonline.com,yahoo.com##.newsletter
foodandwine.com,golf.com,health.com,realsimple.com,southernliving.com,travelandleisure.com##.newsletter-callout
alarabiya.net,businesstimes.com.sg,commondreams.org,economist.com,foxnews.com,techly.com.au,thefiscaltimes.com##.newsletter-form
beinsports.com##.newsletter-header
@ -37178,7 +37205,7 @@ irusa.org###slide_top
oneplus.com###sticky-tools-btn
bbgsite.com###tipGoTop
popmythology.com###toTop
bd.com,howtogermany.com,liveleak.com###top
bd.com,howtogermany.com,livelaw.in,liveleak.com###top
staradvertiser.com###top-anchor
angelshack.co.za,motorscribes.com###top-link
countdown.co.nz,crime-stoppers.org###top-link-block
@ -39188,15 +39215,15 @@ mtn.co.za##.Toast
6abc.com,abc11.com,abc13.com,abc30.com,abc7.com,abc7chicago.com,abc7news.com,abc7ny.com##.Tooltip
hiberworld.com##._1u7AkTjy
tunnelmb.net##._23LkM
thewirecutter.com##._25c8f525
911tabs.com##._29v-t
dreamhack.com##._2IIiex-CsxtuW7QGZ_oO5z
cnn.com##._2dc7d020
reddit.com##._3q-XSJ2vokDQrvdG6mR__k
thewirecutter.com##._5ce4f1c1
instagram.com##._he402
sunweb.co.uk##.absolute-dialog
greenfields.eu##.accept-alert
akeebabackup.com,imunify360.com,luxos.com,v-tac.eu##.activebar-container
akeebabackup.com,imunify360.com,luxos.com,reshade.me,v-tac.eu##.activebar-container
ticketmaster.ca##.agree-terms
adata.com,ahlulbayt.tv,altervista.org,askdifference.com,asklion.co.uk,bankid.com,cfainstitute.org,convert-my-image.com,costaclub.com,efinancialcareers.com,hattrick.org,kenweego.com,lawyersonline.co.uk,lifescience.net,linkedin.com,lonelyplanet.com,m-a.org.uk,nature.com,netweather.tv,norwegian.com,pozyx.io,supercell.com,theonlinesurgery.co.uk,tindie.com,ukpressonline.co.uk,vernemq.com,viewsonic.com,viewsoniceurope.com,youngsseafood.co.uk##.alert
espn.com##.alert--fixed
@ -39273,7 +39300,7 @@ antoineonline.com##.container-overlay
deezer.com##.cookie-banner
theatlantic.com##.cookie-disclaimer
bitfeed.co##.cookiebanner
amnesty.org,asda.com,ashridge.org.uk,auto1.fi,auto10.com,belivehotels.com,chemistdirect.co.uk,cineworld.co.uk,coinbase.com,consumeraffairs.org.uk,crytek.com,custplace.com,dorotheum.com,dur.ac.uk,egyptair.com,eirsport.ie,enable-javascript.com,feelunique.com,forsettlement.com,grandvision.com,graspop.be,guggenheim-bilbao.eus,hmv.com,hotel-spider.com,inagrm.com,indepth.dev,luxottica.com,mabanque.bnpparibas,macpaw.com,mailjet.com,mannheimerswartling.se,medela.co.uk,mindshareworld.com,mindswarms.com,ostrog.com,pjon.org,playgwent.com,proton.com,renaultbryanston.co.za,renaultfourways.co.za,royalparks.org.uk,scamner.com,stuttafordvanlines.co.za,tescomobile.ie,testeri.fi,thenottingham.com,threadreaderapp.com,topographic-map.com,twinings.co.uk,ukcisa.org.uk,ukmail.com,umicore.com,unian.info,unknownphone.com,uptodown.com,urtekram.com,vizologi.com,volvocars.com,warhammerchampions.com,wilko.com,wizards.com##.cookies
amnesty.org,asda.com,ashridge.org.uk,auto1.fi,auto10.com,belivehotels.com,chemistdirect.co.uk,cineworld.co.uk,coinbase.com,consumeraffairs.org.uk,crytek.com,custplace.com,dorotheum.com,dur.ac.uk,egyptair.com,eirsport.ie,enable-javascript.com,feelunique.com,forsettlement.com,grandvision.com,graspop.be,guggenheim-bilbao.eus,hmv.com,hotel-spider.com,inagrm.com,indepth.dev,luxottica.com,mabanque.bnpparibas,macpaw.com,mailjet.com,mannheimerswartling.se,medela.co.uk,mindshareworld.com,mindswarms.com,ostrog.com,perfumesclub.co.uk,perfumesclub.com,pjon.org,playgwent.com,proton.com,renaultbryanston.co.za,renaultfourways.co.za,royalparks.org.uk,scamner.com,stuttafordvanlines.co.za,tescomobile.ie,testeri.fi,thenottingham.com,threadreaderapp.com,topographic-map.com,twinings.co.uk,ukcisa.org.uk,ukmail.com,umicore.com,unian.info,unknownphone.com,uptodown.com,urtekram.com,vizologi.com,volvocars.com,warhammerchampions.com,wilko.com,wizards.com##.cookies
austrian.com,austrianairlines.ag,austriantechnik.at##.cop
semanticscholar.org##.copyright-banner
bandcamp.com##.corp-banners
@ -39643,6 +39670,7 @@ smallseotools.com###cookie-bar
eteknix.com###cookie-law-info-bar
depositfiles.com,depositfiles.org,dfiles.eu,dfiles.ru###cookie_popup
tweaktown.com###cookies_footer_sec
shirtsofcotton.com###udtDark
bild.de,welt.de##.as-oil
icq.com##.ca_wrap
mirror.co.uk##.captify-iframe
@ -40617,7 +40645,7 @@ nnews.mk.co.kr##div[style="width: 525px; border:1px solid #ddd; border-radius: 3
||radioseoul1650.com^*/nav_top.
||sedaily.com^*/btn_top_
!
! ---------- Israeli Site Specific Hiding Rules ----------
! ---------- Hebrew Site Specific Hiding Rules ----------
!
calcalist.co.il###CornerPromotionDiv
globes.co.il###GTV_VideoDetails
@ -40641,6 +40669,7 @@ mouse.co.il##.mouseExtraContent
bizportal.co.il##.promoted-article
auto.co.il##.searchbtn
tapuz.co.il##.tapuzShareBar
wheel.co.il##.xbFootNewsForm
onlife.co.il##div[style="height:264px; background-color:white;width: 300px; float: left;margin-bottom:0px;"]
walla.co.il##div[style="margin-top:10px;margin-bottom:10px;"]
!
@ -41598,7 +41627,7 @@ schmidtnorm.at##.col-12 > div > div > .container
diebayerische.de,fanbike.de##.consent
usz.ch##.consentManagement
borgware.de,buffalo.de,daparto.de,del.org,donaukurier.de,matratzen-concord.de,model-kartei.de,pyur.com,signal-iduna.de,spartanien.de,starcar.de,unumotors.com##.cookie
capcom-germany.de,dtstudyclub.de,insel-sylt.de,medela.de,reifenlehmann.de,selfhost.de,spie.de##.cookies
capcom-germany.de,dtstudyclub.de,insel-sylt.de,medela.de,parfumsclub.de,reifenlehmann.de,selfhost.de,spie.de##.cookies
hilzingen.de,wurmberg.de##.datenschutz
die-linke.de,dielinke.berlin,lexus.at,lexus.de##.disclaimer
jobscout24.ch##.disclaimer-message
@ -41758,7 +41787,7 @@ runinreims.com##.confidentialite
planeteanimal.com,toutcomment.com##.consent
lirelactu.fr##.container-0-5
eco-systemes.fr,ffr.fr,midilibre.fr,quelpneu.com,sudouest.fr,tv7.com##.cookie
118000.fr,adrea.fr,bpost.be,citus-kalix.fr,clique.tv,communauto.com,comparateur-energie.be,cuisineaz.com,degrouptest.com,epresse.fr,info-retraite.fr,intermarche.be,o2recrute.fr,ouestjob.com,parisjob.com,previssima.fr,service-public.fr,stb.com.tn,wemystic.fr,xxe.fr##.cookies
118000.fr,adrea.fr,bpost.be,citus-kalix.fr,clique.tv,communauto.com,comparateur-energie.be,cuisineaz.com,degrouptest.com,epresse.fr,info-retraite.fr,intermarche.be,o2recrute.fr,ouestjob.com,parisjob.com,perfumesclub.fr,previssima.fr,service-public.fr,stb.com.tn,wemystic.fr,xxe.fr##.cookies
creavea.com##.creavea-banner-cookie-consent
lexus.fr##.disclaimer
molotov.tv##.eRnhI
@ -41780,7 +41809,7 @@ symfrance.com##.policy-window
nh-hotels.fr##.politicaRewards
mesampoulesgratuites.fr##.popup
huffingtonpost.fr##.popup-overlay
explicite.info##.privacy
directours.com,explicite.info##.privacy
stihl.fr##.privacyTop
burgerking.fr##.sc-hGoxap
magasinsdeco.fr,recreatisse.com##.spu-bg
@ -41888,7 +41917,7 @@ lsb.dk###notificationBar
jobfinder.dk###sliding-popup
tv2.dk##.CookieWarning_container__1Lmss
santashop.dk##.center-notice
cembrit.dk,conferencemanager.dk,denstoredanske.dk,djurssommerland.dk,madsnorgaard.com,ruc.dk,sportmaster.dk##.cookie
cembrit.dk,conferencemanager.dk,denstoredanske.dk,djurssommerland.dk,kitchentime.dk,madsnorgaard.com,ruc.dk,sportmaster.dk##.cookie
kalfor.dk##.cookies
netdyredoktor.dk##.ct-inner
ritzau.dk##.footer__notification
@ -41948,7 +41977,7 @@ vergelijk.nl##.cg-82
vergelijk.nl##.cg-97
wehkamp.nl##.color-invert.font-size-small
avans.nl,dirk.nl,dutchcarparts.nl,greve.nl,schiphol.nl,t-mobile.nl,utilities.nl##.cookie
nederlandsebrouwers.nl,omaweetraad.nl,omdenken.nl,salusi.nl,universiteitleiden.nl##.cookies
nederlandsebrouwers.nl,omaweetraad.nl,omdenken.nl,perfumesclub.nl,salusi.nl,universiteitleiden.nl##.cookies
opisopvoordeelshop.nl##.cv-notifier-container-item
thermostaat.eu##.fancybox-overlay
aalst.be##.footer-notification
@ -41988,9 +42017,8 @@ pihlajalinna.fi###root > div[aria-live="polite"][role="alert"]
satakunnanautotalo.fi##.AVS-evasteseloste-container
kulttuurivihkot.fi##.activebar-container
americanairlines.fi##.alert
sonera.fi##.attention-notice
vismasign.fi##.banner
sonera.fi##.bottom-notifications
happypancake.fi##.bar.jsx-341223085
hs.fi##.cb-container
vertaa.fi##.cg-89.cg-97
jenkki.fi##.container-agree
@ -42180,7 +42208,7 @@ mivoq.it##.check-policy
frateindovino.eu##.cn-wrapper
leroymerlin.it##.consent-section
aeroporto.catania.it,aeroportoditorino.it,botfactory.info,credem.it,dynamicasrl.com,emi.it,giunti.it,inpgi.it,mauroblasi.it,missingvideo.com,pampers.it,peugeot.it,telepace.it##.cookie
bottegaverde.it,cerutti.it,dehoniane.it,e-glossa.it,ebayextra.it,esso.it,fluorsidgroup.com,fondazionehenraux.it,gatorade.it,gogedizioni.it,ilbestiariorivista.it,italotreno.it,lintellettualedissidente.it,radioitalia.it,rivistacontrasti.it,saint-gobain.it,tirrenia.it,tivu.tv,tivusat.tv,walliance.eu##.cookies
bottegaverde.it,cerutti.it,dehoniane.it,e-glossa.it,ebayextra.it,esso.it,fluorsidgroup.com,fondazionehenraux.it,gatorade.it,gogedizioni.it,ilbestiariorivista.it,italotreno.it,lintellettualedissidente.it,perfumesclub.it,radioitalia.it,rivistacontrasti.it,saint-gobain.it,tirrenia.it,tivu.tv,tivusat.tv,walliance.eu##.cookies
e-coop.it##.coop-privacy
liujo.com##.cp-banner
dentisti-italia.it##.di-banner
@ -42265,10 +42293,9 @@ go4pro.lt##.wu_container
seher.no,sol.no,start.no###__next > div[class^="css"]
kube.no###cookie
homenet.no###toast-container
ba.no,ifinnmark.no,nettavisen.no,op.no##.active > div
netonnet.no##.alert
nextgentel.no##.blocker
parat.com##.cookie
kitchentime.no,parat.com##.cookie
lexus.no##.disclaimer
ruter.no##.fixed-messages
sveip.no##.kake_wrap
@ -42496,7 +42523,7 @@ sapo.ao##.bsu-v2-ntfs
vodafone.pt##.ck-nudge-slim
sinonimos.com.br##.clm
macorlux.pt##.cookie
abola.pt,assismatica.pt,conforama.pt,metalomarao.pt##.cookies
abola.pt,assismatica.pt,conforama.pt,metalomarao.pt,perfumesclub.pt##.cookies
ericeirasurfskate.pt##.footer-fixed-bar
lidl.pt##.notification
jaguarportugal.pt,landrover.pt##.notificationBars
@ -42599,6 +42626,7 @@ bwin.es##.info-message
ulabox.com##.js-alert
plataformaarquitectura.cl##.kth-toast
enaire.es,fiveguys.es##.modal-backdrop
hofmann.es##.muuSm
nomada.gt##.noma-privacy
jaguar.es,landrover.es##.notificationBars
arsys.es##.notifications
@ -42624,7 +42652,7 @@ elkedjan.se##.avalanche-message
inexchange.se##.bannerContainer
fz.se##.blck-info
nacka.se##.c-message
olisen.se##.cookie
kitchentime.se,olisen.se##.cookie
havkom.se,lfv.se,oru.se##.cookies
xlbygg.se##.cookievarning-wrap:not(body):not(html)
icebug.se##.css-4uxznl
@ -42682,6 +42710,7 @@ linnaleht.ee,ohtuleht.ee##.ntf-container
!
||byom.de/js/cookie.de.js
||cmp.pcwelt.de^
||consent.berliner-kurier.de^
||henryschein.at^*/CookieList.aspx
!
! ---------- French ----------
@ -42836,6 +42865,7 @@ mercopress.com#@##goToTop
encompass.tv#@##goTop
nannicskin.ru,redlink.com.ar#@##gotop
libcom.org#@##main-share
upim.com#@##newsletter-modal
exposurelights.com,tactxflashlights.com,thefirefly.com#@##newsletter-popup
dnevnik.bg#@##newsletterBar
cnn.com#@##outbrain_widget_0
@ -42865,7 +42895,7 @@ battle.net,squareup.com,yandex.by,yandex.com,yandex.com.tr,yandex.kz,yandex.ru,y
toutelanutrition.com#@#.footer-newsletter
designdevostransports.fr#@#.gform_widget
ixbt.com#@#.glyphicon-arrow-up
novojornal.co.ao#@#.newsletter-modal
novojornal.co.ao,upim.com#@#.newsletter-modal
billabong.com,strikerconcepts.com,tactxflashlights.com,urbanedcsupply.com#@#.newsletter-popup
bidorbuy.co.za#@#.newsletterContainer
thefork.it#@#.newsletterSignup
@ -42888,7 +42918,7 @@ krasnodar.ru#@#.scrollTop
hyperoptic.com,playtech.co.nz,porozmawiajmyoit.pl,scan.co.uk#@#.scroll_top
ltn.com.tw,theuptake.org#@#.scrolltop
ap.www.namecheap.com#@#.scrolltotop
chorus.co.nz#@#.scrollup
chorus.co.nz,jdpower.com#@#.scrollup
github.com,kifi.com,okcupid.com,retailmenot.com,zoom.us#@#.signup-email
dualshockers.com#@#.socialfooter
blackboat.com#@#.sqs-announcement-bar
@ -42908,6 +42938,7 @@ dj-extensions.com,thadenschool.org#@#.top-of-page
99bitcoins.com#@#.tve-leads-lightbox
getuikit.com#@#.uk-alert
tactxflashlights.com#@#.widget_subscribe
upim.com#@#[data-target="#newsletter-modal"]
twellow.com#@#a[href="http://www.twellow.com/"]
nasa.gov#@#backtotop
reddit.com#@#img[alt="submit to reddit"]
@ -43069,13 +43100,14 @@ jappy.de#@#.facebookbutton
100pour100foot.fr,6ter.fr,achetezfacile.com,clubic.com,deco.fr,fan2.fr,girondins.com,groupem6.fr,jeuxvideo.fr,jolidressing.com,m6.fr,m6blog.fr,m6bonus.fr,m6info.fr,m6jeux.fr,m6kid.fr,m6mobile.fr,m6pubdigital.fr,minuitsexy.fr,minutefacile.com,mobinaute.com,neteco.com,nouvellestar.fr,ozap.com,paris-premiere.fr,teva.fr,turbo.fr,w9.fr,wideo.fr#@#.fb-box
academia.edu,twitter.com#@#.fb-btn
airbnb.cat,airbnb.com,airbnb.de,dobreprogramy.pl#@#.fb-button
mediaexpert.leszczynscy.pl#@#.fb-container
kizlarsoruyor.com#@#.fb-content
firebase.google.com#@#.fb-dialog
allegro.pl,itweb.co.za#@#.fb-icon
e-biznes.pl,facebook.com,fb.com#@#.fb-like
facebook.com#@#.fb-likebox
facebook.com,fb.com#@#.fb-link
cieplikpodrozuje.pl,fashionvoyager.pl,majkrafci.pl#@#.fb-page
cieplikpodrozuje.pl,fashionvoyager.pl,majkrafci.pl,mediaexpert.leszczynscy.pl#@#.fb-page
facebook.com#@#.fb-quote
facebook.com#@#.fb-recommendations
facebook.com#@#.fb-recommendations-bar
@ -43392,6 +43424,7 @@ electnext.com#@#.twitter-share
boingboing.net#@#.twitter-share-button
nothiefsallowed.com,twitter.com#@#.twitter-timeline
about.me,busqueda.com.uy,modhoster.com,mozillamessaging.com,pinterest.com#@#.twitter.icon
feedly.com#@#.twitterFeeds
simonscat.com#@#.twitterShare
pinterest.com#@#.twitterWrapper
twitter.com#@#.twtr-widget
@ -43664,6 +43697,7 @@ bosch-home.com#@#.o-cookielaw
pieseauto.ro#@#.page-cookies
apple.com#@#.privacy-consent
account.microsoft.com#@#.privacy-container
www.google.ac,www.google.ad,www.google.ae,www.google.al,www.google.am,www.google.as,www.google.at,www.google.az,www.google.ba,www.google.be,www.google.bf,www.google.bg,www.google.bi,www.google.bj,www.google.bs,www.google.bt,www.google.by,www.google.ca,www.google.cat,www.google.cd,www.google.cf,www.google.cg,www.google.ch,www.google.ci,www.google.cl,www.google.cm,www.google.co.ao,www.google.co.bw,www.google.co.ck,www.google.co.cr,www.google.co.id,www.google.co.il,www.google.co.in,www.google.co.jp,www.google.co.ke,www.google.co.kr,www.google.co.ls,www.google.co.ma,www.google.co.mz,www.google.co.nz,www.google.co.th,www.google.co.tz,www.google.co.ug,www.google.co.uk,www.google.co.uz,www.google.co.ve,www.google.co.vi,www.google.co.za,www.google.co.zm,www.google.co.zw,www.google.com,www.google.com.af,www.google.com.ag,www.google.com.ai,www.google.com.ar,www.google.com.au,www.google.com.bd,www.google.com.bh,www.google.com.bn,www.google.com.bo,www.google.com.br,www.google.com.by,www.google.com.bz,www.google.com.cn,www.google.com.co,www.google.com.cu,www.google.com.cy,www.google.com.do,www.google.com.ec,www.google.com.eg,www.google.com.et,www.google.com.fj,www.google.com.gh,www.google.com.gi,www.google.com.gt,www.google.com.hk,www.google.com.jm,www.google.com.jo,www.google.com.kh,www.google.com.kw,www.google.com.lb,www.google.com.ly,www.google.com.mm,www.google.com.mt,www.google.com.mx,www.google.com.my,www.google.com.na,www.google.com.ng,www.google.com.ni,www.google.com.np,www.google.com.om,www.google.com.pa,www.google.com.pe,www.google.com.pg,www.google.com.ph,www.google.com.pk,www.google.com.pr,www.google.com.py,www.google.com.qa,www.google.com.ru,www.google.com.sa,www.google.com.sb,www.google.com.sg,www.google.com.sl,www.google.com.sv,www.google.com.tj,www.google.com.tn,www.google.com.tr,www.google.com.tw,www.google.com.ua,www.google.com.uy,www.google.com.vc,www.google.com.ve,www.google.com.vn,www.google.cv,www.google.cz,www.google.de,www.google.dj,www.google.dk,www.google.dm,www.google.dz,www.google.ee,www.google.es,www.google.fi,www.google.fm,www.google.fr,www.google.ga,www.google.ge,www.google.gg,www.google.gl,www.google.gm,www.google.gp,www.google.gr,www.google.gy,www.google.hk,www.google.hn,www.google.hr,www.google.ht,www.google.hu,www.google.ie,www.google.im,www.google.iq,www.google.is,www.google.it,www.google.it.ao,www.google.je,www.google.jo,www.google.jp,www.google.kg,www.google.ki,www.google.kz,www.google.la,www.google.li,www.google.lk,www.google.lt,www.google.lu,www.google.lv,www.google.md,www.google.me,www.google.mg,www.google.mk,www.google.ml,www.google.mn,www.google.ms,www.google.mu,www.google.mv,www.google.mw,www.google.ne,www.google.ne.jp,www.google.ng,www.google.nl,www.google.no,www.google.nr,www.google.nu,www.google.pl,www.google.pn,www.google.ps,www.google.pt,www.google.ro,www.google.rs,www.google.ru,www.google.rw,www.google.sc,www.google.se,www.google.sh,www.google.si,www.google.sk,www.google.sm,www.google.sn,www.google.so,www.google.sr,www.google.st,www.google.td,www.google.tg,www.google.tl,www.google.tm,www.google.tn,www.google.to,www.google.tt,www.google.us,www.google.vg,www.google.vu,www.google.ws#@#.privacyBar
metallica.com#@#.privacy_policy_message_box
jyllands-posten.dk#@#.qc-cmp-showing
jyllands-posten.dk#@#.qc-cmp-ui-container
@ -44191,6 +44225,7 @@ unicode.org#@#div[data-nconvert-cookie]
@@||jrjimg.cn/js.do?f=/share/js/
@@||jsfiddle.net^$generichide
@@||junglevibe2.net/min/?$script
@@||justwatch.com^$generichide
@@||kcrw.com^*/images/social-icons-$image,domain=kcrw.com
@@||keepa.com/img/social/Google.svg
@@||koszykowkanawozkach.pl^*/Header-facebook.jpg
@ -44206,6 +44241,7 @@ unicode.org#@#div[data-nconvert-cookie]
@@||letyshops.com/build/core/images/fb-white.
@@||lifetricks.com/wp-content/plugins/nextend-facebook-connect/
@@||liggoo.com/min/?$script
@@||limanowianin.in/wp-content/plugins/soslider-social-slider/js/jquery.soslider.min.js$script
@@||lipis.github.io^$generichide
@@||livescience.com/images/site/social/footer_*.gif
@@||login.kataweb.it^*/sprite-social.png
@ -44414,6 +44450,7 @@ unicode.org#@#div[data-nconvert-cookie]
@@||stipple.cachefly.net^$domain=stipple.com
@@||stuff.co.nz/video/*.mp4$media
@@||style.aliunicorn.com/js/$script,domain=alibaba.com
@@||superstars.news/wp-content/uploads/*-social-media-$image,~third-party
@@||swappa.com/static/icons/social/login_$image
@@||symantec.com/content/*/about/images/social/b-$image
@@||syndication.twitter.com/tweets.json?*&callback=$script

33246
origin-files/easylist4.txt Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
#version=201912081059
#version=201912182011
#url=https://github.com/vokins/yhosts
127.0.0.1 activate.adobe.com
127.0.0.1 ereg.adobe.com
@ -807,6 +807,7 @@
127.0.0.1 pacaio.match.qq.com
127.0.0.1 qqshow2-item.qq.com
127.0.0.1 setting.snswin.qq.com
127.0.0.1 tdc.qq.com
127.0.0.1 tj.video.qq.com
127.0.0.1 updatecenter.qq.com
127.0.0.1 video.ureport.push.qq.com
@ -1483,7 +1484,6 @@
127.0.0.1 web.data.pplive.com
127.0.0.1 apm.suning.cn
127.0.0.1 dfp.suning.com
127.0.0.1 ssac.suning.com
127.0.0.1 adinf.voole.com
127.0.0.1 apkinfo.voole.com
127.0.0.1 adinf.cp11.ott.cibntv.net
@ -1726,7 +1726,6 @@
127.0.0.1 ad.12306.cn
127.0.0.1 newswifiapi.dfshurufa.com
127.0.0.1 wpc.32df9.rhocdn.net
127.0.0.1 ad.caiyunapp.com
127.0.0.1 aima.weathercn.com
127.0.0.1 bima.weathercn.com
127.0.0.1 mbd.weathercn.com
@ -1866,6 +1865,32 @@
127.0.0.1 t.basictool.vip
127.0.0.1 t.trackingxnads.com
127.0.0.1 t.hmwebs.top
127.0.0.1 ayidaye.m.zwdu.com
127.0.0.1 ee.6et8a.cn
127.0.0.1 ee.6r7yc.cn
127.0.0.1 ee.8h3mc.cn
127.0.0.1 ee.8t5xo.cn
127.0.0.1 ee.i36mf.cn
127.0.0.1 ee.j5s9b.cn
127.0.0.1 hzdaye.m.zwdu.com
127.0.0.1 js.lovexia.top
127.0.0.1 ld.za9mnx.com
127.0.0.1 m.6et8a.cn
127.0.0.1 m.6r7yc.cn
127.0.0.1 m.8h3mc.cn
127.0.0.1 m.8t5xo.cn
127.0.0.1 m.huoyiad1.cn
127.0.0.1 m.i36mf.cn
127.0.0.1 m.j5s9b.cn
127.0.0.1 ndapus.cn
127.0.0.1 qzxcvb.m.zwdu.com
127.0.0.1 s.wxewm.site
127.0.0.1 ssl.aszy.club
127.0.0.1 vpn.tuodupingguomiao.com
127.0.0.1 www.56yk.com
127.0.0.1 www.xingtai0.com
127.0.0.1 k.hbfls.vip
127.0.0.1 uo.jstaogu.com
127.0.0.1 a.tribalfusion.com
127.0.0.1 acuityplatform.com
127.0.0.1 ad-delivery.net

View File

@ -6,7 +6,9 @@ cd $(cd "$(dirname "$0")";pwd)
git pull
echo '开始下载 easylist1...'
wget -O ./origin-files/easylistchina+easylist.txt --timeout 30 https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt
curl -o ./origin-files/easylist1.txt --connect-timeout 60 \
-s \
https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -15,7 +17,9 @@ if [ $? -ne 0 ];then
fi
echo '开始下载 easylist2...'
wget -O ./origin-files/cjx-annoyance.txt --timeout 30 https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt
curl -o ./origin-files/easylist2.txt --connect-timeout 60 \
-s \
https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -24,7 +28,21 @@ if [ $? -ne 0 ];then
fi
echo '开始下载 easylist3...'
wget -O ./origin-files/fanboy-annoyance.txt --timeout 30 https://easylist.to/easylist/fanboy-annoyance.txt
curl -o ./origin-files/easylist3.txt --connect-timeout 60 \
-s \
https://easylist.to/easylist/fanboy-annoyance.txt
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
echo '下载失败,请重试'
exit 1
fi
echo '开始下载 easylist4...'
curl -o ./origin-files/easylist4.txt --connect-timeout 60 \
-s \
https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -34,7 +52,9 @@ fi
echo '开始下载 hosts1...'
wget -O ./origin-files/hosts1 --timeout 30 https://hosts.nfz.moe/full/hosts
curl -o ./origin-files/hosts1 --connect-timeout 60 \
-s \
https://hosts.nfz.moe/full/hosts
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -43,7 +63,9 @@ if [ $? -ne 0 ];then
fi
echo '开始下载 hosts2...'
wget -O ./origin-files/hosts2 --timeout 60 https://raw.githubusercontent.com/vokins/yhosts/master/hosts
curl -o ./origin-files/hosts2 --connect-timeout 60 \
-s \
https://raw.githubusercontent.com/vokins/yhosts/master/hosts
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -52,7 +74,9 @@ if [ $? -ne 0 ];then
fi
echo '开始下载 hosts3...'
wget -O ./origin-files/hosts3 --timeout 60 https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts
curl -o ./origin-files/hosts3 --connect-timeout 60 \
-s \
https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts
# shellcheck disable=SC2181
if [ $? -ne 0 ];then
@ -60,6 +84,16 @@ if [ $? -ne 0 ];then
exit 1
fi
cd origin-files
cat hosts* | grep -v -E "^((#.*)|(\s*))$" \
| grep -v -E "^[0-9\.:]+\s+(ip6\-)?(localhost|loopback)$" \
| sed s/0.0.0.0/127.0.0.1/g | sed s/::/127.0.0.1/g | sort \
| uniq >base-src-hosts.txt
cat easylist*.txt | grep -E "^\|\|[^\^]+\^.*$" | sort | uniq >base-src-easylist.txt
cd ../
PHP_RET=$(/usr/local/php/bin/php make-addr.php)

View File

@ -46,12 +46,12 @@ if(count($arr_china_list) <= 0 && count($arr_dead_horse) <= 0){
$black_list = require LIB_DIR . '/black_domain_list.php';
$src_fp = fopen(SRC_FILE, 'r');
$basic_fp = fopen(DIST_DIR . '/anti-ad-basic.conf', 'w');
$full_fp = fopen(DIST_DIR . '/anti-ad-full.conf', 'w');
$basic_fp = fopen(DIST_DIR . '/anti-ad-dnsmasq-basic.conf', 'w');
$full_fp = fopen(DIST_DIR . '/anti-ad-dnsmasq-full.conf', 'w');
$write_len = fwrite($basic_fp, '#TIME=' . date('YmdHis') . "\n");
$write_len += fwrite($basic_fp, '#URL=https://github.com/gentlyxu/anti-AD' . "\n");
$write_len += fwrite($basic_fp, '#URL=https://github.com/privacy-protection-tools/anti-AD' . "\n");
$write_len = fwrite($full_fp, '#TIME=' . date('YmdHis') . "\n");
$write_len += fwrite($full_fp, '#URL=https://github.com/gentlyxu/anti-AD' . "\n");
$write_len += fwrite($full_fp, '#URL=https://github.com/privacy-protection-tools/anti-AD' . "\n");
while(!feof($src_fp)){
$row = fgets($src_fp, 512);

View File

@ -4,4 +4,15 @@
source /etc/profile
cd $(cd "$(dirname "$0")";pwd)
nohup php research-addr.php >> ./std-research.out &
nohup php research-addr.php >> ./std-research.out
cd ../dist/
sed -E 's/address=\/(.+)?\//||\1^/g' anti-ad-dnsmasq-full.conf > anti-ad-easylist-full.conf
sed -E 's/address=\/(.+)?\//||\1^/g' anti-ad-dnsmasq-basic.conf > anti-ad-easylist-basic.conf
sed -E 's/address=\/(.+)?\//DOMAIN-SUFFIX,\1,REJECT/g' anti-ad-dnsmasq-basic.conf >anti-ad-surge-basic.txt
sed -E 's/address=\/(.+)?\//DOMAIN-SUFFIX,\1,REJECT/g' anti-ad-dnsmasq-full.conf >anti-ad-surge-full.txt
sed -i '3 i [RULE]' anti-ad-surge-basic.txt
sed -i '3 i [RULE]' anti-ad-surge-full.txt
cd ../tools
rm -f std-split-tmp-list_*.out

View File

@ -5,12 +5,10 @@ source /etc/profile
cd $(cd "$(dirname "$0")";pwd)
cd ../origin-files
rm -f split-tmp-list_*
split -l 5000 ../adblock-for-dnsmasq.conf split-tmp-list_
cd ../tools
git pull
# shellcheck disable=SC2045
for f in $(ls ../origin-files/split-tmp-list_*)

View File

@ -52,14 +52,15 @@ $r = new Net_DNS2_Resolver(array('nameservers' => array('223.5.5.5', '223.6.6.6'
$src_fp = fopen($src_file, 'r');
$cnt = 0;
while(!feof($src_fp)){
$row = fgets($src_fp, 512);
echo '[', date('m-d H:i:s'), '],', ++$cnt, "\n";
if(empty($row)){
continue;
}
echo $row;
if(preg_match('/^address=\/(.+)?\/$/', $row, $matches)){
try{
$result = $r->query($matches[1], 'A');