diff --git a/cve-py/newexcels/hdf5CVE_2020-12-18.xlsx b/cve-py/newexcels/hdf5CVE_2020-12-18.xlsx deleted file mode 100644 index 4cc0487eee40d7f7a0676c85b59eb86921a53762..0000000000000000000000000000000000000000 Binary files a/cve-py/newexcels/hdf5CVE_2020-12-18.xlsx and /dev/null differ diff --git a/cve-py/newexcels/sp1_2020-12-22.xlsx b/cve-py/newexcels/sp1_2020-12-22.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..356c565de0c0368ccb4fff2070fcd220b1b45467 Binary files /dev/null and b/cve-py/newexcels/sp1_2020-12-22.xlsx differ diff --git a/task/issuetask.go b/task/issuetask.go index 3ea432422a10ac1ad0dd82cf6dee083da6606da7..c2d0c3eb50f28111c68148b907c03b06f6687d27 100644 --- a/task/issuetask.go +++ b/task/issuetask.go @@ -203,9 +203,13 @@ func addLimitedIssue(beforeTime string, prcnum int, years, toolYears, manYears i } owner := beego.AppConfig.String("gitee::owner") path := beego.AppConfig.String("gitee::path") - issueWhiteData, issueErr := models.QueryIssueWhitelist(1) + issueWhiteData, issueErr := models.QueryIssueWhitelist(0) if issueErr == nil && len(issueWhiteData) > 0 { for _, issues := range issueWhiteData { + if issues.Status == 2 { + logs.Error("Removed from whitelist, repo: ", issues.PackageName) + continue + } for ; ; { cveData, err := models.QueryIssueByPackName(issues.PackageName, beforeTime, prcnum) if err == nil && len(cveData) > 0 { diff --git a/taskhandler/xml.go b/taskhandler/xml.go index 7a64082a62bdd24829261cf832cbc43d84839dc7..69cde7055c780c5365ed251c6ed167957e9c2de2 100644 --- a/taskhandler/xml.go +++ b/taskhandler/xml.go @@ -171,7 +171,7 @@ func WriteXml(filePath string, cveXmlList []CveXml, dpdates *Updates, upDatex.Pkglist = &pl dpdates.Updatex = append(dpdates.Updatex, upDatex) } - xmlOutPut, outPutErr := xml.MarshalIndent(dpdates, "", "") + xmlOutPut, outPutErr := xml.MarshalIndent(dpdates, "", " ") if outPutErr == nil { //加入XML头 headerBytes := []byte(xml.Header)