diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index c5b7883d0e34e6d2d7614c9df0dc362f4fd5fff9..afaf11c0cd21f19d0feef95dda43f5a881a42641 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2678,13 +2678,10 @@ func downloadPackageFile(localPath, url, affectBranch string) error { } func GiteeDownCsv(localPath, branch string) error { - accessToken := os.Getenv("GITEE_TOKEN") - //replace the new warehouse - owner := "openeuler_latest_rpms" - repo := "obs_pkg_rpms_1230" - path := fmt.Sprintf("latest_rpm/%v.csv", branch) - gitUrl := fmt.Sprintf("https://gitee.com/api/v5/repos/%v/%v/contents/%v?access_token=%v", - owner, repo, path, accessToken) + gitUrl := fmt.Sprintf( + "https://gitee.com/api/v5/repos/%s/%s/contents/%s?access_token=%s", + "openeuler_latest_rpms", "obs_pkg_rpms_20230517", fmt.Sprintf("latest_rpm/%v.csv", branch), os.Getenv("GITEE_TOKEN"), + ) resp, err := http.Get(gitUrl) if err != nil { logs.Error("get error, url:", gitUrl, "error: ", err) @@ -2693,31 +2690,24 @@ func GiteeDownCsv(localPath, branch string) error { defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil || body == nil { - logs.Error(err) return err } - //logs.Info("body: \n", string(body), "url: ", gitUrl) var contents map[string]interface{} - err = json.Unmarshal(body, &contents) - if err != nil { - logs.Error(err) + if err = json.Unmarshal(body, &contents); err != nil { return err } f, ferr := os.Create(localPath) if ferr != nil { - logs.Error(ferr) return ferr } - fileType := contents["type"].(string) - encoding := contents["encoding"].(string) - content := contents["content"].(string) - if fileType == "file" && encoding == "base64" { - data, baseErr := base64.StdEncoding.DecodeString(content) + + if contents["type"].(string) == "file" && contents["encoding"].(string) == "base64" { + data, baseErr := base64.StdEncoding.DecodeString(contents["content"].(string)) if baseErr == nil { f.Write(data) } } else { - f.WriteString(content) + f.WriteString(contents["content"].(string)) } return nil }