From 14806a9437cd5f8406226c39b72044ccb935e922 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Mon, 23 Mar 2026 16:51:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(service):=20=E4=BD=BF=E7=94=A8=20RequestIp?=
 =?UTF-8?q?Utils=20=E7=BB=9F=E4=B8=80=E8=A7=A3=E6=9E=90=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E7=9C=9F=E5=AE=9E=20IP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppleServiceImpl.java        |  3 +-
 .../service/impl/UserServiceImpl.java         |  3 +-
 .../impl/user/UserInviteCodeBinder.java       |  4 +-
 .../yolo/keyborad/utils/RequestIpUtils.java   | 47 +++++++++++++++++++
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/yolo/keyborad/utils/RequestIpUtils.java

diff --git a/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java
index c2a4edf..9094c3e 100644
--- a/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java
+++ b/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java
@@ -13,6 +13,7 @@ import com.yolo.keyborad.model.vo.user.KeyboardUserRespVO;
 import com.yolo.keyborad.service.IAppleService;
 import com.yolo.keyborad.service.KeyboardUserLoginLogService;
 import com.yolo.keyborad.service.UserService;
+import com.yolo.keyborad.utils.RequestIpUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import io.jsonwebtoken.*;
 import jakarta.annotation.Resource;
@@ -100,7 +101,7 @@ public class AppleServiceImpl implements IAppleService {
 
             // 记录登录日志
             try {
-                String ipAddress = request.getRemoteAddr();
+                String ipAddress = RequestIpUtils.resolveClientIp(request);
                 String userAgent = request.getHeader("User-Agent");
                 String platform = "Unknown";
                 String os = "Unknown";
diff --git a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
index fb99bfe..6702388 100644
--- a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
@@ -31,6 +31,7 @@ import com.yolo.keyborad.service.impl.user.UserInviteCodeBinder;
 import com.yolo.keyborad.service.impl.user.UserMailVerificationHandler;
 import com.yolo.keyborad.service.impl.user.UserPasswordHandler;
 import com.yolo.keyborad.service.impl.user.UserRegistrationHandler;
+import com.yolo.keyborad.utils.RequestIpUtils;
 
 /*
  * @author: ziin
@@ -228,7 +229,7 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
 
     private void recordLoginLogSafely(Long userId, HttpServletRequest request) {
         try {
-            String ipAddress = request.getRemoteAddr();
+            String ipAddress = RequestIpUtils.resolveClientIp(request);
             String userAgent = request.getHeader("User-Agent");
             String platform = resolvePlatform(userAgent);
             String os = resolveOs(userAgent);
diff --git a/src/main/java/com/yolo/keyborad/service/impl/user/UserInviteCodeBinder.java b/src/main/java/com/yolo/keyborad/service/impl/user/UserInviteCodeBinder.java
index 68e9410..96dcfb0 100644
--- a/src/main/java/com/yolo/keyborad/service/impl/user/UserInviteCodeBinder.java
+++ b/src/main/java/com/yolo/keyborad/service/impl/user/UserInviteCodeBinder.java
@@ -7,6 +7,7 @@ import com.yolo.keyborad.model.entity.KeyboardUserInviteCodes;
 import com.yolo.keyborad.model.entity.KeyboardUserInvites;
 import com.yolo.keyborad.service.KeyboardUserInviteCodesService;
 import com.yolo.keyborad.service.KeyboardUserInvitesService;
+import com.yolo.keyborad.utils.RequestIpUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Date;
 import org.springframework.stereotype.Component;
@@ -73,7 +74,7 @@ public class UserInviteCodeBinder {
         userInvite.setInviteCodeId(inviteCode.getId());
         userInvite.setBindType(MANUAL_BIND_TYPE);
         userInvite.setBoundAt(new Date());
-        userInvite.setBindIp(request.getRemoteAddr());
+        userInvite.setBindIp(RequestIpUtils.resolveClientIp(request));
         userInvite.setBindUserAgent(request.getHeader("User-Agent"));
         userInvite.setInviteType(inviteCode.getInviteType());
         userInvite.setInviteCode(inviteCode.getCode());
@@ -95,4 +96,3 @@ public class UserInviteCodeBinder {
         inviteCodesService.updateById(inviteCode);
     }
 }
-
diff --git a/src/main/java/com/yolo/keyborad/utils/RequestIpUtils.java b/src/main/java/com/yolo/keyborad/utils/RequestIpUtils.java
new file mode 100644
index 0000000..08e8924
--- /dev/null
+++ b/src/main/java/com/yolo/keyborad/utils/RequestIpUtils.java
@@ -0,0 +1,47 @@
+package com.yolo.keyborad.utils;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.util.StringUtils;
+
+public final class RequestIpUtils {
+
+    private static final String HEADER_X_FORWARDED_FOR = "X-Forwarded-For";
+    private static final String HEADER_X_REAL_IP = "X-Real-IP";
+    private static final String UNKNOWN_IP = "unknown";
+
+    private RequestIpUtils() {
+    }
+
+    public static String resolveClientIp(HttpServletRequest request) {
+        String forwardedFor = request.getHeader(HEADER_X_FORWARDED_FOR);
+        String forwardedIp = extractForwardedIp(forwardedFor);
+        if (forwardedIp != null) {
+            return forwardedIp;
+        }
+
+        String realIp = request.getHeader(HEADER_X_REAL_IP);
+        if (isValidIp(realIp)) {
+            return realIp.trim();
+        }
+
+        return request.getRemoteAddr();
+    }
+
+    private static String extractForwardedIp(String forwardedFor) {
+        if (!StringUtils.hasText(forwardedFor)) {
+            return null;
+        }
+
+        String[] ipList = forwardedFor.split(",");
+        for (String ip : ipList) {
+            if (isValidIp(ip)) {
+                return ip.trim();
+            }
+        }
+        return null;
+    }
+
+    private static boolean isValidIp(String ip) {
+        return StringUtils.hasText(ip) && !UNKNOWN_IP.equalsIgnoreCase(ip.trim());
+    }
+}