diff --git a/platform/elmapi/callback.go b/platform/elmapi/callback.go index 41c0ee43..10f70769 100644 --- a/platform/elmapi/callback.go +++ b/platform/elmapi/callback.go @@ -49,6 +49,7 @@ func (e *ELMAPI) unmarshalData(data []byte, msg interface{}) (callbackResponse * func (e *ELMAPI) CheckRequestValidation(mapData map[string]interface{}) (callbackResponse *ELMCallbackResponse) { sign := e.signParamsMap(mapData, "") 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 nil diff --git a/platform/elmapi/elmapi.go b/platform/elmapi/elmapi.go index ce370425..289ef5da 100644 --- a/platform/elmapi/elmapi.go +++ b/platform/elmapi/elmapi.go @@ -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" { return common.PAErrorLevelRecoverable, nil } else { - return errCode, nil + return common.PAErrorLevelGeneralFail, utils.NewErrorCode(errinfoMap["message"].(string), errCode) } }) diff --git a/platform/jdapi/callback.go b/platform/jdapi/callback.go index 90ac857c..8ca51bdd 100644 --- a/platform/jdapi/callback.go +++ b/platform/jdapi/callback.go @@ -66,6 +66,7 @@ func (j *JDAPI) CheckRequestValidation(request *http.Request) (callbackResponse sign := j.signParams(mapData) if sign != request.FormValue(signKey) { + j.sugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey)) return &JDCallbackResponse{ Code: JDerrorCodeInvalidSign, Msg: "signature is invalid", diff --git a/platform/jdapi/jdapi.go b/platform/jdapi/jdapi.go index 1e27e47d..72659fa4 100644 --- a/platform/jdapi/jdapi.go +++ b/platform/jdapi/jdapi.go @@ -190,7 +190,7 @@ func (j *JDAPI) AccessJDQuery(apiStr string, jdParams map[string]string) (retVal } else if _, ok := canRetryCodes[code]; ok { return common.PAErrorLevelRecoverable, nil } else { - return code, nil + return common.PAErrorLevelGeneralFail, utils.NewErrorCode(jsonResult1["msg"].(string), code) } }) diff --git a/platform/mtpsapi/callback.go b/platform/mtpsapi/callback.go index 0b376289..55cce614 100644 --- a/platform/mtpsapi/callback.go +++ b/platform/mtpsapi/callback.go @@ -42,10 +42,12 @@ func (m *MTPSAPI) CheckRequestValidation(request *http.Request) (callbackRespons request.ParseForm() sign := m.signParams(request.PostForm) if sign != request.FormValue(signKey) { + m.sugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey)) return SignatureIsNotOk } for _, valueKey := range []string{"delivery_id", "mt_peisong_id", "order_id"} { + m.sugarLogger.Errorf("Missing mandatory param:%v", valueKey) if request.FormValue(valueKey) == "" { return &MtpsCallbackResponse{ Code: -1,