From afd26142b69296812694ba86aa7c2e58469b237a Mon Sep 17 00:00:00 2001 From: Wang Chen Chen <932560435@qq.com> Date: Fri, 3 Nov 2023 14:49:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=20getRealAddressByIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xaaef/molly/common/util/IpUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/common/src/main/java/com/xaaef/molly/common/util/IpUtils.java b/server/common/src/main/java/com/xaaef/molly/common/util/IpUtils.java index 2146c38..7554ff8 100644 --- a/server/common/src/main/java/com/xaaef/molly/common/util/IpUtils.java +++ b/server/common/src/main/java/com/xaaef/molly/common/util/IpUtils.java @@ -90,12 +90,12 @@ public class IpUtils { if (Ipv4Util.isInnerIP(ip)) { return StrUtil.format("内网 {} IP", ip); } - var response = HttpUtil.get(String.format(IP_URL, ip)); - if (!JsonUtils.isJson(response)) { + var jsonStr = HttpUtil.get(String.format(IP_URL, ip), 1500); + if (!JsonUtils.isJsonValid(jsonStr)) { return "未知"; } - Map stringMap = JsonUtils.toMap(response, String.class, String.class); - if (stringMap == null) { + Map stringMap = JsonUtils.toMap(jsonStr, String.class, String.class); + if (stringMap == null || stringMap.isEmpty()) { return "未知"; } return stringMap.getOrDefault("addr", "未知");