go get -u

go.mod

@@ -1,50 +1,53 @@
 module github.com/OpenIoTHub/server-go
 
-go 1.18
+go 1.21
+
+toolchain go1.21.6
 
 require (
-	github.com/OpenIoTHub/iot-manager-grpc-api v0.0.45
-	github.com/OpenIoTHub/server-grpc-api v1.0.13
-	github.com/OpenIoTHub/utils v0.0.71
+	github.com/OpenIoTHub/openiothub_grpc_api v1.1.1
+	github.com/OpenIoTHub/utils v0.0.72
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/libp2p/go-yamux v1.4.1
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
-	github.com/urfave/cli/v2 v2.3.0
+	github.com/urfave/cli/v2 v2.27.1
 	github.com/xtaci/kcp-go v5.4.20+incompatible
-	golang.org/x/crypto v0.14.0
-	golang.org/x/net v0.17.0
-	google.golang.org/grpc v1.33.1
-	gopkg.in/yaml.v2 v2.3.0
+	golang.org/x/crypto v0.18.0
+	golang.org/x/net v0.20.0
+	google.golang.org/grpc v1.60.1
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/OpenIoTHub/getip v0.1.2 // indirect
+	github.com/OpenIoTHub/getip v0.1.4 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/grandcat/zeroconf v1.0.0 // indirect
 	github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
-	github.com/klauspost/reedsolomon v1.9.13 // indirect
-	github.com/libp2p/go-buffer-pool v0.0.2 // indirect
-	github.com/libp2p/go-msgio v0.0.6 // indirect
-	github.com/miekg/dns v1.1.29 // indirect
-	github.com/multiformats/go-varint v0.0.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/reedsolomon v1.12.0 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-msgio v0.3.0 // indirect
+	github.com/miekg/dns v1.1.57 // indirect
+	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/templexxx/cpu v0.0.7 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/templexxx/cpu v0.1.0 // indirect
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
-	github.com/templexxx/xorsimd v0.4.1 // indirect
-	github.com/tjfoc/gmsm v1.3.2 // indirect
-	github.com/xtaci/kcp-go/v5 v5.6.1 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20201026171402-d4b8fe4fd877 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
+	github.com/templexxx/xorsimd v0.4.2 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/xtaci/kcp-go/v5 v5.6.7 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 )
 
 //replace github.com/OpenIoTHub/utils => C:\Users\Farry\go\src\github.com\OpenIoTHub\utils

manager/SessionsManager.go

@@ -2,12 +2,12 @@ package manager
 
 import (
 	"errors"
+	pb "github.com/OpenIoTHub/openiothub_grpc_api/pb-go/proto/server"
 	"github.com/OpenIoTHub/server-go/config"
 	"github.com/OpenIoTHub/server-go/iface/runtimeStorage"
 	"github.com/OpenIoTHub/server-go/imp/runtimeStorage/memImp"
 	"github.com/OpenIoTHub/server-go/imp/runtimeStorage/redisImp"
 	"github.com/OpenIoTHub/server-go/session"
-	"github.com/OpenIoTHub/server-grpc-api/pb-go"
 	"github.com/OpenIoTHub/utils/io"
 	"github.com/OpenIoTHub/utils/models"
 	"github.com/OpenIoTHub/utils/msg"

manager/grpc.go

@@ -3,8 +3,8 @@ package manager
 import (
 	"context"
 	"fmt"
+	pb "github.com/OpenIoTHub/openiothub_grpc_api/pb-go/proto/server"
 	"github.com/OpenIoTHub/server-go/config"
-	"github.com/OpenIoTHub/server-grpc-api/pb-go"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

manager/loadConfigFromIoTManager.go

@@ -2,13 +2,12 @@ package manager
 
 import (
 	"context"
+	pb "github.com/OpenIoTHub/openiothub_grpc_api/pb-go/proto/manager"
 	"github.com/OpenIoTHub/server-go/config"
 	"github.com/OpenIoTHub/utils/models"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"log"
-
-	"github.com/OpenIoTHub/iot-manager-grpc-api/pb-go"
 )
 
 const IoTManagerAddr = "iot-manager.iotserv.com:8881"