diff --git a/controllers/file.go b/controllers/file.go index 8ed8c2cf734701446d01505a0ecfcec43339e0e0..8702600b104208d9cda8c5a791973f8f644d1715 100644 --- a/controllers/file.go +++ b/controllers/file.go @@ -160,11 +160,6 @@ func (f *FileController) TriggerCveData() { func GenAndUploadCvrf(cvrfFileMap map[string]taskhandler.CvrfSa, cvrfFileList map[string][]string, componentMap map[string]taskhandler.ComponentInfo, affectBranchSlice []string, dir string) { - //if len(cvrfFileMap) > 0 { - // for cvrfKey, cvrfVule := range cvrfFileMap { - // taskhandler.WriteCvrfXml(cvrfKey, &cvrfVule) - // } - //} common.CreateDir(dir) writeCvrfSlice := make([]string, 0) totalFileSlice := make([]string, 0) diff --git a/models/cve.go b/models/cve.go index 109707e3422534dcacec091e6867aaa9b2366b29..bea36f75f1ee13055cb25bdf628225e9d38bf508 100644 --- a/models/cve.go +++ b/models/cve.go @@ -936,9 +936,9 @@ d.affect_product,d.reference_link,d.affect_status, e.public_date,e.openeuler_sa_num,a.cve_level,b.organizate_id FROM cve_issue_template a RIGHT JOIN -(SELECT (SELECT COUNT(*) FROM cve_vuln_center WHERE cve_num = ? AND is_export = 3) num , +(SELECT (SELECT COUNT(*) FROM cve_vuln_center WHERE cve_num = ? AND is_export in (0,3)) num , bc.cve_id,bc.cve_num,bc.organizate_id -FROM cve_vuln_center bc WHERE bc.cve_num = ? AND bc.is_export = 3 ) b +FROM cve_vuln_center bc WHERE bc.cve_num = ? AND bc.is_export in (0,3)) b ON a.cve_id = b.cve_id LEFT JOIN cve_score c ON b.cve_id = c.cve_id @@ -946,7 +946,7 @@ LEFT JOIN cve_security_notice d ON b.cve_id = d.cve_id LEFT JOIN cve_open_euler_s_a e ON b.cve_id = e.cve_id -WHERE a.issue_num = ? +WHERE a.issue_num = ? AND a.Status = 3 ` o := orm.NewOrm() _, err = o.Raw(sql, cveNum, cveNum, issueNum).QueryRows(&list) diff --git a/models/modeldb.go b/models/modeldb.go index d51c3d784ae726f26465806e5a31b823901d6c63..ce1ed275c5411c4057612a473dc5e81f5fbc8676 100644 --- a/models/modeldb.go +++ b/models/modeldb.go @@ -656,7 +656,7 @@ type CvrfSaRecord struct { PackName string `orm:"size(512);column(pack_name)" description:"cve对应得包名称"` CveNum string `orm:"size(8192);column(cve_num);index" description:"cve编号"` XmlContent string `orm:"text;column(xml_content)" description:"xml内容"` - Md5 string `orm:"size(128);column(cur_md5)" description:"当前内容生成的MD5"` + Md5 string `orm:"size(128);column(cur_md5);unique" description:"当前内容生成的MD5"` UpdateMd5 string `orm:"size(128);column(update_md5)" description:"内容更新后生成的MD5"` Status int8 `orm:"default(1);column(cve_status)" description:"1:初始化; 2: 已更新; 3: 已删除"` IsExport int8 `orm:"default(1);column(is_export);null" description:"1: 未导出; 2: 已导出"` diff --git a/taskhandler/excel.go b/taskhandler/excel.go index d79be6b0b81c0bd4df83f6f079d385dfcc2d1b39..d0baaea8fbb2e0b888896f42031912d33c410e2d 100644 --- a/taskhandler/excel.go +++ b/taskhandler/excel.go @@ -1230,7 +1230,7 @@ func getRepoIssueAllPR(affectBranch, token, owner, repo string, startTime, mt := util.TimeStrToInt(closedAt[:19], "2006-01-02T15:04:05") mergedAt := v["merged_at"].(string) ct := util.TimeStrToInt(mergedAt[:19], "2006-01-02T15:04:05") - //logs.Info("******>>mt: ", mt, ", startTime: ", startTime, ",releaseTime: ", releaseTime, ":ct:", ct, ",repo:", repo, ", pr: ", v) + logs.Info("******>>mt: ", mt, ", startTime: ", startTime, ",releaseTime: ", releaseTime, ":ct:", ct, ",repo:", repo, ", pr: ", v) //ct := v["merged_at"].(string).(time.Time).Local().Unix() var pt int64 if mt > 0 && ct > 0 {