Merge pull request #13212 from dataease/pr@dev-v2@perf_person_ip

perf: 社区版获取客户端IP信息
This commit is contained in:
王嘉豪
2024-11-08 10:15:56 +08:00
committed by GitHub
4 changed files with 14 additions and 2 deletions

View File

@@ -260,6 +260,7 @@ public class DatasetDataManage {
public Long getDatasetTotal(Long datasetGroupId) throws Exception {
DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId);
if (ObjectUtils.isEmpty(dto)) return 0L;
if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
return getDatasetTotal(dto, null, new ChartExtRequest());
}

View File

@@ -19,7 +19,7 @@ import java.util.List;
@Component
public class LinkInterceptor implements HandlerInterceptor {
private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValue, /datasetData/enumValueObj, /datasetData/getFieldTree, /dekey, /share/validate, /sysParameter/queryOnlineMap";
private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValue, /datasetData/enumValueObj, /datasetData/getFieldTree, /dekey, /share/validate, /sysParameter/queryOnlineMap, /chartData/innerExportDetails";
@Override

View File

@@ -1,6 +1,7 @@
package io.dataease.substitute.permissions.user;
import io.dataease.api.permissions.user.vo.CurIpVO;
import io.dataease.api.permissions.user.vo.UserFormVO;
import io.dataease.utils.IPUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -27,6 +28,7 @@ public class SubstituteUserServer {
result.put("language", "zh-CN");
return result;
}
@GetMapping("/personInfo")
public UserFormVO personInfo() {
UserFormVO userFormVO = new UserFormVO();
@@ -38,4 +40,13 @@ public class SubstituteUserServer {
userFormVO.setModel("lose");
return userFormVO;
}
@GetMapping("/ipInfo")
public CurIpVO ipInfo() {
CurIpVO curIpVO = new CurIpVO();
curIpVO.setAccount("admin");
curIpVO.setName("管理员");
curIpVO.setIp(IPUtils.get());
return curIpVO;
}
}