diff --git a/src/main/java/com/dd/admin/common/utils/AddressUtils.java b/src/main/java/com/dd/admin/common/utils/AddressUtils.java index 76d5991..e89698e 100644 --- a/src/main/java/com/dd/admin/common/utils/AddressUtils.java +++ b/src/main/java/com/dd/admin/common/utils/AddressUtils.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; public class AddressUtils { private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); + // 未知地址 public static final String UNKNOWN = "未知地址"; @@ -24,10 +25,11 @@ public class AddressUtils { String rspStr = RegionUtil.getRegion(ip); if (StringUtils.isNotEmpty(rspStr)) { String[] obj = rspStr.split("\\|"); -// String region = obj[2]; + String region = obj[2]; String city = obj[3]; - -// return String.format("%s%s", region, city); + if("0".equals(city)){ + return String.format("%s", region); + } return String.format("%s", city); } } catch (Exception e) { @@ -73,7 +75,8 @@ public class AddressUtils { public static void main(String[] args) { - String realAddress = getRealAddress("117.136.79.113"); + String realAddress = getRealAddress("103.85.74.92"); + ; System.out.println("realAddress = " + realAddress); } } diff --git a/src/main/java/com/dd/admin/common/utils/IPUtils.java b/src/main/java/com/dd/admin/common/utils/IPUtils.java index a4403b6..784f723 100644 --- a/src/main/java/com/dd/admin/common/utils/IPUtils.java +++ b/src/main/java/com/dd/admin/common/utils/IPUtils.java @@ -1 +1 @@ -package com.dd.admin.common.utils; import javax.servlet.http.HttpServletRequest; public class IPUtils { /** * 获取IP地址 * * 使用Nginx等反向代理软件, 则不能通过request.getRemoteAddr()获取IP地址 * 如果使用了多级反向代理的话,X-Forwarded-For的值并不止一个,而是一串IP地址,X-Forwarded-For中第一个非unknown的有效IP字符串,则为真实IP地址 */ public static String getIpAddr(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip; } } \ No newline at end of file +package com.dd.admin.common.utils; import javax.servlet.http.HttpServletRequest; public class IPUtils { /** * 获取IP地址 * * 使用Nginx等反向代理软件, 则不能通过request.getRemoteAddr()获取IP地址 * 如果使用了多级反向代理的话,X-Forwarded-For的值并不止一个,而是一串IP地址,X-Forwarded-For中第一个非unknown的有效IP字符串,则为真实IP地址 */ public static String getIpAddr(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip; } } \ No newline at end of file diff --git a/src/main/java/com/dd/admin/common/utils/PureNetUtils.java b/src/main/java/com/dd/admin/common/utils/PureNetUtils.java index bbd8e24..1f4bb2a 100644 --- a/src/main/java/com/dd/admin/common/utils/PureNetUtils.java +++ b/src/main/java/com/dd/admin/common/utils/PureNetUtils.java @@ -2,6 +2,7 @@ package com.dd.admin.common.utils; import com.alibaba.fastjson.JSONObject; +import com.sun.javaws.Main; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,6 +18,8 @@ import java.util.Map; */ public class PureNetUtils { + + private static final Logger log = LoggerFactory.getLogger(PureNetUtils.class); /** diff --git a/src/main/java/com/dd/admin/common/utils/RegionUtil.java b/src/main/java/com/dd/admin/common/utils/RegionUtil.java index 1b88bd7..5386d18 100644 --- a/src/main/java/com/dd/admin/common/utils/RegionUtil.java +++ b/src/main/java/com/dd/admin/common/utils/RegionUtil.java @@ -28,6 +28,10 @@ public class RegionUtil { static DbConfig config = null; static DbSearcher searcher = null; + public static void main(String[] args) { + getRegion("103.85.74.92"); + } + // 初始化IP库 static { try { diff --git a/web/dist.rar b/web/dist.rar new file mode 100644 index 0000000..de8aaad Binary files /dev/null and b/web/dist.rar differ