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/main.go | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/push-service/main.go b/push-service/main.go
index e714d87..dd633ca 100644
--- a/push-service/main.go
+++ b/push-service/main.go
@@ -1,10 +1,6 @@
package main
import (
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
- "basic.com/valib/logger.git"
- "basic.com/valib/version.git"
"context"
"flag"
"os"
@@ -13,15 +9,22 @@
"vamicro/config"
"vamicro/push-service/controllers"
"vamicro/push-service/models"
+ "vamicro/push-service/mqtt"
"vamicro/push-service/service"
+
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "basic.com/valib/logger.git"
+ vaversion "basic.com/valib/version.git"
+ "github.com/go-basic/uuid"
)
var (
procName = service.ProcName
- proc = &bhomeclient.ProcInfo{
+ proc = &bhomeclient.ProcInfo{
Name: procName, //杩涚▼鍚嶇О
- ID: procName, //杩涚▼id
- Info: "", //杩涚▼鐨勬弿杩颁俊鎭紝鐢ㄤ簬鍖哄垎鍚屼竴杩涚▼鍚嶇О涓嬪涓繘绋�
+ ID: procName, //杩涚▼id
+ Info: "", //杩涚▼鐨勬弿杩颁俊鎭紝鐢ㄤ簬鍖哄垎鍚屼竴杩涚▼鍚嶇О涓嬪涓繘绋�
}
env = flag.String("e", "pro", "")
)
@@ -32,20 +35,24 @@
config.Init(*env)
// 鏃ュ織鍒濆鍖�
- var logFile = config.LogConf.Path + "vamicro-"+procName+".log"
+ var logFile = config.LogConf.Path + "vamicro-" + procName + ".log"
logger.InitLogger(logFile, config.LogConf.Level, config.LogConf.MaxSize, config.LogConf.MaxBackups, config.LogConf.MaxAge)
logger.Info("log init success !")
}
-
-func main(){
+func main() {
models.Init()
defer models.CloseDB()
+
+ //鍒濆鍖杕qtt
+ mqtt.LoadConfig()
+ mqtt.Client.Init(mqtt.Options.Broker, "smart-ai-helmet-manager"+uuid.New(), mqtt.Options.Username, mqtt.Options.Password)
+
ctx, cancel := context.WithCancel(context.Background())
fm, pubTopics := initFuncMap()
- var reg = &bhomeclient.RegisterInfo {
- Proc: *proc,
- Channel: nil,
+ var reg = &bhomeclient.RegisterInfo{
+ Proc: *proc,
+ Channel: nil,
PubTopic: pubTopics,
SubTopic: []string{},
}
@@ -54,7 +61,7 @@
signal.Notify(q, os.Interrupt, os.Kill, syscall.SIGTERM)
ms, err := bhomeclient.NewMicroNode(ctx, q, config.Server.AnalyServerId, reg, logger.Debug)
- if err !=nil {
+ if err != nil {
return
}
@@ -68,10 +75,12 @@
ms.DeRegister()
cancel()
ms.Free()
+
}
const urlPrefix = "/data/api-v"
-func initFuncMap() (map[string]bhomeclient.MicroFunc,[]string) {
+
+func initFuncMap() (map[string]bhomeclient.MicroFunc, []string) {
funcMap := make(map[string]bhomeclient.MicroFunc)
ec := new(controllers.EventPushController)
psc := new(controllers.PushSetController)
@@ -85,8 +94,8 @@
funcMap[urlPrefix+"/eventPush/getPushSet"] = psc.GetPushSet
var pubTopics []string
- for key,_ := range funcMap {
+ for key, _ := range funcMap {
pubTopics = append(pubTopics, key)
}
return funcMap, pubTopics
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0