From 0f45d9efa1dfd1580975ecc410d44de053f7af81 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期五, 05 七月 2019 09:45:05 +0800
Subject: [PATCH] remove base64
---
esutil/EsClient.go | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index d022703..4381757 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -8,21 +8,20 @@
"net/http"
"time"
"bytes"
-)
+ "basic.com/pubsub/protomsg.git"
+)
func GetDbinfo(dbinforequest string)([]byte, error) {
buf , err := EsReq("POST", "http://192.168.1.182:9200/dbtablepersons/dbpersons/_search", []byte(dbinforequest))
return buf, err
}
-
-func Parsesources(sources []map[string]interface{}) []Baseinfo {
- var tmpinfo Baseinfo
- var baseinfos []Baseinfo
+func Parsesources(sources []map[string]interface{}) []*protomsg.Baseinfo {
+ var baseinfos []*protomsg.Baseinfo
var ok bool
for _, source := range sources {
-
+ var tmpinfo protomsg.Baseinfo
tmpinfo.FaceFeature, ok = source["faceFeature"].(string)
Isnil("faceFeature", ok)
tmpinfo.PersonId, ok = source["id"].(string)
@@ -40,7 +39,11 @@
tmpinfo.Idcard,ok = source["idCard"].(string)
Isnil("idCard", ok)
tmpinfo.MonitorLevel,ok = source["monitorLevel"].(string)
- baseinfos = append(baseinfos, tmpinfo)
+
+ // 鏍规嵁 tableid 鑾峰彇 tablename
+ name, _:= Dbtablename(tmpinfo.TableId)
+ tmpinfo.TableName= name
+ baseinfos = append(baseinfos, &tmpinfo)
}
return baseinfos
}
@@ -93,13 +96,11 @@
}
defer resp.Body.Close()
-
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
fmt.Println(err)
return nil , err
}
-
return body, nil
}
--
Gitblit v1.8.0