diff --git a/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/client/LsfxAnalysisClient.java b/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/client/LsfxAnalysisClient.java index 049a5aa..57fec36 100644 --- a/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/client/LsfxAnalysisClient.java +++ b/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/client/LsfxAnalysisClient.java @@ -6,10 +6,9 @@ import com.ruoyi.lsfx.domain.response.*; import com.ruoyi.lsfx.util.HttpUtil; import com.ruoyi.lsfx.util.MD5Util; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.HashMap; import java.util.Map; @@ -54,13 +53,13 @@ public class LsfxAnalysisClient { } String url = baseUrl + "/account/common/getToken"; - return httpUtil.postJson(url, request, GetTokenResponse.class); + return httpUtil.postJson(url, request, null, GetTokenResponse.class); } /** * 上传文件 */ - public UploadFileResponse uploadFile(Integer groupId, Resource file) { + public UploadFileResponse uploadFile(Integer groupId, org.springframework.core.io.Resource file) { String url = baseUrl + "/watson/api/project/remoteUploadSplitFile"; Map params = new HashMap<>(); diff --git a/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/controller/LsfxTestController.java b/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/controller/LsfxTestController.java index f86a405..d5e06d5 100644 --- a/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/controller/LsfxTestController.java +++ b/ccdi-lsfx/src/main/java/com/ruoyi/lsfx/controller/LsfxTestController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.core.io.Resource; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 流水分析平台接口测试控制器