Skip to content

Commit e9b9d8b

Browse files
committed
refactor(core): 重构 IP 工具类获取归属地的返回格式(更方便数据处理)
1 parent 04498ff commit e9b9d8b

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,11 @@ public class StringConstants {
254254
*/
255255
public static final String QUESTION_MARK = "?";
256256

257+
/**
258+
* 管道符
259+
*/
260+
public static final String PIPE = "|";
261+
257262
/**
258263
* 中文逗号
259264
*/

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import cn.hutool.core.collection.CollUtil;
2020
import cn.hutool.core.net.NetUtil;
21-
import cn.hutool.core.text.CharSequenceUtil;
2221
import cn.hutool.extra.spring.SpringUtil;
2322
import cn.hutool.http.HtmlUtil;
2423
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
2524
import net.dreamlu.mica.ip2region.core.IpInfo;
2625
import top.continew.starter.core.constant.StringConstants;
2726

27+
import java.util.Objects;
2828
import java.util.Set;
2929

3030
/**
@@ -50,12 +50,13 @@ public static String getIpv4Address(String ip) {
5050
}
5151
Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class);
5252
IpInfo ipInfo = ip2regionSearcher.memorySearch(ip);
53-
if (null != ipInfo) {
54-
Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getAddress(), ipInfo.getIsp());
55-
regionSet.removeIf(CharSequenceUtil::isBlank);
56-
return String.join(StringConstants.SPACE, regionSet);
53+
if (null == ipInfo) {
54+
return null;
5755
}
58-
return null;
56+
Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getCountry(), ipInfo.getRegion(), ipInfo
57+
.getProvince(), ipInfo.getCity(), ipInfo.getIsp());
58+
regionSet.removeIf(Objects::isNull);
59+
return String.join(StringConstants.PIPE, regionSet);
5960
}
6061

6162
/**

0 commit comments

Comments
 (0)