From 4efefb9ada923a7a0480b49b292c498ff88ed15a Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 31 七月 2024 14:22:53 +0800
Subject: [PATCH] 优化图表里的标签显示，设置一定的偏移量，确保标签都在图表内
---
src/main/java/com/ots/common/utils/AddressUtils.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/AddressUtils.java b/src/main/java/com/ots/common/utils/AddressUtils.java
index 9ab5339..9fd4829 100644
--- a/src/main/java/com/ots/common/utils/AddressUtils.java
+++ b/src/main/java/com/ots/common/utils/AddressUtils.java
@@ -7,25 +7,50 @@
public class AddressUtils {
private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
- public static final String IP_URL = "http://ip.taobao.com/service/getIpInfo.php";
+ //https://ip.rss.ink/v1/qqwry?ip=211.147.242.161
+ public static final String IP_URL = "https://ip.rss.ink/v1/qqwry";
public static String getRealAddressByIP(String ip) {
String address = "XX XX";
if (IpUtils.internalIp(ip)) {
return "鍐呯綉IP";
}
- if (EssConfig.isAddressEnabled()) {
- String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
- if (StringUtils.isEmpty(rspStr)) {
- log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
- return address;
+// if (EssConfig.isAddressEnabled()) {
+// String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
+// if (StringUtils.isEmpty(rspStr)) {
+// log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
+// return address;
+// }
+// JSONObject obj = JSONObject.parseObject(rspStr);
+// JSONObject data = obj.getObject("data", JSONObject.class);
+// String region = data.getString("region");
+// String city = data.getString("city");
+// address = region + " " + city;
+// }
+
+ if(EssConfig.isAddressEnabled())
+ {
+ try {
+ String rspStr = HttpUtils.sendGet(IP_URL,"ip=" + ip);
+ if (StringUtils.isEmpty(rspStr)) {
+ log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
+ return address;
+ }
+ JSONObject obj = JSONObject.parseObject(rspStr);
+ JSONObject data = obj.getObject("data", JSONObject.class);
+ String province = data.getString("province");
+ String city = data.getString("city");
+ String area = data.getString("area");
+ address = province + " " + city+"("+area+")";
+ log.info("ip锛�"+ip+",鍦扮悊浣嶇疆锛�"+address);
}
- JSONObject obj = JSONObject.parseObject(rspStr);
- JSONObject data = obj.getObject("data", JSONObject.class);
- String region = data.getString("region");
- String city = data.getString("city");
- address = region + " " + city;
+ catch (Exception ex)
+ {
+ log.error("鑾峰彇ip鍦板潃鍦扮悊浣嶇疆寮傚父锛�"+ex.getMessage());
+ }
}
+
+
return address;
}
}
--
Gitblit v1.9.1