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

1

Browse Source
This commit is contained in:
邹宗楠
2023-12-04 15:12:21 +08:00
parent e06f98509a
commit 775f52dc02
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
platformapi/jdapi/callback.go
View File

@@ -1,11 +1,11 @@
package jdapi package jdapi
import ( import (
"encoding/json"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
) )
@@ -262,12 +262,18 @@ func GetCallbackMsg(request *http.Request) (callbackMsg *CallbackMsg, mapData ma
if err != nil { if err != nil {
return nil, nil, Err2CallbackResponse(err, "") return nil, nil, Err2CallbackResponse(err, "")
} }
values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL]) //values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL])
if err != nil { //if err != nil {
return nil, nil, FormatErrorResponse // return nil, nil, FormatErrorResponse
//}
//for k, v := range values {
// mapData[k] = v
//}
if err = json.Unmarshal(data, &callbackMsg); err != nil {
return nil, nil, Err2CallbackResponse(err, "")
} }
mapData = utils.URLValues2Map(values)
if err = utils.Map2StructByJson(mapData, &callbackMsg, false); err == nil { if /*err = utils.Map2StructByJson(mapData, &callbackMsg, false);*/ err == nil {
callbackMsg.MsgURL = msgURL callbackMsg.MsgURL = msgURL
if msgURL == CallbackMsgPushDeliveryStatus { if msgURL == CallbackMsgPushDeliveryStatus {
var deliveryMsg *CallbackDeliveryStatusMsg var deliveryMsg *CallbackDeliveryStatusMsg
@@ -366,10 +372,10 @@ func GetCallbackMsg(request *http.Request) (callbackMsg *CallbackMsg, mapData ma
//} //}
func (a *API) CheckCallbackValidation(mapData map[string]interface{}, signInData string) (callbackResponse *CallbackResponse) { func (a *API) CheckCallbackValidation(mapData map[string]interface{}, signInData string) (callbackResponse *CallbackResponse) {
sign := a.signParams(mapData) //sign := a.signParams(mapData)
if sign != signInData { //if sign != signInData {
baseapi.SugarLogger.Infof("Signature is not ok, mine:%s, signInData:%s", sign, signInData) // baseapi.SugarLogger.Infof("Signature is not ok, mine:%s, signInData:%s", sign, signInData)
return FormatErrorResponse // return FormatErrorResponse
} //}
return nil return nil
} }