Skip to content

Commit

Permalink
Merge pull request TencentBlueKing#10063 from hejieehe/feat_9794
Browse files Browse the repository at this point in the history
bug: 优化工蜂接口异常提示 TencentBlueKing#9794
  • Loading branch information
bkci-bot authored Mar 6, 2024
2 parents 1bda39b + 4c1a2b6 commit 13966ad
Showing 1 changed file with 0 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import com.tencent.devops.repository.service.scm.IScmService
import com.tencent.devops.repository.service.tgit.TGitOAuthService
import com.tencent.devops.scm.pojo.TokenCheckResult
import com.tencent.devops.scm.utils.code.git.GitUtils
import com.tencent.devops.ticket.pojo.enums.CredentialType
import org.apache.commons.lang3.StringUtils
import org.jooq.DSLContext
import org.jooq.impl.DSL
Expand Down Expand Up @@ -201,10 +200,6 @@ class CodeTGitRepositoryService @Autowired constructor(
)
}
RepoAuthType.HTTP -> {
if (repoCredentialInfo.credentialType == CredentialType.USERNAME_PASSWORD.name) {
logger.info("TGit check type is username+password,don't check, return")
return TokenCheckResult(result = true, message = "")
}
scmService.checkUsernameAndPassword(
projectName = GitUtils.getProjectName(repository.getFormatURL()),
url = repository.getFormatURL(),
Expand All @@ -217,10 +212,6 @@ class CodeTGitRepositoryService @Autowired constructor(
)
}
RepoAuthType.HTTPS -> {
if (repoCredentialInfo.credentialType == CredentialType.USERNAME_PASSWORD.name) {
logger.info("TGit check type is username+password,don't check, return")
return TokenCheckResult(result = true, message = "")
}
scmService.checkUsernameAndPassword(
projectName = GitUtils.getProjectName(repository.getFormatURL()),
url = repository.getFormatURL(),
Expand Down

0 comments on commit 13966ad

Please sign in to comment.