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 14:00:13 +08:00
parent 5eb7b78da2
commit a1069fa3c1
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platformapi/jdapi/callback.go
View File

@@ -1,7 +1,7 @@
package jdapi
import (
"git.rosy.net.cn/jx-callback/globals"
"encoding/json"
"io/ioutil"
"net/http"
"strings"
@@ -260,24 +260,22 @@ func getMsgURLFromRequest(request *http.Request) (msgURL string) {
func GetCallbackMsg(request *http.Request) (callbackMsg *CallbackMsg, mapData map[string]interface{}, callbackResponse *CallbackResponse) {
msgURL := getMsgURLFromRequest(request)
data, err := ioutil.ReadAll(request.Body)
if err != nil {
return nil, nil, Err2CallbackResponse(err, "")
}
values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL])
if err != nil {
return nil, nil, FormatErrorResponse
}
mapData = utils.URLValues2Map(values)
err = utils.Map2StructByJson(mapData, &callbackMsg, false)
globals.SugarLogger.Debugf("===========data := %s", string(data))
globals.SugarLogger.Debugf("===========msgURL := %s", msgURL)
globals.SugarLogger.Debugf("===========mapData := %s", utils.Format4Output(mapData, false))
globals.SugarLogger.Debugf("===========values := %s", utils.Format4Output(values, false))
//if err := json.Unmarshal(data, &callbackMsg); err != nil {
//if err != nil {
// return nil, nil, Err2CallbackResponse(err, "")
//}
//values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL])
//if err != nil {
// return nil, nil, FormatErrorResponse
//}
//mapData = utils.URLValues2Map(values)
//err = utils.Map2StructByJson(mapData, &callbackMsg, false)
if err := json.Unmarshal(data, &callbackMsg); err != nil {
return nil, nil, Err2CallbackResponse(err, "")
}
mapData = utils.Struct2MapByJson(callbackMsg)
if err == nil {
callbackMsg.MsgURL = msgURL
if msgURL == CallbackMsgPushDeliveryStatus {