修改ip获取

common/util.go

@@ -1,28 +1,9 @@
 package common
 
 import (
-	"fmt"
 	"math"
-	"net"
 )
 
-// GetLocalIP 获取本地内网IP地址
-func GetLocalIP() (string, error) {
-	adders, err := net.InterfaceAddrs()
-	if err != nil {
-		return "", err
-	}
-
-	for _, addr := range adders {
-		if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
-			if ipnet.IP.To4() != nil {
-				return ipnet.IP.String(), nil
-			}
-		}
-	}
-	return "", fmt.Errorf("unable to determine local ip")
-}
-
 // SplitPower 多维权限拆解
 // xyz【1需要 0 不需要】
 // SplitPower(1001)=[]bool{true,false,false,true}

core/node/register.go

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"bp.jydev.jianyu360.cn/BaseService/gateway/common"
+	"app.yhyue.com/moapp/jybase/iputil"
 	"context"
 	"fmt"
 	client "go.etcd.io/etcd/client/v3"
@@ -22,11 +22,7 @@ func (n *Node) RegisterWithContext(ctx context.Context, serverCode string, serve
 	if len(domain) > 0 {
 		serverAddr = domain[0]
 	} else {
-		ip, err := common.GetLocalIP()
-		if err != nil {
-			return nil, err
-		}
-		serverAddr = fmt.Sprintf("http://%s", ip)
+		serverAddr = fmt.Sprintf("http://%s", iputil.InternalIp())
 	}
 	//创建租约
 	lease, err := n.Client.Grant(ctx, 5)

go.mod

@@ -3,7 +3,7 @@ module bp.jydev.jianyu360.cn/BaseService/gateway
 go 1.16
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4
+	app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46
 	bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220420075831-0b59892e9982
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5

go.sum

@@ -1,8 +1,9 @@
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4 h1:GD3/xYydpFEHe3qQ1pXTTucuhxDP8eEdZIrbu2Iz10I=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
+app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46 h1:ME9XyG40U8JQh70lmQnzACCPNaDyBQ5BaCVTIxPu6rk=
+app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698 h1:2xGDnrmbGt4VzAmDSsKH+C9Bq40z9eQ4NJfH/779o8g=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=