From a1069fa3c1f3c4276d6a69d23fe8e3484ed8c89d 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:00:13 +0800 Subject: [PATCH] 1 --- platformapi/jdapi/callback.go | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go index 45850919..0c0be4f7 100644 --- a/platformapi/jdapi/callback.go +++ b/platformapi/jdapi/callback.go @@ -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 {