liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- business msg added to error

Browse Source
This commit is contained in:
gazebo
2018-06-20 07:34:11 +08:00
parent 6fc94315f4
commit 7785ef6485
5 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/elmapi/callback.go
View File

@@ -49,6 +49,7 @@ func (e *ELMAPI) unmarshalData(data []byte, msg interface{}) (callbackResponse *
func (e *ELMAPI) CheckRequestValidation(mapData map[string]interface{}) (callbackResponse *ELMCallbackResponse) { func (e *ELMAPI) CheckRequestValidation(mapData map[string]interface{}) (callbackResponse *ELMCallbackResponse) {
sign := e.signParamsMap(mapData, "") sign := e.signParamsMap(mapData, "")
if sign != mapData[signKey].(string) { if sign != mapData[signKey].(string) {
e.sugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, mapData[signKey].(string))
return &ELMCallbackResponse{Message: "signature is invalid"} return &ELMCallbackResponse{Message: "signature is invalid"}
} }
return nil return nil

2
platform/elmapi/elmapi.go
View File

@@ -153,7 +153,7 @@ func (e *ELMAPI) AccessELM(action string, params map[string]interface{}) (retVal
} else if errCode == "SERVER_ERROR" || errCode == "BIZ_SYSTEM_ERROR" || errCode == "BIZ_1006" || errCode == "BUSINESS_ERROR" { } else if errCode == "SERVER_ERROR" || errCode == "BIZ_SYSTEM_ERROR" || errCode == "BIZ_1006" || errCode == "BUSINESS_ERROR" {
return common.PAErrorLevelRecoverable, nil return common.PAErrorLevelRecoverable, nil
} else { } else {
return errCode, nil return common.PAErrorLevelGeneralFail, utils.NewErrorCode(errinfoMap["message"].(string), errCode)
} }
}) })

1
platform/jdapi/callback.go
View File

@@ -66,6 +66,7 @@ func (j *JDAPI) CheckRequestValidation(request *http.Request) (callbackResponse
sign := j.signParams(mapData) sign := j.signParams(mapData)
if sign != request.FormValue(signKey) { if sign != request.FormValue(signKey) {
j.sugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey))
return &JDCallbackResponse{ return &JDCallbackResponse{
Code: JDerrorCodeInvalidSign, Code: JDerrorCodeInvalidSign,
Msg: "signature is invalid", Msg: "signature is invalid",

2
platform/jdapi/jdapi.go
View File

@@ -190,7 +190,7 @@ func (j *JDAPI) AccessJDQuery(apiStr string, jdParams map[string]string) (retVal
} else if _, ok := canRetryCodes[code]; ok { } else if _, ok := canRetryCodes[code]; ok {
return common.PAErrorLevelRecoverable, nil return common.PAErrorLevelRecoverable, nil
} else { } else {
return code, nil return common.PAErrorLevelGeneralFail, utils.NewErrorCode(jsonResult1["msg"].(string), code)
} }
}) })

2
platform/mtpsapi/callback.go
View File

@@ -42,10 +42,12 @@ func (m *MTPSAPI) CheckRequestValidation(request *http.Request) (callbackRespons
request.ParseForm() request.ParseForm()
sign := m.signParams(request.PostForm) sign := m.signParams(request.PostForm)
if sign != request.FormValue(signKey) { if sign != request.FormValue(signKey) {
m.sugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey))
return SignatureIsNotOk return SignatureIsNotOk
} }
for _, valueKey := range []string{"delivery_id", "mt_peisong_id", "order_id"} { for _, valueKey := range []string{"delivery_id", "mt_peisong_id", "order_id"} {
m.sugarLogger.Errorf("Missing mandatory param:%v", valueKey)
if request.FormValue(valueKey) == "" { if request.FormValue(valueKey) == "" {
return &MtpsCallbackResponse{ return &MtpsCallbackResponse{
Code: -1, Code: -1,