From 775f52dc0297806581a504c8aabe28c74540aeed 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 15:12:21 +0800 Subject: [PATCH] 1 --- platformapi/jdapi/callback.go | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go index a454e666..2925ae63 100644 --- a/platformapi/jdapi/callback.go +++ b/platformapi/jdapi/callback.go @@ -1,11 +1,11 @@ package jdapi import ( + "encoding/json" "io/ioutil" "net/http" "strings" - "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" ) @@ -262,12 +262,18 @@ func GetCallbackMsg(request *http.Request) (callbackMsg *CallbackMsg, mapData ma if err != nil { return nil, nil, Err2CallbackResponse(err, "") } - values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL]) - if err != nil { - return nil, nil, FormatErrorResponse + //values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL]) + //if err != nil { + // 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 if msgURL == CallbackMsgPushDeliveryStatus { 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) { - sign := a.signParams(mapData) - if sign != signInData { - baseapi.SugarLogger.Infof("Signature is not ok, mine:%s, signInData:%s", sign, signInData) - return FormatErrorResponse - } + //sign := a.signParams(mapData) + //if sign != signInData { + // baseapi.SugarLogger.Infof("Signature is not ok, mine:%s, signInData:%s", sign, signInData) + // return FormatErrorResponse + //} return nil }