Merge remote-tracking branch 'origin/dev-czh' into dev

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  

k8s/build.sh

@@ -139,7 +139,7 @@ fi
 
 if [ "$service" == "all" ]; then
   # 编译前端
-#  compile_front
+  compile_front
 
   # 编译java
   compile_java "all"

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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<String, String> metrics;
 
     @ApiModelProperty(value = "训练任务")
-    private String trainTask;
+    private TrainTaskDepency trainTask;
 
     @ApiModelProperty(value = "模型标签（模型能力）")
     private String modelTag;