[fix] 规则链解析失败

iothub/hook_message_work/hook_message_work.go

@@ -116,12 +116,13 @@ func getRuleChain(etoken *global_model.DeviceAuth) *ruleEntity.RuleDataJson {
 	get, err := cache.ComputeIfAbsentProductRule(key, func(k any) (any, error) {
 		one := services.ProductModelDao.FindOne(k.(string))
 		rule := ruleService.RuleChainModelDao.FindOne(one.RuleChainId)
-		var lfData ruleEntity.LfData
+		var lfData ruleEntity.RuleDataJson
 		err := tool.StringToStruct(rule.RuleDataJson, &lfData)
 		if err != nil {
 			return nil, err
 		}
-		return ruleEntity.RuleDataJson{Id: rule.Id, LfData: lfData}, nil
+		lfData.Id = rule.Id
+		return lfData, nil
 	})
 	biz.ErrIsNil(err, "缓存读取规则链失败")
 	if ruleData, ok := get.(ruleEntity.RuleDataJson); ok {

iothub/netbase/hook_base.go

@@ -2,6 +2,7 @@ package netbase
 
 import (
 	"encoding/json"
+	"log"
 	"pandax/apps/device/entity"
 	"pandax/apps/device/services"
 	"pandax/iothub/server/emqxserver/protobuf"
@@ -37,6 +38,7 @@ func Auth(authToken string) bool {
 			return false
 		}
 		etoken = services.GetDeviceToken(&device.Device)
+		log.Println("设置设备协议", device.Product.ProtocolName)
 		etoken.DeviceProtocol = device.Product.ProtocolName
 		err = cache.SetDeviceEtoken(authToken, etoken.GetMarshal(), time.Hour*24*365)
 		if err != nil {