fix(customize): issue_repo_commit.host column ignores port, consistan…

…t with devinsights change. (#7094)
apache · Mar 6, 2024 · a364804 · a364804
1 parent b5a41a9
commit a364804
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go b/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go
@@ -43,7 +43,7 @@ func RefineIssueRepoCommit(item *crossdomain.IssueRepoCommit, repoPatterns []*re
 	if err != nil {
 		return item
 	}
-	item.Host = u.Host
+	item.Host = u.Hostname()
 	for _, pattern := range repoPatterns {
 		if pattern.MatchString(commitUrl) {
 			group := pattern.FindStringSubmatch(commitUrl)

diff --git a/backend/plugins/tapd/tasks/bug_commit_converter.go b/backend/plugins/tapd/tasks/bug_commit_converter.go
@@ -71,7 +71,7 @@ func ConvertBugCommit(taskCtx plugin.SubTaskContext) errors.Error {
 					IssueId:   issueIdGen.Generate(data.Options.ConnectionId, toolL.BugId),
 					RepoUrl:   repoUrl,
 					CommitSha: toolL.CommitId,
-					Host:      u.Host,
+					Host:      u.Hostname(),
 					Namespace: getRepoNamespaceFromUrlPath(u.Path),
 					RepoName:  getRepoNameFromUrlPath(u.Path),
 				}

diff --git a/backend/plugins/tapd/tasks/story_commit_converter.go b/backend/plugins/tapd/tasks/story_commit_converter.go
@@ -69,7 +69,7 @@ func ConvertStoryCommit(taskCtx plugin.SubTaskContext) errors.Error {
 					IssueId:   issueIdGen.Generate(data.Options.ConnectionId, toolL.StoryId),
 					RepoUrl:   repoUrl,
 					CommitSha: toolL.CommitId,
-					Host:      u.Host,
+					Host:      u.Hostname(),
 					Namespace: getRepoNamespaceFromUrlPath(u.Path),
 					RepoName:  getRepoNameFromUrlPath(u.Path),
 				}

diff --git a/backend/plugins/tapd/tasks/task_commit_converter.go b/backend/plugins/tapd/tasks/task_commit_converter.go
@@ -72,7 +72,7 @@ func ConvertTaskCommit(taskCtx plugin.SubTaskContext) errors.Error {
 					IssueId:   issueIdGen.Generate(data.Options.ConnectionId, toolL.TaskId),
 					RepoUrl:   repoUrl,
 					CommitSha: toolL.CommitId,
-					Host:      u.Host,
+					Host:      u.Hostname(),
 					Namespace: getRepoNamespaceFromUrlPath(u.Path),
 					RepoName:  getRepoNameFromUrlPath(u.Path),
 				}

diff --git a/backend/plugins/zentao/tasks/shared.go b/backend/plugins/zentao/tasks/shared.go
@@ -154,7 +154,7 @@ func parseRepoUrl(repoUrl string) (string, string, string, error) {
 		return "", "", "", err
 	}
 
-	host := parsedUrl.Host
+	host := parsedUrl.Hostname()
 	host = strings.TrimPrefix(host, "www.")
 	pathParts := strings.Split(parsedUrl.Path, "/")
 	if len(pathParts) < 3 {