营销系统-IP修改

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/util/IPLocationUtil.java

@@ -9,6 +9,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -58,8 +60,8 @@ public class IPLocationUtil {
 					return;
 				}
 				byte[] cBuff = is.readAllBytes();
-				java.nio.file.Path tmp = java.nio.file.Files.createTempFile("ip2region", ".xdb");
-				java.nio.file.Files.write(tmp, cBuff);
+				Path tmp = Files.createTempFile("ip2region", ".xdb");
+				Files.write(tmp, cBuff);
 				subtleSetDeleteOnExit(tmp);
 				searcher = Searcher.newWithFileOnly(tmp.toString());
 				log.info("IPLocationUtil ip2region初始化成功 (temp file: {})", tmp);
@@ -73,7 +75,7 @@ public class IPLocationUtil {
 	/**
 	 * 尝试标记临时文件在JVM退出时删除
 	 */
-	private static void subtleSetDeleteOnExit(java.nio.file.Path tmp) {
+	private static void subtleSetDeleteOnExit(Path tmp) {
 		try {
 			java.io.File f = tmp.toFile();
 			f.deleteOnExit();
@@ -150,8 +152,8 @@ public class IPLocationUtil {
     private String getFullAddressFromIp2region(String ip) {
         try {
             // 统一委托给 IPUtils，避免本地 Searcher 与库/数据版本不一致
-            String region = IPUtils.getIpRegion(ip);
-            log.info("IPLocationUtil 调用 IPUtils.getIpRegion 返回: ip={}, region={}", ip, region);
+            String region = searcher.search(ip);
+            log.info("IPLocationUtil 取临时文件 返回: ip={}, region={}", ip, region);
             if (region == null || region.trim().isEmpty() || "未知".equals(region) || "内网".equals(region)) {
                 return null;
             }