瀏覽代碼

:art: Improve upgrade download

Daniel 1 年之前
父節點
當前提交
c6b48882e1
共有 2 個文件被更改,包括 12 次插入4 次删除
  1. 8 4
      kernel/model/updater.go
  2. 4 0
      kernel/util/cloud.go

+ 8 - 4
kernel/model/updater.go

@@ -131,12 +131,16 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) {
 	}
 	}
 	pkg := "siyuan-" + ver + "-" + suffix
 	pkg := "siyuan-" + ver + "-" + suffix
 
 
-	b3logURL := "https://release.b3log.org/siyuan/" + pkg
-	downloadPkgURLs = append(downloadPkgURLs, b3logURL)
+	b3logURL := "https://release.liuyun.io/siyuan/" + pkg
 	githubURL := "https://github.com/siyuan-note/siyuan/releases/download/v" + ver + "/" + pkg
 	githubURL := "https://github.com/siyuan-note/siyuan/releases/download/v" + ver + "/" + pkg
 	ghproxyURL := "https://mirror.ghproxy.com/" + githubURL
 	ghproxyURL := "https://mirror.ghproxy.com/" + githubURL
-	downloadPkgURLs = append(downloadPkgURLs, ghproxyURL)
-	downloadPkgURLs = append(downloadPkgURLs, githubURL)
+	if util.IsChinaCloud() {
+		downloadPkgURLs = append(downloadPkgURLs, b3logURL)
+		downloadPkgURLs = append(downloadPkgURLs, ghproxyURL)
+	} else {
+		downloadPkgURLs = append(downloadPkgURLs, githubURL)
+		downloadPkgURLs = append(downloadPkgURLs, b3logURL)
+	}
 
 
 	checksums := result["checksums"].(map[string]interface{})
 	checksums := result["checksums"].(map[string]interface{})
 	checksum = checksums[pkg].(string)
 	checksum = checksums[pkg].(string)

+ 4 - 0
kernel/util/cloud.go

@@ -18,6 +18,10 @@ package util
 
 
 var CurrentCloudRegion = 0
 var CurrentCloudRegion = 0
 
 
+func IsChinaCloud() bool {
+	return 0 == CurrentCloudRegion
+}
+
 func GetCloudServer() string {
 func GetCloudServer() string {
 	if 0 == CurrentCloudRegion {
 	if 0 == CurrentCloudRegion {
 		return chinaServer
 		return chinaServer