From 41d942a9e08a1acafcab8c9ba55b4119c006bdeb Mon Sep 17 00:00:00 2001
From: maliang <maliang@lymsh.com>
Date: Fri, 17 Mar 2017 14:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/web/controller/BaseController.java    | 86 +++++++++++-----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
index 3f101fe..fd62534 100644
--- a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
+++ b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -34,10 +35,10 @@ public class BaseController {
 
 	protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
-	// @Autowired
+	@Autowired
 	protected HttpServletRequest request;
 
-	// @Autowired
+	@Autowired
 	protected HttpServletResponse response;
 
 	@InitBinder
@@ -316,47 +317,46 @@ public class BaseController {
 		}
 		return new MobileInfo(appVersion, systemVersion, deviceId, width, height, night != 0);
 	}
-	
-	/** 
-     * <li>@Description:获取客户端IP
-     * <li>@param request
-     * <li>@return
-     * <li>创建人：方承
-     * <li>创建时间：2016年11月26日
-     * <li>修改人：
-     * <li>修改时间：
-     */  
-    public static final String getHost(HttpServletRequest request) {
-        String ip = request.getHeader("X-Forwarded-For");
-        if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("X-Real-IP");
-        }
-        if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
-        }
-        if ("127.0.0.1".equals(ip)) {
-            InetAddress inet = null;
-            try { // 根据网卡取本机配置的IP
-                inet = InetAddress.getLocalHost();
-            } catch (UnknownHostException e) {
-                e.printStackTrace();
-            }
-            ip = inet.getHostAddress();
-        }
-        // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
-        if (ip != null && ip.length() > 15) {
-            if (ip.indexOf(",") > 0) {
-                ip = ip.substring(0, ip.indexOf(","));
-            }
-        }
-        return ip;
-    }
 
+	/**
+	 * <li>@Description:获取客户端IP
+	 * <li>@param request
+	 * <li>@return
+	 * <li>创建人：方承
+	 * <li>创建时间：2016年11月26日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	public static final String getHost(HttpServletRequest request) {
+		String ip = request.getHeader("X-Forwarded-For");
+		if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Real-IP");
+		}
+		if (StrUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		if ("127.0.0.1".equals(ip)) {
+			InetAddress inet = null;
+			try { // 根据网卡取本机配置的IP
+				inet = InetAddress.getLocalHost();
+			} catch (UnknownHostException e) {
+				e.printStackTrace();
+			}
+			ip = inet.getHostAddress();
+		}
+		// 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+		if (ip != null && ip.length() > 15) {
+			if (ip.indexOf(",") > 0) {
+				ip = ip.substring(0, ip.indexOf(","));
+			}
+		}
+		return ip;
+	}
 
 }
-- 
1.8.3.1