From 712ef81c6b8813a498a66cf61ffcd37e5c502c8c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 01 十一月 2019 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 controllers/tasklist.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/tasklist.go b/controllers/tasklist.go
index e6e9e64..13653a6 100644
--- a/controllers/tasklist.go
+++ b/controllers/tasklist.go
@@ -13,7 +13,7 @@
 	"webserver/extend/util"
 )
 
-//浠诲姟鍒楄〃
+// @Security ApiKeyAuth
 // @Summary 浠诲姟鍒楄〃
 // @Description 杩斿洖浠诲姟鍒楄〃
 // @Accept  json
@@ -24,7 +24,7 @@
 // @Router /data/api-v/es/tagList [POST]
 func (sc *EsSearchController) PostEsTaskList(c *gin.Context) {
 	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,"localConf wrong")
 		return

--
Gitblit v1.8.0