Просмотр исходного кода

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 3 лет назад
Родитель
Сommit
fd5cd461d8
1 измененных файлов: 5 добавлений и 5 удалений
  1. 5 5
      utils/csbhttp/httpcaller.go

+ 5 - 5
utils/csbhttp/httpcaller.go Просмотреть файл

214
 	}
214
 	}
215
 
215
 
216
 	reqUrl := params.requestUrl
216
 	reqUrl := params.requestUrl
217
-	defaultContentType := "application/x-www-form-urlencoded"
217
+	//defaultContentType := "application/x-www-form-urlencoded"
218
 	fmt.Println("打印开始")
218
 	fmt.Println("打印开始")
219
 	fmt.Println(params.ct.jsonBody)
219
 	fmt.Println(params.ct.jsonBody)
220
 	fmt.Println(reqUrl)
220
 	fmt.Println(reqUrl)
227
 		//	return str, rtnHeaders, &HttpCallerException{Message: "failed to bad content type json string", CauseErr: err}
227
 		//	return str, rtnHeaders, &HttpCallerException{Message: "failed to bad content type json string", CauseErr: err}
228
 		//}
228
 		//}
229
 		reqStr = params.ct.jsonBody
229
 		reqStr = params.ct.jsonBody
230
-		defaultContentType = params.ct.contentType
230
+		//defaultContentType = "application/json;charset=UTF-8"
231
 		reqUrl = appendParams(reqUrl, data.Encode())
231
 		reqUrl = appendParams(reqUrl, data.Encode())
232
 	} else if params.ct.bytesBody != nil {
232
 	} else if params.ct.bytesBody != nil {
233
 		reqStr = string(params.ct.bytesBody)
233
 		reqStr = string(params.ct.bytesBody)
234
-		defaultContentType = params.ct.contentType
234
+		//defaultContentType = params.ct.contentType
235
 		reqUrl = appendParams(reqUrl, data.Encode())
235
 		reqUrl = appendParams(reqUrl, data.Encode())
236
 	} else {
236
 	} else {
237
 		reqStr = data.Encode()
237
 		reqStr = data.Encode()
240
 	fmt.Println("打印开始1")
240
 	fmt.Println("打印开始1")
241
 	fmt.Println(reqStr)
241
 	fmt.Println(reqStr)
242
 
242
 
243
-	req, err := http.NewRequest(method, reqUrl, bytes.NewBufferString(reqStr))
243
+	req, err := http.NewRequest(method, reqUrl, bytes.NewReader([]byte(reqStr)))
244
 
244
 
245
 	fmt.Println("打印开始2")
245
 	fmt.Println("打印开始2")
246
 	fmt.Println(req)
246
 	fmt.Println(req)
260
 	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk)
260
 	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk)
261
 	printDebug("signHeaders", signHeaders)
261
 	printDebug("signHeaders", signHeaders)
262
 
262
 
263
-	req.Header.Add("Content-Type", defaultContentType)
263
+	req.Header.Add("Content-Type", "application/json;charset=UTF-8")
264
 	if params.headers != nil {
264
 	if params.headers != nil {
265
 		for k, v := range params.headers {
265
 		for k, v := range params.headers {
266
 			req.Header.Add(k, v)
266
 			req.Header.Add(k, v)