From 95e698a9f7647f8ee669a9b7dd6762d6a34c728a Mon Sep 17 00:00:00 2001 From: kaede10 Date: Mon, 4 Mar 2024 14:08:13 +0800 Subject: [PATCH] update application version --- .../ApplicationPackageServiceImpl.java | 5 +- .../ApplicationVersionServiceImpl.java | 46 +++++++++++-------- .../dto/InputApplicationVersion.java | 20 +++++--- .../ApplicationVersion.java | 5 +- .../dataobject/ApplicationVersionDO.java | 5 +- 5 files changed, 49 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java index 9cf5602..67ba8fd 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java @@ -18,12 +18,9 @@ import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenu import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; import com.easysoftware.common.utils.ApiUtil; -import com.easysoftware.common.utils.HttpClientUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; -import com.fasterxml.jackson.databind.JsonNode; import jakarta.annotation.Resource; @@ -118,7 +115,7 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService appPkg.setMaintainerGiteeId(maintainer.get("gitee_id")); appPkg.setMaintainerEmail(maintainer.get("email")); - Map info = ApiUtil.getApiResponse(String.format(repoInfoApi, appPkg.getName(), "docker_openeuler")); + Map info = ApiUtil.getApiResponse(String.format(repoInfoApi, appPkg.getName(), "app_openeuler")); appPkg.setOs(info.get("os")); appPkg.setAppVer(info.get("latest_version") + "-" + info.get("os_version")); appPkg.setArch(info.get("arch")); diff --git a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java index a0ba6aa..690e84b 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java @@ -1,6 +1,7 @@ package com.easysoftware.application.applicationversion; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ApiUtil; import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.common.utils.UuidUtil; @@ -21,7 +23,6 @@ import com.easysoftware.domain.applicationversion.gateway.ApplicationVersionGate import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; import com.easysoftware.infrastructure.mapper.ApplicationVersionDOMapper; import com.easysoftware.kafka.Producer; -// import com.easysoftware.domain.compatible.gateway.CompatibleGateway; import jakarta.annotation.Resource; @@ -33,12 +34,12 @@ public class ApplicationVersionServiceImpl extends ServiceImpl info = ApiUtil.getApiResponse(String.format(repoInfoApi, appVer.getName(), "app_openeuler")); + appVer.setCompatibleVersion(info.get("latest_version")); + + info = ApiUtil.getApiResponse(String.format(repoInfoApi, appVer.getName(), "app_up")); + appVer.setUpstreamVersion(info.get("latest_version")); + + info = ApiUtil.getApiResponse(String.format(repoInfoApi, appVer.getName(), "app_openeuler_ci")); + appVer.setCiVersion(info.get("latest_version")); + + if (appVer.getCompatibleVersion() == null) { + appVer.setStatus("MISSING"); + } else if (appVer.getUpstreamVersion().equals(appVer.getCompatibleVersion())) { + appVer.setStatus("OK"); + } else { + appVer.setStatus("OUTDATED"); + } + return appVer; + } } diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java b/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java index 27a4398..0aa7150 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java +++ b/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java @@ -10,20 +10,28 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class InputApplicationVersion { - @Size(max = 255, message = "the length of version can not exceed 255") - @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_:/ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") - public String version; - @NotBlank(message = "name can not be null") @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_:/ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") - @Size(max = 255, message = "the length of name can not exceed 255") + @Size(max = 45, message = "the length of name can not exceed 45") public String name; @Size(max = 255, message = "the length of homepage can not exceed 255") @Pattern(regexp = "^[A-Za-z0-9.()\\-_:/ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") public String homepage; - @Size(max = 255, message = "the length of backend can not exceed 255") + @Size(max = 45, message = "the length of backend can not exceed 45") @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_:/ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") public String backend; + + @Size(max = 45, message = "the length of status can not exceed 45") + public String status; + + @Size(max = 45, message = "the length of upstreamVersion can not exceed 45") + public String upstreamVersion; + + @Size(max = 45, message = "the length of compatibleVersion can not exceed 45") + public String compatibleVersion; + + @Size(max = 45, message = "the length of compatibleVersion can not exceed 45") + public String ciVersion; } diff --git a/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java b/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java index d78c1a3..3cf50b5 100644 --- a/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java +++ b/src/main/java/com/easysoftware/domain/applicationversion/ApplicationVersion.java @@ -13,8 +13,11 @@ public class ApplicationVersion { @Serial private static final long serialVersionUID = 1L; public String name; - public String version; public String homepage; public String backend; + public String upstreamVersion; + public String compatibleVersion; + public String ciVersion; + public String status; private String id; } diff --git a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java index da679f8..3b577f9 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/dataobject/ApplicationVersionDO.java @@ -17,9 +17,12 @@ public class ApplicationVersionDO { @Serial private static final long serialVersionUID = 1L; public String name; - public String version; public String homepage; public String backend; + public String upstreamVersion; + public String compatibleVersion; + public String ciVersion; + public String status; private String id; private Timestamp createdAt; private Timestamp updateAt; -- Gitee