From 2919bea2ffc28003aaefdf9619dc39cda11c1fd1 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期二, 26 八月 2025 08:47:32 +0800
Subject: [PATCH] 推送相关功能调整，udp开启关闭增加mqtt发送消息，设置推送字段名称修改
---
push-service/service/eventPushService.go | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/push-service/service/eventPushService.go b/push-service/service/eventPushService.go
index c36b6b9..fa16fe4 100644
--- a/push-service/service/eventPushService.go
+++ b/push-service/service/eventPushService.go
@@ -1,16 +1,18 @@
package service
import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
"encoding/json"
"errors"
- "github.com/satori/go.uuid"
"vamicro/extend/util"
"vamicro/push-service/models"
"vamicro/push-service/vo"
sysModel "vamicro/system-service/models"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "basic.com/valib/logger.git"
+ uuid "github.com/satori/go.uuid"
)
type EventPushService struct {
@@ -82,10 +84,12 @@
} else { //鏂板
if er > 0 {
err = errors.New("鍚嶇О涓嶅厑璁搁噸澶�")
+ logger.Debug(err)
return false
}
eventPushE.Id = uuid.NewV4().String()
if err = tx.Table("event_push").Create(&eventPushE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -101,6 +105,7 @@
EventPushId: eventPushE.Id,
}
if err = tx.Table("event_push_server").Create(&ipPortE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -109,18 +114,24 @@
Id: uuid.NewV4().String(),
Enable: urlVo.Enable,
Url: urlVo.Url,
+ ServerIp: urlVo.ServerIp,
+ Port: urlVo.Port,
Type: models.PUSH_URL_TYPE,
EventPushId: eventPushE.Id,
}
if err = tx.Table("event_push_server").Create(&urlE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
+
+ logger.Debug("hhhhhhh")
for _, rule := range body.Rules {
rule.Id = uuid.NewV4().String()
rule.EventPushId = eventPushE.Id
if err = tx.Table("event_push_rule").Create(&rule).Error; err != nil {
+ logger.Debug(err)
return false
}
}
--
Gitblit v1.8.0