msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

test

Browse Source
pull/1499/head
AndrewZuo01 2 years ago
parent 617534c1f8
commit 5998ac8c1e
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
deployments/templates/openim.yaml
Unescape View File

@ -312,7 +312,7 @@ iosPush:
# Timeout in seconds # Timeout in seconds
# Whether to continue execution if callback fails # Whether to continue execution if callback fails
callback: callback:
url: "http://125.124.195.201:18889/sdkName/callbackBeforeSetGroupInfoCommand" url: "http://14.29.168.56:18889/sdkName/callbackBeforeSetGroupInfoCommand"
beforeSendSingleMsg: beforeSendSingleMsg:
enable: false enable: false
timeout: 5 timeout: 5

10
internal/rpc/friend/callback.go
Unescape View File

@ -22,8 +22,6 @@ import (
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"
pbfriend "github.com/OpenIMSDK/protocol/friend" pbfriend "github.com/OpenIMSDK/protocol/friend"
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/mcontext"
cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" 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/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/http" "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, FromUserID: req.FromUserID,
ToUserID: req.ToUserID, ToUserID: req.ToUserID,
ReqMsg: req.ReqMsg, ReqMsg: req.ReqMsg,
OperationID: mcontext.GetOperationID(ctx), EventTime: time.Now().Unix(),
} }
resp := &cbapi.CallbackBeforeAddFriendResp{} resp := &cbapi.CallbackBeforeAddFriendResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriend); err != nil { 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, CallbackCommand: cbapi.CallbackBeforeAddBlackCommand,
OwnerUserID: req.OwnerUserID, OwnerUserID: req.OwnerUserID,
BlackUserID: req.BlackUserID, BlackUserID: req.BlackUserID,
OperationID: mcontext.GetOperationID(ctx), EventTime: time.Now().Unix(),
} }
resp := &cbapi.CallbackBeforeAddBlackResp{} resp := &cbapi.CallbackBeforeAddBlackResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddBlack); err != nil { 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, FromUserID: req.FromUserID,
ToUserID: req.ToUserID, ToUserID: req.ToUserID,
ReqMsg: req.ReqMsg, ReqMsg: req.ReqMsg,
OperationID: mcontext.GetOperationID(ctx), EventTime: time.Now().Unix(),
} }
resp := &cbapi.CallbackAfterAddFriendResp{} resp := &cbapi.CallbackAfterAddFriendResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterAddFriend); err != nil { 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, ToUserID: req.ToUserID,
HandleMsg: req.HandleMsg, HandleMsg: req.HandleMsg,
HandleResult: req.HandleResult, HandleResult: req.HandleResult,
OperationID: mcontext.GetOperationID(ctx), EventTime: time.Now().Unix(),
} }
resp := &cbapi.CallbackBeforeAddFriendAgreeResp{} resp := &cbapi.CallbackBeforeAddFriendAgreeResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriendAgree); err != nil { if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriendAgree); err != nil {

4
internal/rpc/group/callback.go
Unescape View File

@ -16,7 +16,6 @@ package group
import ( import (
"context" "context"
"github.com/OpenIMSDK/tools/log"
"time" "time"
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"
@ -240,6 +239,7 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
OperationID: mcontext.GetOperationID(ctx), OperationID: mcontext.GetOperationID(ctx),
GroupID: req.GroupInfoForSet.GroupID, GroupID: req.GroupInfoForSet.GroupID,
GroupName: req.GroupInfoForSet.GroupName, GroupName: req.GroupInfoForSet.GroupName,
EventTime: time.Now().Unix(),
} }
if req.GroupInfoForSet.Ex != nil { if req.GroupInfoForSet.Ex != nil {
@ -254,7 +254,6 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
if req.GroupInfoForSet.ApplyMemberFriend != nil { if req.GroupInfoForSet.ApplyMemberFriend != nil {
callbackReq.ApplyMemberFriend = &req.GroupInfoForSet.ApplyMemberFriend.Value callbackReq.ApplyMemberFriend = &req.GroupInfoForSet.ApplyMemberFriend.Value
} }
defer log.ZDebug(ctx, "CallbackBeforeSetGroupInfo2", "ex", callbackReq.Ex)
resp := &callbackstruct.CallbackBeforeSetGroupInfoResp{} resp := &callbackstruct.CallbackBeforeSetGroupInfoResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackBeforeSetGroupInfo); err != nil { 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), OperationID: mcontext.GetOperationID(ctx),
GroupID: req.GroupInfoForSet.GroupID, GroupID: req.GroupInfoForSet.GroupID,
GroupName: req.GroupInfoForSet.GroupName, GroupName: req.GroupInfoForSet.GroupName,
EventTime: time.Now().Unix(),
} }
if req.GroupInfoForSet.Ex != nil { if req.GroupInfoForSet.Ex != nil {
callbackReq.Ex = &req.GroupInfoForSet.Ex.Value callbackReq.Ex = &req.GroupInfoForSet.Ex.Value

2
internal/rpc/msg/callback.go
Unescape View File

@ -18,6 +18,7 @@ import (
"context" "context"
"github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/sdkws"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"time"
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"
pbchat "github.com/OpenIMSDK/protocol/msg" pbchat "github.com/OpenIMSDK/protocol/msg"
@ -187,6 +188,7 @@ func CallbackAfterRevokeMsg(ctx context.Context, req *pbchat.RevokeMsgReq) error
ConversationID: req.ConversationID, ConversationID: req.ConversationID,
Seq: req.Seq, Seq: req.Seq,
UserID: req.UserID, UserID: req.UserID,
EventTime: time.Now().Unix(),
} }
resp := &cbapi.CallbackAfterSendGroupMsgResp{} resp := &cbapi.CallbackAfterSendGroupMsgResp{}
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterSetGroupInfo); err != nil { if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterSetGroupInfo); err != nil {

8
pkg/callbackstruct/friend.go
Unescape View File

@ -19,7 +19,7 @@ type CallbackBeforeAddFriendReq struct {
FromUserID string `json:"fromUserID" ` FromUserID string `json:"fromUserID" `
ToUserID string `json:"toUserID"` ToUserID string `json:"toUserID"`
ReqMsg string `json:"reqMsg"` ReqMsg string `json:"reqMsg"`
OperationID string `json:"operationID"` EventTime int64 `json:"eventTime"`
} }
type CallbackBeforeAddFriendResp struct { type CallbackBeforeAddFriendResp struct {
@ -30,7 +30,7 @@ type CallbackAfterAddFriendReq struct {
FromUserID string `json:"fromUserID" ` FromUserID string `json:"fromUserID" `
ToUserID string `json:"toUserID"` ToUserID string `json:"toUserID"`
ReqMsg string `json:"reqMsg"` ReqMsg string `json:"reqMsg"`
OperationID string `json:"operationID"` EventTime int64 `json:"eventTime"`
} }
type CallbackAfterAddFriendResp struct { type CallbackAfterAddFriendResp struct {
@ -40,7 +40,7 @@ type CallbackBeforeAddBlackReq struct {
CallbackCommand `json:"callbackCommand"` CallbackCommand `json:"callbackCommand"`
OwnerUserID string `json:"ownerUserID" ` OwnerUserID string `json:"ownerUserID" `
BlackUserID string `json:"blackUserID"` BlackUserID string `json:"blackUserID"`
OperationID string `json:"operationID"` EventTime int64 `json:"eventTime"`
} }
type CallbackBeforeAddBlackResp struct { type CallbackBeforeAddBlackResp struct {
@ -53,7 +53,7 @@ type CallbackBeforeAddFriendAgreeReq struct {
ToUserID string `json:"blackUserID"` ToUserID string `json:"blackUserID"`
HandleResult int32 `json:"HandleResult"'` HandleResult int32 `json:"HandleResult"'`
HandleMsg string `json:"HandleMsg"'` HandleMsg string `json:"HandleMsg"'`
OperationID string `json:"operationID"` EventTime int64 `json:"eventTime"`
} }
type CallbackBeforeAddFriendAgreeResp struct { type CallbackBeforeAddFriendAgreeResp struct {

2
pkg/callbackstruct/group.go
Unescape View File

@ -125,6 +125,7 @@ type CallbackBeforeSetGroupInfoReq struct {
NeedVerification *int32 `json:"needVerification"` NeedVerification *int32 `json:"needVerification"`
LookMemberInfo *int32 `json:"lookMemberInfo"` LookMemberInfo *int32 `json:"lookMemberInfo"`
ApplyMemberFriend *int32 `json:"applyMemberFriend"` ApplyMemberFriend *int32 `json:"applyMemberFriend"`
EventTime int64 `json:"eventTime"`
} }
type CallbackBeforeSetGroupInfoResp struct { type CallbackBeforeSetGroupInfoResp struct {
@ -152,6 +153,7 @@ type CallbackAfterSetGroupInfoReq struct {
NeedVerification *int32 `json:"needVerification"` NeedVerification *int32 `json:"needVerification"`
LookMemberInfo *int32 `json:"lookMemberInfo"` LookMemberInfo *int32 `json:"lookMemberInfo"`
ApplyMemberFriend *int32 `json:"applyMemberFriend"` ApplyMemberFriend *int32 `json:"applyMemberFriend"`
EventTime int64 `json:"eventTime"`
} }
type CallbackAfterSetGroupInfoResp struct { type CallbackAfterSetGroupInfoResp struct {

1
pkg/callbackstruct/revoke.go
Unescape View File

@ -5,6 +5,7 @@ type CallbackAfterRevokeMsgReq struct {
ConversationID string `json:"conversationID"` ConversationID string `json:"conversationID"`
Seq int64 `json:"seq"` Seq int64 `json:"seq"`
UserID string `json:"userID"` UserID string `json:"userID"`
EventTime int64 `json:"eventTime"`
} }
type CallbackAfterRevokeMsgResp struct { type CallbackAfterRevokeMsgResp struct {
CommonCallbackResp CommonCallbackResp

Write Preview
Loading…
Cancel
Save