From f20536ea12ec5b4fa5a768c6dc20614a47285cf7 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 11 Aug 2025 11:19:36 +0800 Subject: [PATCH] =?UTF-8?q?`getClientIP`=E4=BC=98=E5=85=88=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BC=A0=E5=85=A5=E7=9A=84=E8=AF=B7=E6=B1=82=E5=A4=B4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=88pr#1373@Gitee=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/v7/http/server/engine/sun/SunServerRequest.java | 2 +- .../main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java index 39b871f94..8665b204a 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java @@ -235,7 +235,7 @@ public class SunServerRequest extends SunServerExchangeBase implements ServerReq public String getClientIP(final String... otherHeaderNames) { String[] headers = {"X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"}; if (ArrayUtil.isNotEmpty(otherHeaderNames)) { - headers = ArrayUtil.addAll(headers, otherHeaderNames); + headers = ArrayUtil.addAll(otherHeaderNames, headers); } return getClientIPByHeader(headers); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java index 47da9b393..84d37672c 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java @@ -211,7 +211,7 @@ public class ServletUtil { public static String getClientIP(final HttpServletRequest request, final String... otherHeaderNames) { String[] headers = {"X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"}; if (ArrayUtil.isNotEmpty(otherHeaderNames)) { - headers = ArrayUtil.addAll(headers, otherHeaderNames); + headers = ArrayUtil.addAll(otherHeaderNames, headers); } return getClientIPByHeader(request, headers);