From 98783151e6de7f5f0225379d9da5bcdba68d4742 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 16 May 2024 16:52:19 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=A2=9E=E5=8A=A0=E8=A7=86=E5=9B=BE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?xlsx=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                                     | 2 +-
 sdk/common/src/main/java/io/dataease/utils/IPUtils.java      | 2 ++
 sdk/common/src/main/java/io/dataease/utils/ServletUtils.java | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 23ce24d8cd..7be5178e94 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 23ce24d8cde23d78a3b007fad3cfc1e166eb6524
+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;
     }