diff --git a/doc/md/manual.md b/doc/md/manual.md index 740e0c35f4a041b8617d069f7ca029955c9d137c..459f57864fc13a3719fc3eeb7bb6b5423133ad5b 100644 --- a/doc/md/manual.md +++ b/doc/md/manual.md @@ -80,7 +80,7 @@ issue分析注意事项 | 说明 | 内容 | | --- | ---- | -| 请求地址 | https://api.openeuler.org/v1/download/excel/triggerCveData | +| 请求地址 | https://api.openeuler.org/cve-manager/v1/download/excel/triggerCveData | | 请求类型 | GET | - 参数: @@ -98,7 +98,7 @@ fileCode 用与下载本次调用生成的Excel文档 | 说明 | 内容 | | --- | ---- | -| 请求地址 | https://api.openeuler.org/v1/download/excel/downloadExcel | +| 请求地址 | https://api.openeuler.org/cve-manager/v1/download/excel/downloadExcel | | 请求类型 | GET | - 参数: diff --git a/taskhandler/excel.go b/taskhandler/excel.go index 95b356e1be59ed364002ed2dd4aba19adc7e8c33..695020a12ec0a228f65d43ba82b29fca7b71ee35 100644 --- a/taskhandler/excel.go +++ b/taskhandler/excel.go @@ -527,9 +527,9 @@ func (ec *CveExcel) handleWriteContentSync(list []models.ExcelExport) (err error } func (ec *CveExcel) setContentRow(v models.ExcelExport) { - pkg, err := models.GetCvePackageList(v.SecID) - if err != nil { - logs.Error(err) + pkg, pkgErr := models.GetCvePackageList(v.SecID) + if pkgErr != nil { + logs.Error(pkgErr) } if v.PublicDate == "" { v.PublicDate = time.Now().Format("2006-01-02") @@ -539,9 +539,9 @@ func (ec *CveExcel) setContentRow(v models.ExcelExport) { v.AffectProduct, pkgStr, v.ReferenceLink, v.PublicDate} axis, searched := ec.searchValueInSheet(ec.SecNoticeSheetName, v.InfluenceComponent) if !searched { - err = ec.fillSecurityNoticeSheet(sn) - if err != nil { - logs.Error(err) + fillErr := ec.fillSecurityNoticeSheet(sn) + if fillErr != nil { + logs.Error(fillErr) } } else { //merge openEuler SA notice data @@ -583,13 +583,13 @@ func (ec *CveExcel) setContentRow(v models.ExcelExport) { v.NattackComplexity, v.OattackComplexity, v.NprivilegeRequired, v.OprivilegeRequired, v.NuserInteraction, v.OuserInteraction, v.Nscope, v.Oscope, v.Nconfidentiality, v.Oconfidentiality, v.Nintegrity, v.Ointegrity, v.Navailability, v.Oavailability, v.ScoreType, v.OpenEulerSANum, v.PublicDate} - err = ec.fillCveSheetRow(cve) - if err != nil { - logs.Error(err) + shErr := ec.fillCveSheetRow(cve) + if shErr != nil { + logs.Error(shErr) } ap := []interface{}{v.CveNum, v.AffectProduct, v.InfluenceComponent, v.AffectStatus} - err = ec.fillAffectProductSheet(ap) + err := ec.fillAffectProductSheet(ap) if err != nil { logs.Error(err) }