Merge remote-tracking branch 'origin/master'

sunty

2019-11-19 dfddbbf858b4f24f515746d74d2a6830d8835f1d

 controllers/esSearch.go

@@ -204,7 +204,7 @@
      "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
      "}"
   //logger.Debug("findEsData.param:",prama)
   logger.Debug("findEsData.param:",prama)
   //数据解析
   tokenRes := esutil.GetEsDataReq(url, prama, true)
   //fmt.Println(tokenRes)