From 7afddb91bdf0855ff7ff69729765994ddef033d7 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 29 Mar 2024 17:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E6=97=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../experiment/ExperimentInsController.java | 5 ++- .../service/ExperimentInsService.java | 4 +- .../impl/ExperimentInsServiceImpl.java | 5 ++- .../java/com/ruoyi/platform/vo/PodLogVo.java | 37 +++++++++++++++++++ 4 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodLogVo.java diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java index 6e55db2b..f2bd4688 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.service.ExperimentInsService; import com.ruoyi.platform.vo.LogRequestVo; +import com.ruoyi.platform.vo.PodLogVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Page; @@ -146,8 +147,8 @@ public class ExperimentInsController extends BaseController { @PostMapping("/pods/realTimeLog") @ApiOperation("获取pod实时日志请求") - public GenericsAjaxResult getRealtimePodLogFromPod(@RequestParam("namespace") String namespace, @RequestParam("container_name") String containerName,@RequestParam("pod_name") String podName){ - return genericsSuccess(this.experimentInsService.getRealtimePodLogFromPod(podName,namespace,containerName)); + public GenericsAjaxResult getRealtimePodLogFromPod(@RequestBody PodLogVo podLogVo){ + return genericsSuccess(this.experimentInsService.getRealtimePodLogFromPod(podLogVo)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java index 8293dec1..56f5303d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.service; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.vo.LogRequestVo; +import com.ruoyi.platform.vo.PodLogVo; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -95,5 +96,6 @@ public interface ExperimentInsService { Map getRealtimePodLog(String podName, String startTime); - String getRealtimePodLogFromPod(String podName, String namespace,String container); + String getRealtimePodLogFromPod(PodLogVo podLogVo); + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index 19f4ddf5..8633f47a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.platform.service.ExperimentInsService; import com.ruoyi.platform.service.WorkflowService; import com.ruoyi.platform.utils.*; import com.ruoyi.platform.vo.LogRequestVo; +import com.ruoyi.platform.vo.PodLogVo; import com.ruoyi.system.api.model.LoginUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -522,8 +523,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } @Override - public String getRealtimePodLogFromPod(String podName, String namespace,String container) { - return K8sClientUtil.getPodLogs(podName, namespace,container, logsLines); + public String getRealtimePodLogFromPod(PodLogVo podLogVo) { + return K8sClientUtil.getPodLogs(podLogVo.getPodName(), podLogVo.getNamespace(),podLogVo.getContainerName(), logsLines); } private boolean isTerminatedState(ExperimentIns ins) throws IOException { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodLogVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodLogVo.java new file mode 100644 index 00000000..87574a4e --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodLogVo.java @@ -0,0 +1,37 @@ +package com.ruoyi.platform.vo; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + +import java.io.Serializable; + +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +public class PodLogVo implements Serializable { + private String podName; + private String namespace; + private String containerName; + + public String getPodName() { + return podName; + } + + public void setPodName(String podName) { + this.podName = podName; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + public String getContainerName() { + return containerName; + } + + public void setContainerName(String containerName) { + this.containerName = containerName; + } +}