From cc962c1b6ffabd9d41e6db0571efbcc1a4568ce7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 29 七月 2019 11:39:56 +0800
Subject: [PATCH] use mangos req instead of deliver,add recv timeout
---
extend/esutil/EsClient.go | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/extend/esutil/EsClient.go b/extend/esutil/EsClient.go
index 20f3fa7..6bd550c 100644
--- a/extend/esutil/EsClient.go
+++ b/extend/esutil/EsClient.go
@@ -9,7 +9,6 @@
"log"
"mime/multipart"
"net/http"
- "strconv"
"strings"
"time"
@@ -46,11 +45,11 @@
for _, value := range dat["hits"].([]interface{}) {
source := value.(map[string]interface{})["_source"].(map[string]interface{})
source["id"] = value.(map[string]interface{})["_id"]
- sdkType := source["sdkType"]
+ /*sdkType := source["sdkType"]
if sdkType != nil {
sdk, _ := strconv.Atoi(sdkType.(string))
source["sdkType"] = sdkTypeToValue(sdk)
- }
+ }*/
sources = append(sources, source)
}
data["datalist"] = sources
@@ -62,10 +61,10 @@
}
//sdk绫诲瀷
-func sdkTypeToValue(i int) string {
+/*func sdkTypeToValue(i int) string {
value := []string{"浜鸿劯", "杞﹁締", "浜轰綋", "鍏ヤ镜", "鎷ユ尋", "闈犲彸琛�", "浜哄憳寮傚父", "涓綋闈欐"}
return value[i-1]
-}
+}*/
func PutEsDataReq(url string, parama string) (map[string]interface{}, error) {
//fmt.Println("es 鏌ヨ璇锋眰璺緞" + url) // 閰嶇疆淇℃伅 鑾峰彇
@@ -99,7 +98,7 @@
return dat, nil
}
-func PostFormData(uri string, filename, paramName string, file multipart.File) (maps map[string]interface{}, err0 error) {
+func PostFormData(uri string, filename, paramName string, fileBytes []byte) (maps map[string]interface{}, err0 error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err := writer.CreateFormFile(paramName, filename)
@@ -107,11 +106,11 @@
return nil, err
}
boundary := writer.Boundary()
- //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
+ fmt.Println("PostFormData.fileLen:",len(fileBytes))
+ file := bytes.NewBuffer(fileBytes)
request_reader := io.MultiReader(body, file, close_buf)
- //_, err = io.Copy(part, file)
- //writer.WriteField(key, val)
+
request, err := http.NewRequest("POST", uri, request_reader)
request.Header.Add("Content-Type", writer.FormDataContentType())
timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
--
Gitblit v1.8.0