ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-09 04:59:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): 重构 IP 工具类获取归属地的返回格式（更方便数据处理）

Browse Source
This commit is contained in:
Charles7c
2024-11-08 20:49:12 +08:00
parent 04498ffe56
commit e9b9d8b82e
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
View File

@@ -254,6 +254,11 @@ public class StringConstants {
*/
public static final String QUESTION_MARK = "?";
/**
* 管道符
*/
public static final String PIPE = "|";
/**
* 中文逗号
*/

13
continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
View File

@@ -18,13 +18,13 @@ package top.continew.starter.core.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.net.NetUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.http.HtmlUtil;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
import top.continew.starter.core.constant.StringConstants;
import java.util.Objects;
import java.util.Set;
/**
@@ -50,13 +50,14 @@ public class IpUtils {
}
Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class);
IpInfo ipInfo = ip2regionSearcher.memorySearch(ip);
if (null != ipInfo) {
Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getAddress(), ipInfo.getIsp());
regionSet.removeIf(CharSequenceUtil::isBlank);
return String.join(StringConstants.SPACE, regionSet);
}
if (null == ipInfo) {
return null;
}
Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getCountry(), ipInfo.getRegion(), ipInfo
.getProvince(), ipInfo.getCity(), ipInfo.getIsp());
regionSet.removeIf(Objects::isNull);
return String.join(StringConstants.PIPE, regionSet);
}
/**
* 是否为内网 IPv4