diff --git a/conf/product_app.conf b/conf/product_app.conf index 571f40badef2133f051fdeb55586b9e8f37a29c1..84d7f5d88676013b99a17fd57a28269b9e6e892d 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -118,7 +118,7 @@ cve_number_m = 1990 # Tool import data restriction cve_number_t = 2018 # Create an issue's repo whitelist;1: open; 2: close -issue_whitelist = 1 +issue_whitelist = 2 # List of affected branches affected_branchs = openEuler-20.03-LTS # Close the highest privilege of issue @@ -150,7 +150,7 @@ sa_timestamp_zone = 28800 [xml] updateinfo_path = download/updateinfo.xml cvrf_upload_path = http://localhost:9090/ -use_openeuler_num = openEuler-SA-2021-1001 +use_openeuler_num = openEuler-SA-2021-1001,openEuler-SA-2021-1002 [email] email_name = "${EMAIL_NAME||***}" diff --git a/cve-py/newexcels/CVE-2021-01-27.xlsx b/cve-py/newexcels/CVE-2021-01-27.xlsx deleted file mode 100644 index 87421527f2765d00e7d006a52328030c02fd85aa..0000000000000000000000000000000000000000 Binary files a/cve-py/newexcels/CVE-2021-01-27.xlsx and /dev/null differ diff --git a/cve-py/newexcels/CVE-2021-01-27_1.xlsx b/cve-py/newexcels/CVE-2021-01-27_1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..38ea9e1c6539739578fbd7a8c7d445c9275ca3ee Binary files /dev/null and b/cve-py/newexcels/CVE-2021-01-27_1.xlsx differ diff --git a/taskhandler/oricvecheck.go b/taskhandler/oricvecheck.go index b34ab76af1d5926230b1683a9009965827d144e6..a23fceb10f516742fe9681da99b45b9191d0d2ee 100644 --- a/taskhandler/oricvecheck.go +++ b/taskhandler/oricvecheck.go @@ -51,7 +51,6 @@ func CheckCveOriginData(prcnum int) (string, error) { } else { models.UpdateOriginExist(common.GetCurTime(), cveData.PackName, cveData.Version, cveData.CveId, 0) logs.Info("仓库和版本对应关系错误, 还原: ", cveData, ", gits: ", gits) - break } } else { models.UpdateOriginExist(common.GetCurTime(), cveData.PackName, cveData.Version, cveData.CveId, 1) @@ -59,6 +58,10 @@ func CheckCveOriginData(prcnum int) (string, error) { } } } + } else { + models.UpdateOriginExist(common.GetCurTime(), cveData.PackName, cveData.Version, cveData.CveId, 0) + logs.Info("Data error, field is empty, PackName: ", cveData.PackName, + ",Version: ", cveData.Version, ", CveId, ", cveData.CveId) } }(i, cveOrg) }