diff --git a/de-xpack b/de-xpack index b6cd1a1706..7be5178e94 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit b6cd1a1706ef0cf5ed8e5c6e07607c302a8ffe56 +Subproject commit 7be5178e948086bb1cf608695d43d16eff2f8231 diff --git a/sdk/common/src/main/java/io/dataease/utils/IPUtils.java b/sdk/common/src/main/java/io/dataease/utils/IPUtils.java index 624d36fbd6..06e3ab1dbb 100644 --- a/sdk/common/src/main/java/io/dataease/utils/IPUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/IPUtils.java @@ -1,6 +1,7 @@ package io.dataease.utils; import jakarta.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import java.net.InetAddress; @@ -27,6 +28,7 @@ public class IPUtils { LogUtil.error(e.getMessage(), e); return null; } + if (ObjectUtils.isEmpty(request)) return null; String[] keyArr = HEAD_KEYS.split(","); for (String key : keyArr) { String header = request.getHeader(key.trim()); diff --git a/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java b/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java index 93810de8bb..1c3dacd929 100644 --- a/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/ServletUtils.java @@ -12,6 +12,7 @@ public class ServletUtils { public static HttpServletRequest request() { ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (ObjectUtils.isEmpty(servletRequestAttributes)) return null; HttpServletRequest request = servletRequestAttributes.getRequest(); return request; }