From 2b595ffd604e59b9ca0bea0175ac27e79bd1ef32 Mon Sep 17 00:00:00 2001
From: yjieliang <yundantengteng@163.com>
Date: Mon, 6 Nov 2023 09:56:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B8=8C=E6=9C=9B=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E8=BF=9B=E8=A1=8C=E4=B8=8A=E6=9E=B6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=20#4780?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops/store/pojo/atom/StoreI18nConfig.kt      |  4 +++-
 .../service/atom/impl/AtomReleaseServiceImpl.kt    | 14 ++++++++------
 .../common/impl/StoreI18nMessageServiceImpl.kt     | 11 ++---------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/StoreI18nConfig.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/StoreI18nConfig.kt
index 48518cf997d..7cc0e69c701 100644
--- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/StoreI18nConfig.kt
+++ b/src/backend/ci/core/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/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/AtomReleaseServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/AtomReleaseServiceImpl.kt
index a09f93d3452..95c5afd8578 100644
--- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/AtomReleaseServiceImpl.kt
+++ b/src/backend/ci/core/store/biz-store/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/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/common/impl/StoreI18nMessageServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/common/impl/StoreI18nMessageServiceImpl.kt
index 50a50032173..c5bceb68408 100644
--- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/common/impl/StoreI18nMessageServiceImpl.kt
+++ b/src/backend/ci/core/store/biz-store/src/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