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

service/jsyb_service.go

@@ -126,7 +126,7 @@ func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte
 	csbHP.Print()
 	//进行调用, 返回的第二项为resonse http headers (map[string][]string类型)
 	//res, _, err := csbhttp.Invoke(*csbHP, requestByte)
-	res, _, err := csbhttp.Invoke(*csbHP)
+	res, _, err := csbhttp.Invoke(*csbHP, strconv.FormatInt(timestamp/1000, 10))
 	//是否发成错误
 	if err != nil {
 		fmt.Println(err)

utils/csbhttp/httpcaller.go

@@ -27,7 +27,6 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -126,7 +125,7 @@ func parseUrlParamsMap(reqUrl string) (params map[string]string, err *HttpCaller
 /**
 内部方法: 进行参数的签名处理
 */
-func signParams(params map[string]string, api string, version string, ak string, sk string) (headMaps map[string]string) {
+func signParams(params map[string]string, api string, version string, ak string, sk string, time_stamp string) (headMaps map[string]string) {
 	headMaps = make(map[string]string)
 
 	params[API_NAME_KEY] = api
@@ -136,9 +135,9 @@ func signParams(params map[string]string, api string, version string, ak string,
 	headMaps[VERSION_KEY] = version
 
 	//https://currentmillis.com/  calc current time with varies languages
-	v := time.Now().UnixNano() / 1000000
-	params[TIMESTAMP_KEY] = strconv.FormatInt(v, 10)
-	headMaps[TIMESTAMP_KEY] = strconv.FormatInt(v, 10)
+	//v := time.Now().UnixNano() / 1000000
+	params[TIMESTAMP_KEY] = time_stamp
+	headMaps[TIMESTAMP_KEY] = time_stamp
 
 	if ak != "" {
 		params[ACCESS_KEY] = ak
@@ -164,7 +163,7 @@ func signParams(params map[string]string, api string, version string, ak string,
 当处理正常时,异常为nil
 
 */
-func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
+func Invoke(params HttpParams, time_stamp string) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
 	//init rtnHeaders
 	rtnHeaders = make(map[string][]string)
 
@@ -213,7 +212,7 @@ func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcEr
 
 	reqUrl := params.requestUrl
 
-	defaultContentType := "application/x-www-form-urlencoded"
+	defaultContentType := "application/json;charset=utf-8"
 	if params.ct.jsonBody != "" {
 		json.Marshal(params.ct.jsonBody)
 		//if err == nil {
@@ -244,7 +243,7 @@ func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcEr
 	printDebug("urlparams", urlParams)
 	mergeTwoMaps(urlParams, params.params)
 	printDebug("merged urlparams", urlParams)
-	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk)
+	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk, time_stamp)
 	printDebug("signHeaders", signHeaders)
 
 	req.Header.Add("Content-Type", defaultContentType)