From e785279db8bbc1faf52620b5de420170d9ede792 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Jan 2024 09:52:44 +0800 Subject: [PATCH 1/3] 1 --- business/partner/purchase/mtwm/callback.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 022c99183..1f86c1e7d 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -5,6 +5,8 @@ import ( "net/http" "strings" + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/partner/im" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" @@ -122,6 +124,8 @@ func GetMsgCallBackUrl(msgType, appId string) string { // OnImMsg im消息回调 func OnImMsg(msg *mtwmapi.ImCallbackMsg) (response *mtwmapi.CallbackResponse) { + globals.SugarLogger.Debugf("mtmtmt msg=%s", utils.Format4Output(msg, false)) + if str, err := json.Marshal(msg.PushContent); err == nil { err = im.ReadMsgFromVendor(model.VendorIDMTWM, "", str) if err != nil { From 990f74a5b98e1261b9f8dd4f73e75c3f8ae31c13 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Jan 2024 10:11:21 +0800 Subject: [PATCH 2/3] 1 --- business/partner/im/im.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 228c1adfc..0acfd5876 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -199,9 +199,12 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error { if vendorID == VendorIDMT { var PushContentReq = mtwmapi.PushContentReq{} err = json.Unmarshal(msg, &PushContentReq) - if FilterIm(PushContentReq.AppID, PushContentReq.MsgContent) { //自动回复消息过滤 - return nil + if len(PushContentReq.MsgContent) != 0 || PushContentReq.MsgContent != "" { + if FilterIm(PushContentReq.AppID, PushContentReq.MsgContent) { //自动回复消息过滤 + return nil + } } + jxMsg = &JXMsg{ SendType: SendTypeMt, MsgContent: PushContentReq, From 9bce704776853109db34771aeed351717c4e6f4a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Jan 2024 10:17:15 +0800 Subject: [PATCH 3/3] 1 --- business/partner/purchase/mtwm/callback.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 1f86c1e7d..22872f8f4 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -5,8 +5,6 @@ import ( "net/http" "strings" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/partner/im" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" @@ -124,7 +122,6 @@ func GetMsgCallBackUrl(msgType, appId string) string { // OnImMsg im消息回调 func OnImMsg(msg *mtwmapi.ImCallbackMsg) (response *mtwmapi.CallbackResponse) { - globals.SugarLogger.Debugf("mtmtmt msg=%s", utils.Format4Output(msg, false)) if str, err := json.Marshal(msg.PushContent); err == nil { err = im.ReadMsgFromVendor(model.VendorIDMTWM, "", str)