Skip to content

Commit 178fba9

Browse files
matteriotmatteriot
committed
upgrade libs;添加ipv6接口
1 parent d1f4a47 commit 178fba9

26 files changed

+109
-158
lines changed

‎client/lib.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/OpenIoTHub/gateway-go/v2/info"
88
"github.com/OpenIoTHub/gateway-go/v2/services"
99
"github.com/OpenIoTHub/openiothub_grpc_api/pb-go/proto/gateway"
10-
"github.com/OpenIoTHub/utils/models"
10+
"github.com/OpenIoTHub/utils/v2/models"
1111
"github.com/gin-gonic/gin"
1212
"github.com/grandcat/zeroconf"
1313
"google.golang.org/grpc"

‎go.mod‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.2
44

55
require (
66
github.com/OpenIoTHub/openiothub_grpc_api v1.2.2
7-
github.com/OpenIoTHub/utils v0.0.76
7+
github.com/OpenIoTHub/utils/v2 v2.0.1
88
github.com/OpenIoTHub/water v0.0.3
99
github.com/gin-gonic/gin v1.10.1
1010
github.com/grandcat/zeroconf v1.0.0
@@ -15,20 +15,19 @@ require (
1515
github.com/shirou/gopsutil/v3 v3.24.5
1616
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
1717
github.com/urfave/cli/v2 v2.27.7
18-
golang.org/x/crypto v0.39.0
19-
golang.org/x/net v0.41.0
18+
golang.org/x/crypto v0.40.0
19+
golang.org/x/net v0.42.0
2020
google.golang.org/grpc v1.73.0
2121
google.golang.org/protobuf v1.36.6
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
2424

2525
require (
26-
github.com/OpenIoTHub/getip v0.1.4 // indirect
26+
github.com/OpenIoTHub/getip/v2 v2.0.0 // indirect
2727
github.com/bytedance/sonic v1.13.3 // indirect
2828
github.com/bytedance/sonic/loader v0.3.0 // indirect
2929
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
3030
github.com/cloudwego/base64x v0.1.5 // indirect
31-
github.com/cloudwego/iasm v0.2.0 // indirect
3231
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
3332
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
3433
github.com/gin-contrib/sse v1.1.0 // indirect
@@ -48,7 +47,7 @@ require (
4847
github.com/libp2p/go-msgio v0.3.0 // indirect
4948
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
5049
github.com/mattn/go-isatty v0.0.20 // indirect
51-
github.com/miekg/dns v1.1.66 // indirect
50+
github.com/miekg/dns v1.1.67 // indirect
5251
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5352
github.com/modern-go/reflect2 v1.0.2 // indirect
5453
github.com/multiformats/go-varint v0.0.7 // indirect
@@ -67,16 +66,12 @@ require (
6766
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
6867
github.com/xtaci/kcp-go/v5 v5.6.22 // indirect
6968
github.com/yusufpapurcu/wmi v1.2.4 // indirect
70-
golang.org/x/arch v0.18.0 // indirect
71-
golang.org/x/exp/shiny v0.0.0-20250620022241-b7579e27df2b // indirect
72-
golang.org/x/image v0.28.0 // indirect
73-
golang.org/x/mobile v0.0.0-20250606033058-a2a15c67f36f // indirect
74-
golang.org/x/mod v0.25.0 // indirect
75-
golang.org/x/sync v0.15.0 // indirect
76-
golang.org/x/sys v0.33.0 // indirect
77-
golang.org/x/text v0.26.0 // indirect
69+
golang.org/x/arch v0.19.0 // indirect
70+
golang.org/x/mod v0.26.0 // indirect
71+
golang.org/x/sync v0.16.0 // indirect
72+
golang.org/x/sys v0.34.0 // indirect
73+
golang.org/x/text v0.27.0 // indirect
7874
golang.org/x/tools v0.34.0 // indirect
7975
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
80-
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
8277
)

‎go.sum‎

Lines changed: 28 additions & 106 deletions
Large diffs are not rendered by default.

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/OpenIoTHub/gateway-go/v2/utils/login_utils"
1010
"github.com/OpenIoTHub/gateway-go/v2/utils/qr"
1111
"github.com/OpenIoTHub/gateway-go/v2/utils/str"
12-
utils_models "github.com/OpenIoTHub/utils/models"
12+
utils_models "github.com/OpenIoTHub/utils/v2/models"
1313
uuid "github.com/satori/go.uuid"
1414
"github.com/urfave/cli/v2"
1515
"gopkg.in/yaml.v3"

‎netservice/handle/handle.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
connect "github.com/OpenIoTHub/gateway-go/v2/netservice/services/connect/conn"
55
"github.com/OpenIoTHub/gateway-go/v2/netservice/services/connect/service"
66
"github.com/OpenIoTHub/gateway-go/v2/netservice/services/login"
7-
"github.com/OpenIoTHub/utils/models"
8-
"github.com/OpenIoTHub/utils/msg"
9-
"github.com/OpenIoTHub/utils/net/p2p/gateway"
7+
"github.com/OpenIoTHub/utils/v2/models"
8+
"github.com/OpenIoTHub/utils/v2/msg"
9+
"github.com/OpenIoTHub/utils/v2/net/p2p/gateway"
1010
"log"
1111

1212
"net"

‎netservice/services/connect/conn/serialPort.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package conn
22

33
import (
4-
"github.com/OpenIoTHub/utils/io"
5-
"github.com/OpenIoTHub/utils/models"
4+
"github.com/OpenIoTHub/utils/v2/io"
5+
"github.com/OpenIoTHub/utils/v2/models"
66
"github.com/jacobsa/go-serial/serial"
77
"log"
88
"net"

‎netservice/services/connect/conn/tcp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conn
22

33
import (
4-
"github.com/OpenIoTHub/utils/io"
4+
"github.com/OpenIoTHub/utils/v2/io"
55
"net"
66
"strconv"
77
"time"

‎netservice/services/connect/conn/udp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conn
22

33
import (
4-
"github.com/OpenIoTHub/utils/io"
4+
"github.com/OpenIoTHub/utils/v2/io"
55
"net"
66
)
77

‎netservice/services/connect/conn/ws.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conn
22

33
import (
4-
"github.com/OpenIoTHub/utils/io"
4+
"github.com/OpenIoTHub/utils/v2/io"
55
"golang.org/x/net/websocket"
66
"net"
77
)

‎netservice/services/connect/service/getIPv6Addr.go‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package service
2+
3+
import (
4+
"encoding/json"
5+
"github.com/OpenIoTHub/getip/v2/iputils"
6+
"github.com/OpenIoTHub/utils/v2/models"
7+
"github.com/OpenIoTHub/utils/v2/msg"
8+
"log"
9+
"net"
10+
)
11+
12+
// GetIPv6Addr 传过来一个ipv6Addr+port返回一个ipv6Addr+port
13+
func GetIPv6Addr(stream net.Conn, service *models.NewService) error {
14+
ipv6Map := make(map[string]interface{})
15+
16+
// 获取磁盘信息
17+
var ipv6Addr = iputils.GetMyPublicIpv6()
18+
ipv6Map["Ipv6Addr"] = ipv6Addr
19+
rstByte, err := json.Marshal(ipv6Map)
20+
if err != nil {
21+
log.Println("json.Marshal(ipv6Map)：")
22+
log.Println(err.Error())
23+
}
24+
//log.Println(string(rstByte))
25+
err = msg.WriteMsg(stream, &models.JsonResponse{Code: 0, Msg: "Success", Result: string(rstByte)})
26+
if err != nil {
27+
stream.Close()
28+
log.Println("写消息错误：")
29+
log.Println(err.Error())
30+
}
31+
return err
32+
}

0 commit comments

Comments
 (0)