es配置添加xoath basic认证

config/config.go

@@ -29,6 +29,8 @@ type ConfAPI struct {
 }
 type ElasticSearch struct{
 	Address string `yaml:"address"`
+	User    string `yaml:"user"`
+	Password string  `yaml:"password"`
 }
 
 type EntityRedis struct {

db/elasticEngine.go

@@ -87,6 +87,21 @@ func (p *ElkEngine) Query(index string, query elastic.Query, v interface{},
 			id := []string{}
 			for _, vs := range res.Hits.Hits {
 				id = append(id, vs.Id)
+				data, e := vs.Source.MarshalJSON()
+				if nil != e {
+					log.Print(e.Error())
+				}
+				mapobj := map[string]interface{}{}
+				e = json.Unmarshal(data, &mapobj)
+				if nil != e {
+					log.Print(e.Error())
+				}
+				obj, e := utils.UnmarshalJson2StructGen(eletype, mapobj)
+				log.Print(obj)
+				if nil != e {
+					log.Print(e.Error())
+				}
+				objAdd = append(objAdd, reflect.ValueOf(obj))
 			}
 			return  id, nil
 		} else {
@@ -113,7 +128,6 @@ func (p *ElkEngine) Query(index string, query elastic.Query, v interface{},
 					log.Print(e.Error())
 				}
 				objAdd = append(objAdd, reflect.ValueOf(obj))
-				//v = append(v, obj)
 			}
 			addOp := reflect.Append(obj, objAdd...)
 			obj.Set(addOp)

db/sqlManager.go

@@ -115,11 +115,12 @@ func Init() {
 func InitELK() {
 	var e error
 	elkconf := config.GetElkConfig()
-	log.Print(elkconf)
 	gElkEngine.cli, e = elastic.NewClient(
 		elastic.SetURL(elkconf.Address),
 		// Must turn off sniff in docker
-		elastic.SetSniff(false))
+		elastic.SetSniff(false),
+		elastic.SetBasicAuth(elkconf.User, elkconf.Password),
+	)
 	if nil != e {
 		logs.Error(e.Error())
 		gElkEngine.cli = nil