From 68d09fa06d4e955a4f2db13f288c98254e278e2f Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 19 Sep 2024 08:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9B=E5=BB=BA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java     | 2 +-
 .../com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java | 3 +--
 2 files changed, 2 insertions(+), 3 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 9caf1ef4..1a1e88b8 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
@@ -738,6 +738,7 @@ public class ModelsServiceImpl implements ModelsService {
             modelDependency.setMeta(meta);
             modelDependency1Dao.insert(modelDependency);
 
+            dvcUtils.pushNewBranchToRemote(rootPath, gitLinkUsername, gitLinkPassword, branchName);
             CompletableFuture.supplyAsync(() -> {
                 try {
                     // 配置远程S3地址
@@ -748,7 +749,6 @@ public class ModelsServiceImpl implements ModelsService {
                     dvcUtils.dvcConfigS3Credentials3(rootPath, secretAccessKey);
                     // dvc 跟踪
                     dvcUtils.dvcAdd(rootPath, "model");
-                    dvcUtils.pushNewBranchToRemote(rootPath, gitLinkUsername, gitLinkPassword, branchName);
                     //dvc push 到远程S3
                     dvcUtils.dvcPush(rootPath);
                 } catch (Exception e) {
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 02e43950..3178da35 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
@@ -214,7 +214,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         addDatasetSourceToDataVo(datasetVo);
 
         YamlUtils.generateYamlFile(JsonUtils.objectToMap(datasetVo), localPath, "dataset");
-
+        dvcUtils.pushNewBranchToRemote(localPath, gitLinkUsername, gitLinkPassword, branchName);
         CompletableFuture.supplyAsync(() -> {
             try {
                 //dvc数据跟踪
@@ -225,7 +225,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
                 dvcUtils.dvcConfigS3Credentials3(localPath, secretAccessKey);
                 // dvc 跟踪
                 dvcUtils.dvcAdd(localPath, "dataset");
-                dvcUtils.pushNewBranchToRemote(localPath, gitLinkUsername, gitLinkPassword, branchName);
                 //dvc push 到远程S3
                 dvcUtils.dvcPush(localPath);
             } catch (Exception e) {