From 16cb3defc6d55e156a8bf69c0e6817c0e9b79acf Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Wed, 16 Jul 2025 11:40:10 +0800 Subject: [PATCH 1/2] fix hign memory problem --- cve-vulner-manager/conf/product_app.conf | 2 +- cve-vulner-manager/models/cve.go | 5 ++- cve-vulner-manager/taskhandler/cve.go | 49 +++++++++++------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index 4fff6db..59807cd 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -88,7 +88,7 @@ test = 0/10 * * * * * gittokenflag = 2 issueoath = * * */20 * * * genexcelflag = 1 -genexcel = 0 15 15 * * * +genexcel = 0 0 3 * * 0 days = -30 prcnum = 50 printlogflag = 2 diff --git a/cve-vulner-manager/models/cve.go b/cve-vulner-manager/models/cve.go index 14400da..0d2f83e 100644 --- a/cve-vulner-manager/models/cve.go +++ b/cve-vulner-manager/models/cve.go @@ -958,7 +958,10 @@ func GetVulnCenterByCid(cve *VulnCenter, field ...string) error { func GetCanExportVulnCenterData() (data []VulnCenter, err error) { o := orm.NewOrm() - sql := fmt.Sprintf(`SELECT * from cve_vuln_center WHERE is_export IN (0,2,3) and organizate_id = 1`) + sql := fmt.Sprintf( + `SELECT * from cve_vuln_center WHERE is_export IN (0,2,3) and organizate_id = 1 and create_time > %s`, + time.Now().AddDate(-1, 0, 0).Format(time.DateTime), + ) _, err = o.Raw(sql).QueryRows(&data) logs.Info("GetCanExportVulnCenterData, err: ", err) return diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index 7494768..7846826 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2603,35 +2603,30 @@ func FilterCveExported() { logs.Error(err) return } - for _, v := range data { - ewg.Add(1) - go func(center models.VulnCenter) { - defer ewg.Done() - exist, result := GetCveSecurityNotice(center.CveNum, center.PackName, true) - if exist && result.Result.IsFixed() { - // 1640966400 -- 2022-01-01 - if t := util.TimeStrToInt(result.Result.UpdateTime, ""); t != 0 && t <= 1640966400 { - dbLock.Lock() - center.IsExport = 1 - models.UpdateVulnCenter(¢er, "is_export") - dbLock.Unlock() - } else if b := IsAllProductReleased(center.CveNum, center.PackName); b { - dbLock.Lock() - center.IsExport = 1 - models.UpdateVulnCenter(¢er, "is_export") - dbLock.Unlock() - } - } else { - if center.IsExport == 2 { - dbLock.Lock() - center.IsExport = 3 - models.UpdateVulnCenter(¢er, "is_export") - dbLock.Unlock() - } + for _, center := range data { + exist, result := GetCveSecurityNotice(center.CveNum, center.PackName, true) + if exist && result.Result.IsFixed() { + // 1640966400 -- 2022-01-01 + if t := util.TimeStrToInt(result.Result.UpdateTime, ""); t != 0 && t <= 1640966400 { + dbLock.Lock() + center.IsExport = 1 + models.UpdateVulnCenter(¢er, "is_export") + dbLock.Unlock() + } else if b := IsAllProductReleased(center.CveNum, center.PackName); b { + dbLock.Lock() + center.IsExport = 1 + models.UpdateVulnCenter(¢er, "is_export") + dbLock.Unlock() } - }(v) + } else { + if center.IsExport == 2 { + dbLock.Lock() + center.IsExport = 3 + models.UpdateVulnCenter(¢er, "is_export") + dbLock.Unlock() + } + } } - ewg.Wait() logs.Info("Excluding the cve data that has been released SA ends...") } -- Gitee From 1573adebf5b626131e00606c819815d48dd9b8d0 Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Wed, 16 Jul 2025 14:50:08 +0800 Subject: [PATCH 2/2] fix ci --- cve-vulner-manager/taskhandler/cve.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index 7846826..f62ca75 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2603,11 +2603,13 @@ func FilterCveExported() { logs.Error(err) return } + + const beginOf2022 = 1640966400 for _, center := range data { exist, result := GetCveSecurityNotice(center.CveNum, center.PackName, true) if exist && result.Result.IsFixed() { // 1640966400 -- 2022-01-01 - if t := util.TimeStrToInt(result.Result.UpdateTime, ""); t != 0 && t <= 1640966400 { + if t := util.TimeStrToInt(result.Result.UpdateTime, ""); t != 0 && t <= beginOf2022 { dbLock.Lock() center.IsExport = 1 models.UpdateVulnCenter(¢er, "is_export") @@ -2619,7 +2621,8 @@ func FilterCveExported() { dbLock.Unlock() } } else { - if center.IsExport == 2 { + const noNeedSync = 2 + if center.IsExport == noNeedSync { dbLock.Lock() center.IsExport = 3 models.UpdateVulnCenter(¢er, "is_export") -- Gitee