From f7d71e330376dd82aac910d6ebd27108f2ea4129 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Fri, 13 Sep 2024 13:36:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java index af902cb3..f39e79e2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java @@ -3,6 +3,7 @@ package com.ruoyi.platform.vo; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.platform.domain.dependencydomain.ProjectDepency; +import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -53,7 +54,7 @@ public class ModelMetaVo implements Serializable { private HashMap metrics; @ApiModelProperty(value = "训练任务") - private String trainTask; + private TrainTaskDepency trainTask; @ApiModelProperty(value = "模型标签（模型能力）") private String modelTag; From 31cf861e879f84415feca5f7b1e340456b23fbdd Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Fri, 13 Sep 2024 14:14:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E5=BA=95=E5=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/build-node.sh | 10 +++++----- k8s/dockerfiles/auth-dockerfile | 2 +- k8s/dockerfiles/file-dockerfile | 2 +- k8s/dockerfiles/gateway-dockerfile | 2 +- k8s/dockerfiles/gen-dockerfile | 2 +- k8s/dockerfiles/job-dockerfile | 2 +- k8s/dockerfiles/managent-dockerfile | 2 +- k8s/dockerfiles/system-dockerfile | 2 +- k8s/dockerfiles/visual-dockerfile | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/k8s/build-node.sh b/k8s/build-node.sh index 9805d2ca..5639a72f 100644 --- a/k8s/build-node.sh +++ b/k8s/build-node.sh @@ -3,12 +3,12 @@ baseDir="/home/somuns/ci4s" cd ${baseDir}/react-ui -npm install +# npm install -if [ $? -ne 0 ]; then - echo "Failed to install npm depend package" - exit 1 -fi +#if [ $? -ne 0 ]; then +# echo "Failed to install npm depend package" +# exit 1 +#fi npm run build diff --git a/k8s/dockerfiles/auth-dockerfile b/k8s/dockerfiles/auth-dockerfile index 0eb3dc52..c55fcb88 100644 --- a/k8s/dockerfiles/auth-dockerfile +++ b/k8s/dockerfiles/auth-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/file-dockerfile b/k8s/dockerfiles/file-dockerfile index d5a2b843..ce175dde 100644 --- a/k8s/dockerfiles/file-dockerfile +++ b/k8s/dockerfiles/file-dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 #FROM openjdk:8-jre # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/gateway-dockerfile b/k8s/dockerfiles/gateway-dockerfile index 4ce7ee42..d31960ff 100644 --- a/k8s/dockerfiles/gateway-dockerfile +++ b/k8s/dockerfiles/gateway-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/gen-dockerfile b/k8s/dockerfiles/gen-dockerfile index 8c871a89..0982cf6b 100644 --- a/k8s/dockerfiles/gen-dockerfile +++ b/k8s/dockerfiles/gen-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/job-dockerfile b/k8s/dockerfiles/job-dockerfile index dca8596c..2b8d026e 100644 --- a/k8s/dockerfiles/job-dockerfile +++ b/k8s/dockerfiles/job-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/managent-dockerfile b/k8s/dockerfiles/managent-dockerfile index c4a1b85f..f3ac2be6 100644 --- a/k8s/dockerfiles/managent-dockerfile +++ b/k8s/dockerfiles/managent-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/system-dockerfile b/k8s/dockerfiles/system-dockerfile index f01b3c34..c4d3cc80 100644 --- a/k8s/dockerfiles/system-dockerfile +++ b/k8s/dockerfiles/system-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi diff --git a/k8s/dockerfiles/visual-dockerfile b/k8s/dockerfiles/visual-dockerfile index 34ba71b9..3a96fa3a 100644 --- a/k8s/dockerfiles/visual-dockerfile +++ b/k8s/dockerfiles/visual-dockerfile @@ -1,6 +1,6 @@ # 基础镜像 #FROM openjdk:8-jre -FROM 172.20.32.187/ci4s/openjdk:8-jre +FROM 172.20.32.187/ci4s/openjdk-dvc:2024829 # author MAINTAINER ruoyi From 81908b4b867d817d82f4010d623896e14a948fe5 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Fri, 13 Sep 2024 14:16:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/build.sh b/k8s/build.sh index a0a3adee..ed30e9f1 100644 --- a/k8s/build.sh +++ b/k8s/build.sh @@ -139,7 +139,7 @@ fi if [ "$service" == "all" ]; then # 编译前端 -# compile_front + compile_front # 编译java compile_java "all"