From a1431c5cb198c42d8830969a9a35710fddbc92c0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 17 十一月 2022 17:33:32 +0800
Subject: [PATCH] !251 add 新增字典数据映射注解，根据字段数据（sys_dict_data表）.dict_type 的 value 映射对应的 label Merge pull request !251 from itino/dev-itino
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 808cc8d..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;
@@ -7,9 +8,9 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
/**
* 鑾峰彇鍦板潃绫�
@@ -17,6 +18,7 @@
* @author Lion Li
*/
@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class AddressUtils {
// IP鍦板潃鏌ヨ
@@ -38,21 +40,21 @@
if (RuoYiConfig.isAddressEnabled()) {
try {
String rspStr = HttpUtil.createGet(IP_URL)
- .body("ip=" + ip + "&json=true", Constants.GBK)
- .execute()
- .body();
+ .body("ip=" + ip + "&json=true", Constants.GBK)
+ .execute()
+ .body();
if (StringUtils.isEmpty(rspStr)) {
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