From c5f09e8370cb2b52a86e3fe8df9c6ff5c01b2b80 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 15:30:31 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c8319c6..ff4294b 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,10 +6,10 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
- "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
@@ -114,8 +114,8 @@
fmt.Println(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
@@ -150,7 +150,7 @@
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- resp["fileUrl"].(string),
+ strings.Split(resp["fileUrl"].(string), "/")[1],
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -198,7 +198,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err =util.DrawPolygonOnImage(i)
+ resp, err =util.DrawPolygonOnImage(msg.Cid,i)
if err != nil {
log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
}else{
@@ -211,12 +211,12 @@
}
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err !=nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
- camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
@@ -225,7 +225,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Name,
- msg.Caddr,
+ camera.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
--
Gitblit v1.8.0