feat:希望支持分支进行上架测试 #4780

TencentBlueKing · Nov 6, 2023 · 2b595ff · 2b595ff
1 parent ea6fccb
commit 2b595ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/...ore/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/StoreI18nConfig.kt b/...ore/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/StoreI18nConfig.kt
@@ -43,5 +43,7 @@ data class StoreI18nConfig(
     @ApiModelProperty("map字段在db中key的前缀")
     val dbKeyPrefix: String? = null,
     @ApiModelProperty("代码库哈希ID")
-    val repositoryHashId: String? = null
+    val repositoryHashId: String? = null,
+    @ApiModelProperty("代码库分支")
+    val branch: String? = null
 )
diff --git a/...tore/src/main/kotlin/com/tencent/devops/store/service/atom/impl/AtomReleaseServiceImpl.kt b/...tore/src/main/kotlin/com/tencent/devops/store/service/atom/impl/AtomReleaseServiceImpl.kt
@@ -1406,13 +1406,15 @@ abstract class AtomReleaseServiceImpl @Autowired constructor() : AtomReleaseServ
         val releaseType = convertUpdateRequest.releaseType
         val taskDataMap = storeI18nMessageService.parseJsonMapI18nInfo(
             userId = userId,
-            projectCode = projectCode,
             jsonMap = getAtomConfResult.taskDataMap.toMutableMap(),
-            fileDir = "$atomCode/$version",
-            i18nDir = updateAtomPackageInfo.i18nDir,
-            dbKeyPrefix = StoreUtils.getStoreFieldKeyPrefix(StoreTypeEnum.ATOM, atomCode, version),
-            repositoryHashId = atomRecord.repositoryHashId,
-            branch = branch,
+            storeI18nConfig = StoreI18nConfig(
+                projectCode = projectCode,
+                fileDir = "$atomCode/$version",
+                i18nDir = updateAtomPackageInfo.i18nDir,
+                dbKeyPrefix = StoreUtils.getStoreFieldKeyPrefix(StoreTypeEnum.ATOM, atomCode, version),
+                repositoryHashId = atomRecord.repositoryHashId,
+                branch = branch
+            ),
             version = version
         )
         // 校验插件发布类型

diff --git a/...c/main/kotlin/com/tencent/devops/store/service/common/impl/StoreI18nMessageServiceImpl.kt b/...c/main/kotlin/com/tencent/devops/store/service/common/impl/StoreI18nMessageServiceImpl.kt
@@ -108,7 +108,7 @@ abstract class StoreI18nMessageServiceImpl : StoreI18nMessageService {
             i18nDir = i18nDir,
             fileName = fileName,
             repositoryHashId = repositoryHashId,
-            branch = branch
+            branch = storeI18nConfig.branch
         )
         val fieldLocaleInfos = if (jsonLocaleLanguage == devopsDefaultLocaleLanguage) {
             // 如果map集合中默认字段值对应的语言和蓝盾默认语言一致，则无需替换
@@ -137,14 +137,7 @@ abstract class StoreI18nMessageServiceImpl : StoreI18nMessageService {
                 userId = userId,
                 version = version,
                 fieldLocaleInfos = fieldLocaleInfos,
-                storeI18nConfig = StoreI18nConfig(
-                    projectCode = projectCode,
-                    fileDir = fileDir,
-                    i18nDir = i18nDir,
-                    repositoryHashId = repositoryHashId,
-                    dbKeyPrefix = dbKeyPrefix,
-                    branch = branch,
-                )
+                storeI18nConfig = storeI18nConfig
             )
         }
         return jsonMap