From c9f5e31201b49c886bfa44626ba9294f45c96627 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 20 十一月 2019 17:59:58 +0800
Subject: [PATCH] update picmaxurl to operated and fix getinfobyid
---
EsClient.go | 15 ++++++++++++---
EsApi.go | 6 +++---
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 7777b80..b216b6c 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -60,7 +60,7 @@
}]
}
},
- "_source":["faceFeature"]
+ "_source":["targetInfo.feature"]
}
`
buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search", []byte(jsonDSL))
@@ -72,8 +72,8 @@
if err != nil {
return "", err
}
- faceFeature := sources[0]["faceFeature"].(string)
- return faceFeature, nil
+ feature := sources[0]["targetInfo"].([]interface{})[0].(map[string]interface{})["feature"].(string)
+ return feature, nil
}
//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
diff --git a/EsClient.go b/EsClient.go
index de3b5af..7ea8c54 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -68,7 +68,7 @@
if source["targetInfo"] != nil {
for _, v := range source["targetInfo"].([]interface{}) {
m := v.(map[string]interface{})
- tmpinfo.FaceFeature,ok = m["feature"].(string)
+ tmpinfo.FaceFeature, ok = m["feature"].(string)
if !ok {
continue
}
@@ -108,7 +108,12 @@
tmpinfo.TaskId, ok = source["taskId"].(string)
tmpinfo.TaskName, ok = source["taskName"].(string)
tmpinfo.SdkName, ok = source["sdkName"].(string)
- tmpinfo.PicMaxUrl, ok = source["picMaxUrl"].(string)
+
+ if source["picMaxUrl"] != nil {
+ for _,v := range source["picMaxUrl"].([]interface{}) {
+ tmpinfo.PicMaxUrl = append(tmpinfo.PicMaxUrl, v.(string))
+ }
+ }
tmpinfo.VideoUrl, ok = source["videoUrl"].(string)
tmpinfo.PicDate, ok = source["picDate"].(string)
if source["targetInfo"] != nil {
@@ -202,7 +207,11 @@
lti.TaskId, ok = lm["taskId"].(string)
lti.TaskName, ok = lm["taskName"].(string)
lti.SdkName, ok = lm["sdkName"].(string)
- lti.PicMaxUrl, ok = lm["picMaxUrl"].(string)
+ if lm["picMaxUrl"] != nil {
+ for _,v := range lm["picMaxUrl"].([]interface{}) {
+ lti.PicMaxUrl = append(lti.PicMaxUrl, v.(string))
+ }
+ }
lti.VideoUrl, ok = lm["videoUrl"].(string)
lti.PicDate, ok = lm["picDate"].(string)
if lm["targetInfo"] != nil {
--
Gitblit v1.8.0