Explorar o código

上报消息头增加productKey

liuxiulin hai 8 meses
pai
achega
d1e3241c8e
Modificáronse 1 ficheiros con 4 adicións e 3 borrados
  1. 4 3
      services/emqx-agent/agent.go

+ 4 - 3
services/emqx-agent/agent.go

@@ -71,7 +71,7 @@ func (a *Access) processStatus(topicInfo *protocol.TopicInfo, vendorId string, m
 	if act != "" {
 		switch act {
 		case klink.DevSendAction:
-			processReportStatus(topicInfo.DeviceCode, vendorId, message)
+			processReportStatus(topicInfo, vendorId, message)
 		case klink.DevLoginAction:
 			_ = processDevLogin(topicInfo.DeviceCode, message.GetString("subDeviceId"))
 		case klink.DevLogoutAction:
@@ -140,13 +140,14 @@ func processDeviceReportUpgrade(deviceId, version string) error {
 	}
 	return nil
 }
-func processReportStatus(deviceid, vendorId string, message *gjson.Json) {
+func processReportStatus(topicInfo *protocol.TopicInfo, vendorId string, message *gjson.Json) {
 	reply := rpcs.ReplyOnStatus{}
 	args := rpcs.ArgsOnStatus{
-		DeviceId:    deviceid,
+		DeviceId:    topicInfo.DeviceCode,
 		Timestamp:   message.GetUint64("timestamp"),
 		SubData:     message.GetJson("data").MustToJson(),
 		VendorId:    vendorId,
+		ProductKey:  topicInfo.ProductKey,
 		SubDeviceId: message.GetString("subDeviceId"),
 		Action:      klink.PacketAction(message.GetString("action")),
 	}