From 2f618703e4043eafdda813eafb2327a0f8ed9e83 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Fri, 6 Jun 2025 11:12:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96dvc=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/ModelsServiceImpl.java | 2 +- .../platform/service/impl/NewDatasetServiceImpl.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index ad9a1ac7..457864ab 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -613,7 +613,7 @@ public class ModelsServiceImpl implements ModelsService { String relatePath = ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName + "/" + branchName + "/model"; // 创建分支 - gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master"); + gitService.createBranch(token, owner, repositoryName, branchName, "master"); // 定义标签 标签1：model 标签2：ModelTag 标签3：ModelType gitService.createTopic(token, gitlinIid, Constant.Topic_model); if (StringUtils.isNotEmpty(modelsVo.getModelTag())) { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index 2d7c33f2..827c9ef2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -136,7 +136,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { gitService.createTopic(token, gitlinIid, "datatype-" + datasetVo.getDataType()); } - String relatePath = ci4sUsername + "/datasets/" + gitlinIid + "/" + repositoryName + "/master"; + String relatePath = ci4sUsername + "/datasets/" + gitlinIid + "/" + repositoryName + "/master-dvc"; String localPath = localPathlocal + relatePath; String datasetPath = localPath + "/dataset"; String s3Path = bucketName + "/mini-model-management-platform-files" + "/" + relatePath; @@ -144,8 +144,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { // 得到项目地址 String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git"; - // 创建master分支 - dvcUtils.gitClone(localPath, projectUrl, "master", gitLinkUsername, gitLinkPassword); + // 创建master-dvc分支 + gitService.createBranch(token, owner, repositoryName, "master-dvc", "master"); + dvcUtils.gitClone(localPath, projectUrl, "master-dvc", gitLinkUsername, gitLinkPassword); // 拼接生产的元数据后写入yaml文件 datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login"))); datasetVo.setUpdateTime(DateUtils.getTime()); @@ -182,8 +183,8 @@ public class NewDatasetServiceImpl implements NewDatasetService { String datasetPath1 = localPath1 + "/dataset"; // 命令行操作 git clone 项目地址 - dvcUtils.gitClone(localPath1, projectUrl, "master", gitLinkUsername, gitLinkPassword); - dvcUtils.refreshRemoteBranches(localPath1, gitLinkUsername, gitLinkPassword, "master"); + dvcUtils.gitClone(localPath1, projectUrl, "master-dvc", gitLinkUsername, gitLinkPassword); + dvcUtils.refreshRemoteBranches(localPath1, gitLinkUsername, gitLinkPassword, "master-dvc"); //检查是否存在本地重名分支，有的话干掉 dvcUtils.deleteLocalBranch(localPath1, branchName); // 创建本地分支