【7.1.6】获取请求IP的逻辑中加入自定义头

pull/23/head
rays 2021-12-01 17:22:39 +08:00
parent 08aabade56
commit dddb3a04f7
1 changed files with 11 additions and 8 deletions

View File

@ -56,6 +56,11 @@ public class HttpServletUtil {
*/ */
private static final String LOCAL_IP = "127.0.0.1"; private static final String LOCAL_IP = "127.0.0.1";
/**
* NginxIP
*/
private static final String AGENT_SOURCE_IP = "Agent-Source-Ip";
/** /**
* ipipv6 * ipipv6
*/ */
@ -108,7 +113,7 @@ public class HttpServletUtil {
if (ObjectUtil.isEmpty(request)) { if (ObjectUtil.isEmpty(request)) {
return LOCAL_IP; return LOCAL_IP;
} else { } else {
String remoteHost = ServletUtil.getClientIP(request); String remoteHost = ServletUtil.getClientIP(request, AGENT_SOURCE_IP);
return LOCAL_REMOTE_HOST.equals(remoteHost) ? LOCAL_IP : remoteHost; return LOCAL_REMOTE_HOST.equals(remoteHost) ? LOCAL_IP : remoteHost;
} }
} }
@ -192,8 +197,7 @@ public class HttpServletUtil {
* @date 2021/2/22 22:37 * @date 2021/2/22 22:37
*/ */
public static Boolean getNormalRequestFlag(HttpServletRequest request) { public static Boolean getNormalRequestFlag(HttpServletRequest request) {
return request.getHeader("Accept") == null return request.getHeader("Accept") == null || request.getHeader("Accept").toLowerCase().contains("text/html");
|| request.getHeader("Accept").toLowerCase().contains("text/html");
} }
/** /**
@ -206,8 +210,7 @@ public class HttpServletUtil {
* @date 2021/2/22 22:37 * @date 2021/2/22 22:37
*/ */
public static Boolean getJsonRequestFlag(HttpServletRequest request) { public static Boolean getJsonRequestFlag(HttpServletRequest request) {
return request.getHeader("Accept") == null return request.getHeader("Accept") == null || request.getHeader("Accept").toLowerCase().contains("application/json");
|| request.getHeader("Accept").toLowerCase().contains("application/json");
} }
} }