瀏覽代碼

优化ip获取逻辑

zhouhao 7 年之前
父節點
當前提交
811c4aef6f
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/WebUtil.java

+ 4 - 4
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();