From 826aaf46c949d03d3ecb3bdd9b354cfe6c954ee1 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 27 Jul 2026 17:51:23 +0800 Subject: [PATCH] =?UTF-8?q?i18n(audit-log):=20IP=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E5=9C=B0=E6=96=87=E6=A1=88=E5=9B=BD=E9=99=85=E5=8C=96,=20log.j?= =?UTF-8?q?son=20=E6=96=B0=E5=A2=9E=20region.unknown/innerIp,=2010?= =?UTF-8?q?=E8=AF=AD=E7=A7=8D=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audit/log/service/ip2region/IpToRegionService.java | 7 +++++-- .../common-i18n/src/main/resources/i18n/en-US/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/id-ID/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/ja-JP/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/ko-KR/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/ms-MY/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/th-TH/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/vi-VN/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/zh-CN/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/zh-HK/log.json | 4 ++++ .../common-i18n/src/main/resources/i18n/zh-TW/log.json | 4 ++++ 11 files changed, 45 insertions(+), 2 deletions(-) diff --git a/daxpay-platform/daxpay-platform-capability/capability-audit-log/src/main/java/cn/daxpay/open/platform/capability/audit/log/service/ip2region/IpToRegionService.java b/daxpay-platform/daxpay-platform-capability/capability-audit-log/src/main/java/cn/daxpay/open/platform/capability/audit/log/service/ip2region/IpToRegionService.java index 9be08161a..696c4b625 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-audit-log/src/main/java/cn/daxpay/open/platform/capability/audit/log/service/ip2region/IpToRegionService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-audit-log/src/main/java/cn/daxpay/open/platform/capability/audit/log/service/ip2region/IpToRegionService.java @@ -1,6 +1,7 @@ package cn.daxpay.open.platform.capability.audit.log.service.ip2region; import cn.daxpay.open.platform.common.config.properties.PlatformStarterProperties; +import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.hutool.core.lang.PatternPool; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; @@ -123,7 +124,8 @@ public class IpToRegionService { IpRegion region = this.getRegionByIp(ip); // 未查询到 if (Objects.isNull(region)) { - return "未知"; + // 未知归属地 + return I18nUtil.get("log.region.unknown"); } // 中国 港澳台 if (region.isBigChina()) { @@ -139,7 +141,8 @@ public class IpToRegionService { } // 内网 else if (region.isInnerIp()) { - return "内网地址"; + // 内网地址 + return I18nUtil.get("log.region.innerIp"); } // 国外 else { diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/log.json index d286a5013..245111271 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/log.json @@ -9,5 +9,9 @@ "create": "Create refund, order no: {0}, refund amount: {1}", "success": "Refund success, order no: {0}", "fail": "Refund failed, order no: {0}, reason: {1}" + }, + "region": { + "unknown": "Unknown", + "innerIp": "Internal Network" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/log.json index 8bb77c48b..f3eac5b4f 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/id-ID/log.json @@ -9,5 +9,9 @@ "create": "Buat pengembalian dana, nomor pesanan: {0}, jumlah pengembalian dana: {1}", "success": "Pengembalian dana berhasil, no pesanan: {0}", "fail": "Pengembalian dana gagal, nomor pesanan: {0}, alasan: {1}" + }, + "region": { + "unknown": "Tidak diketahui", + "innerIp": "Jaringan Internal" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/log.json index 9f31abf64..e01b6a178 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ja-JP/log.json @@ -9,5 +9,9 @@ "create": "払い戻しを作成、注文番号: {0}、払い戻し金額: {1}", "success": "返金成功、注文番号: {0}", "fail": "返金に失敗しました。注文番号: {0}、理由: {1}" + }, + "region": { + "unknown": "不明", + "innerIp": "プライベートネットワーク" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/log.json index e8cd76b7b..4083ec99c 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ko-KR/log.json @@ -9,5 +9,9 @@ "create": "환불 생성, 주문 번호: {0}, 환불 금액: {1}", "success": "환불 성공, 주문 번호: {0}", "fail": "환불 실패, 주문 번호: {0}, 이유: {1}" + }, + "region": { + "unknown": "알 수 없음", + "innerIp": "사설망" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/log.json index 1c34abdae..1e529a7bc 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/ms-MY/log.json @@ -9,5 +9,9 @@ "create": "Buat bayaran balik, no pesanan: {0}, jumlah bayaran balik: {1}", "success": "Bayaran balik kejayaan, no pesanan: {0}", "fail": "Bayaran balik gagal, no pesanan: {0}, sebab: {1}" + }, + "region": { + "unknown": "Tidak diketahui", + "innerIp": "Rangkaian Dalaman" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/log.json index 4c0d684e7..6fbe67e8d 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/th-TH/log.json @@ -9,5 +9,9 @@ "create": "สร้างการคืนเงิน หมายเลขคำสั่งซื้อ: {0} จำนวนเงินคืน: {1}", "success": "การคืนเงินสำเร็จ หมายเลขคำสั่งซื้อ: {0}", "fail": "การคืนเงินล้มเหลว หมายเลขคำสั่งซื้อ: {0} เหตุผล: {1}" + }, + "region": { + "unknown": "ไม่ทราบ", + "innerIp": "เครือข่ายภายใน" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/log.json index 7f2458762..bca85da5b 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/vi-VN/log.json @@ -9,5 +9,9 @@ "create": "Tạo khoản tiền hoàn lại, số đơn hàng: {0}, số tiền hoàn lại: {1}", "success": "Hoàn tiền thành công, số đơn hàng: {0}", "fail": "Hoàn tiền không thành công, số đơn hàng: {0}, lý do: {1}" + }, + "region": { + "unknown": "Không xác định", + "innerIp": "Mạng nội bộ" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/log.json index 7d0811adc..a3b5dfc1f 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/log.json @@ -9,5 +9,9 @@ "create": "创建退款，订单号：{0}，退款金额：{1}", "success": "退款成功，订单号：{0}", "fail": "退款失败，订单号：{0}，原因：{1}" + }, + "region": { + "unknown": "未知", + "innerIp": "内网地址" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/log.json index 023120447..a265e444d 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-HK/log.json @@ -9,5 +9,9 @@ "create": "創建退款，訂單號：{0}，退款金額：{1}", "success": "退款成功，訂單號：{0}", "fail": "退款失敗，訂單號：{0}，原因：{1}" + }, + "region": { + "unknown": "未知", + "innerIp": "內網位址" } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/log.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/log.json index a2801c3f8..b3ad31ece 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/log.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-TW/log.json @@ -9,5 +9,9 @@ "create": "建立退款，訂單號：{0}，退款金額：{1}", "success": "退款成功，訂單號：{0}", "fail": "退款失敗，訂單號：{0}，原因：{1}" + }, + "region": { + "unknown": "未知", + "innerIp": "內網位址" } }