From 4703c07c7710e5b5fb6d69d409bcedd374f52b36 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 17 Oct 2024 09:25:35 +0800
Subject: [PATCH] =?UTF-8?q?http=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/service/AimService.java    |  2 +-
 .../platform/service/impl/AimServiceImpl.java |  4 ++--
 .../service/impl/WorkflowServiceImpl.java     |  3 ++-
 .../com/ruoyi/platform/utils/HttpUtils.java   | 20 ++++++++++++++++---
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java
index b6c03292..9a867ff8 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java
@@ -18,5 +18,5 @@ public interface AimService {
 
     HashMap<String, Object> queryMetricsParams(String runId) throws Exception;
 
-    List<Map<String, Object>> getBatchMetric(String runHash, String params);
+    List<Map<String, Object>> getBatchMetric(String runHash, String body);
 }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
index 7fd7c706..fe364123 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
@@ -273,9 +273,9 @@ public class AimServiceImpl implements AimService {
     }
 
     @Override
-    public List<Map<String, Object>> getBatchMetric(String runHash, String params) {
+    public List<Map<String, Object>> getBatchMetric(String runHash, String body) {
         String url = aimUrl + "/api/runs/" + runHash + "/metric/get-batch";
-        String response = HttpUtils.sendPost(url, params);
+        String response = HttpUtils.sendPost(url, null, body);
         if (StringUtils.isNotEmpty(response)) {
             return JacksonUtil.parseJSONStr2MapList(response);
         }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
index 2b586f24..75921c4b 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
@@ -7,6 +7,7 @@ import com.ruoyi.platform.domain.Workflow;
 import com.ruoyi.platform.mapper.WorkflowDao;
 import com.ruoyi.platform.service.ExperimentService;
 import com.ruoyi.platform.service.WorkflowService;
+import com.ruoyi.platform.utils.HttpUtils;
 import com.ruoyi.platform.utils.JsonUtils;
 import com.ruoyi.platform.utils.MinioUtil;
 import com.ruoyi.platform.utils.NewHttpUtils;
@@ -172,7 +173,7 @@ public class WorkflowServiceImpl implements WorkflowService {
                 Map<String,Object> requestData = new HashMap<>();
                 requestData.put("data", oldDag);
                 // 发送POST请求到Argo工作流复制接口，并将请求数据转换为JSON
-                String req = httpUtils.sendPost(argoUrl + argoWorkflowCopy,null , JsonUtils.mapToJson(requestData));
+                String req = HttpUtils.sendPost(argoUrl + argoWorkflowCopy ,null, JsonUtils.mapToJson(requestData));
                 // 检查响应是否为空或无内容
                 if (StringUtils.isEmpty(req)) {
                     throw new RuntimeException("工作流复制接口响应内容为空");
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java
index 6a130f0f..b1e30064 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java
@@ -1,5 +1,6 @@
 package com.ruoyi.platform.utils;
 
+import cn.hutool.http.HttpRequest;
 import com.ruoyi.common.core.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
@@ -305,9 +306,9 @@ public class HttpUtils {
             conn.setRequestProperty("contentType", "utf-8");
             conn.setDoOutput(true);
             conn.setDoInput(true);
-            out = new PrintWriter(conn.getOutputStream());
-            out.print(param);
-            out.flush();
+                out = new PrintWriter(conn.getOutputStream());
+                out.print(param);
+                out.flush();
             in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
             String line;
             while ((line = in.readLine()) != null) {
@@ -337,6 +338,19 @@ public class HttpUtils {
         return result.toString();
     }
 
+    public static String sendPost(String url, String param, String body){
+        String urlNameString = url;
+        if (StringUtils.isNotEmpty(param)) {
+            urlNameString = url + "?" + param;
+        }
+        String response = HttpRequest.post(urlNameString)
+                .body(body) // 设置请求体
+                .contentType("application/json") // 设置Content-Type
+                .execute()
+                .body();
+        return response;
+    }
+
     public static String sendSSLPost(String url, String param) {
         StringBuilder result = new StringBuilder();
         String urlNameString = url + "?" + param;