From f9cf9ad312295ce65803aefbf52c49b3c797dea5 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Sep 2024 17:07:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 6 +++--- .../ruoyi/platform/service/impl/NewDatasetServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 179ed563..43978891 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 @@ -995,9 +995,9 @@ public class ModelsServiceImpl implements ModelsService { if (map != null) { List> topics = (List>) map.get("topics"); - if (topics != null && topics.size() > 0 && modelTopic.equals(topics.get(0).get("name"))) { - String modeltag = (String) topics.get(1).get("name"); - String modeltype = (String) topics.get(2).get("name"); + if (topics != null && topics.size() > 0 && modelTopic.equals(topics.get(1).get("name"))) { + String modeltag = (String) topics.get(2).get("name"); + String modeltype = (String) topics.get(3).get("name"); modeltag = modeltag.substring("modeltag-".length()); modeltype = modeltype.substring("modeltype-".length()); if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modeltag)) { 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 3cf9d2a2..5ebe5274 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 @@ -448,9 +448,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { if (map != null) { List> topics = (List>) map.get("topics"); - if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(0).get("name"))) { - String datasettag = (String) topics.get(1).get("name"); - String datasetype = (String) topics.get(2).get("name"); + if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(1).get("name"))) { + String datasettag = (String) topics.get(2).get("name"); + String datasetype = (String) topics.get(3).get("name"); datasettag = datasettag.substring("datatag-".length()); datasetype = datasetype.substring("datatype-".length()); if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasettag)) { From b0ead1807b3af94028b10022070b1985d89e2e82 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Thu, 19 Sep 2024 17:24:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=94=A8?= =?UTF-8?q?=E5=88=B0=E8=A1=A8=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/platform/service/impl/NewDatasetServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 5ebe5274..ecab9d85 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 @@ -132,7 +132,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { datasetVo.setIdentifier(repositoryName); datasetVo.setId(gitlinIid); datasetVo.setOwner((String) userInfo.get("login")); - datasetVo.setRelativePaths(relatePath); + datasetVo.setRelativePaths(relatePath+"/dataset"); addDatasetSourceToDataVo(datasetVo); @@ -211,7 +211,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { datasetVo.setDescription(newDatasetVo.getDescription()); datasetVo.setDataTag(newDatasetVo.getDataTag()); datasetVo.setDataType(newDatasetVo.getDataType()); - datasetVo.setRelativePaths(relatePath); + datasetVo.setRelativePaths(relatePath+"/dataset"); addDatasetSourceToDataVo(datasetVo); @@ -308,7 +308,6 @@ public class NewDatasetServiceImpl implements NewDatasetService { } List> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword); // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据 - System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!fileDetailsAfterGitPull:{}" + fileDetailsAfterGitPull); Map stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + "dataset.yaml"); NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class); List versionVos = new ArrayList(); From d5ad62af178b74db54b9088942e4998d19c1becd Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Sep 2024 17:27:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=AF=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 43978891..be140f01 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 @@ -593,8 +593,7 @@ public class ModelsServiceImpl implements ModelsService { String projectUrl = gitendpoint + "/" + owner + "/" + repositoryName + ".git"; String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); - String relatePath = ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName; - String rootPath = localPath + relatePath; + String rootPath = localPath + ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName; String modelPath = rootPath + "/model"; String metaPath = rootPath + "/metadata"; @@ -617,7 +616,7 @@ public class ModelsServiceImpl implements ModelsService { modelMetaVo.setIdentifier(repositoryName); modelMetaVo.setOwner(owner); modelMetaVo.setVersionDesc(modelMetaVo.getDescription()); - modelMetaVo.setRelativePaths(relatePath); + modelMetaVo.setRelativePaths(modelPath); File folder = new File(modelPath); long folderSize = FileUtil.getFolderSize(folder); modelMetaVo.setModelSize(FileUtil.formatFileSize(folderSize)); @@ -689,8 +688,7 @@ public class ModelsServiceImpl implements ModelsService { String projectUrl = gitendpoint + "/" + owner + "/" + repositoryName + ".git"; String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); - String relatePath = ci4sUsername + "/model/" + modelsVo.getId() + "/" + repositoryName; - String rootPath = localPath + relatePath; + String rootPath = localPath + ci4sUsername + "/model/" + modelsVo.getId() + "/" + repositoryName; String modelPath = rootPath + "/model"; String metaPath = rootPath + "/metadata"; @@ -721,7 +719,7 @@ public class ModelsServiceImpl implements ModelsService { modelMetaVo.setDescription(oldModelVo.getDescription()); modelMetaVo.setModelTag(oldModelVo.getModelTag()); modelMetaVo.setModelType(oldModelVo.getModelType()); - modelMetaVo.setRelativePaths(relatePath); + modelMetaVo.setRelativePaths(modelPath); File folder = new File(modelPath); long folderSize = FileUtil.getFolderSize(folder); modelMetaVo.setModelSize(FileUtil.formatFileSize(folderSize)); From 5311545d1bfb887fd6cfdabed46e81489b03e9fa Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Sep 2024 17:36:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/utils/DateUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index 137eccb5..bcb1f512 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -9,6 +9,8 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Date; +import java.util.TimeZone; + import org.apache.commons.lang3.time.DateFormatUtils; /** @@ -75,7 +77,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static final String parseDateToStr(final String format, final Date date) { - return new SimpleDateFormat(format).format(date); + SimpleDateFormat sdf = new SimpleDateFormat(format); + sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); + return sdf.format(date); } public static final Date dateTime(final String format, final String ts) From e374d39af892b57c2b66477321edd80ca4208fca Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Sep 2024 18:07:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/template-yaml/k8s-7management.yaml | 3 +++ .../main/java/com/ruoyi/common/core/utils/DateUtils.java | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index a6b4b3a2..d4c17efc 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -16,6 +16,9 @@ spec: containers: - name: ci4s-management-platform image: ${k8s-7management-image} + env: + - name: TZ + value: Asia/Shanghai ports: - containerPort: 9213 volumeMounts: diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index bcb1f512..137eccb5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -9,8 +9,6 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Date; -import java.util.TimeZone; - import org.apache.commons.lang3.time.DateFormatUtils; /** @@ -77,9 +75,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static final String parseDateToStr(final String format, final Date date) { - SimpleDateFormat sdf = new SimpleDateFormat(format); - sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - return sdf.format(date); + return new SimpleDateFormat(format).format(date); } public static final Date dateTime(final String format, final String ts)