From b461c8cc99dd46f4d76efb48626bbea8ac223661 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 01 九月 2021 15:38:08 +0800
Subject: [PATCH] update spring-boot-admin 2.5.0 => 2.5.1 update aliyun.oss 3.13.0 => 3.13.1 update qcloud.cos 5.6.47 => 5.6.51 update hutool 5.7.9 => 5.7.11 update maven-jar-plugin 3.1.1 => 3.2.0
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 2093e19..03c608a 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
@@ -1,12 +1,15 @@
package com.ruoyi.common.utils.ip;
import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
/**
* 鑾峰彇鍦板潃绫�
@@ -25,6 +28,7 @@
public static String getRealAddressByIP(String ip) {
String address = UNKNOWN;
// 鍐呯綉涓嶆煡璇�
+ ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
if (NetUtil.isInnerIP(ip)) {
return "鍐呯綉IP";
}
@@ -34,13 +38,13 @@
.body("ip=" + ip + "&json=true", Constants.GBK)
.execute()
.body();
- if (StrUtil.isEmpty(rspStr)) {
+ if (StringUtils.isEmpty(rspStr)) {
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
return UNKNOWN;
}
- JSONObject obj = JSONObject.parseObject(rspStr);
- String region = obj.getString("pro");
- String city = obj.getString("city");
+ Map<String, String> obj = JsonUtils.parseMap(rspStr);
+ String region = obj.get("pro");
+ String city = obj.get("city");
return String.format("%s %s", region, city);
} catch (Exception e) {
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
--
Gitblit v1.9.3