Merge pull request #89 from Raxcl/feature-ip2region

Naccl · web-flow · commit c6a3ac2caa39 · 2022-11-08T20:31:38.000+08:00
&#21319;&#32423; ip2region ip&#22320;&#22336;&#26597;&#35810;&#26041;&#27861;
diff --git a/blog-api/pom.xml b/blog-api/pom.xml
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
-            <version>1.7.2</version>
+            <version>2.6.5</version>
         </dependency>
         <!-- &#35299;&#26512;&#23458;&#25143;&#31471;&#25805;&#20316;&#31995;&#32479;&#12289;&#27983;&#35272;&#22120; -->
         <dependency>
diff --git a/blog-api/src/main/java/top/naccl/util/IpAddressUtils.java b/blog-api/src/main/java/top/naccl/util/IpAddressUtils.java
@@ -2,10 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.lionsoul.ip2region.DataBlock;
-import org.lionsoul.ip2region.DbConfig;
-import org.lionsoul.ip2region.DbSearcher;
-import org.lionsoul.ip2region.Util;
+import org.lionsoul.ip2region.xdb.Searcher;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 import org.springframework.util.FileCopyUtils;
@@ -64,7 +61,7 @@ public static String getIpAddress(HttpServletRequest request) {
 		return StringUtils.substringBefore(ip, ",");
 	}
 
-	private static DbSearcher searcher;
+	private static Searcher searcher;
 	private static Method method;
 
 	/**
@@ -75,13 +72,13 @@ public static String getIpAddress(HttpServletRequest request) {
 	 */
 	@PostConstruct
 	private void initIp2regionResource() throws Exception {
-		InputStream inputStream = new ClassPathResource("/ipdb/ip2region.db").getInputStream();
+		InputStream inputStream = new ClassPathResource("/ipdb/ip2region.xdb").getInputStream();
 		//&#23558; ip2region.db &#36716;&#20026; ByteArray
 		byte[] dbBinStr = FileCopyUtils.copyToByteArray(inputStream);
-		DbConfig dbConfig = new DbConfig();
-		searcher = new DbSearcher(dbConfig, dbBinStr);
+		// 2&#12289;&#20351;&#29992;&#19978;&#36848;&#30340; dbBinStr &#21019;&#24314;&#19968;&#20010;&#23436;&#20840;&#22522;&#20110;&#20869;&#23384;&#30340;&#26597;&#35810;&#23545;&#35937;&#12290;
+		searcher = new Searcher(null, null, dbBinStr);
 		//&#20108;&#36827;&#21046;&#26041;&#24335;&#21021;&#22987;&#21270; DBSearcher&#65292;&#38656;&#35201;&#20351;&#29992;&#22522;&#20110;&#20869;&#23384;&#30340;&#26597;&#25214;&#31639;&#27861; memorySearch
-		method = searcher.getClass().getMethod("memorySearch", String.class);
+		method = searcher.getClass().getMethod("search", String.class);
 	}
 
 	/**
@@ -91,21 +88,22 @@ private void initIp2regionResource() throws Exception {
 	 * @return
 	 */
 	public static String getCityInfo(String ip) {
-		if (ip == null || !Util.isIpAddress(ip)) {
-			log.error("Error: Invalid ip address");
-			return "";
-		}
 		try {
-			DataBlock dataBlock = (DataBlock) method.invoke(searcher, ip);
-			String ipInfo = dataBlock.getRegion();
+			String ipInfo = (String) method.invoke(searcher, ip);
 			if (!StringUtils.isEmpty(ipInfo)) {
 				ipInfo = ipInfo.replace("|0", "");
 				ipInfo = ipInfo.replace("0|", "");
-				return ipInfo;
 			}
+			return ipInfo;
 		} catch (Exception e) {
 			log.error("getCityInfo exception:", e);
 		}
 		return "";
 	}
+	public static void main(String[] args) throws Exception {
+		IpAddressUtils ipAddressUtils = new IpAddressUtils();
+		ipAddressUtils.initIp2regionResource();
+		String cityInfo = IpAddressUtils.getCityInfo("14.215.177.39");
+		System.out.println(cityInfo);
+	}
 }
diff --git a/blog-api/src/main/resources/ipdb/ip2region.xdb b/blog-api/src/main/resources/ipdb/ip2region.xdb
