userInfo = JsonUtils.jsonToMap(userReq);
@@ -122,7 +123,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
String owner = (String) userInfo.get("login");
gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master");
- // 定义标签 标签1：ci4s-dataset 标签2：DataTag 标签3：DataType
+ // 定义标签 标签1：dataset 标签2：DataTag 标签3：DataType
gitService.createTopic(token, gitlinIid, Constant.Topic_Dataset);
if (StringUtils.isNotEmpty(datasetVo.getDataTag())) {
gitService.createTopic(token, gitlinIid, "datatag-" + datasetVo.getDataTag());
@@ -132,7 +133,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
}
// 得到项目地址
- String projectUrl = gitendpoint + "/" + owner + "/" + repositoryName + ".git";
+ String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git";
// 得到用户操作的路径
String sourcePath = datasetVo.getDatasetVersionVos().get(0).getUrl();
@@ -149,7 +150,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
// 拼接生产的元数据后写入yaml文件
datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login")));
datasetVo.setUpdateTime(DateUtils.getTime());
- datasetVo.setVersionDesc(datasetVo.getDescription());
datasetVo.setUsage("" +
"# 克隆数据集配置文件与存储参数到本地\n" +
"git clone -b " + branchName + " " + projectUrl + "\n" +
@@ -203,8 +203,8 @@ public class NewDatasetServiceImpl implements NewDatasetService {
Jedis jedis = new Jedis(redisHost, redisPort);
LoginUser loginUser = SecurityUtils.getLoginUser();
String ci4sUsername = loginUser.getUsername();
- String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
- String gitLinkPassword = decrypt(loginUser.getSysUser().getGitLinkPassword());
+ String gitLinkUsername = loginUser.getSysUser().getUserName();
+ String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
Map userInfo = JsonUtils.jsonToMap(userReq);
@@ -217,7 +217,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
String relatePath = ci4sUsername + "/datasets/" + datasetVo.getId() + "/" + repositoryName + "/" + branchName;
String localPath = localPathlocal + relatePath;
String datasetPath = localPath + "/dataset";
- String projectUrl = gitendpoint + "/" + owner + "/" + repositoryName + ".git";
+ String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git";
//干掉目标文件夹
dvcUtils.deleteDirectory(localPath);
@@ -341,11 +341,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
@Override
public Page newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception {
String token = gitService.checkoutToken();
- Jedis jedis = new Jedis(redisHost, redisPort);
- LoginUser loginUser = SecurityUtils.getLoginUser();
- String ci4sUsername = loginUser.getUsername();
- String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
- Map userInfo = JsonUtils.jsonToMap(userReq);
// 拼接查询url
String url = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id;
@@ -384,7 +379,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
Map stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + ci4sUsername + "/datasets/" + id + "/" + repo + "/" + version + "/dataset.yaml");
String jsonString = JacksonUtil.toJSONString(stringObjectMap);
NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class);
- List versionVos = new ArrayList();
+ List versionVos = new ArrayList<>();
if (fileDetailsAfterGitPull != null && fileDetailsAfterGitPull.size() > 0) {
for (Map fileDetail : fileDetailsAfterGitPull) {
VersionVo versionVo = new VersionVo();
@@ -396,6 +391,13 @@ public class NewDatasetServiceImpl implements NewDatasetService {
}
}
newDatasetVo.setDatasetVersionVos(versionVos);
+
+ String token = gitService.checkoutToken();
+ String url = gitendpoint + "/api/" + owner + "/" + repo + "/detail.json";
+ String req = httpUtils.sendGetWithToken(url, null, token);
+ Map reqMap = JacksonUtil.parseJSONStr2Map(req);
+ newDatasetVo.setPraisesCount((Integer) reqMap.get("praises_count"));
+ newDatasetVo.setPraised((Boolean) reqMap.get("praised"));
return newDatasetVo;
}
@@ -622,7 +624,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
}
-
+ @Override
public List convert(List> lst, String datasetTopic, String datasetTagName, String datasetTypeName) {
if (lst != null && lst.size() > 0) {
List result = new ArrayList<>();
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java
index 42701bc0..9f3ec88d 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayInsServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.platform.service.impl;
-import com.ruoyi.platform.constant.Constant;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.platform.domain.Ray;
import com.ruoyi.platform.domain.RayIns;
import com.ruoyi.platform.mapper.RayDao;
@@ -157,8 +157,8 @@ public class RayInsServiceImpl implements RayInsService {
if (innerMap.containsKey("phase")) {
String phaseValue = (String) innerMap.get("phase");
// 如果值不等于 Succeeded，则赋值为 Failed
- if (!StringUtils.equals("Succeeded", phaseValue)) {
- innerMap.put("phase", "Failed");
+ if (!StringUtils.equals(Constant.Succeeded, phaseValue)) {
+ innerMap.put("phase", Constant.Failed);
}
}
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java
index 0cbf6ffb..8f4643ed 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java
@@ -3,7 +3,7 @@ package com.ruoyi.platform.service.impl;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.platform.domain.Ray;
import com.ruoyi.platform.domain.RayIns;
import com.ruoyi.platform.mapper.RayDao;
@@ -153,10 +153,10 @@ public class RayServiceImpl implements RayService {
}
// 记录开始扣积分
- if (resourceOccupyService.haveResource(ray.getComputingResourceId())) {
+ if (resourceOccupyService.haveResource(ray.getComputingResourceId(), 1)) {
RayParamVo rayParamVo = new RayParamVo();
BeanUtils.copyProperties(ray, rayParamVo);
- rayParamVo.setResource(ray.getComputingResourceId());
+ rayParamVo.setComputingResourceId(ray.getComputingResourceId());
rayParamVo.setCodeConfig(JsonUtils.jsonToMap(ray.getCodeConfig()));
rayParamVo.setDataset(JsonUtils.jsonToMap(ray.getDataset()));
rayParamVo.setModel(JsonUtils.jsonToMap(ray.getModel()));
@@ -206,7 +206,7 @@ public class RayServiceImpl implements RayService {
rayInsDao.insert(rayIns);
rayInsService.updateRayStatus(id);
// 记录开始扣除积分
- resourceOccupyService.startDeduce(ray.getComputingResourceId(), Constant.TaskType_Ray, id, rayIns.getId(), null, ray.getName(), null);
+ resourceOccupyService.startDeduce(ray.getComputingResourceId(), 1, Constant.TaskType_Ray, id, rayIns.getId(), null, ray.getName(), null, null);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
index bdcf7b58..48373b2a 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
@@ -1,7 +1,7 @@
package com.ruoyi.platform.service.impl;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.platform.domain.ComputingResource;
import com.ruoyi.platform.domain.ResourceOccupy;
import com.ruoyi.platform.mapper.ComputingResourceDao;
@@ -29,21 +29,20 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
private ComputingResourceDao computingResourceDao;
@Override
- public Boolean haveResource(Integer computingResourceId) throws Exception {
+ public Boolean haveResource(Integer computingResourceId, Integer replicas) throws Exception {
ComputingResource computingResource = computingResourceDao.queryById(computingResourceId);
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (loginUser.getSysUser().getCredit() < computingResource.getCreditPerHour()) {
- throw new Exception("积分不足");
+ if (resourceOccupyDao.getUserCredit(SecurityUtils.getLoginUser().getUserid()) <= 0) {
+ throw new Exception("当前积分不足");
}
if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) {
- if (resourceOccupyDao.haveResource(computingResource.getResourceId(), computingResource.getGpuNums())) {
+ if (resourceOccupyDao.haveResource(computingResource.getResourceId(), computingResource.getGpuNums() * replicas)) {
return true;
} else {
throw new Exception("资源不足，GPU资源已被占用");
}
} else {
- if (resourceOccupyDao.haveResource(computingResource.getResourceId(), computingResource.getCpuCores())) {
+ if (resourceOccupyDao.haveResource(computingResource.getResourceId(), computingResource.getCpuCores() * replicas)) {
return true;
} else {
throw new Exception("资源不足，CPU资源已被占用完");
@@ -53,26 +52,31 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
@Override
@Transactional
- public void startDeduce(Integer computingResourceId, String taskType, Long taskId, Long taskInsId, Long workflowId, String taskName, String nodeId) {
+ public void startDeduce(Integer computingResourceId, Integer replicas, String taskType, Long taskId, Long taskInsId, Long workflowId, String taskName, String nodeId, Integer state) {
ResourceOccupy resourceOccupy = new ResourceOccupy();
ComputingResource computingResource = computingResourceDao.queryById(computingResourceId);
resourceOccupy.setComputingResourceId(computingResourceId);
LoginUser loginUser = SecurityUtils.getLoginUser();
resourceOccupy.setUserId(loginUser.getUserid());
- resourceOccupy.setCreditPerHour(computingResource.getCreditPerHour());
- resourceOccupy.setDescription(computingResource.getDescription());
+ resourceOccupy.setCreditPerHour(computingResource.getCreditPerHour() * replicas);
+ if (replicas > 1) {
+ resourceOccupy.setDescription(replicas + " * [" + computingResource.getDescription() + "]");
+ } else {
+ resourceOccupy.setDescription(computingResource.getDescription());
+ }
resourceOccupy.setTaskType(taskType);
resourceOccupy.setTaskId(taskId);
resourceOccupy.setTaskInsId(taskInsId);
resourceOccupy.setWorkflowId(workflowId);
resourceOccupy.setTaskName(taskName);
resourceOccupy.setNodeId(nodeId);
+ resourceOccupy.setState(state);
resourceOccupyDao.save(resourceOccupy);
if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) {
- resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getGpuNums());
+ resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getGpuNums() * replicas);
} else {
- resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getCpuCores());
+ resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getCpuCores() * replicas);
}
}
@@ -86,10 +90,11 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
resourceOccupyDao.edit(resourceOccupy);
ComputingResource computingResource = computingResourceDao.queryById(resourceOccupy.getComputingResourceId());
+ int occupy_num = (int) (resourceOccupy.getCreditPerHour() / computingResource.getCreditPerHour());
if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) {
- resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getGpuNums());
+ resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getGpuNums() * occupy_num);
} else {
- resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getCpuCores());
+ resourceOccupyDao.updateUnUsed(computingResource.getResourceId(), computingResource.getCpuCores() * occupy_num);
}
}
}
@@ -112,6 +117,7 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
resourceOccupy.setDeduceCredit(resourceOccupy.getDeduceCredit() + deduceCredit);
resourceOccupy.setDeduceLastTime(now);
+ resourceOccupy.setState(Constant.State_valid);
resourceOccupyDao.edit(resourceOccupy);
}
}
@@ -131,4 +137,35 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
result.put("deduceCredit", deduceCredit);
return result;
}
+
+ @Override
+ @Transactional
+ public void update(String taskType, Long taskId, Long taskInsId, Integer computingResourceId, Integer replicas) {
+ ResourceOccupy resourceOccupy = resourceOccupyDao.getResourceOccupyByTask(taskType, taskId, taskInsId, null).get(0);
+ ComputingResource oldComputingResource = computingResourceDao.queryById(resourceOccupy.getComputingResourceId());
+ ComputingResource computingResource = computingResourceDao.queryById(computingResourceId);
+
+ int occupy_num = (int) (resourceOccupy.getCreditPerHour() / oldComputingResource.getCreditPerHour());
+
+ if (Constant.Computing_Resource_GPU.equals(oldComputingResource.getComputingResource())) {
+ resourceOccupyDao.updateUnUsed(oldComputingResource.getResourceId(), oldComputingResource.getGpuNums() * occupy_num);
+ } else {
+ resourceOccupyDao.updateUnUsed(oldComputingResource.getResourceId(), computingResource.getCpuCores() * occupy_num);
+ }
+
+ if (Constant.Computing_Resource_GPU.equals(computingResource.getComputingResource())) {
+ resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getGpuNums() * replicas);
+ } else {
+ resourceOccupyDao.updateUsed(computingResource.getResourceId(), computingResource.getCpuCores() * replicas);
+ }
+
+ if (replicas > 1) {
+ resourceOccupy.setDescription(replicas + " * [" + computingResource.getDescription() + "]");
+ } else {
+ resourceOccupy.setDescription(computingResource.getDescription());
+ }
+ resourceOccupy.setCreditPerHour(computingResource.getCreditPerHour() * replicas);
+ resourceOccupy.setComputingResourceId(computingResourceId);
+ resourceOccupyDao.edit(resourceOccupy);
+ }
}
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 41e1df5d..41b2704c 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
@@ -3,7 +3,6 @@ package com.ruoyi.platform.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
import com.ruoyi.platform.domain.AssetWorkflow;
import com.ruoyi.platform.domain.ComputingResource;
import com.ruoyi.platform.domain.ServiceVersion;
@@ -18,6 +17,7 @@ import com.ruoyi.platform.utils.JacksonUtil;
import com.ruoyi.platform.vo.serviceVos.ServiceCodeConfigVo;
import com.ruoyi.platform.vo.serviceVos.ServiceModelVo;
import com.ruoyi.platform.vo.serviceVos.ServiceVersionVo;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.system.api.model.LoginUser;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -28,6 +28,8 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -151,7 +153,8 @@ public class ServiceServiceImpl implements ServiceService {
ServiceVersion oldServiceVersion = serviceDao.getServiceVersionById(serviceVersionVo.getId());
if (!oldServiceVersion.getReplicas().equals(serviceVersionVo.getReplicas()) || !oldServiceVersion.getComputingResourceId().equals(serviceVersionVo.getComputingResourceId())
|| serviceVersionVo.getRerun()) {
- updateServiceVersion(serviceVersion);
+ updateServiceVersion(serviceVersion, serviceVersionVo.getRerun());
+ serviceVersion.setRunState(Constant.Pending);
}
LoginUser loginUser = SecurityUtils.getLoginUser();
serviceVersion.setUpdateBy(loginUser.getUsername());
@@ -171,6 +174,23 @@ public class ServiceServiceImpl implements ServiceService {
ServiceVersionVo serviceVersionVo = getServiceVersionVo(serviceVersion);
com.ruoyi.platform.domain.Service service = serviceDao.getServiceById(serviceVersion.getServiceId());
serviceVersionVo.setServiceName(service.getServiceName());
+ // 拼接文档地址和gradio地址
+ if (StringUtils.isNotEmpty(serviceVersionVo.getUrl())) {
+ try {
+ URL url = new URL(serviceVersionVo.getUrl());
+ // 获取协议、主机、端口
+ String protocol = url.getProtocol();
+ String host = url.getHost();
+ int port = url.getPort();
+ String baseUrl = (port == -1 || port == url.getDefaultPort())
+ ? protocol + "://" + host
+ : protocol + "://" + host + ":" + port;
+ serviceVersionVo.setDocPath(baseUrl + "/redoc");
+ serviceVersionVo.setPagePath(baseUrl + "/gradio");
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ }
return serviceVersionVo;
}
@@ -238,6 +258,8 @@ public class ServiceServiceImpl implements ServiceService {
if (StringUtils.isNotEmpty(req)) {
Map reqMap = JacksonUtil.parseJSONStr2Map(req);
// if ((Integer) reqMap.get("code") == 200) {
+ // 结束扣积分
+ resourceOccupyService.endDeduce(Constant.TaskType_Service, null, id, null, null);
return serviceDao.updateServiceVersion(serviceVersion) > 0 ? "删除成功" : "删除失败";
// }
}
@@ -251,7 +273,7 @@ public class ServiceServiceImpl implements ServiceService {
HashMap paramMap = new HashMap<>();
paramMap.put("service_name", service.getServiceName());
paramMap.put("description", serviceVersion.getDescription());
- paramMap.put("resource", serviceVersion.getComputingResourceId());
+ paramMap.put("computing_resource_id", serviceVersion.getComputingResourceId());
paramMap.put("mount_path", serviceVersion.getMountPath());
paramMap.put("replicas", serviceVersion.getReplicas());
paramMap.put("env", JSONObject.parseObject(serviceVersion.getEnvVariables()));
@@ -262,7 +284,7 @@ public class ServiceServiceImpl implements ServiceService {
paramMap.put("deploy_type", serviceVersion.getDeployType());
// 判断是否有资源
- if (resourceOccupyService.haveResource(serviceVersion.getComputingResourceId())) {
+ if (resourceOccupyService.haveResource(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas())) {
String req = HttpUtils.sendPost(argoUrl + modelService + "/create", JSON.toJSONString(paramMap));
if (StringUtils.isNotEmpty(req)) {
Map reqMap = JacksonUtil.parseJSONStr2Map(req);
@@ -275,7 +297,7 @@ public class ServiceServiceImpl implements ServiceService {
serviceDao.updateServiceVersion(serviceVersion);
// 记录开始扣积分
- resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null);
+ resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, Constant.State_building);
return "启动成功";
} else {
throw new RuntimeException("启动失败");
@@ -305,20 +327,25 @@ public class ServiceServiceImpl implements ServiceService {
}
@Override
- public String updateServiceVersion(ServiceVersion serviceVersion) throws Exception {
+ public String updateServiceVersion(ServiceVersion serviceVersion, Boolean reRun) throws Exception {
// 判断是否有资源
- if (resourceOccupyService.haveResource(serviceVersion.getComputingResourceId())) {
+ if (resourceOccupyService.haveResource(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas())) {
HashMap paramMap = new HashMap<>();
paramMap.put("deployment_name", serviceVersion.getDeploymentName());
HashMap updateMap = new HashMap<>();
updateMap.put("replicas", serviceVersion.getReplicas());
- updateMap.put("resource", serviceVersion.getResource());
+ updateMap.put("computing_resource_id", serviceVersion.getComputingResourceId());
paramMap.put("update_model", new JSONObject(updateMap));
String req = HttpUtils.sendPost(argoUrl + modelService + "/update", JSON.toJSONString(paramMap));
if (StringUtils.isNotEmpty(req)) {
com.ruoyi.platform.domain.Service service = serviceDao.getServiceById(serviceVersion.getServiceId());
+ ServiceVersion serviceVersionById = serviceDao.getServiceVersionById(serviceVersion.getId());
// 记录开始扣积分
- resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null);
+ if (reRun) {
+ resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, Constant.State_building);
+ } else if (Constant.Running.equals(serviceVersionById.getRunState()) || Constant.Pending.equals(serviceVersionById.getRunState())) {
+ resourceOccupyService.update(Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), serviceVersion.getComputingResourceId(), serviceVersion.getReplicas());
+ }
return "修改成功";
} else {
throw new RuntimeException("更新失败");
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
index 06e9646b..2535c1e0 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java
@@ -2,7 +2,6 @@ package com.ruoyi.platform.service.impl;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.annotations.CheckDuplicate;
-import com.ruoyi.platform.constant.Constant;
import com.ruoyi.platform.domain.AssetWorkflow;
import com.ruoyi.platform.domain.Experiment;
import com.ruoyi.platform.domain.ImageVersion;
@@ -15,6 +14,7 @@ import com.ruoyi.platform.service.WorkflowService;
import com.ruoyi.platform.utils.HttpUtils;
import com.ruoyi.platform.utils.JsonUtils;
import com.ruoyi.platform.utils.MinioUtil;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.system.api.model.LoginUser;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -126,6 +126,13 @@ public class WorkflowServiceImpl implements WorkflowService {
this.workflowDao.update(workflow);
assetWorkflowDao.deleteByWorkFlowId(workflow.getId());
saveAssetWorkFlow(workflow);
+ if (StringUtils.isNotEmpty(workflow.getGlobalParam())) {
+ List experimentList = experimentService.queryByWorkflowId(workflow.getId());
+ for (Experiment experiment : experimentList) {
+ experiment.setGlobalParam(workflow.getGlobalParam());
+ experimentService.update(experiment);
+ }
+ }
return this.queryById(workflow.getId());
}
@@ -173,6 +180,10 @@ public class WorkflowServiceImpl implements WorkflowService {
Workflow workflow = this.queryById(id);
if (workflow != null) {
try {
+ if (workflow.getName().length() >= 64) {
+ throw new RuntimeException("流水线名称大于最大长度");
+ }
+
Workflow duplicateWorkflow = new Workflow();
duplicateWorkflow.setName(workflow.getName() + "-copy-" + UUID.randomUUID().toString().substring(0, 6));
String oldDag = workflow.getDag();
@@ -198,7 +209,6 @@ public class WorkflowServiceImpl implements WorkflowService {
return this.insert(duplicateWorkflow);
} catch (Exception e) {
throw new RuntimeException("复制流水线失败: " + e.getMessage(), e);
-
}
}
return null;
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java
index d0f82ccf..1bd00d36 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java
@@ -1,14 +1,19 @@
package com.ruoyi.platform.service.impl;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.domain.*;
import com.ruoyi.platform.mapper.*;
-import com.ruoyi.platform.service.ExperimentInsService;
-import com.ruoyi.platform.service.ModelsService;
-import com.ruoyi.platform.service.WorkflowService;
-import com.ruoyi.platform.service.WorkspaceService;
-import lombok.val;
-import org.checkerframework.checker.units.qual.C;
+import com.ruoyi.platform.service.*;
+import com.ruoyi.platform.utils.JacksonUtil;
+import com.ruoyi.platform.utils.JsonUtils;
+import com.ruoyi.platform.utils.NewHttpUtils;
+import com.ruoyi.platform.vo.ModelsVo;
+import com.ruoyi.platform.vo.NewDatasetVo;
+import com.ruoyi.system.api.constant.Constant;
+import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import redis.clients.jedis.Jedis;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -18,36 +23,33 @@ import java.util.Map;
@Service("WorkspaceService")
public class WorkspaceServiceImpl implements WorkspaceService {
-
- @Resource
- private WorkflowService workflowService;
@Resource
private WorkflowDao workflowDao;
@Resource
private ExperimentDao experimentDao;
-
@Resource
private ExperimentInsDao experimentInsDao;
-
@Resource
private ExperimentInsService experimentInsService;
-
@Resource
- private ModelsService modelsService;
+ private ImageDao imageDao;
@Resource
- private ModelsDao modelsDao;
-
+ private ComponentDao componentDao;
@Resource
- private DatasetDao datasetDao;
-
+ private GitService gitService;
@Resource
- private ImageDao imageDao;
-
+ private NewDatasetService newDatasetService;
@Resource
- private ComponentDao componentDao;
-
-
+ private ModelsService modelsService;
+ @Resource
+ private NewHttpUtils httpUtils;
+ @Value("${git.endpoint}")
+ String gitendpoint;
+ @Value("${spring.redis.host}")
+ private String redisHost;
+ @Value("${spring.redis.port}")
+ private Integer redisPort;
@Override
public Map getOverview() {
@@ -59,16 +61,16 @@ public class WorkspaceServiceImpl implements WorkspaceService {
// 获取运行中实验实例数量
List experimentInsList = experimentInsService.queryByExperimentIsNotTerminated();
- if (experimentInsList!=null && !experimentInsList.isEmpty()) {
+ if (experimentInsList != null && !experimentInsList.isEmpty()) {
Integer experimentInsCount = experimentInsList.size();
resMap.put("runningExperimentInsCount", experimentInsCount);
- }else{
+ } else {
resMap.put("runningExperimentInsCount", 0);
}
//得到最近的三条实例记录,放进返回map
List latestExperimentInsList = experimentInsDao.getLatestInsList();
if (latestExperimentInsList != null && !latestExperimentInsList.isEmpty()) {
- for (ExperimentIns experimentIns : latestExperimentInsList){
+ for (ExperimentIns experimentIns : latestExperimentInsList) {
Integer experimentId = experimentIns.getExperimentId();
Experiment experiment = this.experimentDao.queryById(experimentId);
//拿到对应的流水线id
@@ -83,22 +85,43 @@ public class WorkspaceServiceImpl implements WorkspaceService {
}
@Override
- public Map getAssetCount(Boolean isPublic) {
- Map assetCountMap = new HashMap();
- int availableRange = isPublic ? 1 : 0;
- //统计数据集数量
- Dataset dataset = new Dataset();
- dataset.setAvailableRange(availableRange);
- Integer datasetCount = (int) this.datasetDao.count(dataset);
- assetCountMap.put("dataset", datasetCount);
- //统计模型数量
- Models models = new Models();
- models.setAvailableRange(availableRange);
- Integer modelCount = (int) this.modelsDao.count(models);
- assetCountMap.put("model", modelCount);
- //统计镜像数量
+ public Map getAssetCount(Boolean isPublic) throws Exception {
+ Map assetCountMap = new HashMap<>();
+ String token = gitService.checkoutToken();
+ int availableRange = isPublic ? Constant.Image_Type_Pub : Constant.Image_Type_Pri;
+ String datasetUrl;
+ String modelUrl;
+ if (isPublic) {
+ // 数据集
+ datasetUrl = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id;
+ // 模型
+ modelUrl = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id;
+ } else {
+ Jedis jedis = new Jedis(redisHost, redisPort);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String ci4sUsername = loginUser.getUsername();
+ String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
+ Map userInfo = JsonUtils.jsonToMap(userReq);
+
+ datasetUrl = gitendpoint + "/api/users/" + userInfo.get("login") + "/projects.json?category=manage";
+ modelUrl = gitendpoint + "/api/users/" + userInfo.get("login") + "/projects.json?category=manage";
+ }
+
+ String req = httpUtils.sendGetWithToken(datasetUrl, null, token);
+ Map stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
+ List> projects = (List>) stringObjectMap.get("projects");
+ List collect1 = newDatasetService.convert(projects, Constant.Topic_Dataset, null, null);
+ assetCountMap.put("dataset", collect1.size());
+
+ req = httpUtils.sendGetWithToken(modelUrl, null, token);
+ stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
+ projects = (List>) stringObjectMap.get("projects");
+ List collect2 = modelsService.convert(projects, Constant.Topic_model, null, null);
+ assetCountMap.put("model", collect2.size());
+
+ // 镜像
Image image = new Image();
- image.setImageType(availableRange);
+ image.setImageType(Constant.Image_Type_Pub);
Integer imageCount = (int) this.imageDao.count(image);
assetCountMap.put("image", imageCount);
//统计组件数量
@@ -113,6 +136,4 @@ public class WorkspaceServiceImpl implements WorkspaceService {
return assetCountMap;
}
-
-
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
index 7ecbdc51..5be79efa 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
@@ -91,7 +91,7 @@ public class DVCUtils {
}
}
- private void deletePath(Path path) {
+ public void deletePath(Path path) {
try {
Files.deleteIfExists(path);
} catch (IOException e) {
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
index c4608fd6..13fab8fd 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
@@ -1,6 +1,6 @@
package com.ruoyi.platform.utils;
-import com.ruoyi.platform.constant.Constant;
+import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.platform.domain.ComputingResource;
import com.ruoyi.platform.domain.DevEnvironment;
import com.ruoyi.platform.mapper.ComputingResourceDao;
@@ -41,6 +41,9 @@ public class K8sClientUtil {
@Value("${dockerpush.proxyUrl}")
private String proxyUrl;
+ @Value("${git.localPath}")
+ String localPathlocal;
+
private String http;
private String token;
/**
@@ -512,17 +515,17 @@ public class K8sClientUtil {
try {
// 记录开始扣积分
- if (resourceOccupyService.haveResource(devEnvironment.getComputingResourceId())) {
+ if (resourceOccupyService.haveResource(devEnvironment.getComputingResourceId(), 1)) {
pod = api.createNamespacedPod(namespace, pod, null, null, null);
String nodeName = getNodeName(podName, namespace);
// 记录开始扣除积分
- resourceOccupyService.startDeduce(devEnvironment.getComputingResourceId(), Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId()), null, null, devEnvironment.getName(), null);
+ resourceOccupyService.startDeduce(devEnvironment.getComputingResourceId(), 1, Constant.TaskType_Dev, Long.valueOf(devEnvironment.getId()), null, null, devEnvironment.getName(), null, null);
}
} catch (ApiException e) {
throw new RuntimeException("创建pod异常:" + e.getResponseBody());
} catch (Exception e) {
- throw new RuntimeException("创建pod系统异常:", e);
+ throw new RuntimeException("创建pod系统异常:" + e.getMessage());
}
V1Service service = createService(namespace, podName + "-svc", port, selector);
@@ -638,7 +641,7 @@ public class K8sClientUtil {
}
- public V1Pod createPodWithEnv(String podName, String namespace, String proxyUrl, String mountPath, String pvcName, String image) {
+ public V1Pod createPodWithEnv(String podName, String namespace, String proxyUrl, String mountPath, String image) {
CoreV1Api api = new CoreV1Api(apiClient);
V1SecurityContext v1SecurityContext = new V1SecurityContext();
@@ -649,7 +652,7 @@ public class K8sClientUtil {
volumeMounts.add(new V1VolumeMount().name("workspace").mountPath(mountPath));
List volumes = new ArrayList<>();
- volumes.add(new V1Volume().name("workspace").hostPath(new V1HostPathVolumeSource().path(hostPath + "/" + podName + "/" + mountPath).type("DirectoryOrCreate")));
+ volumes.add(new V1Volume().name("workspace").hostPath(new V1HostPathVolumeSource().path(hostPath + "/images").type("DirectoryOrCreate")));
V1Pod pod = new V1PodBuilder()
.withNewMetadata()
@@ -704,7 +707,7 @@ public class K8sClientUtil {
}
limitMap.put("cpu", new Quantity(String.valueOf(computingResource.getCpuCores())));
limitMap.put("memory", new Quantity(memory));
- limitMap.put("ephemeral-storage", new Quantity("100Gi"));
+ limitMap.put("ephemeral-storage", new Quantity("20Gi"));
V1ResourceRequirements v1ResourceRequirements = new V1ResourceRequirements();
v1ResourceRequirements.setRequests(limitMap);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/NewHttpUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/NewHttpUtils.java
index da117614..dc88ad0e 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/NewHttpUtils.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/NewHttpUtils.java
@@ -1,4 +1,5 @@
package com.ruoyi.platform.utils;
+
import org.apache.http.HttpHost;
import org.apache.http.client.methods.*;
import org.apache.http.client.utils.URIBuilder;
@@ -20,6 +21,7 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
+import java.util.Map;
@Component
public class NewHttpUtils {
@@ -61,27 +63,31 @@ public class NewHttpUtils {
}
}
- public static String sendGet(String url, String param) {
+ public static String sendGet(String url, String param) throws Exception {
return sendRequest(new HttpGet(), url, param, null, null);
}
- public static String sendPost(String url, String param, String body) {
+ public static String sendPost(String url, String param, String body) throws Exception {
return sendRequest(new HttpPost(), url, param, null, body);
}
- public static String sendGetWithToken(String url, String param, String token) {
+ public static String sendGetWithToken(String url, String param, String token) throws Exception {
return sendRequest(new HttpGet(), url, param, token, null);
}
- public static String sendPostWithToken(String url, String param, String token, String body) {
+ public static String sendPostWithToken(String url, String param, String token, String body) throws Exception {
return sendRequest(new HttpPost(), url, param, token, body);
}
- public static String sendDeleteWithToken(String url, String param, String token) {
- return sendRequest(new HttpDelete(), url, param, token, null);
+ public static String sendDeleteWithToken(String url, String param, String token, String body) throws Exception {
+ return sendRequest(new HttpDelete(), url, param, token, body);
+ }
+
+ public static String sendPatchWithToken(String url, String param, String token, String body) throws Exception {
+ return sendRequest(new HttpPatch(), url, param, token, body);
}
- private static String sendRequest(HttpRequestBase request, String url, String param, String token, String body) {
+ private static String sendRequest(HttpRequestBase request, String url, String param, String token, String body) throws Exception {
if (httpClient == null) {
throw new IllegalStateException("HttpClient is not initialized");
}
@@ -121,11 +127,20 @@ public class NewHttpUtils {
throw new IOException("HTTP request failed with response code: " + statusCode);
}
log.info("Response: " + result);
+ if (result.startsWith("{")) {
+ Map resultMap = JsonUtils.jsonToMap(result);
+ Integer status = (Integer) resultMap.get("status");
+ if (status != null && status != 0 && status != 1) {
+ throw new Exception((String) resultMap.get("message"));
+ }
+ }
}
} catch (URISyntaxException e) {
log.error("URISyntaxException, url=" + url + ", param=" + param, e);
+ throw e;
} catch (IOException e) {
log.error("IOException, url=" + url + ", param=" + param, e);
+ throw e;
}
return result;
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
index 8345f214..b6eea537 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
@@ -3,10 +3,12 @@ package com.ruoyi.platform.vo;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@Data
public class ImageVo implements Serializable {
@@ -51,6 +53,10 @@ public class ImageVo implements Serializable {
*/
@ApiModelProperty(name = "file_size")
private String fileSize;
+
+ @ApiModelProperty(name = "file_name")
+ private String fileName;
+
/**
* 镜像构建状态
*/
@@ -66,101 +72,4 @@ public class ImageVo implements Serializable {
@ApiModelProperty(name = "dev_environment_id", value = "环境id")
private Integer devEnvironmentId;
-
-// public Integer getId() {
-// return id;
-// }
-//
-// public void setId(Integer id) {
-// this.id = id;
-// }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Integer getImageType() {
- return imageType;
- }
-
- public void setImageType(Integer imageType) {
- this.imageType = imageType;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
-// public String getUrl() {
-// return url;
-// }
-//
-// public void setUrl(String url) {
-// this.url = url;
-// }
-
- public String getTagName() {
- return tagName;
- }
-
- public void setTagName(String tagName) {
- this.tagName = tagName;
- }
-
- public String getFileSize() {
- return fileSize;
- }
-
- public void setFileSize(String fileSize) {
- this.fileSize = fileSize;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public Integer getUploadType() {
- return uploadType;
- }
-
- public void setUploadType(Integer uploadType) {
- this.uploadType = uploadType;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public Integer getDevEnvironmentId() {
- return devEnvironmentId;
- }
-
- public void setDevEnvironmentId(Integer devEnvironmentId) {
- this.devEnvironmentId = devEnvironmentId;
- }
-
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelsVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelsVo.java
index 9859bf77..50d26219 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelsVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelsVo.java
@@ -15,6 +15,12 @@ public class ModelsVo extends ModelMetaVo implements Serializable {
@ApiModelProperty(name = "status", value = "状态")
private Integer status;
+ @ApiModelProperty(name = "praises_count",value = "点赞数量")
+ private Integer praisesCount;
+
+ @ApiModelProperty(name = "praises_count",value = "是否点赞")
+ private Boolean praised;
+
@ApiModelProperty(name = "model_version_vos")
private List modelVersionVos;
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
index 1f84900f..082df2a4 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
@@ -50,6 +50,13 @@ public class NewDatasetVo implements Serializable {
private Integer id;
@ApiModelProperty(name = "visits",value = "访问次数")
private Integer visits;
+
+ @ApiModelProperty(name = "praises_count",value = "点赞数量")
+ private Integer praisesCount;
+
+ @ApiModelProperty(name = "praised",value = "是否点赞")
+ private Boolean praised;
+
@ApiModelProperty(name = "create_by",value = "创建者")
private String createBy;
@ApiModelProperty(name = "version_desc",value = "版本描述")
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayParamVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayParamVo.java
index 67e768b4..72963fba 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayParamVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayParamVo.java
@@ -44,5 +44,5 @@ public class RayParamVo {
private Integer minSamplesRequired;
- private Integer resource;
+ private Integer computingResourceId;
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/serviceVos/ServiceVersionVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/serviceVos/ServiceVersionVo.java
index d1cb79cd..b42797ad 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/serviceVos/ServiceVersionVo.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/serviceVos/ServiceVersionVo.java
@@ -61,4 +61,8 @@ public class ServiceVersionVo {
private Boolean rerun;
private String deployType;
+
+ private String docPath;
+
+ private String pagePath;
}
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
index 8dce9ccf..9ae12b5b 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
@@ -57,6 +57,7 @@
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
index ead149e7..e23fa964 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
@@ -67,6 +67,7 @@
and img.state = #{image.state}
+ order by img.create_time desc
limit #{pageable.offset}, #{pageable.pageSize}
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
index 46b16587..df174d68 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
@@ -75,6 +75,7 @@
and state = #{imageVersion.state}
+ order by create_time desc
limit #{pageable.offset}, #{pageable.pageSize}
@@ -117,9 +118,6 @@
and update_time = #{imageVersion.updateTime}
-
- and state = #{imageVersion.state}
-
@@ -129,8 +127,12 @@
- insert into image_version(image_id, version, url, tag_name, file_size, status, create_by, create_time, update_by, update_time, state)
- values (#{imageVersion.imageId}, #{imageVersion.version}, #{imageVersion.url}, #{imageVersion.tagName}, #{imageVersion.fileSize}, #{imageVersion.status}, #{imageVersion.createBy}, #{imageVersion.createTime}, #{imageVersion.updateBy}, #{imageVersion.updateTime}, #{imageVersion.state})
+ insert into image_version(image_id, version, description, url, tag_name, file_size, status, create_by,
+ create_time, update_by, update_time, state, host_ip)
+ values (#{imageVersion.imageId}, #{imageVersion.version}, #{imageVersion.description}, #{imageVersion.url},
+ #{imageVersion.tagName}, #{imageVersion.fileSize}, #{imageVersion.status}, #{imageVersion.createBy},
+ #{imageVersion.createTime}, #{imageVersion.updateBy}, #{imageVersion.updateTime}, #{imageVersion.state},
+ #{imageVersion.hostIp})
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml
index 7f7544b0..22e662a4 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml
@@ -3,12 +3,18 @@
insert into resource_occupy (user_id, computing_resource_id, credit_per_hour, description, task_type, task_id,
- task_ins_id, workflow_id, task_name,
- node_id)
+ task_ins_id, workflow_id, task_name,
+
+ state,
+
+ node_id)
values (#{resourceOccupy.userId}, #{resourceOccupy.computingResourceId}, #{resourceOccupy.creditPerHour},
- #{resourceOccupy.description}, #{resourceOccupy.taskType}, #{resourceOccupy.taskId},
- #{resourceOccupy.taskInsId}, #{resourceOccupy.workflowId}, #{resourceOccupy.taskName},
- #{resourceOccupy.nodeId})
+ #{resourceOccupy.description}, #{resourceOccupy.taskType}, #{resourceOccupy.taskId},
+ #{resourceOccupy.taskInsId}, #{resourceOccupy.workflowId}, #{resourceOccupy.taskName},
+
+ #{resourceOccupy.state},
+
+ #{resourceOccupy.nodeId})
@@ -23,6 +29,15 @@
deduce_credit = #{resourceOccupy.deduceCredit},
+
+ computing_resource_id = #{resourceOccupy.computingResourceId},
+
+
+ credit_per_hour = #{resourceOccupy.creditPerHour},
+
+
+ description = #{resourceOccupy.description},
+
where id = #{resourceOccupy.id}
@@ -64,7 +79,7 @@
and node_id = #{nodeId}
- and state = 1
+ and state in (1, 2)
](http://godban.github.io/browsers-support-badges/)Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari | [
](http://godban.github.io/browsers-support-badges/)Opera |
-| --- | --- | --- | --- | --- |
-| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## Contributing
-
-Any type of contribution is welcome, here are some examples of how you may contribute to this project:
-
-- Use Ant Design Pro in your daily work.
-- Submit [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions.
-- Propose [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code.
+# Documentation
\ No newline at end of file
diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts
index b2c41f14..bf012a65 100644
--- a/react-ui/config/routes.ts
+++ b/react-ui/config/routes.ts
@@ -143,6 +143,11 @@ export default [
path: 'compare',
component: './Experiment/Comparison/index',
},
+ {
+ name: '实验可视化对比',
+ path: 'compare-visual',
+ component: './Experiment/Aim/index',
+ },
],
},
{
@@ -271,7 +276,18 @@ export default [
{
name: '镜像详情',
path: 'info/:id',
- component: './Mirror/Info',
+ routes: [
+ {
+ name: '镜像详情',
+ path: '',
+ component: './Mirror/Info',
+ },
+ {
+ name: '新增镜像版本',
+ path: 'add-version',
+ component: './Mirror/Create',
+ },
+ ],
},
{
name: '创建镜像',
@@ -345,7 +361,6 @@ export default [
},
],
},
-
{
name: '应用开发',
path: '/appsDeployment',
@@ -498,6 +513,18 @@ export default [
},
],
},
+ {
+ name: '算力积分',
+ path: '/points',
+ routes: [
+ {
+ name: '算力积分',
+ path: '',
+ key: 'points',
+ component: './Points/index',
+ },
+ ],
+ },
{
path: '*',
layout: false,
diff --git a/react-ui/package.json b/react-ui/package.json
index fbc014d1..c614d920 100644
--- a/react-ui/package.json
+++ b/react-ui/package.json
@@ -1,8 +1,8 @@
{
- "name": "ant-design-pro",
- "version": "6.0.0",
+ "name": "cl-model",
+ "version": "1.0.0",
"private": true,
- "description": "An out-of-box UI solution for enterprise applications",
+ "description": "",
"scripts": {
"analyze": "cross-env ANALYZE=1 max build",
"build": "max build",
@@ -16,6 +16,7 @@
"docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up",
"docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro",
"docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro",
+ "docs": "typedoc",
"gh-pages": "gh-pages -d dist",
"i18n-remove": "pro i18n-remove --locale=zh-CN --write",
"postinstall": "max setup",
@@ -39,6 +40,7 @@
"start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev max dev",
"storybook": "storybook dev -p 6006",
"storybook-build": "storybook build",
+ "storybook-deploy": "./.storybook/scripts/upload-deploy.sh",
"storybook-docs": "storybook dev --docs",
"storybook-docs-build": "storybook build --docs",
"test": "jest",
@@ -66,6 +68,7 @@
"@types/crypto-js": "^4.2.2",
"@umijs/route-utils": "^4.0.1",
"antd": "~5.21.4",
+ "caniuse-lite": "~1.0.30001707",
"classnames": "^2.3.2",
"crypto-js": "^4.2.0",
"echarts": "^5.5.0",
@@ -132,6 +135,7 @@
"swagger-ui-dist": "^4.18.2",
"ts-loader": "~9.5.2",
"ts-node": "^10.9.1",
+ "typedoc": "~0.28.1",
"typescript": "^5.0.4",
"umi-presets-pro": "^2.0.0"
},
diff --git a/react-ui/public/fonts/DingTalk-JinBuTi.ttf b/react-ui/public/fonts/DingTalk-JinBuTi.ttf
new file mode 100644
index 00000000..c4efa55a
Binary files /dev/null and b/react-ui/public/fonts/DingTalk-JinBuTi.ttf differ
diff --git a/react-ui/public/fonts/DingTalk-JinBuTi.woff b/react-ui/public/fonts/DingTalk-JinBuTi.woff
new file mode 100644
index 00000000..5a8efa8e
Binary files /dev/null and b/react-ui/public/fonts/DingTalk-JinBuTi.woff differ
diff --git a/react-ui/public/fonts/DingTalk-JinBuTi.woff2 b/react-ui/public/fonts/DingTalk-JinBuTi.woff2
new file mode 100644
index 00000000..c8d272a5
Binary files /dev/null and b/react-ui/public/fonts/DingTalk-JinBuTi.woff2 differ
diff --git a/react-ui/public/fonts/font.css b/react-ui/public/fonts/font.css
index ea5ffc5c..012b9f59 100644
--- a/react-ui/public/fonts/font.css
+++ b/react-ui/public/fonts/font.css
@@ -1,5 +1,13 @@
@font-face {
- font-family: Alibaba;
- src: url('./ALIBABA-PUHUITI-MEDIUM.TTF');
- font-display: swap;
- }
\ No newline at end of file
+ font-family: Alibaba;
+ src: url('./ALIBABA-PUHUITI-MEDIUM.TTF');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: 'DingTalk-JinBuTi';
+ src: url('./DingTalk-JinBuTi.woff2') format('woff2'), /* 最优先使用 woff2 */
+ url('./DingTalk-JinBuTi.woff') format('woff'), /* 兼容性较好的 woff */
+ url('./DingTalk-JinBuTi.ttf') format('truetype'); /* ttf 作为备选 */
+ font-display: swap; /* 优化页面加载时的字体显示 */
+}
\ No newline at end of file
diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx
index 7c026d3d..6ef5c5b8 100644
--- a/react-ui/src/app.tsx
+++ b/react-ui/src/app.tsx
@@ -1,13 +1,16 @@
import RightContent from '@/components/RightContent';
import themes from '@/styles/theme.less';
+import { type GlobalInitialState } from '@/types';
+import { menuItemRender } from '@/utils/menuRender';
import type { Settings as LayoutSettings } from '@ant-design/pro-components';
import { RuntimeConfig, history } from '@umijs/max';
import { RuntimeAntdConfig } from 'umi';
import defaultSettings from '../config/defaultSettings';
import '../public/fonts/font.css';
import { getAccessToken } from './access';
+import ErrorBoundary from './components/ErrorBoundary';
import './dayjsConfig';
-import { removeAllPageCacheState } from './hooks/pageCacheState';
+import { removeAllPageCacheState } from './hooks/useCacheState';
import {
getRemoteMenu,
getRoutersInfo,
@@ -16,14 +19,9 @@ import {
setRemoteMenu,
} from './services/session';
import './styles/menu.less';
-export { requestConfig as request } from './requestConfig';
-// const isDev = process.env.NODE_ENV === 'development';
-import { type GlobalInitialState } from '@/types';
-// import '@/utils/clipboard';
-import { menuItemRender } from '@/utils/menuRender';
-import ErrorBoundary from './components/ErrorBoundary';
import { needAuth } from './utils';
import { gotoLoginPage } from './utils/ui';
+export { requestConfig as request } from './requestConfig';
/**
* @see https://umijs.org/zh-CN/plugins/plugin-initial-state
@@ -139,7 +137,6 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => {
onClick: () => {
// 点击菜单项，删除所有的页面 state 缓存
removeAllPageCacheState();
- // console.log('click menu');
},
},
...initialState?.settings,
diff --git a/react-ui/src/assets/img/confirm-icon.png b/react-ui/src/assets/img/confirm-icon.png
new file mode 100644
index 00000000..6865b719
Binary files /dev/null and b/react-ui/src/assets/img/confirm-icon.png differ
diff --git a/react-ui/src/assets/img/comfirm-icon.png b/react-ui/src/assets/img/copy-icon.png
similarity index 100%
rename from react-ui/src/assets/img/comfirm-icon.png
rename to react-ui/src/assets/img/copy-icon.png
diff --git a/react-ui/src/assets/img/user-points-bg.png b/react-ui/src/assets/img/user-points-bg.png
new file mode 100644
index 00000000..3f25b128
Binary files /dev/null and b/react-ui/src/assets/img/user-points-bg.png differ
diff --git a/react-ui/src/assets/img/workspace-experiment.png b/react-ui/src/assets/img/workspace-experiment.png
index bcd69981..0bca4327 100644
Binary files a/react-ui/src/assets/img/workspace-experiment.png and b/react-ui/src/assets/img/workspace-experiment.png differ
diff --git a/react-ui/src/assets/img/workspace-pipeline.png b/react-ui/src/assets/img/workspace-pipeline.png
index fbbc3ed7..f551cb9c 100644
Binary files a/react-ui/src/assets/img/workspace-pipeline.png and b/react-ui/src/assets/img/workspace-pipeline.png differ
diff --git a/react-ui/src/components/CodeConfigItem/index.tsx b/react-ui/src/components/CodeConfigItem/index.tsx
index 673bca40..ff48368c 100644
--- a/react-ui/src/components/CodeConfigItem/index.tsx
+++ b/react-ui/src/components/CodeConfigItem/index.tsx
@@ -2,6 +2,7 @@ import { AvailableRange } from '@/enums';
import { type CodeConfigData } from '@/pages/CodeConfig/List';
import { Flex, Typography } from 'antd';
import classNames from 'classnames';
+import { useState } from 'react';
import styles from './index.less';
type CodeConfigItemProps = {
@@ -10,6 +11,7 @@ type CodeConfigItemProps = {
};
function CodeConfigItem({ item, onClick }: CodeConfigItemProps) {
+ const [isEllipsis, setIsEllipsis] = useState(false);
return (