diff --git a/conf/product_app.conf b/conf/product_app.conf index 2bd1d351a95ae5245d27fb32ee9bfb0b481f55a6..c392d320b6c8cb6867f97b29bb7aa8dcd9a4afb2 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -61,7 +61,7 @@ gittokenflag = 2 issueoath = * * */20 * * * genexcelflag = 1 genexcel = 0 30 7 * * * -days = -50 +days = -100 prcnum = 50 printlogflag = 1 printlog = 0 0 1 * * 1 diff --git a/cve-py/import_excels/266_whitelist_2020-11-26.xlsx b/cve-py/import_excels/266_whitelist_2020-11-26.xlsx deleted file mode 100644 index 9691d07170b150faca2ecd73c828bd20724c23d1..0000000000000000000000000000000000000000 Binary files a/cve-py/import_excels/266_whitelist_2020-11-26.xlsx and /dev/null differ diff --git a/cve-py/import_excels/LTS-SP1-2020-12-29.xlsx b/cve-py/import_excels/LTS-SP1-2020-12-29.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..acb93225dd89cb7eb53e075a5ea118d29bd2f1c6 Binary files /dev/null and b/cve-py/import_excels/LTS-SP1-2020-12-29.xlsx differ diff --git a/cve-py/tabletask/import_excel_task.py b/cve-py/tabletask/import_excel_task.py index d08f6783895b33dcb38f692a6afb4f9a113befd7..35cb95883a8e6e91afce5e8bc8dfc6423b491e25 100644 --- a/cve-py/tabletask/import_excel_task.py +++ b/cve-py/tabletask/import_excel_task.py @@ -94,8 +94,10 @@ def import_data(): mysql.dispose() result = parse_excel(filename) for i in range(0, len(result[0])): - sql = 'select * from cve_issue_repo_whitelist where package_name = %s and version = %s' - val = (result[0][i], result[1][i]) + # sql = 'select * from cve_issue_repo_whitelist where package_name = %s and version = %s' + # val = (result[0][i], result[1][i]) + sql = 'select * from cve_issue_repo_whitelist where package_name = %s' + val = (result[0][i]) mysql_data = mysql.getOne(sql, val) if mysql_data: print("更新数据package_name:" + result[0][i]) diff --git a/cve-py/tabletask/repeattask.py b/cve-py/tabletask/repeattask.py index 044ffbeb8238008acea2fe141f86f71d7784d921..f47fd504afac33165832d6e4a4eba0ba2c0977a9 100644 --- a/cve-py/tabletask/repeattask.py +++ b/cve-py/tabletask/repeattask.py @@ -29,6 +29,11 @@ def cur_date(): def repeat_task(): + """ + Parse the artificial CVE table, crawl the CVE official + website data, and store it in the database + return None + """ print("CVE官网数据为空的CVE进行再次抓取") mysql = Mysql() sql = "SELECT cve_num FROM cve_origin_excel WHERE score_type = %s " \