diff --git a/data/cncity/100000.txt b/data/cncity/100000.txt index 245e2e45..33c7a15d 100644 --- a/data/cncity/100000.txt +++ b/data/cncity/100000.txt @@ -510,13 +510,6 @@ 58.195.84.80/28 58.195.84.96/27 58.195.84.128/25 -58.195.103.0/32 -58.195.103.4/30 -58.195.103.8/29 -58.195.103.16/28 -58.195.103.32/27 -58.195.103.64/26 -58.195.103.128/25 58.195.104.0/21 58.195.112.0/20 58.195.176.0/20 @@ -1982,19 +1975,6 @@ 118.85.129.0/24 118.85.130.0/23 118.85.132.0/22 -118.85.136.5/32 -118.85.136.6/31 -118.85.136.8/30 -118.85.136.14/31 -118.85.136.16/29 -118.85.136.24/31 -118.85.136.28/30 -118.85.136.32/27 -118.85.136.64/26 -118.85.136.128/25 -118.85.137.0/24 -118.85.138.0/23 -118.85.140.0/22 118.85.144.0/20 118.85.160.0/19 118.85.195.0/24 diff --git a/data/cncity/110000.txt b/data/cncity/110000.txt index c55554ca..51cacde6 100644 --- a/data/cncity/110000.txt +++ b/data/cncity/110000.txt @@ -869,8 +869,7 @@ 58.195.97.128/26 58.195.97.192/27 58.195.98.0/27 -58.195.102.0/24 -58.195.103.1/32 +58.195.102.0/23 58.200.2.0/24 58.200.5.128/25 58.200.8.0/24 @@ -2135,6 +2134,7 @@ 118.85.117.252/30 118.85.118.0/29 118.85.118.8/30 +118.85.136.0/21 118.85.194.0/24 118.85.207.128/25 118.85.209.36/31 diff --git a/data/cncity/310000.txt b/data/cncity/310000.txt index 6c6c9fe0..1e754d8a 100644 --- a/data/cncity/310000.txt +++ b/data/cncity/310000.txt @@ -321,7 +321,6 @@ 58.195.87.160/27 58.195.88.192/28 58.195.89.128/28 -58.195.103.2/32 58.196.0.0/17 58.196.128.0/18 58.196.240.0/20 diff --git a/data/cncity/440000.txt b/data/cncity/440000.txt index ac963e8f..de074539 100644 --- a/data/cncity/440000.txt +++ b/data/cncity/440000.txt @@ -394,7 +394,6 @@ 58.195.86.16/28 58.195.86.32/28 58.195.98.224/27 -58.195.103.3/32 58.200.1.0/24 58.200.66.0/24 58.200.79.0/24 @@ -1090,8 +1089,6 @@ 118.85.126.160/27 118.85.126.192/28 118.85.126.208/30 -118.85.136.0/30 -118.85.136.4/32 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 diff --git a/data/cncity/440100.txt b/data/cncity/440100.txt index eb7d314e..5392d4fa 100644 --- a/data/cncity/440100.txt +++ b/data/cncity/440100.txt @@ -169,7 +169,6 @@ 58.195.86.16/28 58.195.86.32/28 58.195.98.224/27 -58.195.103.3/32 58.200.79.0/24 58.200.108.0/24 58.200.124.0/24 @@ -258,41 +257,8 @@ 61.234.104.128/25 61.234.105.0/24 61.234.106.0/23 -61.234.109.0/28 -61.234.109.16/32 -61.234.109.18/31 -61.234.109.20/30 -61.234.109.24/29 -61.234.109.32/27 -61.234.109.64/26 -61.234.109.128/30 -61.234.109.132/31 -61.234.109.135/32 -61.234.109.136/29 -61.234.109.144/28 -61.234.109.160/28 -61.234.109.176/29 -61.234.109.184/32 -61.234.109.186/31 -61.234.109.188/30 -61.234.109.192/32 -61.234.109.194/31 -61.234.109.196/30 -61.234.109.200/29 -61.234.109.208/28 -61.234.109.224/27 -61.234.110.0/26 -61.234.110.64/31 -61.234.110.66/32 -61.234.110.69/32 -61.234.110.70/31 -61.234.110.72/29 -61.234.110.80/28 -61.234.110.96/27 -61.234.110.128/26 -61.234.110.200/29 -61.234.110.208/28 -61.234.110.224/27 +61.234.109.0/24 +61.234.110.0/24 61.234.169.0/24 61.234.170.0/23 61.234.172.0/22 @@ -301,36 +267,6 @@ 61.235.70.0/23 61.235.72.0/21 61.235.80.0/22 -61.235.88.0/27 -61.235.88.32/28 -61.235.88.48/29 -61.235.88.56/31 -61.235.88.60/30 -61.235.88.64/28 -61.235.88.80/29 -61.235.88.88/30 -61.235.88.92/31 -61.235.88.96/31 -61.235.88.100/30 -61.235.88.104/29 -61.235.88.112/28 -61.235.88.128/28 -61.235.88.146/31 -61.235.88.148/31 -61.235.88.172/30 -61.235.88.176/30 -61.235.88.180/31 -61.235.88.184/31 -61.235.88.190/31 -61.235.88.192/29 -61.235.88.200/30 -61.235.88.204/31 -61.235.88.208/31 -61.235.88.212/30 -61.235.88.216/30 -61.235.88.221/32 -61.235.88.222/31 -61.235.88.224/27 61.235.114.0/23 61.235.126.0/23 61.235.128.0/22 @@ -385,119 +321,15 @@ 110.120.200.0/21 110.120.208.0/20 110.211.224.0/20 -110.211.252.0/26 -110.211.252.64/31 -110.211.252.67/32 -110.211.252.68/31 -110.211.252.71/32 -110.211.252.72/29 -110.211.252.80/28 -110.211.252.96/28 -110.211.252.112/31 -110.211.252.115/32 -110.211.252.116/31 -110.211.252.119/32 -110.211.252.124/31 -110.211.252.127/32 -110.211.252.128/29 -110.211.252.136/30 -110.211.252.140/31 -110.211.252.143/32 -110.211.252.144/31 -110.211.252.147/32 -110.211.252.148/32 -110.211.252.150/31 -110.211.252.152/31 -110.211.252.155/32 -110.211.252.156/30 -110.211.252.160/29 -110.211.252.168/30 -110.211.252.172/31 -110.211.252.175/32 -110.211.252.176/31 -110.211.252.179/32 -110.211.252.180/31 -110.211.252.183/32 -110.211.252.184/29 -110.211.252.192/31 -110.211.252.195/32 -110.211.252.196/30 -110.211.252.200/29 -110.211.252.208/29 -110.211.252.216/30 -110.211.252.220/31 -110.211.252.223/32 -110.211.252.224/31 -110.211.252.227/32 -110.211.252.228/30 -110.211.252.232/31 -110.211.252.235/32 -110.211.252.236/31 -110.211.252.239/32 -110.211.252.240/31 -110.211.252.243/32 -110.211.252.244/31 -110.211.252.247/32 -110.211.252.248/31 -110.211.252.251/32 -110.211.252.252/30 -110.211.253.0/27 -110.211.253.32/28 -110.211.253.48/31 -110.211.253.52/30 -110.211.253.60/30 -110.211.253.64/27 -110.211.253.96/29 -110.211.253.104/31 -110.211.253.107/32 -110.211.253.108/30 -110.211.253.112/30 -110.211.253.116/31 -110.211.253.119/32 -110.211.253.120/30 -110.211.253.124/31 -110.211.253.127/32 -110.211.253.128/27 -110.211.253.160/30 -110.211.253.164/31 -110.211.253.168/31 -110.211.253.171/32 -110.211.253.172/30 -110.211.253.176/28 -110.211.253.196/30 -110.211.253.200/29 -110.211.253.208/28 -110.211.253.228/30 -110.211.253.232/31 -110.211.253.236/30 -110.211.253.240/28 -110.211.255.32/29 -110.211.255.52/30 -110.211.255.56/29 -110.211.255.144/29 -110.211.255.168/29 -110.211.255.180/30 -110.211.255.184/29 -110.211.255.192/30 -110.211.255.204/30 -110.211.255.224/29 -110.211.255.232/30 -110.211.255.236/32 -110.211.255.238/31 -110.211.255.240/30 -110.211.255.244/32 -110.211.255.246/31 -110.211.255.248/29 111.148.0.0/21 111.230.0.0/16 111.231.230.0/23 111.231.232.0/21 111.231.240.0/20 112.92.0.0/24 -112.94.4.3/32 -112.94.10.13/32 -112.94.18.30/32 -112.94.18.42/32 +112.94.4.0/24 +112.94.10.0/24 +112.94.18.0/24 112.94.23.192/30 112.94.64.0/24 112.94.160.224/27 @@ -742,8 +574,6 @@ 118.85.123.130/31 118.85.123.134/31 118.85.123.138/31 -118.85.136.0/30 -118.85.136.4/32 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 @@ -795,10 +625,9 @@ 120.49.224.0/19 120.80.2.172/31 120.132.112.0/24 -120.196.48.74/32 -120.196.50.239/32 -120.196.52.20/31 -120.196.52.164/32 +120.196.48.0/24 +120.196.50.0/24 +120.196.52.0/24 120.196.58.12/30 120.196.58.21/32 120.196.58.153/32 diff --git a/data/cncity/440200.txt b/data/cncity/440200.txt index 17ad1c2f..f10d6b5f 100644 --- a/data/cncity/440200.txt +++ b/data/cncity/440200.txt @@ -15,7 +15,6 @@ 61.234.111.0/24 61.235.92.0/22 110.120.32.0/22 -110.211.254.128/26 111.148.72.0/22 111.148.120.0/22 111.148.168.0/21 diff --git a/data/cncity/440300.txt b/data/cncity/440300.txt index e85e2d27..5e0ec3fc 100644 --- a/data/cncity/440300.txt +++ b/data/cncity/440300.txt @@ -288,8 +288,6 @@ 61.145.163.0/24 61.145.164.0/22 61.146.240.0/20 -61.234.110.67/32 -61.234.110.68/32 61.235.96.0/21 61.241.0.0/18 101.52.232.0/23 @@ -365,15 +363,6 @@ 110.120.152.0/21 110.211.32.0/20 110.211.128.0/20 -110.211.252.66/32 -110.211.252.70/32 -110.211.252.114/32 -110.211.252.118/32 -110.211.252.120/30 -110.211.252.126/32 -110.211.252.234/32 -110.211.252.238/32 -110.211.252.242/32 111.148.16.0/21 111.148.192.0/21 111.149.0.0/19 diff --git a/data/cncity/440400.txt b/data/cncity/440400.txt index e63901b7..d51e153d 100644 --- a/data/cncity/440400.txt +++ b/data/cncity/440400.txt @@ -27,7 +27,6 @@ 61.234.120.0/22 110.120.40.0/22 110.211.48.0/20 -110.211.254.64/26 111.148.64.0/22 112.91.83.16/28 112.91.83.195/32 diff --git a/data/cncity/440500.txt b/data/cncity/440500.txt index f17149ee..1b15d26e 100644 --- a/data/cncity/440500.txt +++ b/data/cncity/440500.txt @@ -12,13 +12,7 @@ 61.141.63.0/24 61.142.48.28/30 61.143.184.0/21 -61.235.88.58/31 -61.235.88.94/31 -61.235.88.98/31 -61.235.88.150/31 -61.235.88.152/30 -61.235.88.206/31 -61.235.88.210/31 +61.235.88.0/25 61.235.89.0/24 110.120.11.0/24 110.120.15.0/24 diff --git a/data/cncity/440600.txt b/data/cncity/440600.txt index efdeff66..03d28694 100644 --- a/data/cncity/440600.txt +++ b/data/cncity/440600.txt @@ -63,9 +63,7 @@ 110.64.206.0/24 110.120.224.0/20 110.211.96.0/20 -110.211.252.194/32 -110.211.252.222/32 -110.211.252.226/32 +110.211.240.0/20 111.148.40.0/22 112.91.152.84/31 112.91.155.128/27 diff --git a/data/cncity/440700.txt b/data/cncity/440700.txt index 130a8da8..9db8cbe5 100644 --- a/data/cncity/440700.txt +++ b/data/cncity/440700.txt @@ -16,17 +16,12 @@ 61.145.32.0/20 61.145.48.0/22 61.234.96.0/23 -61.234.109.134/32 -61.234.109.185/32 61.234.162.0/23 61.234.164.0/22 61.234.168.0/24 110.120.0.0/21 110.120.56.0/21 110.211.112.0/20 -110.211.253.192/30 -110.211.253.224/30 -110.211.253.234/31 111.148.76.0/22 112.96.88.0/22 112.96.92.0/23 diff --git a/data/cncity/440800.txt b/data/cncity/440800.txt index 313c18cb..04152bc7 100644 --- a/data/cncity/440800.txt +++ b/data/cncity/440800.txt @@ -22,20 +22,12 @@ 61.146.32.0/21 61.146.138.0/24 61.146.164.0/24 -61.234.109.17/32 61.234.112.0/23 110.120.36.0/22 110.120.44.0/22 110.120.108.0/22 110.120.120.0/21 110.120.128.0/21 -110.211.253.50/31 -110.211.253.56/30 -110.211.255.196/30 -110.211.255.200/30 -110.211.255.208/28 -110.211.255.237/32 -110.211.255.245/32 111.148.92.0/22 111.148.96.0/21 111.148.104.0/22 diff --git a/data/cncity/440900.txt b/data/cncity/440900.txt index f81dd476..8e901532 100644 --- a/data/cncity/440900.txt +++ b/data/cncity/440900.txt @@ -21,8 +21,6 @@ 110.120.104.0/22 110.120.144.0/22 110.120.240.0/20 -110.211.240.0/21 -110.211.254.192/26 111.148.68.0/22 111.148.140.0/22 111.148.148.0/22 diff --git a/data/cncity/441200.txt b/data/cncity/441200.txt index 2e7947b1..f7336ec9 100644 --- a/data/cncity/441200.txt +++ b/data/cncity/441200.txt @@ -22,13 +22,11 @@ 61.143.224.0/22 61.143.228.0/23 61.146.208.0/20 -61.234.110.192/29 61.235.108.0/22 110.120.16.0/21 110.120.192.0/22 110.208.52.0/22 110.211.192.0/20 -110.211.254.0/26 111.148.152.0/22 113.85.128.0/17 113.95.128.0/17 diff --git a/data/cncity/441300.txt b/data/cncity/441300.txt index 3542d7fa..9ba7b06f 100644 --- a/data/cncity/441300.txt +++ b/data/cncity/441300.txt @@ -51,9 +51,6 @@ 110.120.48.0/21 110.211.64.0/20 110.211.160.0/20 -110.211.253.106/32 -110.211.253.118/32 -110.211.253.126/32 111.148.44.0/22 111.148.48.0/22 111.148.204.0/22 diff --git a/data/cncity/441400.txt b/data/cncity/441400.txt index 56e54e5a..7e2220fa 100644 --- a/data/cncity/441400.txt +++ b/data/cncity/441400.txt @@ -14,8 +14,6 @@ 61.146.168.0/21 61.146.176.0/20 61.235.116.0/22 -110.211.248.0/22 -110.211.255.64/26 111.148.84.0/22 111.148.112.0/22 113.64.80.0/20 diff --git a/data/cncity/441700.txt b/data/cncity/441700.txt index 2b2089c1..29c5b0c6 100644 --- a/data/cncity/441700.txt +++ b/data/cncity/441700.txt @@ -20,11 +20,6 @@ 61.146.80.0/21 61.146.88.0/22 61.235.69.0/24 -110.211.255.128/29 -110.211.255.136/30 -110.211.255.152/29 -110.211.255.160/29 -110.211.255.176/30 111.148.80.0/22 111.148.116.0/22 111.148.160.0/22 diff --git a/data/cncity/441800.txt b/data/cncity/441800.txt index 85351c49..f049fd20 100644 --- a/data/cncity/441800.txt +++ b/data/cncity/441800.txt @@ -20,9 +20,6 @@ 61.234.114.0/24 61.235.113.0/24 110.211.176.0/20 -110.211.255.0/27 -110.211.255.40/29 -110.211.255.48/30 111.148.88.0/22 111.148.136.0/22 111.148.176.0/22 diff --git a/data/cncity/441900.txt b/data/cncity/441900.txt index 53506e5d..ab717807 100644 --- a/data/cncity/441900.txt +++ b/data/cncity/441900.txt @@ -59,15 +59,6 @@ 110.120.112.0/21 110.211.0.0/19 110.211.208.0/20 -110.211.252.142/32 -110.211.252.146/32 -110.211.252.149/32 -110.211.252.154/32 -110.211.252.174/32 -110.211.252.178/32 -110.211.252.182/32 -110.211.252.246/32 -110.211.252.250/32 111.148.8.0/21 112.93.132.0/23 112.96.8.0/24 diff --git a/data/cncity/442000.txt b/data/cncity/442000.txt index 63213e0a..91954afb 100644 --- a/data/cncity/442000.txt +++ b/data/cncity/442000.txt @@ -20,13 +20,9 @@ 61.142.116.0/23 61.142.118.0/24 61.234.104.2/31 -61.234.109.193/32 61.234.124.0/22 103.186.108.0/23 110.211.80.0/20 -110.211.253.166/31 -110.211.253.170/32 -110.211.255.140/30 111.148.36.0/22 111.148.128.0/21 111.148.144.0/22 diff --git a/data/cncity/445100.txt b/data/cncity/445100.txt index 054642a5..fc7c633f 100644 --- a/data/cncity/445100.txt +++ b/data/cncity/445100.txt @@ -17,10 +17,7 @@ 61.142.49.0/31 61.143.136.0/21 61.146.92.0/22 -61.235.88.156/30 -61.235.88.160/29 -61.235.88.168/30 -61.235.88.220/32 +61.235.88.128/25 61.235.91.0/24 110.120.31.0/24 111.148.32.0/22 diff --git a/data/cncity/445200.txt b/data/cncity/445200.txt index c34ea7c3..3f44a8b6 100644 --- a/data/cncity/445200.txt +++ b/data/cncity/445200.txt @@ -8,10 +8,6 @@ 61.143.152.0/21 61.145.56.0/21 61.146.120.0/21 -61.235.88.144/31 -61.235.88.182/31 -61.235.88.186/31 -61.235.88.188/31 61.235.90.0/24 110.120.24.0/22 111.148.220.0/22 diff --git a/data/cncity/810000.txt b/data/cncity/810000.txt index 78938094..2f40ccf8 100644 --- a/data/cncity/810000.txt +++ b/data/cncity/810000.txt @@ -3348,7 +3348,6 @@ 117.142.0.0/17 118.26.36.0/22 118.84.64.0/18 -118.85.136.26/31 118.99.0.0/18 118.102.8.0/21 118.103.144.0/20 diff --git a/data/country/CN.txt b/data/country/CN.txt index 6928e91c..a0201e43 100644 --- a/data/country/CN.txt +++ b/data/country/CN.txt @@ -2705,21 +2705,7 @@ 118.84.32.0/19 118.84.128.0/17 118.85.0.0/17 -118.85.128.0/21 -118.85.136.0/29 -118.85.136.8/30 -118.85.136.14/31 -118.85.136.16/29 -118.85.136.24/31 -118.85.136.28/30 -118.85.136.32/27 -118.85.136.64/26 -118.85.136.128/25 -118.85.137.0/24 -118.85.138.0/23 -118.85.140.0/22 -118.85.144.0/20 -118.85.160.0/19 +118.85.128.0/18 118.85.192.0/21 118.85.200.0/22 118.85.207.0/24 diff --git a/data/country/CN/CN-BJ.txt b/data/country/CN/CN-BJ.txt index c55554ca..51cacde6 100644 --- a/data/country/CN/CN-BJ.txt +++ b/data/country/CN/CN-BJ.txt @@ -869,8 +869,7 @@ 58.195.97.128/26 58.195.97.192/27 58.195.98.0/27 -58.195.102.0/24 -58.195.103.1/32 +58.195.102.0/23 58.200.2.0/24 58.200.5.128/25 58.200.8.0/24 @@ -2135,6 +2134,7 @@ 118.85.117.252/30 118.85.118.0/29 118.85.118.8/30 +118.85.136.0/21 118.85.194.0/24 118.85.207.128/25 118.85.209.36/31 diff --git a/data/country/CN/CN-GD.txt b/data/country/CN/CN-GD.txt index ac963e8f..de074539 100644 --- a/data/country/CN/CN-GD.txt +++ b/data/country/CN/CN-GD.txt @@ -394,7 +394,6 @@ 58.195.86.16/28 58.195.86.32/28 58.195.98.224/27 -58.195.103.3/32 58.200.1.0/24 58.200.66.0/24 58.200.79.0/24 @@ -1090,8 +1089,6 @@ 118.85.126.160/27 118.85.126.192/28 118.85.126.208/30 -118.85.136.0/30 -118.85.136.4/32 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 diff --git a/data/country/CN/CN-SH.txt b/data/country/CN/CN-SH.txt index 6c6c9fe0..1e754d8a 100644 --- a/data/country/CN/CN-SH.txt +++ b/data/country/CN/CN-SH.txt @@ -321,7 +321,6 @@ 58.195.87.160/27 58.195.88.192/28 58.195.89.128/28 -58.195.103.2/32 58.196.0.0/17 58.196.128.0/18 58.196.240.0/20 diff --git a/data/country/HK.txt b/data/country/HK.txt index 78938094..2f40ccf8 100644 --- a/data/country/HK.txt +++ b/data/country/HK.txt @@ -3348,7 +3348,6 @@ 117.142.0.0/17 118.26.36.0/22 118.84.64.0/18 -118.85.136.26/31 118.99.0.0/18 118.102.8.0/21 118.103.144.0/20 diff --git a/data/country/RU.txt b/data/country/RU.txt index 97dedac9..9ca574ce 100644 --- a/data/country/RU.txt +++ b/data/country/RU.txt @@ -4314,7 +4314,6 @@ 109.248.240.0/20 109.252.0.0/16 116.251.110.0/30 -118.85.136.12/31 118.85.205.168/29 118.85.205.176/28 122.8.160.0/20 diff --git a/data/country/RU/RU-MOW.txt b/data/country/RU/RU-MOW.txt index 0eec3a05..a61eb0d3 100644 --- a/data/country/RU/RU-MOW.txt +++ b/data/country/RU/RU-MOW.txt @@ -101,7 +101,6 @@ 109.234.32.0/23 109.234.152.0/21 116.251.110.0/30 -118.85.136.12/31 118.85.205.168/29 124.21.64.0/19 130.255.170.0/24 diff --git a/data/special/china.txt b/data/special/china.txt index 0a2548a0..44d4eec8 100644 --- a/data/special/china.txt +++ b/data/special/china.txt @@ -2691,21 +2691,7 @@ 118.84.32.0/19 118.84.128.0/17 118.85.0.0/17 -118.85.128.0/21 -118.85.136.0/29 -118.85.136.8/30 -118.85.136.14/31 -118.85.136.16/29 -118.85.136.24/31 -118.85.136.28/30 -118.85.136.32/27 -118.85.136.64/26 -118.85.136.128/25 -118.85.137.0/24 -118.85.138.0/23 -118.85.140.0/22 -118.85.144.0/20 -118.85.160.0/19 +118.85.128.0/18 118.85.192.0/21 118.85.200.0/22 118.85.207.0/24