Browse Source

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

csx 3 years ago
parent
commit
467f69aa9f
2 changed files with 7 additions and 5 deletions
  1. 1 1
      service/jsyb_service.go
  2. 6 4
      utils/csbhttp/httpcaller.go

+ 1 - 1
service/jsyb_service.go View File

@@ -92,7 +92,7 @@ func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte
92 92
 	//打印请求参数信息
93 93
 	csbHP.Print()
94 94
 	//进行调用, 返回的第二项为resonse http headers (map[string][]string类型)
95
-	res, _, err := csbhttp.Invoke(*csbHP)
95
+	res, _, err := csbhttp.Invoke(*csbHP, requestByte)
96 96
 	//是否发成错误
97 97
 	if err != nil {
98 98
 		fmt.Println(err)

+ 6 - 4
utils/csbhttp/httpcaller.go View File

@@ -164,11 +164,9 @@ func signParams(params map[string]string, api string, version string, ak string,
164 164
 当处理正常时,异常为nil
165 165
 
166 166
 */
167
-func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
167
+func Invoke(params HttpParams, bytesData []byte) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
168 168
 	//init rtnHeaders
169 169
 	rtnHeaders = make(map[string][]string)
170
-	fmt.Println("~~~~~~")
171
-	fmt.Println(params)
172 170
 
173 171
 	hcError = params.Validate()
174 172
 	if hcError != nil {
@@ -239,8 +237,12 @@ func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcEr
239 237
 
240 238
 	fmt.Println("打印开始1")
241 239
 	fmt.Println(reqStr)
240
+	fmt.Println(method)
241
+	fmt.Println(reqUrl)
242
+	fmt.Println(bytesData)
243
+	fmt.Println(string(bytesData))
242 244
 
243
-	req, err := http.NewRequest(method, reqUrl, bytes.NewReader([]byte(reqStr)))
245
+	req, err := http.NewRequest(method, reqUrl, bytes.NewReader(bytesData))
244 246
 
245 247
 	fmt.Println("打印开始2")
246 248
 	fmt.Println(req)