Merge remote-tracking branch 'origin/master'

sunty

2019-11-01 712ef81c6b8813a498a66cf61ffcd37e5c502c8c

 controllers/esSearch.go

@@ -1,22 +1,23 @@
   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{}

// @Security ApiKeyAuth
// @Summary 检索
// @Description 信息检索和比对检索
// @Accept  json