From 455ec9a2f12cb058759080cff8dadb9395cadeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E8=BE=9E=E6=9C=AA=E5=AF=92?= <545073804@qq.com> Date: Thu, 11 Dec 2025 13:04:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20IP=E5=9C=B0=E5=9D=80=E8=A1=8C=E6=94=BF?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=8A=A9=E6=89=8B=E7=B1=BB=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=BB=A5=E5=8C=B9=E9=85=8D=E5=85=B6=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E5=8A=9F=E8=83=BD=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/core/utils/ip/AddressUtils.java | 2 +- .../ip/{Ip2RegionHelper.java => RegionUtils.java} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/{Ip2RegionHelper.java => RegionUtils.java} (94%) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java index 7c797a2d7..fe36d9cc0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java @@ -37,7 +37,7 @@ public class AddressUtils { return LOCAL_ADDRESS; } // Tips:Ip2Region 提供了精简的IPv6地址库,精简的IPv6地址库并不能完全支持IPv6地址的查询,且准确度上可能会存在问题,如需要准确的IPv6地址查询,建议自行实现 - return Ip2RegionHelper.getRegion(ip); + return RegionUtils.getRegion(ip); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/Ip2RegionHelper.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/Ip2RegionHelper.java rename to ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index d52210a6d..a2d210c10 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/Ip2RegionHelper.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -13,14 +13,14 @@ import java.io.File; import java.time.Duration; /** - * IP地址行政区域助手工具类 + * IP地址行政区域工具类 * 参考地址:ip2region xdb java 查询客户端实现 * xdb数据库文件下载:ip2region data * * @author 秋辞未寒 */ @Slf4j -public class Ip2RegionHelper { +public class RegionUtils { // 默认IPv4地址库文件路径 // 下载地址:https://gitee.com/lionsoul/ip2region/blob/master/data/ip2region_v4.xdb @@ -53,11 +53,11 @@ public class Ip2RegionHelper { // Config v6Config = Config.custom() // .setCachePolicy(Config.BufferCache) // .setXdbPath(v6TempXdb.getPath()) -// .asV6(FileUtil.createRandomAccessFile(v6TempXdb, FileMode.r)); +// .asV6(); // 初始化Ip2Region实例 - Ip2RegionHelper.ip2Region = Ip2Region.create(v4Config, null); -// Ip2RegionHelper.ip2Region = Ip2Region.create(v4Config, v6Config); + RegionUtils.ip2Region = Ip2Region.create(v4Config, null); +// RegionUtils.ip2Region = Ip2Region.create(v4Config, v6Config); // 删除临时文件 // 注意:因为使用的 CachePolicy 为 BufferCache,BufferCache是加载整个xdb文件到内存中,所以临时文件的删除不会影响到正常的使用。如果使用的是 VIndexCache 或 NoCache(即实时读取文件),删除临时文件会导致xdb数据库读取不到而无法使用。