From d3d05d0eecdd76e86eeb3d28dcd765db042dce17 Mon Sep 17 00:00:00 2001
From: gongshangguo <gongshangguo@admin.com>
Date: 星期四, 03 三月 2022 10:46:05 +0800
Subject: [PATCH] 修改获取消息ID方法
---
client/client.go | 6 +++---
server/clienter.go | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/client.go b/client/client.go
index c6b21ab..e501367 100644
--- a/client/client.go
+++ b/client/client.go
@@ -259,7 +259,7 @@
c.Logger.Debug("registering...")
data := c.deviceRegister
msgData, _ := json.Marshal(data)
- _, err := c.WriteMsg(c.deviceId, aiot.MSG_TYPE_REGISTER, aiot.REQ_TYPE_REQUEST, msgData, c.GetMsgProto(""))
+ _, err := c.WriteMsg(c.deviceId, aiot.MSG_TYPE_REGISTER, aiot.REQ_TYPE_REQUEST, msgData, GetMsgProto(""))
if err != nil {
c.Logger.Error("Fail to send device register", zap.Any("msg", msgData))
}
@@ -283,7 +283,7 @@
t.Stop()
return
}
- go c.WriteMsg(c.deviceId, aiot.MSG_TYPE_HEART_BEAT, aiot.REQ_TYPE_REQUEST, pingData, c.GetMsgProto(""))
+ go c.WriteMsg(c.deviceId, aiot.MSG_TYPE_HEART_BEAT, aiot.REQ_TYPE_REQUEST, pingData, GetMsgProto(""))
}
}
}
@@ -415,7 +415,7 @@
}
// 鎷艰娑堟伅ID
-func (c *Client) GetMsgProto(msgId string) *aiot.MsgIdProto {
+func GetMsgProto(msgId string) *aiot.MsgIdProto {
// 鏂版秷鎭�
if msgId == "" {
return &aiot.MsgIdProto{
diff --git a/server/clienter.go b/server/clienter.go
index c6de633..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)
@@ -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