From 0d050990a19e602d85a585955f5320a237787ec7 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 8 Nov 2022 14:55:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E5=A2=9E=E5=8A=A0=20Cloudflare=20R?= =?UTF-8?q?2=20=E6=9B=B4=E6=96=B0=E5=8C=85=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/updater.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 83c9c1d03..9f374130f 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -142,6 +142,8 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) { downloadPkgURLs = append(downloadPkgURLs, url) url = "https://ghproxy.com/" + url downloadPkgURLs = append(downloadPkgURLs, url) + url = "https://release-r2.b3log.org/siyuan/" + pkg + downloadPkgURLs = append(downloadPkgURLs, url) url = "https://release.b3log.org/siyuan/" + pkg downloadPkgURLs = append(downloadPkgURLs, url) From ab482a143c1808cba1995cd261eb4429540ef8a9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 8 Nov 2022 14:55:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E6=9B=B4=E6=96=B0=E5=8C=85?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=B6=85=E6=97=B6=2010m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/updater.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 9f374130f..a180f851e 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -173,7 +173,7 @@ func downloadInstallPkg(pkgURL, checksum string) (err error) { } logging.LogInfof("downloading install package [%s]", pkgURL) - client := req.C().SetTLSHandshakeTimeout(7 * time.Second).SetTimeout(30 * time.Minute) + client := req.C().SetTLSHandshakeTimeout(7 * time.Second).SetTimeout(10 * time.Minute) callback := func(info req.DownloadInfo) { //logging.LogDebugf("downloading install package [%s %.2f%%]", pkgURL, float64(info.DownloadedSize)/float64(info.Response.ContentLength)*100.0) } From b615240f4be964864e05d5143c81130f9db193bb Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 8 Nov 2022 18:26:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E5=88=87=E6=8D=A2=20release-r2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/updater.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index a180f851e..7dc3c9a0d 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -142,8 +142,6 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) { downloadPkgURLs = append(downloadPkgURLs, url) url = "https://ghproxy.com/" + url downloadPkgURLs = append(downloadPkgURLs, url) - url = "https://release-r2.b3log.org/siyuan/" + pkg - downloadPkgURLs = append(downloadPkgURLs, url) url = "https://release.b3log.org/siyuan/" + pkg downloadPkgURLs = append(downloadPkgURLs, url)