From bfe6b1bc5e5a59b36895ee965e1db4996dca7c5d Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Mon, 30 Mar 2026 11:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20LogInterceptor=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E7=94=A8=E6=88=B7=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?IP=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springbootinit/aop/LogInterceptor.java    |  5 +-
 .../yupi/springbootinit/utils/NetUtils.java   | 90 +++++++++++++------
 2 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java b/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java
index 5b804b9..2ca04e2 100644
--- a/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java
+++ b/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java
@@ -1,5 +1,6 @@
 package com.yupi.springbootinit.aop;
 
+import com.yupi.springbootinit.utils.NetUtils;
 import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -41,9 +42,10 @@ public class LogInterceptor {
         // 获取请求参数
         Object[] args = point.getArgs();
         String reqParam = "[" + StringUtils.join(args, ", ") + "]";
+        String clientIp = NetUtils.getIpAddress(httpServletRequest);
         // 输出请求日志
         log.info("request start，id: {}, path: {}, ip: {}, params: {}", requestId, url,
-                httpServletRequest.getRemoteHost(), reqParam);
+                clientIp, reqParam);
         // 执行原方法
         Object result = point.proceed();
         // 输出响应日志
@@ -53,4 +55,3 @@ public class LogInterceptor {
         return result;
     }
 }
-
diff --git a/src/main/java/com/yupi/springbootinit/utils/NetUtils.java b/src/main/java/com/yupi/springbootinit/utils/NetUtils.java
index 88069fb..50d35af 100644
--- a/src/main/java/com/yupi/springbootinit/utils/NetUtils.java
+++ b/src/main/java/com/yupi/springbootinit/utils/NetUtils.java
@@ -1,7 +1,9 @@
 package com.yupi.springbootinit.utils;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 网络工具类
@@ -11,6 +13,23 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class NetUtils {
 
+    private static final String UNKNOWN = "unknown";
+
+    private static final String LOCALHOST_IPV4 = "127.0.0.1";
+
+    private static final String LOCALHOST_IPV6 = "0:0:0:0:0:0:0:1";
+
+    private static final String LOCALHOST_IPV6_SHORT = "::1";
+
+    private static final String[] IP_HEADER_CANDIDATES = {
+            "x-forwarded-for",
+            "X-Forwarded-For",
+            "X-Real-IP",
+            "Proxy-Client-IP",
+            "WL-Proxy-Client-IP",
+            "HTTP_X_FORWARDED_FOR"
+    };
+
     /**
      * 获取客户端 IP 地址
      *
@@ -18,38 +37,57 @@ public class NetUtils {
      * @return
      */
     public static String getIpAddress(HttpServletRequest request) {
-        String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
+        String headerIp = getIpFromHeaders(request);
+        if (StringUtils.isNotBlank(headerIp)) {
+            return headerIp;
         }
-        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();
-            if (ip.equals("127.0.0.1")) {
-                // 根据网卡取本机配置的 IP
-                InetAddress inet = null;
-                try {
-                    inet = InetAddress.getLocalHost();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (inet != null) {
-                    ip = inet.getHostAddress();
-                }
+        return normalizeLocalIp(request.getRemoteAddr());
+    }
+
+    private static String getIpFromHeaders(HttpServletRequest request) {
+        for (String headerName : IP_HEADER_CANDIDATES) {
+            String headerValue = request.getHeader(headerName);
+            String ip = extractFirstValidIp(headerValue);
+            if (StringUtils.isNotBlank(ip)) {
+                return ip;
             }
         }
-        // 多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
-        if (ip != null && ip.length() > 15) {
-            if (ip.indexOf(",") > 0) {
-                ip = ip.substring(0, ip.indexOf(","));
+        return null;
+    }
+
+    private static String extractFirstValidIp(String ipValue) {
+        if (StringUtils.isBlank(ipValue)) {
+            return null;
+        }
+        String[] ipList = ipValue.split(",");
+        for (String ip : ipList) {
+            String trimmedIp = StringUtils.trim(ip);
+            if (StringUtils.isNotBlank(trimmedIp) && !UNKNOWN.equalsIgnoreCase(trimmedIp)) {
+                return trimmedIp;
             }
         }
-        if (ip == null) {
-            return "127.0.0.1";
+        return null;
+    }
+
+    private static String normalizeLocalIp(String remoteAddr) {
+        if (StringUtils.isBlank(remoteAddr)) {
+            return LOCALHOST_IPV4;
         }
-        return ip;
+        if (!isLocalhost(remoteAddr)) {
+            return remoteAddr;
+        }
+        try {
+            InetAddress inetAddress = InetAddress.getLocalHost();
+            return inetAddress.getHostAddress();
+        } catch (UnknownHostException e) {
+            return remoteAddr;
+        }
+    }
+
+    private static boolean isLocalhost(String ip) {
+        return LOCALHOST_IPV4.equals(ip)
+                || LOCALHOST_IPV6.equals(ip)
+                || LOCALHOST_IPV6_SHORT.equals(ip);
     }
 
 }