ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

This commit is contained in:
fanshuai 2024-09-13 15:00:12 +08:00
parent 38ced879f4 c7967bc8e9
commit b8f4da80a3
11 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
k8s/build-node.sh
View File

@ -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

2
k8s/build.sh
View File

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

2
k8s/dockerfiles/auth-dockerfile
View File

@ -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

2
k8s/dockerfiles/file-dockerfile
View File

@ -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

2
k8s/dockerfiles/gateway-dockerfile
View File

@ -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

2
k8s/dockerfiles/gen-dockerfile
View File

@ -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

2
k8s/dockerfiles/job-dockerfile
View File

@ -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

2
k8s/dockerfiles/managent-dockerfile
View File

@ -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

2
k8s/dockerfiles/system-dockerfile
View File

@ -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

2
k8s/dockerfiles/visual-dockerfile
View File

@ -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

3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java
View File

@ -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;