Merge branch 'dev-v2' into pr@dev-v2@fixds

sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java

@@ -12,6 +12,7 @@ import io.dataease.extensions.datasource.dto.SimpleDatasourceDTO;
 import io.dataease.model.BusiNodeRequest;
 import io.dataease.model.BusiNodeVO;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -139,6 +140,6 @@ public interface DataFillingApi {
 
     void geFullName(Long pid, List<String> fullName);
 
-    @PostMapping("/innerExport/{formId}")
-    void innerExport(@PathVariable("formId") Long formId) throws Exception;
+    @PostMapping("/innerExport/{isDataEaseBi}/{formId}")
+    void innerExport(@PathVariable("formId") Long formId, @PathVariable("isDataEaseBi") boolean isDataEaseBi, HttpServletResponse response) throws Exception;
 }

sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java

@@ -51,6 +51,10 @@ public interface UserApi {
     @GetMapping("/personInfo")
     UserFormVO personInfo();
 
+    @Operation(summary = "查询客户端IP信息")
+    @GetMapping("/ipInfo")
+    CurIpVO ipInfo();
+
     @Operation(summary = "创建")
     @DePermit("m:read")
     @PostMapping("/create")

sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/CurIpVO.java

@@ -0,0 +1,18 @@
+package io.dataease.api.permissions.user.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class CurIpVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -3025566841330382707L;
+
+    private String account;
+
+    private String name;
+
+    private String ip;
+}