fix: 修复Resource导入冲突和postJson方法调用

This commit is contained in:
wkc
2026-03-02 10:16:30 +08:00
parent 6d101a018f
commit 7cc0dd30f1
2 changed files with 4 additions and 5 deletions

View File

@@ -6,10 +6,9 @@ import com.ruoyi.lsfx.domain.response.*;
import com.ruoyi.lsfx.util.HttpUtil; import com.ruoyi.lsfx.util.HttpUtil;
import com.ruoyi.lsfx.util.MD5Util; import com.ruoyi.lsfx.util.MD5Util;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -54,13 +53,13 @@ public class LsfxAnalysisClient {
} }
String url = baseUrl + "/account/common/getToken"; 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"; String url = baseUrl + "/watson/api/project/remoteUploadSplitFile";
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();

View File

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* 流水分析平台接口测试控制器 * 流水分析平台接口测试控制器