lijian 1 rok pred
rodič
commit
3a437fd66d

+ 3 - 3
pkg/online/online.go

@@ -21,14 +21,14 @@ type Manager struct {
 }
 
 func NewManager(host string, port, db int) *Manager {
-	gredis.SetConfig(&gredis.Config{
+	red := gredis.New(&gredis.Config{
 		Host:      host,
 		Port:      port,
 		Db:        db,
 		MaxActive: 100,
-	}, "")
+	})
 	mgr := &Manager{
-		redisClient: gredis.Instance(),
+		redisClient: red,
 	}
 	return mgr
 }

+ 2 - 2
pkg/token/token.go

@@ -19,14 +19,14 @@ type Helper struct {
 }
 
 func NewHelper(host string, port, db int) *Helper {
-	gredis.SetConfig(&gredis.Config{
+	red := gredis.New(&gredis.Config{
 		Host:      host,
 		Port:      port,
 		Db:        db,
 		MaxActive: 100,
 	})
 	helper := &Helper{
-		redisClient: gredis.Instance(),
+		redisClient: red,
 	}
 	return helper
 }

+ 1 - 1
services/emqx-agent/agent.go

@@ -27,7 +27,7 @@ func (a *Agent) Connected(status *protocol.DevConnectStatus) error {
 		return nil
 	}
 	args := rpcs.ArgsGetOnline{
-		Id:                status.DeviceId,
+		Id:                device.RecordId,
 		ClientIP:          status.ClientIp,
 		AccessRPCHost:     server.GetRPCHost(),
 		HeartbeatInterval: 300,