This commit is contained in:
邹宗楠
2023-12-04 14:08:43 +08:00
parent a1069fa3c1
commit 0b966fd233

View File

@@ -2,6 +2,7 @@ package jdapi
import (
"encoding/json"
"git.rosy.net.cn/jx-callback/globals"
"io/ioutil"
"net/http"
"strings"
@@ -260,21 +261,23 @@ 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)
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("========mapdata1 := %s", utils.Format4Output(mapData, false))
if err := json.Unmarshal(data, &callbackMsg); err != nil {
return nil, nil, Err2CallbackResponse(err, "")
}
mapData = utils.Struct2MapByJson(callbackMsg)
var callbackMsg2 *CallbackMsg
mapData2 := utils.Struct2MapByJson(callbackMsg2)
globals.SugarLogger.Debugf("========mapData2 := %s", utils.Format4Output(mapData2, false))
if err == nil {
callbackMsg.MsgURL = msgURL