diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/cn/ac/iie/bolt/segmentation/InternalBolt.java | 1 | ||||
| -rw-r--r-- | src/main/java/cn/ac/iie/utils/TopUtils.java | 15 | ||||
| -rw-r--r-- | src/test/java/cn/ac/iie/test/IpTest.java | 28 |
3 files changed, 31 insertions, 13 deletions
diff --git a/src/main/java/cn/ac/iie/bolt/segmentation/InternalBolt.java b/src/main/java/cn/ac/iie/bolt/segmentation/InternalBolt.java index 09f5f34..c765135 100644 --- a/src/main/java/cn/ac/iie/bolt/segmentation/InternalBolt.java +++ b/src/main/java/cn/ac/iie/bolt/segmentation/InternalBolt.java @@ -46,5 +46,4 @@ public class InternalBolt extends BaseBasicBolt { } - } diff --git a/src/main/java/cn/ac/iie/utils/TopUtils.java b/src/main/java/cn/ac/iie/utils/TopUtils.java index c145fd1..5ada340 100644 --- a/src/main/java/cn/ac/iie/utils/TopUtils.java +++ b/src/main/java/cn/ac/iie/utils/TopUtils.java @@ -8,15 +8,20 @@ import com.zdjizhi.utils.IpLookup; */ public class TopUtils { private static IpLookup ipLookup = new IpLookup.Builder(false) - .loadDataFileV4(TopNCountConfig.IP_LIBRARY + "Kazakhstan.mmdb") + .loadDataFileV4("Kazakhstan.mmdb") .loadDataFileV6(TopNCountConfig.IP_LIBRARY + "Kazakhstan.mmdb") .build(); public static boolean isKazakhstan(String ip) { - String[] ipAddress = ipLookup.cityLookupDetail(ip).split("\t"); - String country = ipAddress[2]; - return "Kazakhstan".equals(country) || "N/A".equals(country); -// return "China".equals(country) || "N/A".equals(country); + String address = ipLookup.cityLookupDetail(ip); + String pri = "Private IP"; + if (pri.equals(address)) { + return true; + } else { + String[] ipAddress = address.split("\t"); + String country = ipAddress[2]; + return "Kazakhstan".equals(country); + } } } diff --git a/src/test/java/cn/ac/iie/test/IpTest.java b/src/test/java/cn/ac/iie/test/IpTest.java index c60679d..89c51d6 100644 --- a/src/test/java/cn/ac/iie/test/IpTest.java +++ b/src/test/java/cn/ac/iie/test/IpTest.java @@ -1,17 +1,31 @@ package cn.ac.iie.test; import cn.ac.iie.common.TopNCountConfig; +import cn.ac.iie.utils.TopUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zdjizhi.utils.IpLookup; +import com.zdjizhi.utils.StringUtil; public class IpTest { - public static void main(String[] args) { - IpLookup ipLookup = new IpLookup.Builder(false) - .loadDataFileV4("Kazakhstan.mmdb") - .loadDataFileV6("Kazakhstan.mmdb") - .build(); + private static IpLookup ipLookup = new IpLookup.Builder(false) + .loadDataFileV4("Kazakhstan.mmdb") + .loadDataFileV6("Kazakhstan.mmdb") + .build(); + + public static boolean isKazakhstan(String ip) { + String adress = ipLookup.cityLookupDetail(ip); + if ("Private IP".equals(adress)){ + return true; + }else { + String[] ipAddress = adress.split("\t"); + String country = ipAddress[2]; + return "Kazakhstan".equals(country); + } + } - System.out.println(ipLookup.cityLookupDetail("2001:470:19:790::7f")); -// System.out.println(ipLookup.asnLookup("2001:470:19:790::7f")); + public static void main(String[] args) { + System.out.println(isKazakhstan("95.59.99.58")); } } |