优化白名单

.gitignore

@@ -1,2 +1,4 @@
 
 optimize-dns.conf
+.gitignore
+.idea/

adblock-for-dnsmasq.conf

@@ -1,4 +1,4 @@
-#TIME=20191019193701
+#TIME=20191019202625
 #URL=https://github.com/gentlyxu/anti-AD
 address=/quandangdang.net/
 address=/0024aaaa.com/
@@ -659,7 +659,7 @@ address=/guanjia.baidu.com/
 address=/hc.baidu.com/
 address=/hmma.baidu.com/
 address=/hpd.baidu.com/
-address=/bce.baidu.com/
+address=/idm.bce.baidu.com/
 address=/idm-su.baidu.com/
 address=/iebar.baidu.com/
 address=/ikcode.baidu.com/
@@ -2473,7 +2473,7 @@ address=/android.rqd.qq.com/
 address=/appsupport.qq.com/
 address=/astat.bugly.qq.com/
 address=/astrategy.beacon.qq.com/
-address=/l.qq.com/
+address=/bs.l.qq.com/
 address=/btrace.video.qq.com/
 address=/bugreportv2.qq.com/
 address=/cdn.ark.qq.com/
@@ -27887,7 +27887,6 @@ address=/widnd.dajiadou6.com/
 address=/allnews.uodoo.com/
 address=/umengcloud.com/
 address=/umeng.co/
-address=/umeng.com/
 address=/a.mct01.com/
 address=/cm.mct01.com/
 address=/static.mct01.com/

make-addr.php

@@ -205,6 +205,9 @@ class makeAddr{
 						if(in_array(implode('.', $tmp_arr2), $rv)){
 							if(!in_array(implode('.', $tmp_arr2), $arr_written)){
 								$arr_written[] = implode('.', $tmp_arr2);
+                                if(array_key_exists(implode('.', $tmp_arr2), $GLOBALS['arr_whitelist'])){
+                                    continue;
+                                }
 								$write_len += fwrite($fp, 'address=/' . implode('.', $tmp_arr2) . '/' . "\n");
 							}
 							$written_flag = true;

start.sh

@@ -3,7 +3,6 @@
 source /etc/profile
 
 cd $(cd "$(dirname "$0")";pwd)
-echo pwd is: `pwd`
 git pull
 
 echo '开始下载 easylist1...'
@@ -39,7 +38,7 @@ if [ $? -ne 0 ];then
 fi
 
 
-PHP_RET=$(php make-addr.php)
+PHP_RET=$(/user/local/php/bin/php make-addr.php)
 
 git add adblock-for-dnsmasq.conf
 git commit -am "auto commit. script output--- $PHP_RET"

white_domain_list.php

@@ -1,6 +1,6 @@
 <?php
 //white_domain_list
-//白名单机制...
+//白名单机制...，白名单是
 //@date 2018年12月23日
 
 return array(
@@ -8,14 +8,11 @@ return array(
 	'cdn-thumb.fds.api.xiaomi.com'		=> true,
 	'.cdn-thumb.fds.api.xiaomi.com'		=> true,
 	'bce.baidu.com'						=> true,
-	'.bce.baidu.com'					=> true,
 	'b.bdstatic.com'					=> true,
-	'googleadapis.l.google.com'			=> true,
-	'.googleadapis.l.google.com'		=> true,
-	'gstaticadssl.l.google.com'			=> true,
+	'googleadapis.l.google.com'			=> true, //解决google字体下载异常
+	'gstaticadssl.l.google.com'			=> true, //解决google字体下载异常
 	'gvt1.com'							=> true,
 	'wangbase.com'						=> true,
 	'l.qq.com'							=> true, //解决腾讯视频无法播放
 	'g.csdnimg.cn'						=> true, //csdn阅读更多
-	'bce.baidu.com'						=> true, //csdn阅读更多
 );