diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index a6864342..dfc8b5d4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/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); 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 cd0eab07..bed75bab 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 @@ -986,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> versionList = this.getVersionList(identifier, owner); 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 ae74bd57..79390c49 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 @@ -339,8 +339,6 @@ public class NewDatasetServiceImpl implements NewDatasetService { public NewDatasetVo getNewDatasetDesc(Integer id, String name, String repo, String owner, String version) throws Exception { LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); - String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); - String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); // cd到 localPathlocal/id/下面还有一个文件夹,然后做git pull操作,然后读取里面的文件列表,列出每个文件的大小和名称,封装成MAP if (StringUtils.isEmpty(version)) { List> versionList = this.getVersionList(repo, owner); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java index 6ee97249..7c1a17f3 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java +++ b/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 {