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

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

@@ -132,7 +132,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         datasetVo.setIdentifier(repositoryName);
         datasetVo.setId(gitlinIid);
         datasetVo.setOwner((String) userInfo.get("login"));
-        datasetVo.setRelativePaths(relatePath);
+        datasetVo.setRelativePaths(relatePath+"/dataset");
 
         addDatasetSourceToDataVo(datasetVo);
 
@@ -211,7 +211,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         datasetVo.setDescription(newDatasetVo.getDescription());
         datasetVo.setDataTag(newDatasetVo.getDataTag());
         datasetVo.setDataType(newDatasetVo.getDataType());
-        datasetVo.setRelativePaths(relatePath);
+        datasetVo.setRelativePaths(relatePath+"/dataset");
 
         addDatasetSourceToDataVo(datasetVo);
 
@@ -308,7 +308,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         }
         List<Map<String, Object>> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword);
         // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据
-        System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!fileDetailsAfterGitPull:{}" + fileDetailsAfterGitPull);
         Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + "dataset.yaml");
         NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class);
         List<VersionVo> versionVos = new ArrayList<VersionVo>();