!32 判断如果是内网IP则不去获取IP地址

Merge pull request !32 from Skqing/master

ruoyi-common/src/main/java/com/ruoyi/common/utils/AddressUtils.java

@@ -20,7 +20,7 @@ public class AddressUtils
 
     public static String getRealAddressByIP(String ip)
     {
-        String address = "XX XX";
+        String address = "address disabled";
         if (Global.isAddressEnabled())
         {
             String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);

ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java

@@ -1,5 +1,7 @@
 package com.ruoyi.common.utils;
 
+import sun.net.util.IPAddressUtil;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -7,37 +9,65 @@ import javax.servlet.http.HttpServletRequest;
  * 
  * @author ruoyi
  */
-public class IpUtils
+public class IpUtils {
-{
+    public static String getIpAddr(HttpServletRequest request) {
-    public static String getIpAddr(HttpServletRequest request)
+        if (request == null) {
-    {
-        if (request == null)
-        {
             return "unknown";
         }
         String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("Proxy-Client-IP");
         }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("X-Forwarded-For");
         }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(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))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("X-Real-IP");
         }
 
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(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;
     }
-}
+
+
+    public static boolean internalIp(String ip) {
+        byte[] addr = IPAddressUtil.textToNumericFormatV4(ip);
+        return internalIp(addr);
+    }
+
+    private static boolean internalIp(byte[] addr) {
+        final byte b0 = addr[0];
+        final byte b1 = addr[1];
+        //10.x.x.x/8
+        final byte SECTION_1 = 0x0A;
+        //172.16.x.x/12
+        final byte SECTION_2 = (byte) 0xAC;
+        final byte SECTION_3 = (byte) 0x10;
+        final byte SECTION_4 = (byte) 0x1F;
+        //192.168.x.x/16
+        final byte SECTION_5 = (byte) 0xC0;
+        final byte SECTION_6 = (byte) 0xA8;
+        switch (b0) {
+            case SECTION_1:
+                return true;
+            case SECTION_2:
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
+                    return true;
+                }
+            case SECTION_5:
+                switch (b1) {
+                    case SECTION_6:
+                        return true;
+                }
+            default:
+                return false;
+        }
+
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -1,10 +1,8 @@
 package com.ruoyi.framework.manager.factory;
 
-import java.util.TimerTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.AddressUtils;
+import com.ruoyi.common.utils.IpUtils;
 import com.ruoyi.framework.shiro.session.OnlineSession;
 import com.ruoyi.framework.util.LogUtils;
 import com.ruoyi.framework.util.ServletUtils;
@@ -17,6 +15,10 @@ import com.ruoyi.system.service.ISysOperLogService;
 import com.ruoyi.system.service.impl.SysLogininforServiceImpl;
 import com.ruoyi.system.service.impl.SysUserOnlineServiceImpl;
 import eu.bitwalker.useragentutils.UserAgent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.TimerTask;
 
 /**
  * 异步工厂（产生任务用）
@@ -72,8 +74,12 @@ public class AsyncFactory
             @Override
             public void run()
             {
-                // 远程查询操作地点
+                if (IpUtils.internalIp(operLog.getOperIp())) {
-                operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+                    operLog.setOperLocation("内网IP");
+                } else {
+                    // 远程查询操作地点
+                    operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+                }
                 SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
             }
         };