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

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java

@@ -572,7 +572,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                     newDatasetVo.setName((String) dataset.get("dataset_name"));
                     newDatasetVo.setVersion((String) dataset.get("dataset_version"));
                     newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
-                    //todo newDatasetVo.setowner
+                    newDatasetVo.setOwner((String) dataset.get("owner"));
                     trainDatasets.add(newDatasetVo);
                 }
                 modelMetaVo.setTrainDatasets(trainDatasets);
@@ -620,7 +620,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                         newDatasetVo.setName((String) dataset.get("dataset_name"));
                         newDatasetVo.setVersion((String) dataset.get("dataset_version"));
                         newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
-                        //todo newDatasetVo.setowner
+                        newDatasetVo.setOwner((String) dataset.get("owner"));
                         testDatasets.add(newDatasetVo);
                     }
                     modelMetaVo.setTestDatasets(testDatasets);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -590,12 +590,6 @@ public class ModelsServiceImpl implements ModelsService {
             if (gitlinIid == null) {
                 throw new Exception("创建模型失败:" + project.get("message"));
             }
-            // 创建分支
-            gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, modelsVo.getVersion(), "master");
-            // 定义标签 标签1：ci4s-model 标签2：ModelTag 标签3：ModelType
-            gitService.createTopic(token, gitlinIid, "ci4s-model");
-            gitService.createTopic(token, gitlinIid, "modeltag-" + modelsVo.getModelTag());
-            gitService.createTopic(token, gitlinIid, "modeltype-" + modelsVo.getModelType());
 
             String branchName = modelsVo.getVersion();
             String owner = (String) userInfo.get("login");
@@ -607,9 +601,14 @@ public class ModelsServiceImpl implements ModelsService {
             String metaPath = rootPath + "/metadata";
             String relatePath = ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName + "/" + branchName + "/model";
 
-            dvcUtils.gitClone(rootPath, projectUrl, "master", gitLinkUsername, gitLinkPassword);
-            dvcUtils.createLocalBranchBasedOnMaster(rootPath, branchName);
-            dvcUtils.gitCheckoutBranch(rootPath, branchName);
+            // 创建分支
+            gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master");
+            // 定义标签 标签1：ci4s-model 标签2：ModelTag 标签3：ModelType
+            gitService.createTopic(token, gitlinIid, "ci4s-model");
+            gitService.createTopic(token, gitlinIid, "modeltag-" + modelsVo.getModelTag());
+            gitService.createTopic(token, gitlinIid, "modeltype-" + modelsVo.getModelType());
+
+            dvcUtils.gitClone(rootPath, projectUrl, branchName, gitLinkUsername, gitLinkPassword);
 
             //干掉目标文件夹
             dvcUtils.deleteDirectory(modelPath);
@@ -987,8 +986,6 @@ public class ModelsServiceImpl implements ModelsService {
     public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
-        String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
-        String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
 
         if (StringUtils.isEmpty(version)) {
             List<Map<String, Object>> versionList = this.getVersionList(identifier, owner);
@@ -999,8 +996,7 @@ public class ModelsServiceImpl implements ModelsService {
         }
 
         // git pull操作，然后读取里面的文件列表，列出每个文件的大小和名称，封装成MAP
-        List<Map<String, Object>> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPath + ci4sUsername + "/model/" + id, identifier, version, "model", gitLinkUsername, gitLinkPassword);
-
+        List<Map<String, Object>> fileDetailsAfterGitPull = FileUtil.getFiles(localPath + ci4sUsername + "/model/" + id + "/" + identifier + "/" + version + "/model");
         Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPath + ci4sUsername + "/model/" + id + "/" + identifier + "/" + version + "/metadata/metadata.yaml");
 
         String jsonString = JSON.toJSONString(stringObjectMap);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -338,8 +338,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     @Override
     public NewDatasetVo getNewDatasetDesc(Integer id, String name, String repo, String owner, String version) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
-        String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
+        String ci4sUsername = loginUser.getUsername();
         // cd到 localPathlocal/id/下面还有一个文件夹，然后做git pull操作，然后读取里面的文件列表，列出每个文件的大小和名称，封装成MAP
         if (StringUtils.isEmpty(version)) {
             List<Map<String, Object>> versionList = this.getVersionList(repo, owner);
@@ -348,9 +347,10 @@ public class NewDatasetServiceImpl implements NewDatasetService {
             }
             version = (String) versionList.get(0).get("name");
         }
-        List<Map<String, Object>> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword);
+        List<Map<String, Object>> fileDetailsAfterGitPull = FileUtil.getFiles(localPathlocal + ci4sUsername + "/datasets/" + id + "/" + repo + "/" + version + "/dataset");
+
         // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据
-        Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + version + "/dataset.yaml");
+        Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + ci4sUsername + "/datasets/" + id + "/" + repo + "/" + version + "/dataset.yaml");
         String jsonString = JacksonUtil.toJSONString(stringObjectMap);
         NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class);
         List<VersionVo> versionVos = new ArrayList<VersionVo>();

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

@@ -212,7 +212,7 @@ public class ServiceServiceImpl implements ServiceService {
                 serviceVersion.setUrl(data.get("url"));
                 serviceVersion.setDeploymentName(data.get("deployment_name"));
                 serviceVersion.setSvcName(data.get("svc_name"));
-                serviceVersion.setRunState(Constant.Init);
+                serviceVersion.setRunState(Constant.Pending);
                 serviceDao.updateServiceVersion(serviceVersion);
                 return "启动成功";
             } else {