From e9b9d8b82e7e28be82c9ed518582d88f507cfac2 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 8 Nov 2024 20:49:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=87=8D=E6=9E=84=20IP=20?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E8=8E=B7=E5=8F=96=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E5=9C=B0=E7=9A=84=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F=EF=BC=88?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B9=E4=BE=BF=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/core/constant/StringConstants.java      |  5 +++++
 .../top/continew/starter/core/util/IpUtils.java     | 13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java b/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
index e220a099..a9527ee9 100644
--- a/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
@@ -254,6 +254,11 @@ public class StringConstants {
      */
     public static final String QUESTION_MARK = "?";
 
+    /**
+     * 管道符
+     */
+    public static final String PIPE = "|";
+
     /**
      * 中文逗号
      */
diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
index 56c47f72..53b32fcd 100644
--- a/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
@@ -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,12 +50,13 @@ 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;
         }
-        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);
     }
 
     /**