dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9679 from dataease/pr@dev@dev-v2@perf_report_view_xlsx

Browse Source 
perf(X-Pack): 定时报告增加视图导出xlsx附件
This commit is contained in:
fit2cloud-chenyw 2024-05-16 16:54:33 +08:00 committed by GitHub
commit ce2e511102
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
de-xpack

@ -1 +1 @@
Subproject commit b6cd1a1706ef0cf5ed8e5c6e07607c302a8ffe56 Subproject commit 7be5178e948086bb1cf608695d43d16eff2f8231

2
sdk/common/src/main/java/io/dataease/utils/IPUtils.java
View File

@ -1,6 +1,7 @@
package io.dataease.utils; package io.dataease.utils;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.net.InetAddress; import java.net.InetAddress;
@ -27,6 +28,7 @@ public class IPUtils {
LogUtil.error(e.getMessage(), e); LogUtil.error(e.getMessage(), e);
return null; return null;
} }
if (ObjectUtils.isEmpty(request)) return null;
String[] keyArr = HEAD_KEYS.split(","); String[] keyArr = HEAD_KEYS.split(",");
for (String key : keyArr) { for (String key : keyArr) {
String header = request.getHeader(key.trim()); String header = request.getHeader(key.trim());

1
sdk/common/src/main/java/io/dataease/utils/ServletUtils.java
View File

@ -12,6 +12,7 @@ public class ServletUtils {
public static HttpServletRequest request() { public static HttpServletRequest request() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (ObjectUtils.isEmpty(servletRequestAttributes)) return null;
HttpServletRequest request = servletRequestAttributes.getRequest(); HttpServletRequest request = servletRequestAttributes.getRequest();
return request; return request;
} }