From e7f088552f97a71cd27631b019df923ef91e7d6f Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 05 四月 2023 17:36:45 +0800
Subject: [PATCH] !686 导出Excel，提高导出效率 Merge pull request !686 from wzy1024/wzy1024
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 11faa32..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;
@@ -25,7 +26,6 @@
public static String getRealAddressByIP(String ip)
{
- String address = UNKNOWN;
// 内网不查询
if (IpUtils.internalIp(ip))
{
@@ -41,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);
@@ -51,6 +51,6 @@
log.error("获取地理位置异常 {}", ip);
}
}
- return address;
+ return UNKNOWN;
}
}
--
Gitblit v1.9.2