From 41ac67f13587ff76631167d6050c3f27f7b97c2a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 15 十月 2019 18:55:21 +0800
Subject: [PATCH] rm no use config
---
controllers/capture.go | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/controllers/capture.go b/controllers/capture.go
index 962a333..f263e1b 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -1,7 +1,6 @@
package controllers
import (
- "basic.com/dbapi.git"
"basic.com/valib/logger.git"
"fmt"
"github.com/gin-gonic/gin"
@@ -42,7 +41,7 @@
}
//璇锋眰澶�
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" {
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
util.ResponseFormat(c,code.ComError,"es config err")
return
@@ -50,9 +49,7 @@
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
--
Gitblit v1.8.0