From d0c608f9882ec4f4ed692a89b545e92695d5b0a5 Mon Sep 17 00:00:00 2001 From: zacYL Date: Tue, 14 Jan 2025 15:03:53 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4=20#2922?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/repo/RRepositoryService.kt | 20 ++++++++-- .../service/repo/RepositoryService.kt | 19 +++++++-- .../repo/impl/CenterRepositoryServiceImpl.kt | 6 +-- .../repo/impl/EdgeRepositoryServiceImpl.kt | 6 +-- .../repo/impl/RRepositoryServiceImpl.kt | 40 +++++++++++++------ .../repo/impl/RepositoryServiceImpl.kt | 37 +++++++++++------ .../metadata/util/RepositoryServiceHelper.kt | 32 ++++++++++----- .../user/UserRepositoryController.kt | 10 +++-- .../service/file/impl/ListViewServiceImpl.kt | 4 +- 9 files changed, 122 insertions(+), 52 deletions(-) diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RRepositoryService.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RRepositoryService.kt index d13c180b2b..7341b29889 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RRepositoryService.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RRepositoryService.kt @@ -49,7 +49,12 @@ interface RRepositoryService { * @param name 仓库名称 * @param type 仓库类型 */ - suspend fun getRepoInfo(projectId: String, name: String, type: String? = null): RepositoryInfo? + suspend fun getRepoInfo( + projectId: String, + name: String, + type: String? = null, + returnDecrypt: Boolean = false, + ): RepositoryInfo? /** * 查询仓库详情，不存在返回null @@ -58,7 +63,12 @@ interface RRepositoryService { * @param name 仓库名称 * @param type 仓库类型 */ - suspend fun getRepoDetail(projectId: String, name: String, type: String? = null): RepositoryDetail? + suspend fun getRepoDetail( + projectId: String, + name: String, + type: String? = null, + returnDecrypt: Boolean = false, + ): RepositoryDetail? /** * 查询项目[projectId]下的所有仓库 @@ -68,6 +78,7 @@ interface RRepositoryService { name: String? = null, type: String? = null, display: Boolean? = null, + returnDecrypt: Boolean = false, ): List /** @@ -85,6 +96,7 @@ interface RRepositoryService { pageSize: Int, name: String? = null, type: String? = null, + returnDecrypt: Boolean = false, ): Page /** @@ -98,6 +110,7 @@ interface RRepositoryService { userId: String, projectId: String, option: RepoListOption, + returnDecrypt: Boolean = false, ): List /** @@ -112,6 +125,7 @@ interface RRepositoryService { pageNumber: Int, pageSize: Int, option: RepoListOption, + returnDecrypt: Boolean = false, ): Page /** @@ -142,7 +156,7 @@ interface RRepositoryService { /** * 根据请求[repoCreateRequest]创建仓库 */ - suspend fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail + suspend fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean = false): RepositoryDetail /** * 根据请求[repoUpdateRequest]更新仓库 diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RepositoryService.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RepositoryService.kt index 3117653fbe..082e6fbf1b 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RepositoryService.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/RepositoryService.kt @@ -49,7 +49,12 @@ interface RepositoryService { * @param name 仓库名称 * @param type 仓库类型 */ - fun getRepoInfo(projectId: String, name: String, type: String? = null): RepositoryInfo? + fun getRepoInfo( + projectId: String, + name: String, + type: String? = null, + returnDecrypt: Boolean = false, + ): RepositoryInfo? /** * 查询仓库详情，不存在返回null @@ -58,7 +63,12 @@ interface RepositoryService { * @param name 仓库名称 * @param type 仓库类型 */ - fun getRepoDetail(projectId: String, name: String, type: String? = null): RepositoryDetail? + fun getRepoDetail( + projectId: String, + name: String, + type: String? = null, + returnDecrypt: Boolean = false, + ): RepositoryDetail? /** * 查询项目[projectId]下的所有仓库 @@ -68,6 +78,7 @@ interface RepositoryService { name: String? = null, type: String? = null, display: Boolean? = null, + returnDecrypt: Boolean = false, ): List /** @@ -98,6 +109,7 @@ interface RepositoryService { userId: String, projectId: String, option: RepoListOption, + returnDecrypt: Boolean = false, ): List /** @@ -112,6 +124,7 @@ interface RepositoryService { pageNumber: Int, pageSize: Int, option: RepoListOption, + returnDecrypt: Boolean = false, ): Page /** @@ -142,7 +155,7 @@ interface RepositoryService { /** * 根据请求[repoCreateRequest]创建仓库 */ - fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail + fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean = false): RepositoryDetail /** * 根据请求[repoUpdateRequest]更新仓库 diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/CenterRepositoryServiceImpl.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/CenterRepositoryServiceImpl.kt index 746e8d316c..90bdb8e5e1 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/CenterRepositoryServiceImpl.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/CenterRepositoryServiceImpl.kt @@ -107,7 +107,7 @@ class CenterRepositoryServiceImpl( return exitRepo != null && ClusterUtils.containsSrcCluster(exitRepo.clusterNames) } - override fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail { + override fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean): RepositoryDetail { with(repoCreateRequest) { val exitRepo = repositoryDao.findByNameAndType(projectId, name, type.name) if (exitRepo != null && ClusterUtils.containsSrcCluster(exitRepo.clusterNames)) { @@ -118,7 +118,7 @@ class CenterRepositoryServiceImpl( } if (exitRepo == null) { - return super.createRepo(repoCreateRequest) + return super.createRepo(repoCreateRequest, returnDecrypt) } val query = RepositoryServiceHelper.buildSingleQuery(projectId, name, type.name) @@ -130,7 +130,7 @@ class CenterRepositoryServiceImpl( val update = Update().addToSet(TRepository::clusterNames.name).each(clusterNames) exitRepo.clusterNames = clusterNames repositoryDao.updateFirst(query, update) - return convertToDetail(exitRepo)!! + return convertToDetail(exitRepo, returnDecrypt = returnDecrypt)!! } } diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/EdgeRepositoryServiceImpl.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/EdgeRepositoryServiceImpl.kt index 4aafd6b53c..9cea40a7d8 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/EdgeRepositoryServiceImpl.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/EdgeRepositoryServiceImpl.kt @@ -79,9 +79,9 @@ class EdgeRepositoryServiceImpl( ) } - override fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail { + override fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean): RepositoryDetail { if (!reportMetadataToCenter(repoCreateRequest.projectId, repoCreateRequest.name)) { - return super.createRepo(repoCreateRequest) + return super.createRepo(repoCreateRequest, returnDecrypt) } try { centerRepoClient.createRepo(repoCreateRequest) @@ -90,7 +90,7 @@ class EdgeRepositoryServiceImpl( throw e } } - return super.createRepo(repoCreateRequest) + return super.createRepo(repoCreateRequest, returnDecrypt) } override fun deleteRepo(repoDeleteRequest: RepoDeleteRequest) { diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RRepositoryServiceImpl.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RRepositoryServiceImpl.kt index 5de5d30782..10e18c930d 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RRepositoryServiceImpl.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RRepositoryServiceImpl.kt @@ -121,15 +121,25 @@ class RRepositoryServiceImpl( private val resourcePermissionListener: RResourcePermissionListener ) : RRepositoryService { - override suspend fun getRepoInfo(projectId: String, name: String, type: String?): RepositoryInfo? { + override suspend fun getRepoInfo( + projectId: String, + name: String, + type: String?, + returnDecrypt: Boolean + ): RepositoryInfo? { val tRepository = repositoryDao.findByNameAndType(projectId, name, type) - return convertToInfo(tRepository) + return convertToInfo(tRepository, returnDecrypt) } - override suspend fun getRepoDetail(projectId: String, name: String, type: String?): RepositoryDetail? { + override suspend fun getRepoDetail( + projectId: String, + name: String, + type: String?, + returnDecrypt: Boolean + ): RepositoryDetail? { val tRepository = repositoryDao.findByNameAndType(projectId, name, type) val storageCredentials = tRepository?.credentialsKey?.let { storageCredentialService.findByKey(it) } - return convertToDetail(tRepository, storageCredentials) + return convertToDetail(tRepository, storageCredentials, returnDecrypt) } override suspend fun updateStorageCredentialsKey( @@ -153,10 +163,11 @@ class RRepositoryServiceImpl( projectId: String, name: String?, type: String?, - display: Boolean? + display: Boolean?, + returnDecrypt: Boolean, ): List { val query = buildListQuery(projectId, name, type, display) - return repositoryDao.find(query).map { convertToInfo(it)!! } + return repositoryDao.find(query).map { convertToInfo(it, returnDecrypt)!! } } override suspend fun listRepoPage( @@ -165,11 +176,12 @@ class RRepositoryServiceImpl( pageSize: Int, name: String?, type: String?, + returnDecrypt: Boolean, ): Page { val query = buildListQuery(projectId, name, type) val pageRequest = Pages.ofRequest(pageNumber, pageSize) val totalRecords = repositoryDao.count(query) - val records = repositoryDao.find(query.with(pageRequest)).map { convertToInfo(it)!! } + val records = repositoryDao.find(query.with(pageRequest)).map { convertToInfo(it, returnDecrypt)!! } return Pages.ofResponse(pageRequest, totalRecords, records) } @@ -177,6 +189,7 @@ class RRepositoryServiceImpl( userId: String, projectId: String, option: RepoListOption, + returnDecrypt: Boolean, ): List { var names = rAuthClient.listPermissionRepo( projectId = projectId, @@ -187,14 +200,14 @@ class RRepositoryServiceImpl( names = names.filter { it.startsWith(option.name.orEmpty(), true) } } val query = buildListPermissionRepoQuery(projectId, names, option) - val originResults = repositoryDao.find(query).map { convertToInfo(it)!! } + val originResults = repositoryDao.find(query).map { convertToInfo(it, returnDecrypt)!! } val originNames = originResults.map { it.name }.toSet() var includeResults = emptyList() if (names.isNotEmpty() && option.include != null) { val inValues = names.intersect(setOf(option.include!!)).minus(originNames) val includeCriteria = where(TRepository::projectId).isEqualTo(projectId) .and(TRepository::name).inValues(inValues) - includeResults = repositoryDao.find(Query(includeCriteria)).map { convertToInfo(it)!! } + includeResults = repositoryDao.find(Query(includeCriteria)).map { convertToInfo(it, returnDecrypt)!! } } return originResults + includeResults } @@ -205,8 +218,9 @@ class RRepositoryServiceImpl( pageNumber: Int, pageSize: Int, option: RepoListOption, + returnDecrypt: Boolean, ): Page { - val allRepos = listPermissionRepo(userId, projectId, option) + val allRepos = listPermissionRepo(userId, projectId, option, returnDecrypt) return Pages.buildPage(allRepos, pageNumber, pageSize) } @@ -225,7 +239,7 @@ class RRepositoryServiceImpl( } @Transactional(rollbackFor = [Throwable::class]) - override suspend fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail { + override suspend fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean): RepositoryDetail { with(repoCreateRequest) { Preconditions.matchPattern(name, REPO_NAME_PATTERN, this::name.name) Preconditions.checkArgument((description?.length ?: 0) <= REPO_DESC_MAX_LENGTH, this::description.name) @@ -267,10 +281,10 @@ class RRepositoryServiceImpl( key = event.getFullResourceKey(), ) logger.info("Create repository [$repoCreateRequest] success.") - convertToDetail(repository)!! + convertToDetail(repository, returnDecrypt = returnDecrypt)!! } catch (exception: DuplicateKeyException) { logger.warn("Insert repository[$projectId/$name] error: [${exception.message}]") - getRepoDetail(projectId, name, type.name)!! + getRepoDetail(projectId, name, type.name, returnDecrypt)!! } } } diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RepositoryServiceImpl.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RepositoryServiceImpl.kt index 1cdbc37fe9..e63f851d31 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RepositoryServiceImpl.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/service/repo/impl/RepositoryServiceImpl.kt @@ -120,15 +120,20 @@ class RepositoryServiceImpl( private val resourceClearService: ObjectProvider ) : RepositoryService { - override fun getRepoInfo(projectId: String, name: String, type: String?): RepositoryInfo? { + override fun getRepoInfo(projectId: String, name: String, type: String?, returnDecrypt: Boolean): RepositoryInfo? { val tRepository = repositoryDao.findByNameAndType(projectId, name, type) - return convertToInfo(tRepository) + return convertToInfo(tRepository, returnDecrypt) } - override fun getRepoDetail(projectId: String, name: String, type: String?): RepositoryDetail? { + override fun getRepoDetail( + projectId: String, + name: String, + type: String?, + returnDecrypt: Boolean + ): RepositoryDetail? { val tRepository = repositoryDao.findByNameAndType(projectId, name, type) val storageCredentials = tRepository?.credentialsKey?.let { storageCredentialService.findByKey(it) } - return convertToDetail(tRepository, storageCredentials) + return convertToDetail(tRepository, storageCredentials, returnDecrypt) } override fun updateStorageCredentialsKey(projectId: String, repoName: String, storageCredentialsKey: String?) { @@ -144,9 +149,15 @@ class RepositoryServiceImpl( repositoryDao.unsetOldCredentialsKey(projectId, repoName) } - override fun listRepo(projectId: String, name: String?, type: String?, display: Boolean?): List { + override fun listRepo( + projectId: String, + name: String?, + type: String?, + display: Boolean?, + returnDecrypt: Boolean + ): List { val query = buildListQuery(projectId, name, type, display) - return repositoryDao.find(query).map { convertToInfo(it)!! } + return repositoryDao.find(query).map { convertToInfo(it, returnDecrypt)!! } } override fun listRepoPage( @@ -167,6 +178,7 @@ class RepositoryServiceImpl( userId: String, projectId: String, option: RepoListOption, + returnDecrypt: Boolean, ): List { var names = servicePermissionClient.listPermissionRepo( projectId = projectId, @@ -177,14 +189,14 @@ class RepositoryServiceImpl( names = names.filter { it.startsWith(option.name.orEmpty(), true) } } val query = buildListPermissionRepoQuery(projectId, names, option) - val originResults = repositoryDao.find(query).map { convertToInfo(it)!! } + val originResults = repositoryDao.find(query).map { convertToInfo(it, returnDecrypt)!! } val originNames = originResults.map { it.name }.toSet() var includeResults = emptyList() if (names.isNotEmpty() && option.include != null) { val inValues = names.intersect(setOf(option.include!!)).minus(originNames) val includeCriteria = where(TRepository::projectId).isEqualTo(projectId) .and(TRepository::name).inValues(inValues) - includeResults = repositoryDao.find(Query(includeCriteria)).map { convertToInfo(it)!! } + includeResults = repositoryDao.find(Query(includeCriteria)).map { convertToInfo(it, returnDecrypt)!! } } return originResults + includeResults } @@ -195,8 +207,9 @@ class RepositoryServiceImpl( pageNumber: Int, pageSize: Int, option: RepoListOption, + returnDecrypt: Boolean, ): Page { - val allRepos = listPermissionRepo(userId, projectId, option) + val allRepos = listPermissionRepo(userId, projectId, option, returnDecrypt) return Pages.buildPage(allRepos, pageNumber, pageSize) } @@ -215,7 +228,7 @@ class RepositoryServiceImpl( } @Transactional(rollbackFor = [Throwable::class]) - override fun createRepo(repoCreateRequest: RepoCreateRequest): RepositoryDetail { + override fun createRepo(repoCreateRequest: RepoCreateRequest, returnDecrypt: Boolean): RepositoryDetail { with(repoCreateRequest) { Preconditions.matchPattern(name, REPO_NAME_PATTERN, this::name.name) Preconditions.checkArgument((description?.length ?: 0) <= REPO_DESC_MAX_LENGTH, this::description.name) @@ -257,10 +270,10 @@ class RepositoryServiceImpl( key = event.getFullResourceKey(), ) logger.info("Create repository [$repoCreateRequest] success.") - convertToDetail(repository)!! + convertToDetail(repository, returnDecrypt = returnDecrypt)!! } catch (exception: DuplicateKeyException) { logger.warn("Insert repository[$projectId/$name] error: [${exception.message}]") - getRepoDetail(projectId, name, type.name)!! + getRepoDetail(projectId, name, type.name, returnDecrypt)!! } } } diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/RepositoryServiceHelper.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/RepositoryServiceHelper.kt index cab4d6347d..7481139674 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/RepositoryServiceHelper.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/RepositoryServiceHelper.kt @@ -57,7 +57,8 @@ class RepositoryServiceHelper( fun convertToDetail( tRepository: TRepository?, storageCredentials: StorageCredentials? = null, - ): RepositoryDetail? { + returnDecrypt: Boolean = false, + ): RepositoryDetail? { return tRepository?.let { handlerConfiguration(it) RepositoryDetail( @@ -66,7 +67,10 @@ class RepositoryServiceHelper( category = it.category, public = it.public, description = it.description, - configuration = cryptoConfigurationPwd(it.configuration.readJsonString()), + configuration = cryptoConfigurationPwd( + it.configuration.readJsonString(), + returnDecrypt = returnDecrypt + ), storageCredentials = storageCredentials, projectId = it.projectId, createdBy = it.createdBy, @@ -80,7 +84,7 @@ class RepositoryServiceHelper( } } - fun convertToInfo(tRepository: TRepository?): RepositoryInfo? { + fun convertToInfo(tRepository: TRepository?, returnDecrypt: Boolean = false): RepositoryInfo? { return tRepository?.let { handlerConfiguration(it) RepositoryInfo( @@ -90,7 +94,10 @@ class RepositoryServiceHelper( category = it.category, public = it.public, description = it.description, - configuration = cryptoConfigurationPwd(it.configuration.readJsonString()), + configuration = cryptoConfigurationPwd( + it.configuration.readJsonString(), + returnDecrypt = returnDecrypt + ), storageCredentialsKey = it.credentialsKey, projectId = it.projectId, createdBy = it.createdBy, @@ -144,30 +151,35 @@ class RepositoryServiceHelper( fun cryptoConfigurationPwd( repoConfiguration: RepositoryConfiguration, decrypt: Boolean = true, + returnDecrypt: Boolean = false, ): RepositoryConfiguration { if (repoConfiguration is CompositeConfiguration) { repoConfiguration.proxy.channelList.forEach { it.password?.let { pw -> - it.password = crypto(pw, decrypt) + it.password = crypto(pw, decrypt, returnDecrypt) } } } if (repoConfiguration is RemoteConfiguration) { repoConfiguration.credentials.password?.let { - repoConfiguration.credentials.password = crypto(it, decrypt) + repoConfiguration.credentials.password = crypto(it, decrypt, returnDecrypt) } } return repoConfiguration } - fun crypto(pw: String, decrypt: Boolean): String { + fun crypto(pw: String, decrypt: Boolean, returnDecrypt: Boolean): String { return if (!decrypt) { RsaUtils.encrypt(pw) } else { - try { - RsaUtils.decrypt(pw) - } catch (e: Exception) { + if (returnDecrypt) { pw + } else { + try { + RsaUtils.decrypt(pw) + } catch (e: Exception) { + pw + } } } } diff --git a/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserRepositoryController.kt b/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserRepositoryController.kt index 95599a3c17..d56b97a89f 100644 --- a/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserRepositoryController.kt +++ b/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserRepositoryController.kt @@ -114,7 +114,7 @@ class UserRepositoryController( @PathVariable type: String? = null, ): Response { - return ResponseBuilder.success(repositoryService.getRepoInfo(projectId, repoName, type)) + return ResponseBuilder.success(repositoryService.getRepoInfo(projectId, repoName, type, true)) } @ApiOperation("根据名称查询仓库是否存在") @@ -177,7 +177,7 @@ class UserRepositoryController( ) } ActionAuditContext.current().setInstance(createRequest) - return ResponseBuilder.success(repositoryService.createRepo(createRequest)) + return ResponseBuilder.success(repositoryService.createRepo(createRequest, true)) } @AuditEntry( @@ -205,7 +205,7 @@ class UserRepositoryController( projectId: String, repoListOption: RepoListOption, ): Response> { - return ResponseBuilder.success(repositoryService.listPermissionRepo(userId, projectId, repoListOption)) + return ResponseBuilder.success(repositoryService.listPermissionRepo(userId, projectId, repoListOption, true)) } @AuditEntry( @@ -239,7 +239,9 @@ class UserRepositoryController( pageSize: Int, repoListOption: RepoListOption, ): Response> { - val page = repositoryService.listPermissionRepoPage(userId, projectId, pageNumber, pageSize, repoListOption) + val page = repositoryService.listPermissionRepoPage( + userId, projectId, pageNumber, pageSize, repoListOption, true + ) return ResponseBuilder.success(page) } diff --git a/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/service/file/impl/ListViewServiceImpl.kt b/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/service/file/impl/ListViewServiceImpl.kt index c28833b606..3a474e7189 100644 --- a/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/service/file/impl/ListViewServiceImpl.kt +++ b/src/backend/repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/service/file/impl/ListViewServiceImpl.kt @@ -91,7 +91,9 @@ class ListViewServiceImpl( override fun listRepoView(projectId: String) { viewModelService.trailingSlash(applicationName) - val itemList = repositoryService.listRepo(projectId, display = true).map { RepoListViewItem.from(it) } + val itemList = repositoryService.listRepo( + projectId, display = true, returnDecrypt = true + ).map { RepoListViewItem.from(it) } val title = "Repository[$projectId]" val headerList = listOf( HeaderItem("Name"),