Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

⚡ 检查互联网连通性时将 www.baidu.com 排在第一个

Browse source
This commit is contained in:
Liang Ding 2023-02-08 09:40:07 +08:00
parent 0e7f68114d
commit 346ce6edd0
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/electron/main.js
View file

@ -1006,11 +1006,11 @@ powerMonitor.on('resume', async () => {
writeLog('system resume') writeLog('system resume')
const isOnline = async () => { const isOnline = async () => {
try { try {
const result = await fetch('https://icanhazip.com', {timeout: 1000}) const result = await fetch('https://www.baidu.com', {timeout: 1000})
return 200 === result.status return 200 === result.status
} catch (e) { } catch (e) {
try { try {
const result = await fetch('https://www.baidu.com', {timeout: 1000}) const result = await fetch('https://icanhazip.com', {timeout: 1000})
return 200 === result.status return 200 === result.status
} catch (e) { } catch (e) {
return false return false

8
kernel/util/net.go
View file

@ -31,14 +31,14 @@ import (
func IsOnline() bool { func IsOnline() bool {
c := req.C().SetTimeout(1 * time.Second) 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 { if nil != err {
resp, err = c.R().Get("https://api.ipify.org") resp, err = c.R().Head("https://icanhazip.com")
if nil != err { 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 { func GetRemoteAddr(session *melody.Session) string {