From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java
index e523b6c..b9b1861 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java
@@ -1,42 +1,34 @@
package com.panzhihua.common.utlis;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* 获取地址类
*
* @author ruoyi
*/
-public class AddressUtils
-{
- private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
-
+public class AddressUtils {
// IP地址查询
public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
-
// 未知地址
public static final String UNKNOWN = "XX XX";
+ private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
- public static String getRealAddressByIP(String ip)
- {
+ public static String getRealAddressByIP(String ip) {
String address = UNKNOWN;
// 内网不查询
- if (IpUtils.internalIp(ip))
- {
+ if (IpUtils.internalIp(ip)) {
return "内网IP";
}
-// if (RuoYiConfig.isAddressEnabled())
- if (true)
- {
- try
- {
+ // if (RuoYiConfig.isAddressEnabled())
+ if (true) {
+ try {
String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
- if (StringUtils.isEmpty(rspStr))
- {
+ if (StringUtils.isEmpty(rspStr)) {
log.error("获取地理位置异常 {}", ip);
return UNKNOWN;
}
@@ -44,9 +36,7 @@
String region = obj.getString("pro");
String city = obj.getString("city");
return String.format("%s %s", region, city);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("获取地理位置异常 {}", ip);
}
}
--
Gitblit v1.7.1