From 7d874e31cfa42163fe448a6d742a805492359fc1 Mon Sep 17 00:00:00 2001
From: Zeno <15270656234@163.com>
Date: 星期一, 28 十一月 2022 18:29:38 +0800
Subject: [PATCH] update ruoyi-ui/src/plugins/download.js. 修复文件名包含特殊字符（+、-、*...）的文件无法下载问题
---
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