From 496df8494ed7dd2b02fd3bb4bab111e5e1fa5a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 23 Dec 2025 10:38:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E5=AE=9E=E7=8E=B0=E7=B1=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../translation/core/impl/NicknameTranslationImpl.java | 2 +- .../translation/core/impl/UserNameTranslationImpl.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java index b92c7f0f5..d1720f714 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java @@ -20,7 +20,7 @@ public class NicknameTranslationImpl implements TranslationInterface { @Override public String translation(Object key, String other) { if (key instanceof Long id) { - return userService.selectNicknameByIds(id.toString()); + return userService.selectNicknameById(id); } else if (key instanceof String ids) { return userService.selectNicknameByIds(ids); } diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java index 96f1cd3ed..5fc7773d9 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java @@ -1,5 +1,6 @@ package org.dromara.common.translation.core.impl; +import cn.hutool.core.convert.Convert; import org.dromara.common.core.service.UserService; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; @@ -19,9 +20,6 @@ public class UserNameTranslationImpl implements TranslationInterface { @Override public String translation(Object key, String other) { - if (key instanceof Long id) { - return userService.selectUserNameById(id); - } - return null; + return userService.selectUserNameById(Convert.toLong(key)); } } From 961bca462e1178290279da0d62ad469f9f9473c1 Mon Sep 17 00:00:00 2001 From: ColorDreams <545073804@qq.com> Date: Tue, 23 Dec 2025 14:32:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8DI?= =?UTF-8?q?p2Region=20InputStream=E8=AF=BB=E5=8F=96=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84OOM=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/ip/RegionUtils.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index bab520838..191b1e599 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -1,5 +1,6 @@ package org.dromara.common.core.utils.ip; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ResourceUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.exception.ServiceException; @@ -8,6 +9,7 @@ import org.lionsoul.ip2region.service.Config; import org.lionsoul.ip2region.service.Ip2Region; import org.lionsoul.ip2region.xdb.Util; +import java.io.File; import java.io.InputStream; import java.time.Duration; @@ -43,11 +45,18 @@ public class RegionUtils { // 因为加载整个xdb文件会耗费非常大的内存，如果你不希望加载整个xdb到内存中，更推荐使用 VIndexCache 或 NoCache（即实时读取文件）策略和 setXdbPath/setXdbFile 加载方法（需要注意的一点，setXdbPath 和 setXdbFile 不支持读取ClassPath（即源码和resource目录）中的文件）。 // 一般而言，更建议把xdb数据库放到一个指定的文件目录中（即不打包进jar包中），然后使用 NoCache + 配合SearcherPool的并发池读取数据，更方便随时更新xdb数据库 + // TODO 2025年12月23日 Ip2Region封装的 InputStream 读取函数 Searcher.loadContentFromInputStream 在Linux环境下会申请过大的byte[]空间而导致OOM，这里先用临时文件的方案解决，等后续 Ip2Region 更新解决方案 + // 创建临时文件 + File v4TempXdb = FileUtil.writeFromStream(ResourceUtil.getStream(DEFAULT_IPV4_XDB_PATH), FileUtil.createTempFile()); + // IPv4配置 Config v4Config = Config.custom() .setCachePolicy(Config.BufferCache) - .setXdbInputStream(ResourceUtil.getStream(DEFAULT_IPV4_XDB_PATH)) + .setXdbFile(v4TempXdb) +// .setXdbInputStream(ResourceUtil.getStream(DEFAULT_IPV4_XDB_PATH)) .asV4(); + // 删除临时文件 + v4TempXdb.delete(); // IPv6配置 Config v6Config = null; @@ -55,10 +64,17 @@ public class RegionUtils { if (v6XdbInputStream == null) { log.warn("未加载 IPv6 地址库：未在类路径下找到文件 {}。当前仅启用 IPv4 查询。如需启用 IPv6，请将 ip2region_v6.xdb 放置到 resources 目录", DEFAULT_IPV6_XDB_PATH); } else { + // 创建临时文件 + File v6TempXdb = FileUtil.writeFromStream(ResourceUtil.getStream(DEFAULT_IPV4_XDB_PATH), FileUtil.createTempFile()); + v6Config = Config.custom() .setCachePolicy(Config.BufferCache) - .setXdbInputStream(v6XdbInputStream) + .setXdbFile(v6TempXdb) +// .setXdbInputStream(v6XdbInputStream) .asV6(); + + // 删除临时文件 + v6TempXdb.delete(); } // 初始化Ip2Region实例