| @@ -338,6 +338,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| @Override | @Override | ||||
| public NewDatasetVo getNewDatasetDesc(Integer id, String name, String repo, String owner, String version) throws Exception { | public NewDatasetVo getNewDatasetDesc(Integer id, String name, String repo, String owner, String version) throws Exception { | ||||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | LoginUser loginUser = SecurityUtils.getLoginUser(); | ||||
| String ci4sUsername = loginUser.getUsername(); | |||||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | ||||
| String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); | String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); | ||||
| // cd到 localPathlocal/id/下面还有一个文件夹,然后做git pull操作,然后读取里面的文件列表,列出每个文件的大小和名称,封装成MAP | // cd到 localPathlocal/id/下面还有一个文件夹,然后做git pull操作,然后读取里面的文件列表,列出每个文件的大小和名称,封装成MAP | ||||
| @@ -348,9 +349,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| } | } | ||||
| version = (String) versionList.get(0).get("name"); | 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中取到元数据 | // 在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); | String jsonString = JacksonUtil.toJSONString(stringObjectMap); | ||||
| NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class); | NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class); | ||||
| List<VersionVo> versionVos = new ArrayList<VersionVo>(); | List<VersionVo> versionVos = new ArrayList<VersionVo>(); | ||||