From 9a20ec2c2b0796e222ad896616d6873a0b64c3ac Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Sun, 29 Sep 2024 14:43:23 +0800 Subject: [PATCH] clear test --- .../service/impl/NewDatasetServiceImpl.java | 5 ++++- .../com/ruoyi/platform/vo/NewDatasetVo.java | 2 +- .../src/main/resources/bootstrap.yml | 17 +++-------------- 3 files changed, 8 insertions(+), 16 deletions(-) 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 3e930b87..dc07f176 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 @@ -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> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword); // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据 Map 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 versionVos = new ArrayList(); if (fileDetailsAfterGitPull != null && fileDetailsAfterGitPull.size() > 0) { for (Map fileDetail : fileDetailsAfterGitPull) { 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 245341ef..fb089000 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 @@ -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 { diff --git a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml index 25460d4c..2102df19 100644 --- a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml @@ -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 \ No newline at end of file + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}