mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-04 15:58:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
Vanessa
commit
b0b8ba9ab8
6 changed files with 22 additions and 22 deletions
6
.github/CONTRIBUTING.md
vendored
6
.github/CONTRIBUTING.md
vendored
|
|
@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm`
|
|||
|
||||
Set the Electron mirror environment variable and install Electron:
|
||||
|
||||
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D`
|
||||
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@23.0.0 -D`
|
||||
* Windows:
|
||||
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
|
||||
* `pnpm install electron@22.1.0 -D`
|
||||
* `pnpm install electron@23.0.0 -D`
|
||||
|
||||
NPM mirror:
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ NPM mirror:
|
|||
|
||||
On the desktop, go to the app folder to run:
|
||||
|
||||
* `pnpm install electron@22.1.0 -D`
|
||||
* `pnpm install electron@23.0.0 -D`
|
||||
* `pnpm run dev`
|
||||
* `pnpm run start`
|
||||
|
||||
|
|
|
|||
6
.github/CONTRIBUTING_zh_CN.md
vendored
6
.github/CONTRIBUTING_zh_CN.md
vendored
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
* macOS/Linux:
|
||||
```
|
||||
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D
|
||||
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@23.0.0 -D
|
||||
```
|
||||
* Windows:
|
||||
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
|
||||
* `pnpm install electron@22.1.0 -D`
|
||||
* `pnpm install electron@23.0.0 -D`
|
||||
|
||||
NPM 镜像：
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ NPM 镜像：
|
|||
|
||||
桌面端进入 app 文件夹运行：
|
||||
|
||||
* `pnpm install electron@22.1.0 -D`
|
||||
* `pnpm install electron@23.0.0 -D`
|
||||
* `pnpm run dev`
|
||||
* `pnpm run start`
|
||||
|
||||
|
|
|
|||
|
|
@ -1006,11 +1006,11 @@ powerMonitor.on('resume', async () => {
|
|||
writeLog('system resume')
|
||||
const isOnline = async () => {
|
||||
try {
|
||||
const result = await fetch('https://icanhazip.com', {timeout: 1000})
|
||||
const result = await fetch('https://www.baidu.com', {timeout: 1000})
|
||||
return 200 === result.status
|
||||
} catch (e) {
|
||||
try {
|
||||
const result = await fetch('https://www.baidu.com', {timeout: 1000})
|
||||
const result = await fetch('https://icanhazip.com', {timeout: 1000})
|
||||
return 200 === result.status
|
||||
} catch (e) {
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
"clean-webpack-plugin": "^4.0.0",
|
||||
"css-loader": "^6.7.1",
|
||||
"dayjs": "^1.11.5",
|
||||
"electron": "22.1.0",
|
||||
"electron": "23.0.0",
|
||||
"electron-builder": "^23.3.3",
|
||||
"encoding": "^0.1.13",
|
||||
"eslint": "^8.19.0",
|
||||
|
|
|
|||
18
app/pnpm-lock.yaml
generated
18
app/pnpm-lock.yaml
generated
|
|
@ -15,7 +15,7 @@ specifiers:
|
|||
clean-webpack-plugin: ^4.0.0
|
||||
css-loader: ^6.7.1
|
||||
dayjs: ^1.11.5
|
||||
electron: 22.1.0
|
||||
electron: 23.0.0
|
||||
electron-builder: ^23.3.3
|
||||
electron-fetch: ^1.7.4
|
||||
encoding: ^0.1.13
|
||||
|
|
@ -39,7 +39,7 @@ specifiers:
|
|||
webpack-cli: ^4.10.0
|
||||
|
||||
dependencies:
|
||||
'@electron/remote': 2.0.9_electron@22.1.0
|
||||
'@electron/remote': 2.0.9_electron@23.0.0
|
||||
electron-fetch: 1.7.4
|
||||
pnpm: 7.9.3
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ devDependencies:
|
|||
clean-webpack-plugin: 4.0.0_webpack@5.73.0
|
||||
css-loader: 6.7.1_webpack@5.73.0
|
||||
dayjs: 1.11.5
|
||||
electron: 22.1.0
|
||||
electron: 23.0.0
|
||||
electron-builder: 23.3.3
|
||||
encoding: 0.1.13
|
||||
eslint: 8.19.0
|
||||
|
|
@ -1273,12 +1273,12 @@ packages:
|
|||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
/@electron/remote/2.0.9_electron@22.1.0:
|
||||
/@electron/remote/2.0.9_electron@23.0.0:
|
||||
resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==}
|
||||
peerDependencies:
|
||||
electron: '>= 13.0.0'
|
||||
dependencies:
|
||||
electron: 22.1.0
|
||||
electron: 23.0.0
|
||||
dev: false
|
||||
|
||||
/@electron/universal/1.2.1:
|
||||
|
|
@ -1928,10 +1928,10 @@ packages:
|
|||
resolution: {integrity: sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==}
|
||||
engines: {node: '>=14.0.0'}
|
||||
dependencies:
|
||||
7zip-bin: 5.1.1
|
||||
'@develar/schema-utils': 2.6.5
|
||||
'@electron/universal': 1.2.1
|
||||
'@malept/flatpak-bundler': 0.4.0
|
||||
7zip-bin: 5.1.1
|
||||
async-exit-hook: 2.0.1
|
||||
bluebird-lst: 1.0.9
|
||||
builder-util: 23.3.3
|
||||
|
|
@ -2215,9 +2215,9 @@ packages:
|
|||
/builder-util/23.3.3:
|
||||
resolution: {integrity: sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==}
|
||||
dependencies:
|
||||
7zip-bin: 5.1.1
|
||||
'@types/debug': 4.1.7
|
||||
'@types/fs-extra': 9.0.13
|
||||
7zip-bin: 5.1.1
|
||||
app-builder-bin: 4.0.0
|
||||
bluebird-lst: 1.0.9
|
||||
builder-util-runtime: 9.0.3
|
||||
|
|
@ -2861,8 +2861,8 @@ packages:
|
|||
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
|
||||
dev: true
|
||||
|
||||
/electron/22.1.0:
|
||||
resolution: {integrity: sha512-wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA==}
|
||||
/electron/23.0.0:
|
||||
resolution: {integrity: sha512-S6hVtTAjauMiiWP9sBVR5RpcUC464cNZ06I2EMUjeZBq+KooS6tLmNsfw0zLpAXDp1qosjlBP3v71NTZ3gd9iA==}
|
||||
engines: {node: '>= 12.20.55'}
|
||||
hasBin: true
|
||||
requiresBuild: true
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@ import (
|
|||
|
||||
func IsOnline() bool {
|
||||
c := req.C().SetTimeout(1 * time.Second)
|
||||
resp, err := c.R().Get("https://icanhazip.com")
|
||||
resp, err := c.R().Head("https://www.baidu.com")
|
||||
if nil != err {
|
||||
resp, err = c.R().Get("https://api.ipify.org")
|
||||
resp, err = c.R().Head("https://icanhazip.com")
|
||||
if nil != err {
|
||||
resp, err = c.R().Get("https://www.baidu.com")
|
||||
resp, err = c.R().Head("https://api.ipify.org")
|
||||
}
|
||||
}
|
||||
return nil == err && nil != resp && 200 == resp.StatusCode
|
||||
return nil == err && nil != resp && nil != resp.Response
|
||||
}
|
||||
|
||||
func GetRemoteAddr(session *melody.Session) string {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue