Merge pull request #1833 from wansir/release-2.1

fix: use constants

pkg/apiserver/openpitrix/apps.go

@@ -153,9 +153,9 @@ func ListAppVersionAudits(req *restful.Request, resp *restful.Response) {
 		resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
 		return
 	}
-	conditions.Match["app"] = appId
+	conditions.Match[openpitrix.AppId] = appId
 	if versionId != "" {
-		conditions.Match["version"] = versionId
+		conditions.Match[openpitrix.VersionId] = versionId
 	}
 
 	result, err := openpitrix.ListAppVersionAudits(conditions, orderBy, reverse, limit, offset)

pkg/models/openpitrix/repos.go

@@ -270,7 +270,7 @@ func ListRepoEvents(repoId string, conditions *params.Conditions, limit, offset
 	describeRepoEventsRequest := &pb.DescribeRepoEventsRequest{
 		RepoId: []string{repoId},
 	}
-	if eventId := conditions.Match["repo_event_id"]; eventId != "" {
+	if eventId := conditions.Match[RepoEventId]; eventId != "" {
 		describeRepoEventsRequest.RepoEventId = strings.Split(eventId, "|")
 	}
 	if status := conditions.Match[Status]; status != "" {

pkg/models/openpitrix/types.go

@@ -843,6 +843,7 @@ const (
 	VersionId      = "version_id"
 	RepoId         = "repo_id"
 	CategoryId     = "category_id"
+	RepoEventId    = "repo_event_id"
 	Status         = "status"
 	Type           = "type"
 	Visibility     = "visibility"