diff --git a/conf/app.conf b/conf/app.conf index 92f33ed7b61fe1cf05bc44bdb66a941cf4323653..4ef2cefa6c089b3ab0905773abc39cf9c47702d8 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -91,8 +91,8 @@ seclinktask = 0 8 10 * * * #email = 1499273991@qq.com #redirect_uri = http://119.8.126.102:80/v1/issue/oauth/callback # -------jianjun gitee 配置 -------- -owner = src-openeuler -#owner = cve-test +#owner = src-openeuler +owner = cve-test path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com redirect_uri = http://159.138.2.2:80/v1/issue/oauth/callback diff --git a/controllers/hook.go b/controllers/hook.go index e8260d7dda6bf0f033d3219cb173e0d97b576409..6d0be42ae8e3100e57584eeba61cc958b6396af9 100644 --- a/controllers/hook.go +++ b/controllers/hook.go @@ -801,12 +801,9 @@ func getRepoIssueAllPR(affectBranch, token, owner, repo string, isTemp models.Is } pr := models.PullRequestIssue{} if v["state"].(string) == "merged" && v["mergeable"].(bool) { - if v["head"].(map[string]interface{})["label"].(string) == affectBranch || - v["base"].(map[string]interface{})["label"].(string) == affectBranch { - if v["head"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo || - v["base"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo { - if v["head"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner || - v["base"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner { + if v["base"].(map[string]interface{})["label"].(string) == affectBranch { + if v["base"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo { + if v["base"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner { pr.Id = int64(v["id"].(float64)) pr.Number = isTemp.IssueNum pr.CveNumber = isTemp.CveNum diff --git a/taskhandler/excel.go b/taskhandler/excel.go index bf1a7d597f13f620b164ae2689ded98f0ac2da53..df62c071b0a801941b9dd8c31d550d27961b8355 100644 --- a/taskhandler/excel.go +++ b/taskhandler/excel.go @@ -1245,12 +1245,9 @@ func getRepoIssueAllPR(affectBranch, token, owner, repo string, startTime, pt = mt } if pt >= startTime && pt <= releaseTime { - if v["head"].(map[string]interface{})["label"].(string) == affectBranch || - v["base"].(map[string]interface{})["label"].(string) == affectBranch { - if v["head"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo || - v["base"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo { - if v["head"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner || - v["base"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner { + if v["base"].(map[string]interface{})["label"].(string) == affectBranch { + if v["base"].(map[string]interface{})["repo"].(map[string]interface{})["path"] == repo { + if v["base"].(map[string]interface{})["repo"].(map[string]interface{})["namespace"].(map[string]interface{})["path"] == owner { pr.Id = int64(v["id"].(float64)) pr.Number = isTemp.IssueNum pr.CveNumber = isTemp.CveNum