feat:【流水线插件】支持历史大版本下的小版本更新 TencentBlueKing#1841

carlyin0801 · Aug 13, 2021 · 842d4c8 · 842d4c8
1 parent 144f1f1
commit 842d4c8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/...store-image/src/main/kotlin/com/tencent/devops/store/service/image/ImageReleaseService.kt b/...store-image/src/main/kotlin/com/tencent/devops/store/service/image/ImageReleaseService.kt
@@ -369,10 +369,13 @@ abstract class ImageReleaseService {
         val requireVersionList =
             if (cancelFlag && releaseType == ReleaseTypeEnum.CANCEL_RE_RELEASE) {
                 listOf(dbVersion)
-            } else storeCommonService.getRequireVersion(
-                dbVersion,
-                releaseType
-            )
+            } else {
+                storeCommonService.getRequireVersion(
+                    reqVersion = version,
+                    dbVersion = dbVersion,
+                    releaseType = releaseType
+                )
+            }
         if (!requireVersionList.contains(version)) {
             return MessageCodeUtil.generateResponseDataObject(
                 StoreMessageCode.USER_IMAGE_VERSION_IS_INVALID,

diff --git a/...src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomCommonServiceImpl.kt b/...src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomCommonServiceImpl.kt
@@ -141,6 +141,7 @@ class MarketAtomCommonServiceImpl : MarketAtomCommonService {
             if (cancelFlag && releaseType == ReleaseTypeEnum.CANCEL_RE_RELEASE) {
                 listOf(dbVersion)
             } else storeCommonService.getRequireVersion(
+                reqVersion = version,
                 dbVersion = dbVersion,
                 releaseType = requireReleaseType
             )

diff --git a/...e/biz-store/src/main/kotlin/com/tencent/devops/store/service/common/StoreCommonService.kt b/...e/biz-store/src/main/kotlin/com/tencent/devops/store/service/common/StoreCommonService.kt
@@ -51,6 +51,7 @@ interface StoreCommonService {
      * 获取正确的升级版本号
      */
     fun getRequireVersion(
+        reqVersion: String,
         dbVersion: String,
         releaseType: ReleaseTypeEnum
     ): List<String>

diff --git a/...re/src/main/kotlin/com/tencent/devops/store/service/common/impl/StoreCommonServiceImpl.kt b/...re/src/main/kotlin/com/tencent/devops/store/service/common/impl/StoreCommonServiceImpl.kt
@@ -109,14 +109,19 @@ class StoreCommonServiceImpl @Autowired constructor(
      * 获取正确的升级版本号
      */
     override fun getRequireVersion(
+        reqVersion: String,
         dbVersion: String,
         releaseType: ReleaseTypeEnum
     ): List<String> {
         var requireVersionList = listOf(INIT_VERSION)
-        val dbVersionParts = dbVersion.split(".")
-        val firstVersionPart = dbVersionParts[0]
-        val secondVersionPart = dbVersionParts[1]
-        val thirdVersionPart = dbVersionParts[2]
+        if (dbVersion.isBlank()) {
+            return requireVersionList
+        }
+        val version = if (releaseType != ReleaseTypeEnum.HIS_VERSION_UPGRADE) dbVersion else reqVersion
+        val versionParts = version.split(".")
+        val firstVersionPart = versionParts[0]
+        val secondVersionPart = versionParts[1]
+        val thirdVersionPart = versionParts[2]
         when (releaseType) {
             ReleaseTypeEnum.INCOMPATIBILITY_UPGRADE -> {
                 requireVersionList = listOf("${firstVersionPart.toInt() + 1}.0.0")
@@ -131,9 +136,10 @@ class StoreCommonServiceImpl @Autowired constructor(
                 requireVersionList = listOf(dbVersion)
             }
             ReleaseTypeEnum.HIS_VERSION_UPGRADE -> {
+                val dbVersionParts = dbVersion.split(".")
                 requireVersionList = listOf(
-                    "$firstVersionPart.${secondVersionPart.toInt() + 1}.0",
-                    "$firstVersionPart.$secondVersionPart.${thirdVersionPart.toInt() + 1}"
+                    "${dbVersionParts[0]}.${secondVersionPart.toInt() + 1}.0",
+                    "${dbVersionParts[0]}.$secondVersionPart.${thirdVersionPart.toInt() + 1}"
                 )
             }
             else -> {