From 05feef34c72c7984291e5316f63816de20f356ba Mon Sep 17 00:00:00 2001 From: 万河 <12894283+science-01@user.noreply.gitee.com> Date: 星期四, 18 五月 2023 16:53:14 +0800 Subject: [PATCH] update ruoyi-admin/src/main/resources/banner.txt. 线条填歪了,看着难受 --- ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java index 8b18da9..f95766e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java @@ -2,7 +2,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.StringUtils; @@ -40,7 +41,7 @@ log.error("获取地理位置异常 {}", ip); return UNKNOWN; } - JSONObject obj = JSONObject.parseObject(rspStr); + JSONObject obj = JSON.parseObject(rspStr); String region = obj.getString("pro"); String city = obj.getString("city"); return String.format("%s %s", region, city); -- Gitblit v1.9.2