From 5998ac8c1e7fc20d3a43d118fb5506d3f55c3483 Mon Sep 17 00:00:00 2001 From: AndrewZuo01 Date: Thu, 23 Nov 2023 14:31:43 +0800 Subject: [PATCH] test --- deployments/templates/openim.yaml | 2 +- internal/rpc/friend/callback.go | 10 ++++------ internal/rpc/group/callback.go | 4 ++-- internal/rpc/msg/callback.go | 2 ++ pkg/callbackstruct/friend.go | 8 ++++---- pkg/callbackstruct/group.go | 2 ++ pkg/callbackstruct/revoke.go | 1 + 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index f076943d8..1270b5138 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://125.124.195.201:18889/sdkName/callbackBeforeSetGroupInfoCommand" + url: "http://14.29.168.56:18889/sdkName/callbackBeforeSetGroupInfoCommand" beforeSendSingleMsg: enable: false timeout: 5 diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index ed3b8f459..9358024fa 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -22,8 +22,6 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mcontext" - cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" @@ -38,7 +36,7 @@ func CallbackBeforeAddFriend(ctx context.Context, req *pbfriend.ApplyToAddFriend FromUserID: req.FromUserID, ToUserID: req.ToUserID, ReqMsg: req.ReqMsg, - OperationID: mcontext.GetOperationID(ctx), + EventTime: time.Now().Unix(), } resp := &cbapi.CallbackBeforeAddFriendResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriend); err != nil { @@ -57,7 +55,7 @@ func CallbackBeforeAddBlack(ctx context.Context, req *pbfriend.AddBlackReq) erro CallbackCommand: cbapi.CallbackBeforeAddBlackCommand, OwnerUserID: req.OwnerUserID, BlackUserID: req.BlackUserID, - OperationID: mcontext.GetOperationID(ctx), + EventTime: time.Now().Unix(), } resp := &cbapi.CallbackBeforeAddBlackResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddBlack); err != nil { @@ -78,7 +76,7 @@ func CallbackAfterAddFriend(ctx context.Context, req *pbfriend.ApplyToAddFriendR FromUserID: req.FromUserID, ToUserID: req.ToUserID, ReqMsg: req.ReqMsg, - OperationID: mcontext.GetOperationID(ctx), + EventTime: time.Now().Unix(), } resp := &cbapi.CallbackAfterAddFriendResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterAddFriend); err != nil { @@ -100,7 +98,7 @@ func CallbackBeforeAddFriendAgree(ctx context.Context, req *pbfriend.RespondFrie ToUserID: req.ToUserID, HandleMsg: req.HandleMsg, HandleResult: req.HandleResult, - OperationID: mcontext.GetOperationID(ctx), + EventTime: time.Now().Unix(), } resp := &cbapi.CallbackBeforeAddFriendAgreeResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriendAgree); err != nil { diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 8ed35cd66..f2646de79 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,7 +16,6 @@ package group import ( "context" - "github.com/OpenIMSDK/tools/log" "time" "github.com/OpenIMSDK/protocol/constant" @@ -240,6 +239,7 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) OperationID: mcontext.GetOperationID(ctx), GroupID: req.GroupInfoForSet.GroupID, GroupName: req.GroupInfoForSet.GroupName, + EventTime: time.Now().Unix(), } if req.GroupInfoForSet.Ex != nil { @@ -254,7 +254,6 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) if req.GroupInfoForSet.ApplyMemberFriend != nil { callbackReq.ApplyMemberFriend = &req.GroupInfoForSet.ApplyMemberFriend.Value } - defer log.ZDebug(ctx, "CallbackBeforeSetGroupInfo2", "ex", callbackReq.Ex) resp := &callbackstruct.CallbackBeforeSetGroupInfoResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackBeforeSetGroupInfo); err != nil { @@ -288,6 +287,7 @@ func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) OperationID: mcontext.GetOperationID(ctx), GroupID: req.GroupInfoForSet.GroupID, GroupName: req.GroupInfoForSet.GroupName, + EventTime: time.Now().Unix(), } if req.GroupInfoForSet.Ex != nil { callbackReq.Ex = &req.GroupInfoForSet.Ex.Value diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index 427f19ab3..498170a07 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -18,6 +18,7 @@ import ( "context" "github.com/OpenIMSDK/protocol/sdkws" "google.golang.org/protobuf/proto" + "time" "github.com/OpenIMSDK/protocol/constant" pbchat "github.com/OpenIMSDK/protocol/msg" @@ -187,6 +188,7 @@ func CallbackAfterRevokeMsg(ctx context.Context, req *pbchat.RevokeMsgReq) error ConversationID: req.ConversationID, Seq: req.Seq, UserID: req.UserID, + EventTime: time.Now().Unix(), } resp := &cbapi.CallbackAfterSendGroupMsgResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterSetGroupInfo); err != nil { diff --git a/pkg/callbackstruct/friend.go b/pkg/callbackstruct/friend.go index 34e8047e1..889d05fe3 100644 --- a/pkg/callbackstruct/friend.go +++ b/pkg/callbackstruct/friend.go @@ -19,7 +19,7 @@ type CallbackBeforeAddFriendReq struct { FromUserID string `json:"fromUserID" ` ToUserID string `json:"toUserID"` ReqMsg string `json:"reqMsg"` - OperationID string `json:"operationID"` + EventTime int64 `json:"eventTime"` } type CallbackBeforeAddFriendResp struct { @@ -30,7 +30,7 @@ type CallbackAfterAddFriendReq struct { FromUserID string `json:"fromUserID" ` ToUserID string `json:"toUserID"` ReqMsg string `json:"reqMsg"` - OperationID string `json:"operationID"` + EventTime int64 `json:"eventTime"` } type CallbackAfterAddFriendResp struct { @@ -40,7 +40,7 @@ type CallbackBeforeAddBlackReq struct { CallbackCommand `json:"callbackCommand"` OwnerUserID string `json:"ownerUserID" ` BlackUserID string `json:"blackUserID"` - OperationID string `json:"operationID"` + EventTime int64 `json:"eventTime"` } type CallbackBeforeAddBlackResp struct { @@ -53,7 +53,7 @@ type CallbackBeforeAddFriendAgreeReq struct { ToUserID string `json:"blackUserID"` HandleResult int32 `json:"HandleResult"'` HandleMsg string `json:"HandleMsg"'` - OperationID string `json:"operationID"` + EventTime int64 `json:"eventTime"` } type CallbackBeforeAddFriendAgreeResp struct { diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 659bda56e..32f1207a3 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -125,6 +125,7 @@ type CallbackBeforeSetGroupInfoReq struct { NeedVerification *int32 `json:"needVerification"` LookMemberInfo *int32 `json:"lookMemberInfo"` ApplyMemberFriend *int32 `json:"applyMemberFriend"` + EventTime int64 `json:"eventTime"` } type CallbackBeforeSetGroupInfoResp struct { @@ -152,6 +153,7 @@ type CallbackAfterSetGroupInfoReq struct { NeedVerification *int32 `json:"needVerification"` LookMemberInfo *int32 `json:"lookMemberInfo"` ApplyMemberFriend *int32 `json:"applyMemberFriend"` + EventTime int64 `json:"eventTime"` } type CallbackAfterSetGroupInfoResp struct { diff --git a/pkg/callbackstruct/revoke.go b/pkg/callbackstruct/revoke.go index 364c0162b..da7ed4800 100644 --- a/pkg/callbackstruct/revoke.go +++ b/pkg/callbackstruct/revoke.go @@ -5,6 +5,7 @@ type CallbackAfterRevokeMsgReq struct { ConversationID string `json:"conversationID"` Seq int64 `json:"seq"` UserID string `json:"userID"` + EventTime int64 `json:"eventTime"` } type CallbackAfterRevokeMsgResp struct { CommonCallbackResp