From 7cc0dd30f1a404ca054534a21bf7756c87a9c6c2 Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Mon, 2 Mar 2026 10:16:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DResource=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=86=B2=E7=AA=81=E5=92=8CpostJson=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/lsfx/client/LsfxAnalysisClient.java     | 7 +++----
 .../java/com/ruoyi/lsfx/controller/LsfxTestController.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

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<String, Object> 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;
 
 /**
  * 流水分析平台接口测试控制器