♻️ 通过域名 siyuan.localhost 加载 https://github.com/siyuan-note/siyuan/issues/6368

This commit is contained in:
Liang Ding 2022-10-27 09:47:03 +08:00
parent f8d01913a4
commit 8bc889659b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
19 changed files with 38 additions and 47 deletions

View file

@ -87,7 +87,7 @@ var LocalIPs []string
func GetLocalIPs() (ret []string) {
if ContainerAndroid == Container {
// Android 上用不了 net.InterfaceAddrs() https://github.com/golang/go/issues/40569所以前面使用启动内核传入的参数 localIPs
LocalIPs = append(LocalIPs, "127.0.0.1")
LocalIPs = append(LocalIPs, LocalHost)
LocalIPs = gulu.Str.RemoveDuplicatedElem(LocalIPs)
return LocalIPs
}
@ -104,7 +104,7 @@ func GetLocalIPs() (ret []string) {
ret = append(ret, networkIp.IP.String())
}
}
ret = append(ret, "127.0.0.1")
ret = append(ret, LocalHost)
ret = gulu.Str.RemoveDuplicatedElem(ret)
return
}

View file

@ -17,9 +17,7 @@
package util
import (
"net"
"strings"
"time"
"github.com/88250/gulu"
"github.com/gin-gonic/gin"
@ -50,16 +48,3 @@ func JsonArg(c *gin.Context, result *gulu.Result) (arg map[string]interface{}, o
ok = true
return
}
func isPortOpen(port string) bool {
timeout := time.Second
conn, err := net.DialTimeout("tcp", net.JoinHostPort("127.0.0.1", port), timeout)
if nil != err {
return false
}
if nil != conn {
conn.Close()
return true
}
return false
}

View file

@ -293,7 +293,8 @@ const (
ContainerAndroid = "android" // Android 端
ContainerIOS = "ios" // iOS 端
FixedPort = "6806" // 固定端口
LocalHost = "siyuan.localhost" // 本地域名,由操作系统自动解析到 127.0.0.1
FixedPort = "6806" // 固定端口
)
func initPathDir() {