- basic elm api added.

This commit is contained in:
gazebo
2018-06-13 17:10:41 +08:00
parent 47ecf4263d
commit 5f6865666a
4 changed files with 258 additions and 16 deletions

View File

@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"net/url"
@@ -57,11 +56,9 @@ const (
)
var (
ErrJdParam = errors.New("can not marshal jd param")
ErrSystemErrMaxRetry = errors.New("JD System error reach max retry count!")
ErrLimitReachMaxRetry = errors.New("JD Reach max retry count!")
ErrHttpCode = errors.New("JD HTTP Code is not 200")
ErrFormatWrong = errors.New("JD Result format is strange!")
ErrJDCode = errors.New("JD code is not 0")
ErrInnerCodeIsNotOk = errors.New("JD result inner code is not ok")
@@ -146,12 +143,11 @@ func (j *JDAPI) AccessJDQuery(apiStr string, jdParams map[string]string) (map[st
jdParams = make(map[string]string, 0)
}
jdParamStr, err := json.Marshal(jdParams)
if err == nil {
params["jd_param_json"] = string(jdParamStr)
} else {
return nil, ErrJdParam
if err != nil {
j.sugarLogger.Errorf("Error when marshal %v, error:%v", jdParams, err)
return nil, err
}
params["jd_param_json"] = string(jdParamStr)
params["timestamp"] = utils.GetCurTimeStr()
sign := signParams(params)
params["sign"] = sign
@@ -184,16 +180,10 @@ func (j *JDAPI) AccessJDQuery(apiStr string, jdParams map[string]string) (map[st
return nil, ErrHttpCode
}
var jsonResult map[string]interface{}
bodyData, err := ioutil.ReadAll(response.Body)
if err != nil {
j.sugarLogger.Debugf("ioutil.ReadAll return:%v", err)
return nil, err
}
jsonResult, err := utils.HttpResponse2Json(response)
err = utils.UnmarshalUseNumber(bodyData, &jsonResult)
if err != nil {
j.sugarLogger.Debugf("json.Unmarshal return:%v", err)
j.sugarLogger.Warnf("HttpResponse2Json return:%v", err)
return nil, err
}