From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/tasklist.go | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/controllers/tasklist.go b/controllers/tasklist.go
index e24848a..13653a6 100644
--- a/controllers/tasklist.go
+++ b/controllers/tasklist.go
@@ -1,7 +1,10 @@
package controllers
import (
+ "basic.com/valib/logger.git"
"fmt"
+ "strconv"
+ "webserver/cache"
"github.com/gin-gonic/gin"
"webserver/extend/code"
@@ -10,7 +13,7 @@
"webserver/extend/util"
)
-//浠诲姟鍒楄〃
+// @Security ApiKeyAuth
// @Summary 浠诲姟鍒楄〃
// @Description 杩斿洖浠诲姟鍒楄〃
// @Accept json
@@ -20,8 +23,13 @@
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
// @Router /data/api-v/es/tagList [POST]
func (sc *EsSearchController) PostEsTaskList(c *gin.Context) {
-
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ util.ResponseFormat(c,code.ComError,"localConf wrong")
+ return
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName + "/_search"
prama := "{\"size\":0,\"aggs\":{\"taskId_list\":{\"terms\":{\"field\":\"taskId\"}}}}"
@@ -41,7 +49,7 @@
source["title"] = key.(string)
source["value"] = key.(string)
source["key"] = key.(string)
- sources := append(sources, source)
+ sources = append(sources, source)
fmt.Println(key)
}
--
Gitblit v1.8.0