Browse Source

clear test

dev-lhz
fanshuai 1 year ago
parent
commit
9a20ec2c2b
3 changed files with 8 additions and 16 deletions
  1. +4
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
  2. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java
  3. +3
    -14
      ruoyi-modules/management-platform/src/main/resources/bootstrap.yml

+ 4
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -1,5 +1,6 @@
package com.ruoyi.platform.service.impl;

import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.constant.Constant;
@@ -11,6 +12,7 @@ import com.ruoyi.platform.service.GitService;
import com.ruoyi.platform.service.NewDatasetService;
import com.ruoyi.platform.utils.*;
import com.ruoyi.platform.vo.GitProjectVo;
import com.ruoyi.platform.vo.ModelsVo;
import com.ruoyi.platform.vo.NewDatasetVo;
import com.ruoyi.platform.vo.VersionVo;
import com.ruoyi.system.api.model.LoginUser;
@@ -324,7 +326,8 @@ 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中取到元数据
Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + "dataset.yaml");
NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject2(stringObjectMap, NewDatasetVo.class);
String jsonString = JacksonUtil.toJSONString(stringObjectMap);
NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class);
List<VersionVo> versionVos = new ArrayList<VersionVo>();
if (fileDetailsAfterGitPull != null && fileDetailsAfterGitPull.size() > 0) {
for (Map<String, Object> fileDetail : fileDetailsAfterGitPull) {


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java View File

@@ -11,8 +11,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;

@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
@Data
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class NewDatasetVo implements Serializable {




+ 3
- 14
ruoyi-modules/management-platform/src/main/resources/bootstrap.yml View File

@@ -14,23 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 172.20.32.181:8848
username: nacos
password: nacos
retry:
enabled: true
namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
server-addr: 172.20.32.181:18847
config:
namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
# 配置中心地址
server-addr: 172.20.32.181:8848
server-addr: 172.20.32.181:18847
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
group: DEFAULT_GROUP
refresh: true
- data-id: management-platform-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
group: DEFAULT_GROUP
refresh: true
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

Loading…
Cancel
Save