From d3d05d0eecdd76e86eeb3d28dcd765db042dce17 Mon Sep 17 00:00:00 2001
From: gongshangguo <gongshangguo@admin.com>
Date: 星期四, 03 三月 2022 10:46:05 +0800
Subject: [PATCH] 修改获取消息ID方法

---
 server/clienter.go |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/clienter.go b/server/clienter.go
index 710f769..018ce34 100644
--- a/server/clienter.go
+++ b/server/clienter.go
@@ -28,7 +28,7 @@
 	msg.SenderId = Srv.serverId
 	msg.Receiver = aiot.RECEIVER_TO_MASTER
 	msg.ReqType = aiot.REQ_TYPE_RESPONSE
-	msg.MsgProto = cli.GetMsgProto(msg.MsgProto.MsgId)
+	msg.MsgProto = client.GetMsgProto(msg.MsgProto.MsgId)
 	_ = cli.WriteBody(msg)
 	// 涓婃姤鍒版湇鍔$
 	go Srv.serverCallBack.OnHeartBeat(cli, msg)
@@ -37,7 +37,7 @@
 
 // 瀹炵幇OnRegister
 func (c *Clients) OnRegister(cli *client.Client, msg *aiot.Protocol) error {
-	Srv.RegisterDevice(msg, cli)
+	Srv.RegisterDevice(cli, msg)
 	go Srv.serverCallBack.OnRegister(cli, msg)
 	msgFeedBack := &aiot.Protocol{
 		Receiver: aiot.RECEIVER_TO_MASTER,
@@ -45,7 +45,7 @@
 		DeviceProto: msg.DeviceProto,
 		MsgType: aiot.MSG_TYPE_REGISTER,
 		ReqType: aiot.REQ_TYPE_RESPONSE,
-		MsgProto: cli.GetMsgProto(msg.MsgProto.MsgId),
+		MsgProto: client.GetMsgProto(msg.MsgProto.MsgId),
 		Data: msg.Data,
 	}
 	_ = cli.WriteBody(msgFeedBack)

--
Gitblit v1.8.0