pref：研发商店通用化接口封装优化 TencentBlueKing#11049

carlyin0801 · Nov 11, 2024 · c61b8a6 · c61b8a6
1 parent 2f7497c
commit c61b8a6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/...i/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/pojo/GitRepositoryResp.kt b/...i/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/pojo/GitRepositoryResp.kt
@@ -31,6 +31,8 @@ import io.swagger.v3.oas.annotations.media.Schema
 
 @Schema(title = "创建git仓库响应体")
 class GitRepositoryResp(
+    @get:Schema(title = "仓库ID", required = true)
+    val id: Long,
     @get:Schema(title = "仓库名称", required = true)
     val name: String,
     @get:Schema(title = "仓库地址", required = true)

diff --git a/...itory/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt b/...itory/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt
@@ -47,5 +47,7 @@ data class RepositoryInfo(
     @get:Schema(title = "最后更新时间", required = true)
     val updatedTime: Long,
     @get:Schema(title = "创建人", required = false)
-    val createUser: String? = null
+    val createUser: String? = null,
+    @get:Schema(title = "远程仓库ID", required = false)
+    val remoteRepoId: Long? = null
 )
diff --git a/...biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt b/...biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt
@@ -209,7 +209,8 @@ class RepositoryService @Autowired constructor(
                     aliasName = gitRepositoryResp.name,
                     url = gitRepositoryResp.repositoryUrl,
                     type = ScmType.CODE_GIT,
-                    updatedTime = LocalDateTime.now().timestampmilli()
+                    updatedTime = LocalDateTime.now().timestampmilli(),
+                    remoteRepoId = gitRepositoryResp.id
                 )
             )
         } else {

diff --git a/...ry/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/scm/GitService.kt b/...ry/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/scm/GitService.kt
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.google.gson.JsonParser
 import com.tencent.devops.common.api.constant.CommonMessageCode
+import com.tencent.devops.common.api.constant.ID
 import com.tencent.devops.common.api.enums.FrontendTypeEnum
 import com.tencent.devops.common.api.exception.CustomException
 import com.tencent.devops.common.api.pojo.Result
@@ -628,7 +629,8 @@ class GitService @Autowired constructor(
                     )
                 }
             }
-            return Result(GitRepositoryResp(nameSpaceName, atomRepositoryUrl as String))
+            val id = dataMap[ID] as Long
+            return Result(GitRepositoryResp(id, nameSpaceName, atomRepositoryUrl as String))
         }
     }
 

diff --git a/...ain/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt b/...ain/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt
@@ -508,7 +508,13 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService {
         val userCommentInfo = storeCommentService.getStoreUserCommentInfo(userId, storeCode, storeType)
 
         val baseExtRecords = storeBaseExtQueryDao.getBaseExtByIds(dslContext, listOf(storeId))
-        val extData = baseExtRecords.associateBy({ it.fieldName }, { formatJson(it.fieldValue) })
+        var extData = baseExtRecords.associateBy({ it.fieldName }, { formatJson(it.fieldValue) })
+        val baseFeatureExtRecords = storeBaseFeatureExtQueryDao.queryStoreBaseFeatureExt(
+            dslContext = dslContext,
+            storeCode = storeCode,
+            storeType = storeType
+        )
+        extData = extData.plus(baseFeatureExtRecords.associateBy({ it.fieldName }, { formatJson(it.fieldValue) }))
         val htmlTemplateVersion = extData[KEY_HTML_TEMPLATE_VERSION]
         val initProjectCode =
             if (htmlTemplateVersion != null && htmlTemplateVersion == FrontendTypeEnum.HISTORY.typeVersion) {