fix: update setGroupInfoEX field name.

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.20
+	github.com/openimsdk/protocol v0.0.72-alpha.21
 	github.com/openimsdk/tools v0.0.50-alpha.12
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -322,8 +322,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.20 h1:kfSYOnWRp9KKkwGelR9Zo20TdjMq5LLzfYKyVqUaolo=
-github.com/openimsdk/protocol v0.0.72-alpha.20/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.21 h1:MRSFDHVRsFymglbv2FSGPtiKo4RXZDTBwQTWNWiUf/U=
+github.com/openimsdk/protocol v0.0.72-alpha.21/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.12 h1:rV3BxgqN+F79vZvdoQ+97Eob8ScsRVEM8D+Wrcl23uo=
 github.com/openimsdk/tools v0.0.50-alpha.12/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

internal/rpc/group/callback.go

@@ -363,26 +363,26 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
 		cbReq := &callbackstruct.CallbackBeforeSetGroupInfoEXReq{
 			CallbackCommand: callbackstruct.CallbackBeforeSetGroupInfoCommand,
-			GroupID:         req.GroupInfoForSetEX.GroupID,
-			GroupName:       req.GroupInfoForSetEX.GroupName,
-			Notification:    req.GroupInfoForSetEX.Notification,
-			Introduction:    req.GroupInfoForSetEX.Introduction,
-			FaceURL:         req.GroupInfoForSetEX.FaceURL,
+			GroupID:         req.GroupInfoForSet.GroupID,
+			GroupName:       req.GroupInfoForSet.GroupName,
+			Notification:    req.GroupInfoForSet.Notification,
+			Introduction:    req.GroupInfoForSet.Introduction,
+			FaceURL:         req.GroupInfoForSet.FaceURL,
 		}
 
-		if req.GroupInfoForSetEX.Ex != nil {
-			cbReq.Ex = req.GroupInfoForSetEX.Ex
+		if req.GroupInfoForSet.Ex != nil {
+			cbReq.Ex = req.GroupInfoForSet.Ex
 		}
 		log.ZDebug(ctx, "debug CallbackBeforeSetGroupInfoEX", "ex", cbReq.Ex)
 
-		if req.GroupInfoForSetEX.NeedVerification != nil {
-			cbReq.NeedVerification = req.GroupInfoForSetEX.NeedVerification
+		if req.GroupInfoForSet.NeedVerification != nil {
+			cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
 		}
-		if req.GroupInfoForSetEX.LookMemberInfo != nil {
-			cbReq.LookMemberInfo = req.GroupInfoForSetEX.LookMemberInfo
+		if req.GroupInfoForSet.LookMemberInfo != nil {
+			cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
 		}
-		if req.GroupInfoForSetEX.ApplyMemberFriend != nil {
-			cbReq.ApplyMemberFriend = req.GroupInfoForSetEX.ApplyMemberFriend
+		if req.GroupInfoForSet.ApplyMemberFriend != nil {
+			cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
 		}
 
 		resp := &callbackstruct.CallbackBeforeSetGroupInfoEXResp{}
@@ -391,14 +391,14 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 			return err
 		}
 
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.GroupID, &resp.GroupID)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.GroupName, &resp.GroupName)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.FaceURL, &resp.FaceURL)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.Introduction, &resp.Introduction)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.Ex, &resp.Ex)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.NeedVerification, &resp.NeedVerification)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.LookMemberInfo, &resp.LookMemberInfo)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.ApplyMemberFriend, &resp.ApplyMemberFriend)
+		datautil.NotNilReplace(&req.GroupInfoForSet.GroupID, &resp.GroupID)
+		datautil.NotNilReplace(&req.GroupInfoForSet.GroupName, &resp.GroupName)
+		datautil.NotNilReplace(&req.GroupInfoForSet.FaceURL, &resp.FaceURL)
+		datautil.NotNilReplace(&req.GroupInfoForSet.Introduction, &resp.Introduction)
+		datautil.NotNilReplace(&req.GroupInfoForSet.Ex, &resp.Ex)
+		datautil.NotNilReplace(&req.GroupInfoForSet.NeedVerification, &resp.NeedVerification)
+		datautil.NotNilReplace(&req.GroupInfoForSet.LookMemberInfo, &resp.LookMemberInfo)
+		datautil.NotNilReplace(&req.GroupInfoForSet.ApplyMemberFriend, &resp.ApplyMemberFriend)
 
 		return nil
 	})
@@ -407,24 +407,24 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 func (s *groupServer) webhookAfterSetGroupInfoEX(ctx context.Context, after *config.AfterConfig, req *group.SetGroupInfoEXReq) {
 	cbReq := &callbackstruct.CallbackAfterSetGroupInfoEXReq{
 		CallbackCommand: callbackstruct.CallbackAfterSetGroupInfoCommand,
-		GroupID:         req.GroupInfoForSetEX.GroupID,
-		GroupName:       req.GroupInfoForSetEX.GroupName,
-		Notification:    req.GroupInfoForSetEX.Notification,
-		Introduction:    req.GroupInfoForSetEX.Introduction,
-		FaceURL:         req.GroupInfoForSetEX.FaceURL,
+		GroupID:         req.GroupInfoForSet.GroupID,
+		GroupName:       req.GroupInfoForSet.GroupName,
+		Notification:    req.GroupInfoForSet.Notification,
+		Introduction:    req.GroupInfoForSet.Introduction,
+		FaceURL:         req.GroupInfoForSet.FaceURL,
 	}
 
-	if req.GroupInfoForSetEX.Ex != nil {
-		cbReq.Ex = req.GroupInfoForSetEX.Ex
+	if req.GroupInfoForSet.Ex != nil {
+		cbReq.Ex = req.GroupInfoForSet.Ex
 	}
-	if req.GroupInfoForSetEX.NeedVerification != nil {
-		cbReq.NeedVerification = req.GroupInfoForSetEX.NeedVerification
+	if req.GroupInfoForSet.NeedVerification != nil {
+		cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
 	}
-	if req.GroupInfoForSetEX.LookMemberInfo != nil {
-		cbReq.LookMemberInfo = req.GroupInfoForSetEX.LookMemberInfo
+	if req.GroupInfoForSet.LookMemberInfo != nil {
+		cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
 	}
-	if req.GroupInfoForSetEX.ApplyMemberFriend != nil {
-		cbReq.ApplyMemberFriend = req.GroupInfoForSetEX.ApplyMemberFriend
+	if req.GroupInfoForSet.ApplyMemberFriend != nil {
+		cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
 	}
 
 	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterSetGroupInfoEXResp{}, after)

internal/rpc/group/group.go

@@ -1064,7 +1064,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 	if !authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID) {
 		var err error
 
-		opMember, err = g.db.TakeGroupMember(ctx, req.GroupInfoForSetEX.GroupID, mcontext.GetOpUserID(ctx))
+		opMember, err = g.db.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
 		}
@@ -1082,7 +1082,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	group, err := g.db.TakeGroup(ctx, req.GroupInfoForSetEX.GroupID)
+	group, err := g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1104,7 +1104,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	updatedData := UpdateGroupInfoEXMap(ctx, req.GroupInfoForSetEX)
+	updatedData := UpdateGroupInfoEXMap(ctx, req.GroupInfoForSet)
 	if len(updatedData) == 0 {
 		return &pbgroup.SetGroupInfoEXResp{}, nil
 	}
@@ -1113,7 +1113,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	group, err = g.db.TakeGroup(ctx, req.GroupInfoForSetEX.GroupID)
+	group, err = g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1129,18 +1129,18 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 	}
 
 	num := len(updatedData)
-	if req.GroupInfoForSetEX.Notification != nil {
+	if req.GroupInfoForSet.Notification != nil {
 		num--
 
-		if req.GroupInfoForSetEX.Notification.Value != "" {
+		if req.GroupInfoForSet.Notification.Value != "" {
 			func() {
 				conversation := &pbconversation.ConversationReq{
-					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSetEX.GroupID),
+					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
 					ConversationType: constant.ReadGroupChatType,
-					GroupID:          req.GroupInfoForSetEX.GroupID,
+					GroupID:          req.GroupInfoForSet.GroupID,
 				}
 
-				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSetEX.GroupID})
+				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
 				if err != nil {
 					log.ZWarn(ctx, "GetGroupMemberIDs is failed.", err)
 					return
@@ -1157,7 +1157,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		}
 	}
 
-	if req.GroupInfoForSetEX.GroupName != "" {
+	if req.GroupInfoForSet.GroupName != "" {
 		num--
 		g.notification.GroupInfoSetNameNotification(ctx, &sdkws.GroupInfoSetNameTips{Group: tips.Group, OpUser: tips.OpUser})
 	}