From 0f19fbeb06c8cc004027f7431c0be0d2f3512559 Mon Sep 17 00:00:00 2001
From: gently <1243610+gentlyxu@users.noreply.github.com>
Date: Tue, 30 Jun 2020 19:59:24 +0800
Subject: [PATCH] fixed #163  fixed #162

---
 adblock-for-dnsmasq.conf  | 7 ++-----
 anti-ad-domains.txt       | 7 ++-----
 anti-ad-easylist.txt      | 7 ++-----
 anti-ad-smartdns.conf     | 7 ++-----
 anti-ad-surge.txt         | 7 ++-----
 lib/black_domain_list.php | 2 --
 lib/white_domain_list.php | 4 ++--
 7 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf
index f376dbeb..c0a37476 100644
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200629141956
+#VER=20200630115805
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=35355
+#TOTAL_LINES=35352
 address=/00-gov.cn/
 address=/kwcdn.000dn.com/
 address=/kwcscdn.000dn.com/
@@ -15739,8 +15739,6 @@ address=/iozsmwjezobro.com/
 address=/ip-adress.com/
 address=/ip-api.com/
 address=/ip-label.net/
-address=/api.ip138.com/
-address=/ip2location.com/
 address=/ip2map.com/
 address=/ip2phrase.com/
 address=/c.ipaddress.com/
@@ -19593,7 +19591,6 @@ address=/vortex-sandbox.data.microsoft.com/
 address=/vortex-win-sandbox.data.microsoft.com/
 address=/vortex.data.microsoft.com/
 address=/mobile.pipe.aria.microsoft.com/
-address=/events.data.microsoft.com/
 address=/microsoftaffiliates.net/
 address=/dl.microsword.net/
 address=/mid5in.top/
diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt
index 641c3835..80225d02 100644
--- a/anti-ad-domains.txt
+++ b/anti-ad-domains.txt
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200629141956
+#VER=20200630115805
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=40418
+#TOTAL_LINES=40415
 00-gov.cn
 kwcdn.000dn.com
 kwcscdn.000dn.com
@@ -18451,8 +18451,6 @@ ip-adress.com
 ip-api.com
 ip-label.net
 observer.ip-label.net
-api.ip138.com
-ip2location.com
 ip2map.com
 ip2phrase.com
 c.ipaddress.com
@@ -22875,7 +22873,6 @@ watson.telemetry.microsoft.com
 wes.df.telemetry.microsoft.com
 www.bingads.microsoft.com
 mobile.pipe.aria.microsoft.com
-events.data.microsoft.com
 microsoftaffiliates.net
 dl.microsword.net
 mid5in.top
diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt
index 8107b3cf..7d7fde44 100644
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
@@ -1,7 +1,7 @@
 !TITLE=anti-AD
-!VER=20200629120656
+!VER=20200630115805
 !URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=33608
+!TOTAL_LINES=33605
 ||*.wap.xsbiquge.com^
 ||*serror*.wo.com.cn^
 ||201*.myhard.com^
@@ -14911,8 +14911,6 @@
 ||ip-adress.com^
 ||ip-api.com^
 ||ip-label.net^
-||api.ip138.com^
-||ip2location.com^
 ||ip2map.com^
 ||ip2phrase.com^
 ||c.ipaddress.com^
@@ -18636,7 +18634,6 @@
 ||vortex-win-sandbox.data.microsoft.com^
 ||vortex.data.microsoft.com^
 ||mobile.pipe.aria.microsoft.com^
-||events.data.microsoft.com^
 ||microsoftaffiliates.net^
 ||dl.microsword.net^
 ||mid5in.top^
diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf
index 7ec1c860..2b268d03 100644
--- a/anti-ad-smartdns.conf
+++ b/anti-ad-smartdns.conf
@@ -1,7 +1,7 @@
 #TITLE=anti-AD for SmartDNS
-#VER=20200629141956
+#VER=20200630115805
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=35355
+#TOTAL_LINES=35352
 address /00-gov.cn/#
 address /kwcdn.000dn.com/#
 address /kwcscdn.000dn.com/#
@@ -15739,8 +15739,6 @@ address /iozsmwjezobro.com/#
 address /ip-adress.com/#
 address /ip-api.com/#
 address /ip-label.net/#
-address /api.ip138.com/#
-address /ip2location.com/#
 address /ip2map.com/#
 address /ip2phrase.com/#
 address /c.ipaddress.com/#
@@ -19593,7 +19591,6 @@ address /vortex-sandbox.data.microsoft.com/#
 address /vortex-win-sandbox.data.microsoft.com/#
 address /vortex.data.microsoft.com/#
 address /mobile.pipe.aria.microsoft.com/#
-address /events.data.microsoft.com/#
 address /microsoftaffiliates.net/#
 address /dl.microsword.net/#
 address /mid5in.top/#
diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt
index 9fe76b76..160708c9 100644
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200629141956
+#VER=20200630115805
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=35355
+#TOTAL_LINES=35352
 DOMAIN-SUFFIX,00-gov.cn
 DOMAIN-SUFFIX,kwcdn.000dn.com
 DOMAIN-SUFFIX,kwcscdn.000dn.com
@@ -15739,8 +15739,6 @@ DOMAIN-SUFFIX,iozsmwjezobro.com
 DOMAIN-SUFFIX,ip-adress.com
 DOMAIN-SUFFIX,ip-api.com
 DOMAIN-SUFFIX,ip-label.net
-DOMAIN-SUFFIX,api.ip138.com
-DOMAIN-SUFFIX,ip2location.com
 DOMAIN-SUFFIX,ip2map.com
 DOMAIN-SUFFIX,ip2phrase.com
 DOMAIN-SUFFIX,c.ipaddress.com
@@ -19593,7 +19591,6 @@ DOMAIN-SUFFIX,vortex-sandbox.data.microsoft.com
 DOMAIN-SUFFIX,vortex-win-sandbox.data.microsoft.com
 DOMAIN-SUFFIX,vortex.data.microsoft.com
 DOMAIN-SUFFIX,mobile.pipe.aria.microsoft.com
-DOMAIN-SUFFIX,events.data.microsoft.com
 DOMAIN-SUFFIX,microsoftaffiliates.net
 DOMAIN-SUFFIX,dl.microsword.net
 DOMAIN-SUFFIX,mid5in.top
diff --git a/lib/black_domain_list.php b/lib/black_domain_list.php
index 4a155f4a..7bdf710b 100644
--- a/lib/black_domain_list.php
+++ b/lib/black_domain_list.php
@@ -274,7 +274,6 @@ return array(
     ),
     'amap.com' => array('logs.amap.com'),
     'tt114.net' => array('tt114.net'), //例如http://www.tt114.net/html/tlink.html
-    'ip138.com' => array('api.ip138.com'),
     'taobao.com' => array(
       'ip.taobao.com',
       'fourier.taobao.com',
@@ -566,7 +565,6 @@ return array(
     ),
     'microsoft.com' => array(
         'mobile.pipe.aria.microsoft.com',
-        'events.data.microsoft.com',
     ),
     'leixjun.com' => array(//恶意诱导下载app
       'leixjun.com',
diff --git a/lib/white_domain_list.php b/lib/white_domain_list.php
index 203998d3..6631fc04 100644
--- a/lib/white_domain_list.php
+++ b/lib/white_domain_list.php
@@ -143,8 +143,8 @@ return array(
     'dyn.ithome.com' => 0, // #157
     'sf6-ttcdn-tos.pstatp.com' => 0, // #159
     'api.tv.sohu.com' => 0, // 搜狐视频win app版不能使用
-
-    
+    'ip2location.com' => 0, // #163
+