| @@ -986,8 +986,6 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version) throws Exception { | public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version) throws Exception { | ||||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | LoginUser loginUser = SecurityUtils.getLoginUser(); | ||||
| String ci4sUsername = loginUser.getUsername(); | String ci4sUsername = loginUser.getUsername(); | ||||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | |||||
| String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); | |||||
| if (StringUtils.isEmpty(version)) { | if (StringUtils.isEmpty(version)) { | ||||
| List<Map<String, Object>> versionList = this.getVersionList(identifier, owner); | List<Map<String, Object>> versionList = this.getVersionList(identifier, owner); | ||||
| @@ -339,8 +339,6 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| 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 ci4sUsername = loginUser.getUsername(); | ||||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | |||||
| String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); | |||||
| // cd到 localPathlocal/id/下面还有一个文件夹,然后做git pull操作,然后读取里面的文件列表,列出每个文件的大小和名称,封装成MAP | // cd到 localPathlocal/id/下面还有一个文件夹,然后做git pull操作,然后读取里面的文件列表,列出每个文件的大小和名称,封装成MAP | ||||
| if (StringUtils.isEmpty(version)) { | if (StringUtils.isEmpty(version)) { | ||||
| List<Map<String, Object>> versionList = this.getVersionList(repo, owner); | List<Map<String, Object>> versionList = this.getVersionList(repo, owner); | ||||
| @@ -212,7 +212,7 @@ public class ServiceServiceImpl implements ServiceService { | |||||
| serviceVersion.setUrl(data.get("url")); | serviceVersion.setUrl(data.get("url")); | ||||
| serviceVersion.setDeploymentName(data.get("deployment_name")); | serviceVersion.setDeploymentName(data.get("deployment_name")); | ||||
| serviceVersion.setSvcName(data.get("svc_name")); | serviceVersion.setSvcName(data.get("svc_name")); | ||||
| serviceVersion.setRunState(Constant.Init); | |||||
| serviceVersion.setRunState(Constant.Pending); | |||||
| serviceDao.updateServiceVersion(serviceVersion); | serviceDao.updateServiceVersion(serviceVersion); | ||||
| return "启动成功"; | return "启动成功"; | ||||
| } else { | } else { | ||||