From 614eb4291d18716b353e7f48773cf2986920f796 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 05 十一月 2019 19:58:33 +0800
Subject: [PATCH] msg.Push初始化
---
ruleserver/attachInfo.go | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruleserver/attachInfo.go b/ruleserver/attachInfo.go
index 55394ee..285b7b1 100644
--- a/ruleserver/attachInfo.go
+++ b/ruleserver/attachInfo.go
@@ -9,27 +9,34 @@
)
func GetAttachInfo(msg *protomsg.SdkMessage){
//浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ push := new(protomsg.PushAttach)
localConfig, err := cache.GetServerInfo()
if err != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- msg.Push.ServerId = localConfig.ServerId
- msg.Push.ServerName = localConfig.ServerName
+ logger.Info("localConfig淇℃伅锛�",localConfig)
+ push.ServerId = "localConfig.ServerId"
+ push.ServerName = "localConfig.ServerName"
serverIp, err := GetLocalIP()
- msg.Push.LocalIp = serverIp
+ push.LocalIp = serverIp
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
- msg.Push.Cam = &camera
+ push.Cam = &camera
// 瑙嗛鍦板潃鍗犱綅绗�
localConfig1, err := cache.GetServerInfo()
if err != nil {
panic("閰嶇疆鏂囦欢涓嶅悎娉�")
}
+ logger.Info("璇锋眰瑙嗛璺緞锛�",msg.Push,serverIp,camera)
weedfsUrl := "http://" + localConfig1.WebPicIp + ":" + strconv.Itoa(int(localConfig1.WebPicPort)) + "/dir/assign"
- if path,err := WeedFSClient.GetFid(weedfsUrl);err !=nil {
- msg.Push.VideoUrl = path
+ if path,err := WeedFSClient.GetFid(weedfsUrl);err != nil {
+ logger.Info("璇锋眰鏂囦欢鍦板潃澶辫触:",err)
+ } else {
+ logger.Info("瑙嗛璺緞涓猴細",path)
+ push.VideoUrl = path
}
+ msg.Push = push
}
\ No newline at end of file
--
Gitblit v1.8.0