From 5c0525c359e8ac55897c3bbd013ad281a8e49d1d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 13 Jun 2022 20:57:18 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=88=97=E5=87=BA=20`=E5=9C=A8?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8A=E4=BD=BF=E7=94=A8`=20?= =?UTF-8?q?=E7=9A=84=20IP=20=E4=B8=AD=E9=BB=98=E8=AE=A4=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=20`127.0.0.1`=20https://github.com/siyuan-note/siyuan/issues/5?= =?UTF-8?q?177?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/util/path.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/util/path.go b/kernel/util/path.go index d127f7f17..80a793c30 100644 --- a/kernel/util/path.go +++ b/kernel/util/path.go @@ -84,12 +84,15 @@ func IsIDPattern(str string) bool { var LocalIPs []string func GetLocalIPs() (ret []string) { - if 0 < len(LocalIPs) { + if "android" == Container { + // Android 上用不了 net.InterfaceAddrs() https://github.com/golang/go/issues/40569，所以前面使用启动内核传入的参数 localIPs + LocalIPs = append(LocalIPs, "127.0.0.1") + LocalIPs = RemoveDuplicatedElem(LocalIPs) return LocalIPs } ret = []string{} - addrs, err := net.InterfaceAddrs() // Android 上用不了 https://github.com/golang/go/issues/40569，所以前面使用启动内核传入的参数 localIPs + addrs, err := net.InterfaceAddrs() if nil != err { LogWarnf("get interface addresses failed: %s", err) return @@ -100,6 +103,8 @@ func GetLocalIPs() (ret []string) { ret = append(ret, networkIp.IP.String()) } } + ret = append(ret, "127.0.0.1") + ret = RemoveDuplicatedElem(ret) return }