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

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

Browse source
This commit is contained in:
Vanessa 2024-04-04 10:30:00 +08:00
commit 7c7d8803a0
5 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View file

@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`
Set the Electron mirror environment variable and install Electron: Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D` * macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.2.4 -D` * `pnpm install electron@28.2.10 -D`
NPM mirror: NPM mirror:
@ -30,7 +30,7 @@ NPM mirror:
On the desktop, go to the app folder to run: On the desktop, go to the app folder to run:
* `pnpm install electron@28.2.4 -D` * `pnpm install electron@28.2.10 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -18,11 +18,11 @@
* macOS/Linux: * macOS/Linux:
``` ```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D
``` ```
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.2.4 -D` * `pnpm install electron@28.2.10 -D`
NPM 镜像： NPM 镜像：
@ -32,7 +32,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行： 桌面端进入 app 文件夹运行：
* `pnpm install electron@28.2.4 -D` * `pnpm install electron@28.2.10 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

2
app/package.json
View file

@ -53,7 +53,7 @@
"clean-webpack-plugin": "^4.0.0", "clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1", "css-loader": "^6.7.1",
"dayjs": "^1.11.5", "dayjs": "^1.11.5",
"electron": "28.2.4", "electron": "28.2.10",
"electron-builder": "^24.13.3", "electron-builder": "^24.13.3",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"esbuild-loader": "^3.0.1", "esbuild-loader": "^3.0.1",

14
app/pnpm-lock.yaml generated
View file

@ -7,7 +7,7 @@ settings:
dependencies: dependencies:
'@electron/remote': '@electron/remote':
specifier: ^2.1.2 specifier: ^2.1.2
version: 2.1.2(electron@28.2.4) version: 2.1.2(electron@28.2.10)
devDependencies: devDependencies:
'@types/node': '@types/node':
@ -32,8 +32,8 @@ devDependencies:
specifier: ^1.11.5 specifier: ^1.11.5
version: 1.11.5 version: 1.11.5
electron: electron:
specifier: 28.2.4 specifier: 28.2.10
version: 28.2.4 version: 28.2.10
electron-builder: electron-builder:
specifier: ^24.13.3 specifier: ^24.13.3
version: 24.13.3(electron-builder-squirrel-windows@24.13.3) version: 24.13.3(electron-builder-squirrel-windows@24.13.3)
@ -161,12 +161,12 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@electron/remote@2.1.2(electron@28.2.4): /@electron/remote@2.1.2(electron@28.2.10):
resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==}
peerDependencies: peerDependencies:
electron: '>= 13.0.0' electron: '>= 13.0.0'
dependencies: dependencies:
electron: 28.2.4 electron: 28.2.10
dev: false dev: false
/@electron/universal@1.5.1: /@electron/universal@1.5.1:
@ -1763,8 +1763,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true dev: true
/electron@28.2.4: /electron@28.2.10:
resolution: {integrity: sha512-XrSsqKCmpGwz1pqzmdLhdGonYvatDXor60rBd+TfURMQQRSxyTaSwrds9kV0aab9YRpeYUH6NJDAOwBhQYDDkA==} resolution: {integrity: sha512-0rGBJNogcl2FIRxGRUv9zuMaBP78nSBJW+Bd1U7OGeg8IEkSIbHOhfn71XoGxgbOUSCEXjjyftq4mtAAVbUsZQ==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true

5
kernel/model/updater.go
View file

@ -131,16 +131,19 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) {
} }
pkg := "siyuan-" + ver + "-" + suffix pkg := "siyuan-" + ver + "-" + suffix
b3logURL := "https://release.liuyun.io/siyuan/" + pkg b3logURL := "https://release.b3log.org/siyuan/" + pkg
liuyunURL := "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
if util.IsChinaCloud() { if util.IsChinaCloud() {
downloadPkgURLs = append(downloadPkgURLs, b3logURL) downloadPkgURLs = append(downloadPkgURLs, b3logURL)
downloadPkgURLs = append(downloadPkgURLs, liuyunURL)
downloadPkgURLs = append(downloadPkgURLs, ghproxyURL) downloadPkgURLs = append(downloadPkgURLs, ghproxyURL)
downloadPkgURLs = append(downloadPkgURLs, githubURL) downloadPkgURLs = append(downloadPkgURLs, githubURL)
} else { } else {
downloadPkgURLs = append(downloadPkgURLs, githubURL) downloadPkgURLs = append(downloadPkgURLs, githubURL)
downloadPkgURLs = append(downloadPkgURLs, b3logURL) downloadPkgURLs = append(downloadPkgURLs, b3logURL)
downloadPkgURLs = append(downloadPkgURLs, liuyunURL)
} }
checksums := result["checksums"].(map[string]interface{}) checksums := result["checksums"].(map[string]interface{})