From a1e2f38e9408b73c7083c73617a7a2966edb75e5 Mon Sep 17 00:00:00 2001 From: xujun Date: Mon, 27 Apr 2026 17:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ip=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xtools/boot/core/utils/AddrUtils.java | 20 ------------------- .../java/xtools/boot/ip/utils/IpUtils.java | 11 ++++++++++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xtools-boot-core/src/main/java/xtools/boot/core/utils/AddrUtils.java b/xtools-boot-core/src/main/java/xtools/boot/core/utils/AddrUtils.java index 4e1d5ee..489fca9 100644 --- a/xtools-boot-core/src/main/java/xtools/boot/core/utils/AddrUtils.java +++ b/xtools-boot-core/src/main/java/xtools/boot/core/utils/AddrUtils.java @@ -2,7 +2,6 @@ package xtools.boot.core.utils; import xtools.base.config.BaseParams; import xtools.core.StringUtils; -import xtools.core.encrypt.Md5Utils; import java.util.List; @@ -45,23 +44,4 @@ public class AddrUtils implements BaseParams { return LOCAL_IP_LIST.contains(ip); } - /** - * 根据IP地址获取通用地址code - * - * @param country 国家 - * @param province 省份 - * @param city 城市 - * @return 通用地址code - */ - public static String getCode(String country, String province, String city) { - String code = country; - if (StringUtils.isNotBlank(province)) { - code += CP_LINE + province; - } - if (StringUtils.isNotBlank(city)) { - code += CP_LINE + city; - } - return Md5Utils.encryptToString(code); - } - } diff --git a/xtools-boot-ip/src/main/java/xtools/boot/ip/utils/IpUtils.java b/xtools-boot-ip/src/main/java/xtools/boot/ip/utils/IpUtils.java index 778ec0b..8f0386a 100644 --- a/xtools-boot-ip/src/main/java/xtools/boot/ip/utils/IpUtils.java +++ b/xtools-boot-ip/src/main/java/xtools/boot/ip/utils/IpUtils.java @@ -3,6 +3,7 @@ package xtools.boot.ip.utils; import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.core.StringUtils; +import xtools.core.encrypt.Md5Utils; import xtools.extend.IpLocalUtils; import xtools.extend.dto.IpAddrDto; @@ -80,4 +81,14 @@ public class IpUtils implements BaseParams { return joiner.toString(); } + /** + * 获取IP对应地址的编码 + * + * @param addr 地址信息 + * @return IP对应地址的编码 + */ + public static String getCode(IpAddrDto addr) { + return Md5Utils.encryptToString(searchAddr(addr)); + } + }