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

- ebaiapi.GetCmd

Browse Source
This commit is contained in:
gazebo
2019-04-25 12:33:27 +08:00
parent fcfbfa2178
commit 3a8bf100bc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platformapi/ebaiapi/callback.go
View File

@@ -90,7 +90,7 @@ func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *
if sign != request.FormValue(signKey) {
msg := fmt.Sprintf("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey))
baseapi.SugarLogger.Info(msg)
return a.Err2CallbackResponse(request.FormValue("cmd"), errors.New(msg), nil)
return a.Err2CallbackResponse(GetCmd(request), errors.New(msg), nil)
}
return nil
}
@@ -102,12 +102,16 @@ func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackR
return nil, callbackResponse
}
msg = new(CallbackMsg)
if callbackResponse = a.unmarshalData(request.FormValue("cmd"), []byte(request.FormValue("body")), &msg.Body); callbackResponse != nil {
if callbackResponse = a.unmarshalData(GetCmd(request), []byte(request.FormValue("body")), &msg.Body); callbackResponse != nil {
return nil, callbackResponse
}
msg.Cmd = request.FormValue("cmd")
msg.Cmd = GetCmd(request)
msg.Timestamp = utils.Str2Int64(utils.Interface2String(request.FormValue("timestamp")))
return msg, nil
}
return nil, a.Err2CallbackResponse("", err, nil)
}
func GetCmd(request *http.Request) string {
return request.FormValue("cmd")
}