From a195df175f3031d682eccd1fc764ad2033d92b5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 18 六月 2020 15:07:56 +0800
Subject: [PATCH] 修正定时任务日志权限字符
---
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index d70351f..c36431f 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -3,8 +3,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.framework.config.RuoYiConfig;
/**
* 获取地址类
@@ -15,27 +17,40 @@
{
private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
- public static final String IP_URL = "http://ip.taobao.com/service/getIpInfo.php";
+ // IP地址查询
+ public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
+
+ // 未知地址
+ public static final String UNKNOWN = "XX XX";
public static String getRealAddressByIP(String ip)
{
- String address = "XX XX";
+ String address = UNKNOWN;
// 内网不查询
if (IpUtils.internalIp(ip))
{
return "内网IP";
}
- String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
- if (StringUtils.isEmpty(rspStr))
+ if (RuoYiConfig.isAddressEnabled())
{
- log.error("获取地理位置异常 {}", ip);
- return address;
+ try
+ {
+ String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
+ if (StringUtils.isEmpty(rspStr))
+ {
+ log.error("获取地理位置异常 {}", ip);
+ return UNKNOWN;
+ }
+ JSONObject obj = JSONObject.parseObject(rspStr);
+ String region = obj.getString("pro");
+ String city = obj.getString("city");
+ return String.format("%s %s", region, city);
+ }
+ catch (Exception e)
+ {
+ log.error("获取地理位置异常 {}", ip);
+ }
}
- 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;
return address;
}
}
--
Gitblit v1.9.2