diff --git a/cve-vulner-manager/conf/app.conf b/cve-vulner-manager/conf/app.conf index 44ffebb06df255f0a86790eeb601c8d0f1af4fa1..7d6089204424cc6389567747746b1fb1c2299dac 100644 --- a/cve-vulner-manager/conf/app.conf +++ b/cve-vulner-manager/conf/app.conf @@ -49,6 +49,7 @@ SupplementCveTask = "@every 27m" LongSupplementCveTask = "30 1 * * 0-6" ParseOpenGaussYamlTask = "30 2 * * 0-6" ParseMindsporeYamlTask = "30 3 * * 0-6" +ParseOpenlookengYamlTask = "30 4 * * 0-6" @@ -63,6 +64,7 @@ maxidle = 30 maxconn = 3000 + [log] log_level = 7 log_dir = ./logs diff --git a/cve-vulner-manager/cve-py/controller/timertaskcontroller.py b/cve-vulner-manager/cve-py/controller/timertaskcontroller.py index 429e6e239637971a55758ab1de78002cb2e9f1aa..5e6b397e9b558f9b6cc3bf05992031a9cbc74642 100644 --- a/cve-vulner-manager/cve-py/controller/timertaskcontroller.py +++ b/cve-vulner-manager/cve-py/controller/timertaskcontroller.py @@ -51,7 +51,7 @@ def timertask(): # Parse the yaml file of mindspore scheduler.add_job(taskcontroller.parse_mindspore_yaml_task, 'cron', day_of_week='0-6', hour=3, minute=30) # Parse the yaml file of openLooKeng - # scheduler.add_job(taskcontroller.parse_openlookeng_yaml_task, 'cron', day_of_week='0-6', hour=4, minute=30) + scheduler.add_job(taskcontroller.parse_openlookeng_yaml_task, 'cron', day_of_week='0-6', hour=4, minute=30) scheduler.start() except SystemExit as err: print("Err:", err) diff --git a/cve-vulner-manager/cve-timed-task/controller/task_controller.go b/cve-vulner-manager/cve-timed-task/controller/task_controller.go index fe1371e41295eb80e7f39d440fd123b7e7cda59b..f6beb6a01c715870e298100d3e8b75252f72bef8 100644 --- a/cve-vulner-manager/cve-timed-task/controller/task_controller.go +++ b/cve-vulner-manager/cve-timed-task/controller/task_controller.go @@ -1,6 +1,8 @@ package controller import ( + "time" + "cvevulner/cve-timed-task/deletetask" "cvevulner/cve-timed-task/emailtask" "cvevulner/cve-timed-task/gitwebtask" @@ -8,7 +10,6 @@ import ( "cvevulner/cve-timed-task/util" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "time" ) // GwController Grab warehouse yaml data @@ -120,3 +121,10 @@ func ParseMindsporeYamlTask() { tabletask.ProcMindSporeYaml() logs.Info("END TASK:", "the task of Process mindspore yaml data complete") } + +// ParseOpenlookengYamlTask Download the yaml file first, then parse the yaml file of openLooKeng +func ParseOpenlookengYamlTask() { + logs.Info("START TASK:", "the task of Process openLooKeng yaml data start") + tabletask.ProcOpenlookengYaml() + logs.Info("END TASK:", "the task of Process openLooKeng yaml data complete") +} diff --git a/cve-vulner-manager/cve-timed-task/controller/timer_task_controller.go b/cve-vulner-manager/cve-timed-task/controller/timer_task_controller.go index b770868aa30bc5b2d25cec4e13f3b3287143952c..8485ec9a7a74d8779f4df3ed4637eb3fe7b4e276 100644 --- a/cve-vulner-manager/cve-timed-task/controller/timer_task_controller.go +++ b/cve-vulner-manager/cve-timed-task/controller/timer_task_controller.go @@ -101,6 +101,14 @@ func StartTimerTask() error { return err } logs.Info("Add ParseMindsporeYamlTask task success, ID is:", IdParseMindsporeYamlTask) + + //Parse the yaml file of mindspore + IdParseOpenlookengYamlTask, err := c.AddFunc(beego.AppConfig.String("timedtask::ParseOpenlookengYamlTask"), ParseOpenlookengYamlTask) + if err != nil { + logs.Error("add ParseMindsporeYamlTask task error:", err.Error()) + return err + } + logs.Info("Add ParseMindsporeYamlTask task success, ID is:", IdParseOpenlookengYamlTask) c.Start() return nil } diff --git a/cve-vulner-manager/cve-timed-task/db_models/db_operations.go b/cve-vulner-manager/cve-timed-task/db_models/db_operations.go index 028d9f0afd08aa1de908257a8ffa8c8ab6199aac..8c105b8f4441d3d2dce6a02ffb3fb64b20c6584a 100644 --- a/cve-vulner-manager/cve-timed-task/db_models/db_operations.go +++ b/cve-vulner-manager/cve-timed-task/db_models/db_operations.go @@ -1,9 +1,10 @@ package db_models import ( + "time" + "cvevulner/models" "github.com/astaxie/beego/orm" - "time" ) // UpdateYamlOriginMark Update origin data @@ -256,6 +257,13 @@ func UpdateCveOriginExcel(originExcel models.OriginExcel, ORM orm.Ormer) error { // UpdateMindYamlOriginMark UpdateYamlOriginMarkLookeng Update origin data func UpdateMindYamlOriginMark(ORM orm.Ormer) error { + sqlString := "update cve_mind_spore_yaml set mark_bit = 2 where mark_bit = 1" + _, err := ORM.Raw(sqlString).Exec() + return err +} + +// UpdateOpenlookengYamlOriginMark UpdateYamlOriginMarkLookeng Update origin data +func UpdateOpenlookengYamlOriginMark(ORM orm.Ormer) error { sqlString := "update cve_open_lookeng_yaml set mark_bit = 2 where mark_bit = 1" _, err := ORM.Raw(sqlString).Exec() return err @@ -269,6 +277,14 @@ func SelectMindYamlOriginData(packageName, version, repokey string, ORM orm.Orme return openGussYaml, err } +// SelectOpenlookengYamlOriginData Query origin data +func SelectOpenlookengYamlOriginData(packageName, version, repokey string, ORM orm.Ormer) (models.OpenLookengYaml, error) { + var openLookengYaml models.OpenLookengYaml + sqlString := "SELECT id FROM cve_open_lookeng_yaml WHERE package_name = ? and version = ? and repo_name = ?" + err := ORM.Raw(sqlString, packageName, version, repokey).QueryRow(&openLookengYaml) + return openLookengYaml, err +} + // InsertMindYamlOriginData insert origin data func InsertMindYamlOriginData(mindSporeYaml *models.MindSporeYaml, ORM orm.Ormer) error { sqlString := "insert into cve_mind_spore_yaml(package_name,version,origin_url, status, cpe_name,create_time,update_time, mark_bit, repo_name) values(?,?,?,?,?,?,?,?,?)" @@ -276,12 +292,25 @@ func InsertMindYamlOriginData(mindSporeYaml *models.MindSporeYaml, ORM orm.Ormer return err } +// InsertOpenlookengYamlOriginData insert origin data +func InsertOpenlookengYamlOriginData(openLookengYaml *models.OpenLookengYaml, ORM orm.Ormer) error { + sqlString := "insert into cve_open_lookeng_yaml(package_name,version,origin_url, status, cpe_name,create_time,update_time, mark_bit, repo_name) values(?,?,?,?,?,?,?,?,?)" + _, err := ORM.Raw(sqlString, openLookengYaml.PackageName, openLookengYaml.Version, openLookengYaml.OriginUrl, openLookengYaml.Status, openLookengYaml.CpeName, openLookengYaml.CreateTime, openLookengYaml.UpdateTime, openLookengYaml.MarkBit, openLookengYaml.Repo).Exec() + return err +} + // UpdateMindYamlOriginData Update origin data func UpdateMindYamlOriginData(mindSporeYaml *models.MindSporeYaml, ORM orm.Ormer) (int64, error) { id, err := ORM.Update(mindSporeYaml, "OriginUrl", "Status", "CpeName", "UpdateTime", "MarkBit") return id, err } +// UpdateMindYamlOriginData Update origin data +func UpdateOpenlookengYamlOriginData(openLookengYaml *models.OpenLookengYaml, ORM orm.Ormer) (int64, error) { + id, err := ORM.Update(openLookengYaml, "OriginUrl", "Status", "CpeName", "UpdateTime", "MarkBit") + return id, err +} + // DeleteMindYamlOriginMark delete origin data func DeleteMindYamlOriginMark(ORM orm.Ormer) error { sqlString := "delete from cve_mind_spore_yaml where mark_bit = 2" @@ -289,6 +318,13 @@ func DeleteMindYamlOriginMark(ORM orm.Ormer) error { return err } +// DeleteMindYamlOriginMark delete origin data +func DeleteOpenlookengYamlOriginMark(ORM orm.Ormer) error { + sqlString := "delete from cve_open_lookeng_yaml where mark_bit = 2" + _, err := ORM.Raw(sqlString).Exec() + return err +} + func SelectCveFileHashByFileName(fileName string, ORM orm.Ormer) ([]interface{}, int64, error) { var list orm.ParamsList sqlString := "select file_hash from cve_file_hash where file_name = ?" diff --git a/cve-vulner-manager/cve-timed-task/gitwebtask/yaml_task.go b/cve-vulner-manager/cve-timed-task/gitwebtask/yaml_task.go deleted file mode 100644 index a75be2c84e2770189b8fcb539d2345864b42202f..0000000000000000000000000000000000000000 --- a/cve-vulner-manager/cve-timed-task/gitwebtask/yaml_task.go +++ /dev/null @@ -1,6 +0,0 @@ -package gitwebtask - -// DownLoad download detail -func DownLoad() { - -} diff --git a/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go b/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go index 3e20d4b760d9ff03655f7cbacb2d5f0c6a3fd37f..ef249254ffe6746c65ba8d0cf9463c8019e98538 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go @@ -2,19 +2,21 @@ package tabletask import ( "crypto/sha1" + "encoding/hex" + "errors" + "io" + "io/ioutil" + "os" + "strconv" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/downloadfiletask" "cvevulner/cve-timed-task/util" "cvevulner/models" - "encoding/hex" - "errors" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" "github.com/xuri/excelize/v2" - "io" - "os" - "strconv" - "time" ) func ImportDataTypeTwo() { @@ -24,9 +26,9 @@ func ImportDataTypeTwo() { logs.Error("downloadfiletask.HandleThree error:", err) return } - files, err := os.ReadDir(filePath) + files, err := ioutil.ReadDir(filePath) if err != nil { - logs.Error(" os.ReadDir error: ", err, filePath) + logs.Error(" ioutil.ReadDir error: ", err, filePath) return } diff --git a/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go b/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go index 0c9fade5202bba4b5b5de59ad645e6e8d236742b..2743960d39fb4ffa94643b3209f0947c515d5fa6 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go @@ -2,19 +2,21 @@ package tabletask import ( "crypto/sha1" + "encoding/hex" + "io" + "io/ioutil" + "os" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/downloadfiletask" "cvevulner/cve-timed-task/util" "cvevulner/models" - "encoding/hex" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" "github.com/pkg/errors" "github.com/xuri/excelize/v2" - "io" - "os" - "time" ) // ToMysql Data stored in the database @@ -25,9 +27,9 @@ func ToMysql() { logs.Error("downloadfiletask.HandleTwo error:", err) return } - files, err := os.ReadDir(filePath) + files, err := ioutil.ReadDir(filePath) if err != nil { - logs.Error(" os.ReadDir error: ", err, filePath) + logs.Error(" ioutil.ReadDir error: ", err, filePath) return } diff --git a/cve-vulner-manager/cve-timed-task/tabletask/mindspore_yaml.go b/cve-vulner-manager/cve-timed-task/tabletask/mindspore_yaml.go index 0e8efcd4a0700c0aca19cf7517c50e7c58903286..44ac1b32387d7decc86220851c3b03ec85ce2a2d 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/mindspore_yaml.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/mindspore_yaml.go @@ -1,17 +1,18 @@ package tabletask import ( + "errors" + "io" + "net/http" + "os" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/util" "cvevulner/models" - "errors" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "io" - "net/http" - "os" - "time" ) // DownloadGuessYaml Download the yaml file of openGauss on Gitee diff --git a/cve-vulner-manager/cve-timed-task/tabletask/package_committer_task.go b/cve-vulner-manager/cve-timed-task/tabletask/package_committer_task.go index 7a3f215837b166e9c65290a57804a2449ccfc566..a3edd0bce17da5692882a777ccac1bb5050db603 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/package_committer_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/package_committer_task.go @@ -2,17 +2,19 @@ package tabletask import ( "crypto/sha1" + "encoding/hex" + "io" + "io/ioutil" + "os" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/downloadfiletask" "cvevulner/cve-timed-task/util" "cvevulner/models" - "encoding/hex" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" "github.com/xuri/excelize/v2" - "io" - "os" - "time" ) // import excel @@ -24,9 +26,9 @@ func ImportData() { return } - files, err := os.ReadDir(filePath) + files, err := ioutil.ReadDir(filePath) if err != nil { - logs.Error(" os.ReadDir error: ", err, filePath) + logs.Error(" ioutil.ReadDir error: ", err, filePath) return } diff --git a/cve-vulner-manager/cve-timed-task/tabletask/parselookeng_yaml.go b/cve-vulner-manager/cve-timed-task/tabletask/parselookeng_yaml.go new file mode 100644 index 0000000000000000000000000000000000000000..7b5b2d1416595939ed77124dde5646d5311bb36c --- /dev/null +++ b/cve-vulner-manager/cve-timed-task/tabletask/parselookeng_yaml.go @@ -0,0 +1,289 @@ +package tabletask + +import ( + "errors" + "io" + "net/http" + "os" + "time" + + "cvevulner/cve-timed-task/db_models" + "cvevulner/cve-timed-task/util" + "cvevulner/models" + "github.com/astaxie/beego" + "github.com/astaxie/beego/logs" + "github.com/astaxie/beego/orm" +) + +func DownloadOpenlookengYaml() (string, error) { + filePath := beego.AppConfig.String("timedtask::packageDir") + "openlookeng_yaml/" + err := util.MakeDir(filePath) + if err != nil { + return "", err + } + yamlFileName := filePath + "openlookeng_yaml.yaml" + //download the yaml file + downloadUrl := "https://gitee.com/openlookeng/community/raw/master/security/config/Third_Party_Open_Source_Software_List.yaml" + resp, err := http.Get(downloadUrl) + defer resp.Body.Close() + if err != nil { + logs.Error("get", downloadUrl, "error", err.Error()) + return "", err + } + if resp.StatusCode != http.StatusOK { + logs.Error("get", downloadUrl, resp.Status) + return "", errors.New(resp.Status) + } + saveFile, err := os.Create(yamlFileName) + defer saveFile.Close() + if err != nil { + logs.Error("Create file error", yamlFileName, err.Error()) + return "", err + } + _, err = io.Copy(saveFile, resp.Body) + if err != nil { + logs.Error("copy resp.Body to file error", yamlFileName, err.Error()) + return "", err + } + return yamlFileName, nil +} + +// StoreOpenLookengYaml parse dict +//Store yaml data to mysql +func StoreOpenlookengYaml(yamlData map[string]map[string]map[string]string, ormModel orm.Ormer) { + if len(yamlData) > 0 { + err := db_models.UpdateOpenlookengYamlOriginMark(ormModel) + if err != nil { + logs.Error("db_models.UpdateYamlOriginMarkLookeng:", err.Error()) + return + } + for RepoKey, RepoValue := range yamlData { + for k, v := range RepoValue { + if _, ok := v["version"]; !ok || v["version"] == "" { + v["version"] = "" + } + //open transaction + logs.Info("open transaction") + tranErr := ormModel.Begin() + if tranErr != nil { + logs.Error(" Open transaction error:", tranErr.Error()) + continue + } + originData, err := db_models.SelectOpenlookengYamlOriginData(k, v["version"], RepoKey, ormModel) + now := time.Now() + if err != nil { + if errors.Is(orm.ErrNoRows, err) { + logs.Warn("error is orm.ErrNoRows, Create a record") + openLookengYaml := &models.OpenLookengYaml{ + PackageName: k, + Version: v["version"], + OriginUrl: v["url"], + Status: 1, + CpeName: v["cpeName"], + CreateTime: now.Format("2006-01-02 15:04:05"), + UpdateTime: now.Format("2006-01-02 15:04:05"), + MarkBit: 1, + Repo: RepoKey, + } + err = db_models.InsertOpenlookengYamlOriginData(openLookengYaml, ormModel) + if err != nil { + logs.Error("db_models.InsertMindYamlOriginData error:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + logs.Info("insert MindSporeYaml success") + } else { + logs.Error("db_models.SelectMindYamlOriginData error:", err) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + } else { + logs.Info("database records, change the data") + openLookengYaml := &models.OpenLookengYaml{ + Id: originData.Id, + OriginUrl: v["url"], + Status: 1, + CpeName: v["cpeName"], + UpdateTime: now.Format("2006-01-02 15:04:05"), + MarkBit: 1, + } + _, err = db_models.UpdateOpenlookengYamlOriginData(openLookengYaml, ormModel) + if err != nil { + logs.Error("db_models.UpdateMindYamlOriginData:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + } + packAgesData, rowsAffected, err := db_models.SelectYamlData(k, v["version"], ormModel) + if err != nil { + logs.Error("db_models.SelectMindYamlData error:", err) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", err.Error()) + } + continue + } + if rowsAffected == 0 { + logs.Warn("No record found, Create a record") + var packId int64 + gitOpenEuler, err := db_models.SelectYamlLastData(ormModel) + if err != nil { + if errors.Is(orm.ErrNoRows, err) { + packId = 10000000 + } else { + logs.Error("db_models.SelectYamlLastData error:", err) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + } else { + if gitOpenEuler.PackageId >= 10000000 { + packId = gitOpenEuler.PackageId + 1 + } else { + packId = 10000000 + } + } + goe := &models.GitOpenEuler{ + PackageId: packId, + PackageName: k, + Version: v["version"], + OriginUrl: v["url"], + CreateTime: now, + UpdateTime: now, + CpePackName: v["cpeName"], + Status: 1, + } + lastId, err := models.InsertYamlData(goe) + if err != nil { + logs.Error("db_models.InsertYamlData error:", err) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", err.Error()) + } + continue + } + gpi := &models.GitPackageInfo{ + GitId: lastId, + PackageName: k, + Version: v["version"], + OriginUrl: v["url"], + CreateTime: now, + UpdateTime: now, + Decription: "", + Status: 0, + } + err = db_models.InsertYamlDetailData(gpi, ormModel) + if err != nil { + logs.Error("db_models.InsertYamlDetailData:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", err.Error()) + } + continue + } + } else { + if rowsAffected > 1 { + for _, pv := range packAgesData[1:] { + err = db_models.DeleteYamlOpenEulerDetailData(pv.GitId, ormModel) + if err != nil { + logs.Error("db_models.DeleteYamlOpenEulerDetailData:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + err = db_models.DeleteYamlOpenEulerData(pv.GitId, ormModel) + if err != nil { + logs.Error("db_models.DeleteYamlOpenEulerData:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + } + } + goe := &models.GitOpenEuler{ + OriginUrl: v["url"], + UpdateTime: now, + CpePackName: v["cpeName"], + Status: 1, + PackageId: packAgesData[0].PackageId, + PackageName: k, + Version: v["version"], + } + err = models.UpdateYamlData(goe) + if err != nil { + logs.Error("db_models.UpdateYamlData:", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + gpi := &models.GitPackageInfo{ + PackageName: k, + Version: v["version"], + OriginUrl: v["url"], + UpdateTime: now, + Status: 0, + GitId: packAgesData[0].GitId, + } + err = db_models.UpdateYamlDetailData(gpi, ormModel) + if err != nil { + logs.Error("db_models.UpdateYamlDetailData", err.Error()) + tranErr = ormModel.Rollback() + if tranErr != nil { + logs.Error(" Rollback transaction error:", tranErr.Error()) + } + continue + } + } + tranErr = ormModel.Commit() + if tranErr != nil { + logs.Error(" Commit transaction error:", tranErr.Error()) + continue + } + logs.Info("Transaction committed successfully", k) + } + } + err = db_models.DeleteOpenlookengYamlOriginMark(ormModel) + if err != nil { + logs.Error("db_models.DeleteMindYamlOriginMark error:", err.Error()) + } + } else { + logs.Warning("yamlData Is empty, nothing can be done") + } + +} + +func ProcOpenlookengYaml() { + ormModel := orm.NewOrm() + + yamlFileName, err := DownloadOpenlookengYaml() + + if err != nil { + logs.Error("DownloadOpenlookengYaml error:", err.Error()) + return + } + yamlData, err := util.ParseYamlTypeTwo(yamlFileName) + if err != nil { + logs.Error("util.ParseYamlTypeTwo error: ", yamlFileName, err) + return + } + + StoreMindSporeYaml(yamlData, ormModel) + DeleteYamlData(ormModel) +} diff --git a/cve-vulner-manager/cve-timed-task/tabletask/run_task.go b/cve-vulner-manager/cve-timed-task/tabletask/run_task.go index a1acd9006804f15322714cfb2604f85a9a5c6423..572f67712237f5828b67a887c53bc5dcba2a1053 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/run_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/run_task.go @@ -2,20 +2,22 @@ package tabletask import ( "crypto/sha1" + "encoding/hex" + "fmt" + "io" + "io/ioutil" + "os" + "strconv" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/downloadfiletask" "cvevulner/cve-timed-task/util" "cvevulner/models" - "encoding/hex" - "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" "github.com/pkg/errors" "github.com/xuri/excelize/v2" - "io" - "os" - "strconv" - "time" ) // HandleDate CVSS official website data crawling data storage database @@ -27,9 +29,9 @@ func HandleDate() { return } - files, err := os.ReadDir(filePath) + files, err := ioutil.ReadDir(filePath) if err != nil { - logs.Error(" os.ReadDir error: ", err, filePath) + logs.Error(" ioutil.ReadDir error: ", err, filePath) return } for _, file := range files { diff --git a/cve-vulner-manager/cve-timed-task/tabletask/spec_error_task.go b/cve-vulner-manager/cve-timed-task/tabletask/spec_error_task.go index 9bfea1b1d72d23cfa7f5b5d45602939798dbde9a..869685850f056767d2e551fa38a0b71fcafae5dc 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/spec_error_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/spec_error_task.go @@ -1,6 +1,10 @@ package tabletask import ( + "io/ioutil" + "os" + "time" + "cvevulner/cve-timed-task/db_models" "cvevulner/cve-timed-task/downloadfiletask" "cvevulner/models" @@ -8,8 +12,6 @@ import ( "github.com/astaxie/beego/orm" "github.com/pkg/errors" "github.com/xuri/excelize/v2" - "os" - "time" ) // AddErrorDetails Conditions for filtering incorrect data @@ -21,9 +23,9 @@ func AddErrorDetails() { return } - files, err := os.ReadDir(filePath) + files, err := ioutil.ReadDir(filePath) if err != nil { - logs.Error(" os.ReadDir error: ", err, filePath) + logs.Error(" ioutil.ReadDir error: ", err, filePath) return }