From 1d0b4e44046d6bd20da099d9d61bbc8d8cfcc683 Mon Sep 17 00:00:00 2001 From: Leric Zhang Date: Mon, 4 Mar 2024 17:12:58 +0800 Subject: [PATCH] fix(customize): issue_repo_commit.host column ignores port, consistant with devinsights change. --- backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go | 2 +- backend/plugins/tapd/tasks/bug_commit_converter.go | 2 +- backend/plugins/tapd/tasks/story_commit_converter.go | 2 +- backend/plugins/tapd/tasks/task_commit_converter.go | 2 +- backend/plugins/zentao/tasks/shared.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go b/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go index d5d6e2763a4..3ed842ee501 100644 --- 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 index f90c6818fc0..f47dc4c8e68 100644 --- 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 index 071db033465..b98ddbc124e 100644 --- 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 index c4c48e84f96..aec034839d9 100644 --- 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 index cd78d45e516..aa114057324 100644 --- 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 {