From 811c4aef6f4b9dbcfd368f237b3f800d3d9f0af1 Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Wed, 5 Jul 2017 16:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ip=E8=8E=B7=E5=8F=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/hswebframework/web/WebUtil.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/WebUtil.java b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/WebUtil.java
index 4d0af9116..2e85e1e52 100644
--- a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/WebUtil.java
+++ b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/WebUtil.java
@@ -69,7 +69,7 @@ public class WebUtil {
         return map;
     }
 
-     static final String[] ipHeaders = {
+    static final String[] ipHeaders = {
             "X-Forwarded-For",
             "X-Real-IP",
             "Proxy-Client-IP",
@@ -83,10 +83,10 @@ public class WebUtil {
      * @return ip地址
      */
     public static String getIpAddr(HttpServletRequest request) {
-        String ip = request.getHeader("X-Forwarded-For");
         for (String ipHeader : ipHeaders) {
-            if (!StringUtils.isEmpty(ipHeader) && ip.contains("unknown")) {
-                return request.getHeader(ipHeader);
+            String ip = request.getHeader(ipHeader);
+            if (!StringUtils.isEmpty(ip) && !ip.contains("unknown")) {
+                return ip;
             }
         }
         return request.getRemoteAddr();