From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/esSearch.go | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 83dd6db..9fd0f95 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -1,19 +1,19 @@
- package controllers
+package controllers
- import (
- "basic.com/dbapi.git"
- "fmt"
- "github.com/gin-gonic/gin"
- "strconv"
- "strings"
- "webserver/cache"
- "webserver/extend/code"
- "webserver/extend/config"
- "webserver/extend/esutil"
- "basic.com/valib/logger.git"
- "webserver/extend/util"
- "webserver/models"
- )
+import (
+ "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
+ "fmt"
+ "github.com/gin-gonic/gin"
+ "strconv"
+ "strings"
+ "webserver/cache"
+ "webserver/extend/code"
+ "webserver/extend/config"
+ "webserver/extend/esutil"
+ "webserver/extend/util"
+ "webserver/models"
+)
type EsSearchController struct{}
@@ -220,7 +220,7 @@
}
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName + "/_search?search_type=dfs_query_then_fetch"
- jsonDSL := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"linkId.keyword\":\"" + linkId + "\"}}],\"must_not\":[{\"term\":{\"id\":\"" + id + "\"}}]}},\"size\":100}"
+ jsonDSL := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"linkId\":\"" + linkId + "\"}}],\"must_not\":[{\"term\":{\"id\":\"" + id + "\"}}]}},\"size\":100}"
buf, err := esutil.EsReq("POST", url, []byte(jsonDSL))
if err != nil {
--
Gitblit v1.8.0