From 0b966fd233406bda25c6ff968a98a7590e74efa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 4 Dec 2023 14:08:43 +0800 Subject: [PATCH] 1 --- platformapi/jdapi/callback.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go index 0c0be4f7..b7326a0a 100644 --- a/platformapi/jdapi/callback.go +++ b/platformapi/jdapi/callback.go @@ -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