Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-03-25 20:14:16 +08:00
commit 5d0d031b60
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/model/updater.go
View file

@ -131,12 +131,17 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) {
}
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
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)
downloadPkgURLs = append(downloadPkgURLs, githubURL)
} else {
downloadPkgURLs = append(downloadPkgURLs, githubURL)
downloadPkgURLs = append(downloadPkgURLs, b3logURL)
}
checksums := result["checksums"].(map[string]interface{})
checksum = checksums[pkg].(string)

4
kernel/util/cloud.go
View file

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