github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

更换IP地址查询接口

pull/118/MERGE
RuoYi 2020-05-13 21:16:15 +08:00
parent 7190516a27
commit 1af0fef99e
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-common/src/main/java/com/ruoyi/common/utils/AddressUtils.java
View File

@ -2,9 +2,8 @@ package com.ruoyi.common.utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.Global; import com.ruoyi.common.config.Global;
import com.ruoyi.common.json.JSON;
import com.ruoyi.common.json.JSONObject;
import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.http.HttpUtils;
/** /**
@ -16,12 +15,15 @@ public class AddressUtils
{ {
private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); 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) public static String getRealAddressByIP(String ip)
{ {
String address = "XX XX"; String address = UNKNOWN;
// 内网不查询 // 内网不查询
if (IpUtils.internalIp(ip)) if (IpUtils.internalIp(ip))
{ {
@ -29,20 +31,18 @@ public class AddressUtils
} }
if (Global.isAddressEnabled()) if (Global.isAddressEnabled())
{ {
String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip); try
{
String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true");
if (StringUtils.isEmpty(rspStr)) if (StringUtils.isEmpty(rspStr))
{ {
log.error("获取地理位置异常 {}", ip); log.error("获取地理位置异常 {}", ip);
return address; return UNKNOWN;
} }
JSONObject obj; JSONObject obj = JSONObject.parseObject(rspStr);
try String region = obj.getString("pro");
{ String city = obj.getString("city");
obj = JSON.unmarshal(rspStr, JSONObject.class); return String.format("%s %s", region, city);
JSONObject data = obj.getObj("data");
String region = data.getStr("region");
String city = data.getStr("city");
address = region + " " + city;
} }
catch (Exception e) catch (Exception e)
{ {

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View File

@ -49,7 +49,7 @@ public class HttpUtils
connection.setRequestProperty("connection", "Keep-Alive"); connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
connection.connect(); connection.connect();
in = new BufferedReader(new InputStreamReader(connection.getInputStream())); in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
String line; String line;
while ((line = in.readLine()) != null) while ((line = in.readLine()) != null)
{ {