From e2160b449116e6d9bf4616a02cc5c7091724cb71 Mon Sep 17 00:00:00 2001 From: zu1k Date: Thu, 30 Jul 2020 07:18:06 +0800 Subject: [PATCH] fix cdn db download --- pkg/cdn/update.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkg/cdn/update.go b/pkg/cdn/update.go index 3e5a5f2..d7c3488 100644 --- a/pkg/cdn/update.go +++ b/pkg/cdn/update.go @@ -12,7 +12,7 @@ func Download(filePath string) (data []byte, err error) { data, err = getData() if err != nil { log.Printf("CDN数据库下载失败,请手动下载解压后保存到本地: %s \n", filePath) - log.Println("下载链接: https://cdn.jsdelivr.net/gh/SukkaLab/cdn/dist/cdn.json") + log.Println("下载链接:", githubUrl) return } @@ -23,12 +23,22 @@ func Download(filePath string) (data []byte, err error) { return } +const ( + githubUrl = "https://raw.githubusercontent.com/SukkaLab/cdn/master/dist/cdn.json" + jsdelivrUrl = "https://cdn.jsdelivr.net/gh/SukkaLab/cdn/dist/cdn.json" +) + func getData() (data []byte, err error) { - //resp, err := http.Get("https://raw.githubusercontent.com/SukkaLab/cdn/master/dist/cdn.json") - resp, err := http.Get("https://cdn.jsdelivr.net/gh/SukkaLab/cdn/dist/cdn.json") + resp, err := http.Get(jsdelivrUrl) if err != nil { return nil, err } + if resp.StatusCode != 200 { + resp, err = http.Get(githubUrl) + if err != nil { + return nil, err + } + } defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body)