From 3a454e86f28c0e5a50332c2d3760598d36d800da Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 09 十二月 2019 17:43:54 +0800
Subject: [PATCH] es模块儿做成so
---
insertdata/EsClient.go | 0
insertdata/insertDataToEs.go | 26 ++++++++++++++++++++++++--
structure/config.go | 2 +-
algorithm/insertEs/insertDataToEs.go | 9 +++++----
main.go | 2 +-
buildmode | 1 +
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/algorithm/insertEs/insertDataToEs.go b/algorithm/insertEs/insertDataToEs.go
index 6515807..103b3d9 100644
--- a/algorithm/insertEs/insertDataToEs.go
+++ b/algorithm/insertEs/insertDataToEs.go
@@ -5,6 +5,7 @@
"encoding/json"
"errors"
"net"
+ "ruleprocess/insertdata"
"strconv"
"time"
@@ -226,7 +227,7 @@
}
if key == "track" && len(face.Liker) == 1{
esid := face.Liker[0].TargetId
- returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
+ returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),structure.EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
if err1 != nil {
logger.Error("杩藉姞鏁版嵁鍑洪敊锛�---", err1)
} else {
@@ -235,7 +236,7 @@
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
}
} else {
- resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
@@ -445,7 +446,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err2 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -605,7 +606,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err2 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
diff --git a/buildmode b/buildmode
index 79e042c..0707b8b 100755
--- a/buildmode
+++ b/buildmode
@@ -6,4 +6,5 @@
go build -buildmode=plugin -o ./algorithm/personUnsual.so ./algorithm/personUnsual/personUnsual.go
go build -buildmode=plugin -o ./algorithm/intrusion.so ./algorithm/intrusion/intrusion.go
go build -buildmode=plugin -o ./algorithm/plate.so ./algorithm/car/plate.go
+go build -buildmode=plugin -o ./algorithm/insertEs.so ./algorithm/insertEs/insertDataToEs.go
go build
\ No newline at end of file
diff --git a/algorithm/insertEs/EsClient.go b/insertdata/EsClient.go
similarity index 100%
rename from algorithm/insertEs/EsClient.go
rename to insertdata/EsClient.go
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 2e70d2a..d44ccec 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -2,11 +2,33 @@
import (
"plugin"
+ "ruleprocess/cache"
+ "basic.com/valib/logger.git"
"ruleprocess/structure"
+ "strconv"
)
-
+var weedfsUrl, videoPersonUrl, personAction string
+var serverIp string
+var serverPort string
func InsertToEs(msg structure.ResultMsg) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ }
+ }()
+ localConfig1, err := cache.GetServerInfo()
+ if err != nil {
+ panic("閰嶇疆鏂囦欢涓嶅悎娉�")
+ }
+ weedfsUrl = "http://" + localConfig1.WebPicIp + ":" + strconv.Itoa(int(localConfig1.WebPicPort)) + "/submit"
+ videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + structure.EsInfo.EsIndex.AIOcean.IndexName + "/" + structure.EsInfo.EsIndex.AIOcean.IndexType+"?refresh=true"
+ serverIp = localConfig1.AlarmIp
+ serverPort = strconv.Itoa(int(localConfig1.AlarmPort))
+
+}
+
+func handle (msg structure.ResultMsg,weedfsUrl,videoPersonUrl,serverIp,serverPort string) {
p,err := plugin.Open("./algorithm/insertEs.so")
if err != nil {
panic(err)
@@ -15,5 +37,5 @@
if err1 != nil {
panic("娌℃湁鎵惧埌涓棿浠剁殑鏍煎紡鍖栨暟鎹嚱鏁�")
}
- f.(func(msg structure.ResultMsg))(msg)
+ f.(func(msg structure.ResultMsg,weedfsUrl,videoPersonUrl,serverIp,serverPort string))(msg,weedfsUrl,videoPersonUrl,serverIp,serverPort)
}
diff --git a/main.go b/main.go
index a531d0b..fb30ecd 100644
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@
flag.Parse()
// 鏃ュ織鍒濆鍖�
- insertdata.Init(*env)
+ structure.Init(*env)
var logFile = "./logger/"
if viper.GetString("LogBasePath") != "" {
logFile = viper.GetString("LogBasePath")
diff --git a/algorithm/insertEs/config.go b/structure/config.go
similarity index 98%
rename from algorithm/insertEs/config.go
rename to structure/config.go
index a1adae7..185c555 100644
--- a/algorithm/insertEs/config.go
+++ b/structure/config.go
@@ -1,4 +1,4 @@
-package insertdata
+package structure
import (
"github.com/spf13/viper"
--
Gitblit v1.8.0