From 55ba098e506df00e982581eeb4c074a344d60177 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期六, 16 七月 2022 15:41:51 +0800
Subject: [PATCH] StreamUtils优化分组方法返回由HashMap无序转为LinkedHashMap有序
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 11 +++++------
1 files changed, 5 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 1d61230..8d3515e 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,5 +1,6 @@
package com.ruoyi.common.utils.ip;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.net.NetUtil;
import cn.hutool.http.HtmlUtil;
import cn.hutool.http.HttpUtil;
@@ -10,8 +11,6 @@
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
/**
* 鑾峰彇鍦板潃绫�
@@ -48,14 +47,14 @@
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
return UNKNOWN;
}
- Map<String, String> obj = JsonUtils.parseMap(rspStr);
- String region = obj.get("pro");
- String city = obj.get("city");
+ Dict obj = JsonUtils.parseMap(rspStr);
+ String region = obj.getStr("pro");
+ String city = obj.getStr("city");
return String.format("%s %s", region, city);
} catch (Exception e) {
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
}
}
- return address;
+ return UNKNOWN;
}
}
--
Gitblit v1.9.3