blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-05 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
AndrewZuo01 2023-11-22 11:42:00 +08:00
parent f2dea7b833
commit 4e515c0a86
9 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.yaml
View File

@ -368,13 +368,10 @@ callback:
enable: false enable: false
timeout: 5 timeout: 5
failedContinue: true failedContinue: true
##TODO CALLBACK/
beforeInviteUserToGroup: beforeInviteUserToGroup:
enable: true enable: true
timeout: 5 timeout: 5
failedContinue: true failedContinue: true
beforeSetGroupMemberInfo: beforeSetGroupMemberInfo:
enable: false enable: false
timeout: 5 timeout: 5

5
deployments/templates/openim.yaml
View File

@ -392,11 +392,12 @@ callback:
enable: false enable: false
timeout: 5 timeout: 5
failedContinue: true failedContinue: true
##TODO CALLBACK
joinGroupAfter: joinGroupAfter:
enable: false enable: false
timeout: 5 timeout: 5
failedContinue: true failedContinue: true
##TODO CALLBACK TEST
setGroupInfoAfter: setGroupInfoAfter:
enable: false enable: false
timeout: 5 timeout: 5
@ -405,6 +406,8 @@ callback:
enable: true enable: true
timeout: 5 timeout: 5
failedContinue: true failedContinue: true
###################### Prometheus ###################### ###################### Prometheus ######################
# Prometheus configuration for various services # Prometheus configuration for various services
# The number of Prometheus ports per service needs to correspond to rpcPort # The number of Prometheus ports per service needs to correspond to rpcPort

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

@ -278,7 +278,7 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
if resp.ApplyMemberFriend != nil { if resp.ApplyMemberFriend != nil {
req.GroupInfoForSet.ApplyMemberFriend = wrapperspb.Int32(*resp.ApplyMemberFriend) req.GroupInfoForSet.ApplyMemberFriend = wrapperspb.Int32(*resp.ApplyMemberFriend)
} }
utils.StructFieldNotNilReplace(req, resp)
return nil return nil
} }
func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) error { func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) error {
@ -313,7 +313,7 @@ func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
} }
return err return err
} }
utils.StructFieldNotNilReplace(req, resp)
return nil return nil
} }

1
internal/rpc/group/group.go
View File

@ -856,7 +856,6 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
return nil, err return nil, err
} }
s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID) s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
//TODO CALLBACK1
if err = CallbackAfterJoinGroup(ctx, req); err != nil { if err = CallbackAfterJoinGroup(ctx, req); err != nil {
return nil, err return nil, err
} }

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

@ -177,3 +177,5 @@ func callbackMsgModify(ctx context.Context, msg *pbchat.SendMsgReq) error {
log.ZDebug(ctx, "callbackMsgModify", "msg", msg.MsgData) log.ZDebug(ctx, "callbackMsgModify", "msg", msg.MsgData)
return nil return nil
} }
//TODO CALLBACK

4
pkg/callbackstruct/constant.go
View File

@ -1,8 +1,8 @@
package callbackstruct package callbackstruct
const CallbackBeforeInviteJoinGroupCommand = "CallbackBeforeInviteJoinGroupCommand" const CallbackBeforeInviteJoinGroupCommand = "CallbackBeforeInviteJoinGroupCommand"
// TODO CALLBACK
const CallbackAfterJoinGroupCommand = "CallbackAfterJoinGroupCommand" const CallbackAfterJoinGroupCommand = "CallbackAfterJoinGroupCommand"
const CallbackAfterSetGroupInfoCommand = "CallbackAfterSetGroupInfoCommand" const CallbackAfterSetGroupInfoCommand = "CallbackAfterSetGroupInfoCommand"
const CallbackBeforeSetGroupInfoCommand = "CallbackBeforeSetGroupInfoCommand" const CallbackBeforeSetGroupInfoCommand = "CallbackBeforeSetGroupInfoCommand"
// TODO CALLBACK

2
pkg/callbackstruct/group.go
View File

@ -157,5 +157,3 @@ type CallbackAfterSetGroupInfoReq struct {
type CallbackAfterSetGroupInfoResp struct { type CallbackAfterSetGroupInfoResp struct {
CommonCallbackResp CommonCallbackResp
} }
// TODO CALLBACK 2

2
pkg/callbackstruct/message.go
View File

@ -79,3 +79,5 @@ type CallbackMsgModifyCommandResp struct {
AttachedInfo *string `json:"attachedInfo"` AttachedInfo *string `json:"attachedInfo"`
Ex *string `json:"ex"` Ex *string `json:"ex"`
} }
// TODO CALLBACK 2

2
pkg/common/config/config.go
View File

@ -263,11 +263,11 @@ type configStruct struct {
CallbackBeforeCreateGroup CallBackConfig `yaml:"beforeCreateGroup"` CallbackBeforeCreateGroup CallBackConfig `yaml:"beforeCreateGroup"`
CallbackBeforeMemberJoinGroup CallBackConfig `yaml:"beforeMemberJoinGroup"` CallbackBeforeMemberJoinGroup CallBackConfig `yaml:"beforeMemberJoinGroup"`
CallbackBeforeSetGroupMemberInfo CallBackConfig `yaml:"beforeSetGroupMemberInfo"` CallbackBeforeSetGroupMemberInfo CallBackConfig `yaml:"beforeSetGroupMemberInfo"`
//TODO CALLBACK/
CallbackBeforeInviteUserToGroup CallBackConfig `yaml:"beforeInviteUserToGroup"` CallbackBeforeInviteUserToGroup CallBackConfig `yaml:"beforeInviteUserToGroup"`
CallbackAfterJoinGroup CallBackConfig `yaml:"joinGroupAfter"` CallbackAfterJoinGroup CallBackConfig `yaml:"joinGroupAfter"`
CallbackAfterSetGroupInfo CallBackConfig `yaml:"setGroupInfoAfter"` CallbackAfterSetGroupInfo CallBackConfig `yaml:"setGroupInfoAfter"`
CallbackBeforeSetGroupInfo CallBackConfig `yaml:"setGroupInfoBefore"` CallbackBeforeSetGroupInfo CallBackConfig `yaml:"setGroupInfoBefore"`
//TODO CALLBACK/
} `yaml:"callback"` } `yaml:"callback"`
Prometheus struct { Prometheus struct {