From 1b9c07d984defa74fd56678a1f725f72c72c5f7c Mon Sep 17 00:00:00 2001 From: zjm <1076115376@qq.com> Date: Tue, 13 Sep 2022 15:39:18 +0800 Subject: [PATCH] issue asynchronous create --- cve-vulner-manager/conf/product_app.conf | 2 +- cve-vulner-manager/controllers/upload.go | 21 ++++++++++++--------- cve-vulner-manager/task/issue.go | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index 2799542..03a9ef6 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -85,7 +85,7 @@ getissue = 0 20 1,12 * * * issueflag = 1 createissue = 0 0 6 * * * emergissueflag = 1 -emergcreateissue = 0 */10 * * * * +emergcreateissue = 0 */20 * * * * test = 0/10 * * * * * gittokenflag = 2 issueoath = * * */20 * * * diff --git a/cve-vulner-manager/controllers/upload.go b/cve-vulner-manager/controllers/upload.go index 69306dd..3774fe9 100644 --- a/cve-vulner-manager/controllers/upload.go +++ b/cve-vulner-manager/controllers/upload.go @@ -29,12 +29,15 @@ func (c *UserUploadController) RetData(resp map[string]interface{}, list []strin c.ServeJSON() // sysnc cve and create issue if list != nil && len(list) > 0 { - synErr := task.SyncCveAndIssue(list) - if synErr != nil { - logs.Error("SyncCveAndIssue, Sync cve data error, err: ", synErr) - } else { - logs.Info("SyncCveAndIssue, cve data has been synchronized") - } + go func() { + synErr := task.SyncCveAndIssue(list) + if synErr != nil { + logs.Error("SyncCveAndIssue, Sync cve data error, err: ", synErr) + } else { + logs.Info("SyncCveAndIssue, cve data has been synchronized") + } + return + }() } } @@ -216,11 +219,11 @@ func (u *UserUploadController) Post() { return } -func AddOrgUpstream(source int,CveDataDict common.CveOriginData) (ResDataList []ResultData) { +func AddOrgUpstream(source int, CveDataDict common.CveOriginData) (ResDataList []ResultData) { defer common.Catchs() logs.Info("Each request parameter: ", CveDataDict) // Record data flow - AddOrgUpstreamRecord(source,CveDataDict) + AddOrgUpstreamRecord(source, CveDataDict) var ResData ResultData ids := CveDataDict.Ids if len(ids) < 1 { @@ -392,7 +395,7 @@ func checkPackageAndVersion(packName string, orCve *models.OriginUpstream) { } } -func AddOrgUpstreamRecord(source int,CveDataDict common.CveOriginData) { +func AddOrgUpstreamRecord(source int, CveDataDict common.CveOriginData) { orCve := models.OriginUpstreamRecord{} ids := CveDataDict.Ids cveNum := CveDataDict.CveNum diff --git a/cve-vulner-manager/task/issue.go b/cve-vulner-manager/task/issue.go index 645af75..29d0560 100644 --- a/cve-vulner-manager/task/issue.go +++ b/cve-vulner-manager/task/issue.go @@ -248,7 +248,7 @@ func SetIssueProcParams() error { its := models.IssueTemplate{CveId: vl.CveId, CveNum: vl.CveNum} tmpErr := models.GetIssueTemplateByColName(&its, "CveId", "CveNum") if its.TemplateId == 0 { - logs.Error("tmpErr:", tmpErr) + logs.Info("tmpErr:", tmpErr) continue } if its.Status > 2 || (len(its.PlanStarted) > 1 && len(its.Deadline) > 1) { @@ -263,7 +263,7 @@ func SetIssueProcParams() error { } if its.NVDScore > 0 { cveLevel := models.OpenEulerScoreProc(its.NVDScore) - deadLine := taskhandler.CvePlanCloseTime(its.CreateTime, cveLevel, false,true) + deadLine := taskhandler.CvePlanCloseTime(its.CreateTime, cveLevel, false, true) planAt := common.GetSpecifiedTime(its.CreateTime, 0, false, true) priority := taskhandler.GetIssuePriority(cveLevel) owner, accessToken := common.GetOwnerAndToken(vl.CveNum, vl.OrganizationID) @@ -272,7 +272,7 @@ func SetIssueProcParams() error { if s, ok := issueBody["created_at"].(string); ok { if t, err := time.Parse("2006-01-02T15:04:05+08:00", s); err == nil { planAt = common.GetSpecifiedTime(t, 0, true, true) - deadLine = taskhandler.CvePlanCloseTime(t, cveLevel, true,true) + deadLine = taskhandler.CvePlanCloseTime(t, cveLevel, true, true) } } } -- Gitee