test

config/config.yaml

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

deployments/templates/openim.yaml

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

internal/rpc/group/callback.go

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

internal/rpc/group/group.go

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

internal/rpc/msg/callback.go

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

pkg/callbackstruct/constant.go

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

pkg/callbackstruct/group.go

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

pkg/callbackstruct/message.go

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

pkg/common/config/config.go

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