Explorar el Código

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

csx hace 3 años
padre
commit
9e62ecd4b3
Se han modificado 2 ficheros con 8 adiciones y 9 borrados
  1. 1 1
      service/jsyb_service.go
  2. 7 8
      utils/csbhttp/httpcaller.go

+ 1 - 1
service/jsyb_service.go Ver fichero

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

+ 7 - 8
utils/csbhttp/httpcaller.go Ver fichero

27
 	"net"
27
 	"net"
28
 	"net/http"
28
 	"net/http"
29
 	"net/url"
29
 	"net/url"
30
-	"strconv"
31
 	"strings"
30
 	"strings"
32
 	"sync"
31
 	"sync"
33
 	"time"
32
 	"time"
126
 /**
125
 /**
127
 内部方法: 进行参数的签名处理
126
 内部方法: 进行参数的签名处理
128
 */
127
 */
129
-func signParams(params map[string]string, api string, version string, ak string, sk string) (headMaps map[string]string) {
128
+func signParams(params map[string]string, api string, version string, ak string, sk string, time_stamp string) (headMaps map[string]string) {
130
 	headMaps = make(map[string]string)
129
 	headMaps = make(map[string]string)
131
 
130
 
132
 	params[API_NAME_KEY] = api
131
 	params[API_NAME_KEY] = api
136
 	headMaps[VERSION_KEY] = version
135
 	headMaps[VERSION_KEY] = version
137
 
136
 
138
 	//https://currentmillis.com/  calc current time with varies languages
137
 	//https://currentmillis.com/  calc current time with varies languages
139
-	v := time.Now().UnixNano() / 1000000
140
-	params[TIMESTAMP_KEY] = strconv.FormatInt(v, 10)
141
-	headMaps[TIMESTAMP_KEY] = strconv.FormatInt(v, 10)
138
+	//v := time.Now().UnixNano() / 1000000
139
+	params[TIMESTAMP_KEY] = time_stamp
140
+	headMaps[TIMESTAMP_KEY] = time_stamp
142
 
141
 
143
 	if ak != "" {
142
 	if ak != "" {
144
 		params[ACCESS_KEY] = ak
143
 		params[ACCESS_KEY] = ak
164
 当处理正常时,异常为nil
163
 当处理正常时,异常为nil
165
 
164
 
166
 */
165
 */
167
-func Invoke(params HttpParams) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
166
+func Invoke(params HttpParams, time_stamp string) (str string, rtnHeaders map[string][]string, hcError *HttpCallerException) {
168
 	//init rtnHeaders
167
 	//init rtnHeaders
169
 	rtnHeaders = make(map[string][]string)
168
 	rtnHeaders = make(map[string][]string)
170
 
169
 
213
 
212
 
214
 	reqUrl := params.requestUrl
213
 	reqUrl := params.requestUrl
215
 
214
 
216
-	defaultContentType := "application/x-www-form-urlencoded"
215
+	defaultContentType := "application/json;charset=utf-8"
217
 	if params.ct.jsonBody != "" {
216
 	if params.ct.jsonBody != "" {
218
 		json.Marshal(params.ct.jsonBody)
217
 		json.Marshal(params.ct.jsonBody)
219
 		//if err == nil {
218
 		//if err == nil {
244
 	printDebug("urlparams", urlParams)
243
 	printDebug("urlparams", urlParams)
245
 	mergeTwoMaps(urlParams, params.params)
244
 	mergeTwoMaps(urlParams, params.params)
246
 	printDebug("merged urlparams", urlParams)
245
 	printDebug("merged urlparams", urlParams)
247
-	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk)
246
+	signHeaders := signParams(urlParams, params.api, params.version, params.ak, params.sk, time_stamp)
248
 	printDebug("signHeaders", signHeaders)
247
 	printDebug("signHeaders", signHeaders)
249
 
248
 
250
 	req.Header.Add("Content-Type", defaultContentType)
249
 	req.Header.Add("Content-Type", defaultContentType)