Merge 76ad8c88ac4f5936a172b55d933682a8d1c9fcb6 into 632a65303c88b5465e4c3f8c4e9fb37d632b1911

go.mod

@@ -12,8 +12,8 @@ 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.73-alpha.12
-	github.com/openimsdk/tools v0.0.50-alpha.84
+	github.com/openimsdk/protocol v0.0.73-alpha.6
+	github.com/openimsdk/tools v0.0.50-alpha.83
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -347,10 +347,10 @@ 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.15-alpha.5 h1:eEZCEHm+NsmcO3onXZPIUbGFCYPYbsX5beV3ZyOsGhY=
 github.com/openimsdk/gomake v0.0.15-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.73-alpha.12 h1:2NYawXeHChYUeSme6QJ9pOLh+Empce2WmwEtbP4JvKk=
-github.com/openimsdk/protocol v0.0.73-alpha.12/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
-github.com/openimsdk/tools v0.0.50-alpha.84 h1:jN60Ys/0edZjL/TDmm/5VSJFP4pGYRipkWqhILJbq/8=
-github.com/openimsdk/tools v0.0.50-alpha.84/go.mod h1:n2poR3asX1e1XZce4O+MOWAp+X02QJRFvhcLCXZdzRo=
+github.com/openimsdk/protocol v0.0.73-alpha.6 h1:sna9coWG7HN1zObBPtvG0Ki/vzqHXiB4qKbA5P3w7kc=
+github.com/openimsdk/protocol v0.0.73-alpha.6/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
+github.com/openimsdk/tools v0.0.50-alpha.83 h1:7c1D40YGqIWUmGfCII5pduETGC/8c2DyS9SQ4LvoplU=
+github.com/openimsdk/tools v0.0.50-alpha.83/go.mod h1:n2poR3asX1e1XZce4O+MOWAp+X02QJRFvhcLCXZdzRo=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

internal/api/conversation.go

@@ -49,9 +49,9 @@ func (o *ConversationApi) SetConversations(c *gin.Context) {
 	a2r.Call(c, conversation.ConversationClient.SetConversations, o.Client)
 }
 
-//func (o *ConversationApi) GetConversationOfflinePushUserIDs(c *gin.Context) {
-//	a2r.Call(c, conversation.ConversationClient.GetConversationOfflinePushUserIDs, o.Client)
-//}
+func (o *ConversationApi) GetConversationOfflinePushUserIDs(c *gin.Context) {
+	a2r.Call(c, conversation.ConversationClient.GetConversationOfflinePushUserIDs, o.Client)
+}
 
 func (o *ConversationApi) GetFullOwnerConversationIDs(c *gin.Context) {
 	a2r.Call(c, conversation.ConversationClient.GetFullOwnerConversationIDs, o.Client)

internal/api/friend.go

@@ -114,7 +114,3 @@ func (o *FriendApi) GetIncrementalBlacks(c *gin.Context) {
 func (o *FriendApi) GetFullFriendUserIDs(c *gin.Context) {
 	a2r.Call(c, relation.FriendClient.GetFullFriendUserIDs, o.Client)
 }
-
-func (o *FriendApi) GetSelfUnhandledApplyCount(c *gin.Context) {
-	a2r.Call(c, relation.FriendClient.GetSelfUnhandledApplyCount, o.Client)
-}

internal/api/group.go

@@ -165,7 +165,3 @@ func (o *GroupApi) GetFullGroupMemberUserIDs(c *gin.Context) {
 func (o *GroupApi) GetFullJoinGroupIDs(c *gin.Context) {
 	a2r.Call(c, group.GroupClient.GetFullJoinGroupIDs, o.Client)
 }
-
-func (o *GroupApi) GetGroupApplicationUnhandledCount(c *gin.Context) {
-	a2r.Call(c, group.GroupClient.GetGroupApplicationUnhandledCount, o.Client)
-}

internal/api/msg.go

@@ -467,10 +467,6 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
 		sessionType int32
 		recvID      string
 	)
-	if err = c.BindJSON(&req); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
 	err = json.Unmarshal(decodedData, &keyMsgData)
 	if err != nil {
 		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
@@ -494,11 +490,6 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
 		return
 	}
 
-	content, err := jsonutil.JsonMarshal(apistruct.MarkdownTextElem{Content: req.Content})
-	if err != nil {
-		apiresp.GinError(c, errs.Wrap(err))
-		return
-	}
 	msgData := &sdkws.MsgData{
 		SendID:           sendID,
 		RecvID:           recvID,
@@ -507,17 +498,17 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
 		SenderPlatformID: constant.AdminPlatformID,
 		SessionType:      sessionType,
 		MsgFrom:          constant.UserMsgType,
-		ContentType:      constant.MarkdownText,
-		Content:          content,
+		ContentType:      constant.Text,
+		Content:          []byte(req.Content),
 		OfflinePushInfo:  req.OfflinePushInfo,
 		Ex:               req.Ex,
 	}
 
-	sendReq := &msg.SendSimpleMsgReq{
+	sendReq := &msg.SendMsgReq{
 		MsgData: msgData,
 	}
 
-	respPb, err := m.Client.SendSimpleMsg(c, sendReq)
+	respPb, err := m.Client.SendMsg(c, sendReq)
 	if err != nil {
 		apiresp.GinError(c, err)
 		return
@@ -534,12 +525,7 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
 		return
 	}
 
-	m.ginRespSendMsg(c, &msg.SendMsgReq{MsgData: sendReq.MsgData}, &msg.SendMsgResp{
-		ServerMsgID: respPb.ServerMsgID,
-		ClientMsgID: respPb.ClientMsgID,
-		SendTime:    respPb.SendTime,
-		Modify:      respPb.Modify,
-	})
+	m.ginRespSendMsg(c, sendReq, respPb)
 }
 
 func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) {

internal/api/router.go

@@ -156,7 +156,6 @@ func newGinRouter(ctx context.Context, client discovery.Conn, cfg *Config) (*gin
 		friendRouterGroup.POST("/update_friends", f.UpdateFriends)
 		friendRouterGroup.POST("/get_incremental_friends", f.GetIncrementalFriends)
 		friendRouterGroup.POST("/get_full_friend_user_ids", f.GetFullFriendUserIDs)
-		friendRouterGroup.POST("/get_self_unhandled_apply_count", f.GetSelfUnhandledApplyCount)
 	}
 
 	g := NewGroupApi(group.NewGroupClient(groupConn))
@@ -193,7 +192,6 @@ func newGinRouter(ctx context.Context, client discovery.Conn, cfg *Config) (*gin
 		groupRouterGroup.POST("/get_incremental_group_members_batch", g.GetIncrementalGroupMemberBatch)
 		groupRouterGroup.POST("/get_full_group_member_user_ids", g.GetFullGroupMemberUserIDs)
 		groupRouterGroup.POST("/get_full_join_group_ids", g.GetFullJoinGroupIDs)
-		groupRouterGroup.POST("/get_group_application_unhandled_count", g.GetGroupApplicationUnhandledCount)
 	}
 	// certificate
 	{
@@ -252,7 +250,6 @@ func newGinRouter(ctx context.Context, client discovery.Conn, cfg *Config) (*gin
 		msgGroup.POST("/delete_msg_physical", m.DeleteMsgPhysical)
 
 		msgGroup.POST("/batch_send_msg", m.BatchSendMsg)
-		msgGroup.POST("/send_simple_msg", m.SendSimpleMessage)
 		msgGroup.POST("/check_msg_is_send_success", m.CheckMsgIsSendSuccess)
 		msgGroup.POST("/get_server_time", m.GetServerTime)
 	}
@@ -265,7 +262,7 @@ func newGinRouter(ctx context.Context, client discovery.Conn, cfg *Config) (*gin
 		conversationGroup.POST("/get_conversation", c.GetConversation)
 		conversationGroup.POST("/get_conversations", c.GetConversations)
 		conversationGroup.POST("/set_conversations", c.SetConversations)
-		//conversationGroup.POST("/get_conversation_offline_push_user_ids", c.GetConversationOfflinePushUserIDs)
+		conversationGroup.POST("/get_conversation_offline_push_user_ids", c.GetConversationOfflinePushUserIDs)
 		conversationGroup.POST("/get_full_conversation_ids", c.GetFullOwnerConversationIDs)
 		conversationGroup.POST("/get_incremental_conversations", c.GetIncrementalConversation)
 		conversationGroup.POST("/get_owner_conversation", c.GetOwnerConversation)

internal/push/push.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 
 	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush"
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/mcache"
@@ -107,7 +106,7 @@ func Start(ctx context.Context, config *Config, client discovery.Conn, server gr
 	go func() {
 		pushHandler.WaitCache()
 		fn := func(ctx context.Context, key string, value []byte) error {
-			pushHandler.HandleMs2PsChat(authverify.WithTempAdmin(ctx), value)
+			pushHandler.HandleMs2PsChat(ctx, value)
 			return nil
 		}
 		consumerCtx := mcontext.SetOperationID(context.Background(), "push_"+strconv.Itoa(int(rand.Uint32())))

internal/rpc/conversation/conversation.go

@@ -19,7 +19,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/dbbuild"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 
@@ -118,9 +117,6 @@ func Start(ctx context.Context, config *Config, client discovery.Conn, server gr
 }
 
 func (c *conversationServer) GetConversation(ctx context.Context, req *pbconversation.GetConversationReq) (*pbconversation.GetConversationResp, error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	conversations, err := c.conversationDatabase.FindConversations(ctx, req.OwnerUserID, []string{req.ConversationID})
 	if err != nil {
 		return nil, err
@@ -134,9 +130,7 @@ func (c *conversationServer) GetConversation(ctx context.Context, req *pbconvers
 }
 
 func (c *conversationServer) GetSortedConversationList(ctx context.Context, req *pbconversation.GetSortedConversationListReq) (resp *pbconversation.GetSortedConversationListResp, err error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
+	log.ZDebug(ctx, "GetSortedConversationList", "seqs", req, "userID", req.UserID)
 	var conversationIDs []string
 	if len(req.ConversationIDs) == 0 {
 		conversationIDs, err = c.conversationDatabase.GetConversationIDs(ctx, req.UserID)
@@ -209,9 +203,6 @@ func (c *conversationServer) GetSortedConversationList(ctx context.Context, req
 }
 
 func (c *conversationServer) GetAllConversations(ctx context.Context, req *pbconversation.GetAllConversationsReq) (*pbconversation.GetAllConversationsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	conversations, err := c.conversationDatabase.GetUserAllConversation(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
@@ -222,9 +213,6 @@ func (c *conversationServer) GetAllConversations(ctx context.Context, req *pbcon
 }
 
 func (c *conversationServer) GetConversations(ctx context.Context, req *pbconversation.GetConversationsReq) (*pbconversation.GetConversationsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	conversations, err := c.getConversations(ctx, req.OwnerUserID, req.ConversationIDs)
 	if err != nil {
 		return nil, err
@@ -245,9 +233,6 @@ func (c *conversationServer) getConversations(ctx context.Context, ownerUserID s
 }
 
 func (c *conversationServer) SetConversation(ctx context.Context, req *pbconversation.SetConversationReq) (*pbconversation.SetConversationResp, error) {
-	if err := authverify.CheckAccess(ctx, req.GetConversation().GetUserID()); err != nil {
-		return nil, err
-	}
 	var conversation dbModel.Conversation
 	if err := datautil.CopyStructFields(&conversation, req.Conversation); err != nil {
 		return nil, err
@@ -262,11 +247,10 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbconvers
 }
 
 func (c *conversationServer) SetConversations(ctx context.Context, req *pbconversation.SetConversationsReq) (*pbconversation.SetConversationsResp, error) {
-	for _, userID := range req.UserIDs {
-		if err := authverify.CheckAccess(ctx, userID); err != nil {
-			return nil, err
-		}
+	if req.Conversation == nil {
+		return nil, errs.ErrArgs.WrapMsg("conversation must not be nil")
 	}
+
 	if req.Conversation.ConversationType == constant.WriteGroupChatType {
 		groupInfo, err := c.groupClient.GetGroupInfo(ctx, req.Conversation.GroupID)
 		if err != nil {
@@ -347,9 +331,6 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 }
 
 func (c *conversationServer) UpdateConversationsByUser(ctx context.Context, req *pbconversation.UpdateConversationsByUserReq) (*pbconversation.UpdateConversationsByUserResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	m := make(map[string]any)
 	if req.Ex != nil {
 		m["ex"] = req.Ex.Value
@@ -362,8 +343,15 @@ func (c *conversationServer) UpdateConversationsByUser(ctx context.Context, req
 	return &pbconversation.UpdateConversationsByUserResp{}, nil
 }
 
+// Get user IDs with "Do Not Disturb" enabled in super large groups.
+func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbconversation.GetRecvMsgNotNotifyUserIDsReq) (*pbconversation.GetRecvMsgNotNotifyUserIDsResp, error) {
+	return nil, errs.New("deprecated")
+}
+
 // create conversation without notification for msg redis transfer.
-func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbconversation.CreateSingleChatConversationsReq) (*pbconversation.CreateSingleChatConversationsResp, error) {
+func (c *conversationServer) CreateSingleChatConversations(ctx context.Context,
+	req *pbconversation.CreateSingleChatConversationsReq,
+) (*pbconversation.CreateSingleChatConversationsResp, error) {
 	var conversation dbModel.Conversation
 	switch req.ConversationType {
 	case constant.SingleChatType:
@@ -432,9 +420,6 @@ func (c *conversationServer) CreateGroupChatConversations(ctx context.Context, r
 	if err != nil {
 		return nil, err
 	}
-	if err := c.msgClient.SetUserConversationMaxSeq(ctx, conversation.ConversationID, req.UserIDs, 0); err != nil {
-		return nil, err
-	}
 
 	c.webhookAfterCreateGroupChatConversations(ctx, &c.config.WebhooksConfig.AfterCreateGroupChatConversations, &conversation)
 	return &pbconversation.CreateGroupChatConversationsResp{}, nil
@@ -469,9 +454,6 @@ func (c *conversationServer) SetConversationMinSeq(ctx context.Context, req *pbc
 }
 
 func (c *conversationServer) GetConversationIDs(ctx context.Context, req *pbconversation.GetConversationIDsReq) (*pbconversation.GetConversationIDsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	conversationIDs, err := c.conversationDatabase.GetConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -480,9 +462,6 @@ func (c *conversationServer) GetConversationIDs(ctx context.Context, req *pbconv
 }
 
 func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req *pbconversation.GetUserConversationIDsHashReq) (*pbconversation.GetUserConversationIDsHashResp, error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	hash, err := c.conversationDatabase.GetUserConversationIDsHash(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
@@ -490,7 +469,10 @@ func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req
 	return &pbconversation.GetUserConversationIDsHashResp{Hash: hash}, nil
 }
 
-func (c *conversationServer) GetConversationsByConversationID(ctx context.Context, req *pbconversation.GetConversationsByConversationIDReq) (*pbconversation.GetConversationsByConversationIDResp, error) {
+func (c *conversationServer) GetConversationsByConversationID(
+	ctx context.Context,
+	req *pbconversation.GetConversationsByConversationIDReq,
+) (*pbconversation.GetConversationsByConversationIDResp, error) {
 	conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, req.ConversationIDs)
 	if err != nil {
 		return nil, err
@@ -544,7 +526,10 @@ func (c *conversationServer) conversationSort(conversations map[int64]string, re
 	resp.ConversationElems = append(resp.ConversationElems, cons...)
 }
 
-func (c *conversationServer) getConversationInfo(ctx context.Context, chatLogs map[string]*sdkws.MsgData, userID string) (map[string]*pbconversation.ConversationElem, error) {
+func (c *conversationServer) getConversationInfo(
+	ctx context.Context,
+	chatLogs map[string]*sdkws.MsgData,
+	userID string) (map[string]*pbconversation.ConversationElem, error) {
 	var (
 		sendIDs         []string
 		groupIDs        []string
@@ -630,11 +615,6 @@ func (c *conversationServer) GetConversationNotReceiveMessageUserIDs(ctx context
 }
 
 func (c *conversationServer) UpdateConversation(ctx context.Context, req *pbconversation.UpdateConversationReq) (*pbconversation.UpdateConversationResp, error) {
-	for _, userID := range req.UserIDs {
-		if err := authverify.CheckAccess(ctx, userID); err != nil {
-			return nil, err
-		}
-	}
 	m := make(map[string]any)
 	if req.RecvMsgOpt != nil {
 		m["recv_msg_opt"] = req.RecvMsgOpt.Value
@@ -681,9 +661,6 @@ func (c *conversationServer) UpdateConversation(ctx context.Context, req *pbconv
 }
 
 func (c *conversationServer) GetOwnerConversation(ctx context.Context, req *pbconversation.GetOwnerConversationReq) (*pbconversation.GetOwnerConversationResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	total, conversations, err := c.conversationDatabase.GetOwnerConversation(ctx, req.UserID, req.Pagination)
 	if err != nil {
 		return nil, err
@@ -745,9 +722,6 @@ func (c *conversationServer) GetConversationsNeedClearMsg(ctx context.Context, _
 }
 
 func (c *conversationServer) GetNotNotifyConversationIDs(ctx context.Context, req *pbconversation.GetNotNotifyConversationIDsReq) (*pbconversation.GetNotNotifyConversationIDsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	conversationIDs, err := c.conversationDatabase.GetNotNotifyConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -756,9 +730,6 @@ func (c *conversationServer) GetNotNotifyConversationIDs(ctx context.Context, re
 }
 
 func (c *conversationServer) GetPinnedConversationIDs(ctx context.Context, req *pbconversation.GetPinnedConversationIDsReq) (*pbconversation.GetPinnedConversationIDsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	conversationIDs, err := c.conversationDatabase.GetPinnedConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err

internal/rpc/conversation/sync.go

@@ -35,9 +35,6 @@ func (c *conversationServer) GetFullOwnerConversationIDs(ctx context.Context, re
 }
 
 func (c *conversationServer) GetIncrementalConversation(ctx context.Context, req *conversation.GetIncrementalConversationReq) (*conversation.GetIncrementalConversationResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	opt := incrversion.Option[*conversation.Conversation, conversation.GetIncrementalConversationResp]{
 		Ctx:             ctx,
 		VersionKey:      req.UserID,

internal/rpc/group/cache.go

@@ -33,9 +33,6 @@ func (g *groupServer) GetGroupInfoCache(ctx context.Context, req *pbgroup.GetGro
 }
 
 func (g *groupServer) GetGroupMemberCache(ctx context.Context, req *pbgroup.GetGroupMemberCacheReq) (*pbgroup.GetGroupMemberCacheResp, error) {
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	members, err := g.db.TakeGroupMember(ctx, req.GroupID, req.GroupMemberID)
 	if err != nil {
 		return nil, err

internal/rpc/group/group.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/openimsdk/open-im-server/v3/pkg/dbbuild"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
+
 	"google.golang.org/grpc"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
@@ -152,14 +153,10 @@ func (g *groupServer) NotificationUserInfoUpdate(ctx context.Context, req *pbgro
 
 func (g *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error {
 	if !authverify.IsAdmin(ctx) {
-		members, err := g.db.FindGroupMembers(ctx, groupID, []string{mcontext.GetOpUserID(ctx)})
+		groupMember, err := g.db.TakeGroupMember(ctx, groupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return err
 		}
-		if len(members) == 0 {
-			return errs.ErrNoPermission.WrapMsg("op user not in group")
-		}
-		groupMember := members[0]
 		if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) {
 			return errs.ErrNoPermission.WrapMsg("no group owner or admin")
 		}
@@ -372,10 +369,6 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 		return nil, servererrs.ErrDismissedAlready.WrapMsg("group dismissed checking group status found it dismissed")
 	}
 
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
-
 	userMap, err := g.userClient.GetUsersInfoMap(ctx, req.InvitedUserIDs)
 	if err != nil {
 		return nil, err
@@ -386,9 +379,9 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 	}
 
 	var groupMember *model.GroupMember
-	opUserID := mcontext.GetOpUserID(ctx)
-
+	var opUserID string
 	if !authverify.IsAdmin(ctx) {
+		opUserID = mcontext.GetOpUserID(ctx)
 		var err error
 		groupMember, err = g.db.TakeGroupMember(ctx, req.GroupID, opUserID)
 		if err != nil {
@@ -397,6 +390,8 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 		if err := g.PopulateGroupMember(ctx, groupMember); err != nil {
 			return nil, err
 		}
+	} else {
+		opUserID = mcontext.GetOpUserID(ctx)
 	}
 
 	if err := g.webhookBeforeInviteUserToGroup(ctx, &g.config.WebhooksConfig.BeforeInviteUserToGroup, req); err != nil && err != servererrs.ErrCallbackContinue {
@@ -426,7 +421,7 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 						ReqMessage:    request.ReqMsg,
 						JoinSource:    request.JoinSource,
 						InviterUserID: request.InviterUserID,
-					}, request)
+					})
 				}
 				return &pbgroup.InviteUserToGroupResp{}, nil
 			}
@@ -455,7 +450,10 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 
 	const singleQuantity = 50
 	for start := 0; start < len(groupMembers); start += singleQuantity {
-		end := min(start+singleQuantity, len(groupMembers))
+		end := start + singleQuantity
+		if end > len(groupMembers) {
+			end = len(groupMembers)
+		}
 		currentMembers := groupMembers[start:end]
 
 		if err := g.db.CreateGroup(ctx, nil, currentMembers); err != nil {
@@ -466,8 +464,8 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 			return e.UserID
 		})
 
-		if len(userIDs) != 0 {
-			g.notification.GroupApplicationAgreeMemberEnterNotification(ctx, req.GroupID, req.SendMessage, opUserID, userIDs...)
+		if err = g.notification.GroupApplicationAgreeMemberEnterNotification(ctx, req.GroupID, req.SendMessage, opUserID, userIDs...); err != nil {
+			return nil, err
 		}
 	}
 	return &pbgroup.InviteUserToGroupResp{}, nil
@@ -478,19 +476,6 @@ func (g *groupServer) GetGroupAllMember(ctx context.Context, req *pbgroup.GetGro
 	if err != nil {
 		return nil, err
 	}
-	if !authverify.IsAdmin(ctx) {
-		var inGroup bool
-		opUserID := mcontext.GetOpUserID(ctx)
-		for _, member := range members {
-			if member.UserID == opUserID {
-				inGroup = true
-				break
-			}
-		}
-		if !inGroup {
-			return nil, errs.ErrNoPermission.WrapMsg("opuser not in group")
-		}
-	}
 	if err := g.PopulateGroupMember(ctx, members...); err != nil {
 		return nil, err
 	}
@@ -501,24 +486,11 @@ func (g *groupServer) GetGroupAllMember(ctx context.Context, req *pbgroup.GetGro
 	return &resp, nil
 }
 
-func (g *groupServer) checkAdminOrInGroup(ctx context.Context, groupID string) error {
-	if authverify.IsAdmin(ctx) {
-		return nil
-	}
-	opUserID := mcontext.GetOpUserID(ctx)
-	members, err := g.db.FindGroupMembers(ctx, groupID, []string{opUserID})
-	if err != nil {
-		return err
-	}
-	if len(members) == 0 {
-		return errs.ErrNoPermission.WrapMsg("op user not in group")
-	}
-	return nil
-}
-
 func (g *groupServer) GetGroupMemberList(ctx context.Context, req *pbgroup.GetGroupMemberListReq) (*pbgroup.GetGroupMemberListResp, error) {
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
+	if opUserID := mcontext.GetOpUserID(ctx); !datautil.Contain(opUserID, g.config.Share.IMAdminUserID...) {
+		if _, err := g.db.TakeGroupMember(ctx, req.GroupID, opUserID); err != nil {
+			return nil, err
+		}
 	}
 	var (
 		total   int64
@@ -659,9 +631,6 @@ func (g *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbgroup.GetG
 	if req.GroupID == "" {
 		return nil, errs.ErrArgs.WrapMsg("groupID empty")
 	}
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	members, err := g.getGroupMembersInfo(ctx, req.GroupID, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -689,37 +658,15 @@ func (g *groupServer) getGroupMembersInfo(ctx context.Context, groupID string, u
 
 // GetGroupApplicationList handles functions that get a list of group requests.
 func (g *groupServer) GetGroupApplicationList(ctx context.Context, req *pbgroup.GetGroupApplicationListReq) (*pbgroup.GetGroupApplicationListResp, error) {
-	if err := authverify.CheckAccess(ctx, req.FromUserID); err != nil {
+	groupIDs, err := g.db.FindUserManagedGroupID(ctx, req.FromUserID)
+	if err != nil {
 		return nil, err
 	}
-	var (
-		groupIDs []string
-		err      error
-	)
-	if len(req.GroupIDs) == 0 {
-		groupIDs, err = g.db.FindUserManagedGroupID(ctx, req.FromUserID)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		req.GroupIDs = datautil.Distinct(req.GroupIDs)
-		if !authverify.IsAdmin(ctx) {
-			for _, groupID := range req.GroupIDs {
-				if err := g.CheckGroupAdmin(ctx, groupID); err != nil {
-					return nil, err
-				}
-			}
-		}
-		groupIDs = req.GroupIDs
-	}
 	resp := &pbgroup.GetGroupApplicationListResp{}
 	if len(groupIDs) == 0 {
 		return resp, nil
 	}
-	handleResults := datautil.Slice(req.HandleResults, func(e int32) int {
-		return int(e)
-	})
-	total, groupRequests, err := g.db.PageGroupRequest(ctx, groupIDs, handleResults, req.Pagination)
+	total, groupRequests, err := g.db.PageGroupRequest(ctx, groupIDs, req.Pagination)
 	if err != nil {
 		return nil, err
 	}
@@ -784,23 +731,6 @@ func (g *groupServer) GetGroupsInfo(ctx context.Context, req *pbgroup.GetGroupsI
 	}, nil
 }
 
-func (g *groupServer) GetGroupApplicationUnhandledCount(ctx context.Context, req *pbgroup.GetGroupApplicationUnhandledCountReq) (*pbgroup.GetGroupApplicationUnhandledCountResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
-	groupIDs, err := g.db.FindUserManagedGroupID(ctx, req.UserID)
-	if err != nil {
-		return nil, err
-	}
-	count, err := g.db.GetGroupApplicationUnhandledCount(ctx, groupIDs, req.Time)
-	if err != nil {
-		return nil, err
-	}
-	return &pbgroup.GetGroupApplicationUnhandledCountResp{
-		Count: count,
-	}, nil
-}
-
 func (g *groupServer) getGroupsInfo(ctx context.Context, groupIDs []string) ([]*sdkws.GroupInfo, error) {
 	if len(groupIDs) == 0 {
 		return nil, nil
@@ -982,7 +912,7 @@ func (g *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
 	if err = g.db.CreateGroupRequest(ctx, []*model.GroupRequest{&groupRequest}); err != nil {
 		return nil, err
 	}
-	g.notification.JoinGroupApplicationNotification(ctx, req, &groupRequest)
+	g.notification.JoinGroupApplicationNotification(ctx, req)
 	return &pbgroup.JoinGroupResp{}, nil
 }
 
@@ -1346,9 +1276,6 @@ func (g *groupServer) GetGroups(ctx context.Context, req *pbgroup.GetGroupsReq)
 }
 
 func (g *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGroupMembersCMSReq) (*pbgroup.GetGroupMembersCMSResp, error) {
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	total, members, err := g.db.SearchGroupMember(ctx, req.UserName, req.GroupID, req.Pagination)
 	if err != nil {
 		return nil, err
@@ -1365,17 +1292,11 @@ func (g *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGr
 }
 
 func (g *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbgroup.GetUserReqApplicationListReq) (*pbgroup.GetUserReqApplicationListResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	user, err := g.userClient.GetUserInfo(ctx, req.UserID)
 	if err != nil {
 		return nil, err
 	}
-	handleResults := datautil.Slice(req.HandleResults, func(e int32) int {
-		return int(e)
-	})
-	total, requests, err := g.db.PageGroupRequestUser(ctx, req.UserID, req.GroupIDs, handleResults, req.Pagination)
+	total, requests, err := g.db.PageGroupRequestUser(ctx, req.UserID, req.Pagination)
 	if err != nil {
 		return nil, err
 	}
@@ -1731,11 +1652,6 @@ func (g *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbgroup.Get
 	if datautil.Duplicate(req.GroupIDs) {
 		return nil, errs.ErrArgs.WrapMsg("groupIDs duplicate")
 	}
-	for _, groupID := range req.GroupIDs {
-		if err := g.checkAdminOrInGroup(ctx, groupID); err != nil {
-			return nil, err
-		}
-	}
 	groups, err := g.db.FindGroup(ctx, req.GroupIDs)
 	if err != nil {
 		return nil, err
@@ -1764,9 +1680,6 @@ func (g *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbgroup.Ge
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.WrapMsg("groupIDs empty")
 	}
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	members, err := g.db.FindGroupMemberUser(ctx, req.GroupIDs, req.UserID)
 	if err != nil {
 		return nil, err
@@ -1786,9 +1699,6 @@ func (g *groupServer) GetGroupMemberUserIDs(ctx context.Context, req *pbgroup.Ge
 	if err != nil {
 		return nil, err
 	}
-	if err := authverify.CheckAccessIn(ctx, userIDs...); err != nil {
-		return nil, err
-	}
 	return &pbgroup.GetGroupMemberUserIDsResp{
 		UserIDs: userIDs,
 	}, nil
@@ -1798,9 +1708,6 @@ func (g *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbgroup.
 	if len(req.RoleLevels) == 0 {
 		return nil, errs.ErrArgs.WrapMsg("RoleLevels empty")
 	}
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	members, err := g.db.FindGroupMemberRoleLevels(ctx, req.GroupID, req.RoleLevels)
 	if err != nil {
 		return nil, err
@@ -1816,9 +1723,6 @@ func (g *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbgroup.
 }
 
 func (g *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *pbgroup.GetGroupUsersReqApplicationListReq) (*pbgroup.GetGroupUsersReqApplicationListResp, error) {
-	if err := g.CheckGroupAdmin(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	requests, err := g.db.FindGroupRequests(ctx, req.GroupID, req.UserIDs)
 	if err != nil {
 		return nil, err

internal/rpc/group/notification.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 
 	"go.mongodb.org/mongo-driver/mongo"
@@ -366,46 +365,13 @@ func (g *NotificationSender) GroupInfoSetAnnouncementNotification(ctx context.Co
 	g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupInfoSetAnnouncementNotification, tips, notification.WithRpcGetUserName(), notification.WithSendMessage(sendMessage))
 }
 
-func (g *NotificationSender) uuid() string {
-	return uuid.New().String()
-}
-
-func (g *NotificationSender) getGroupRequest(ctx context.Context, groupID string, userID string) (*sdkws.GroupRequest, error) {
-	request, err := g.db.TakeGroupRequest(ctx, groupID, userID)
-	if err != nil {
-		return nil, err
-	}
-	users, err := g.getUsersInfo(ctx, []string{userID})
-	if err != nil {
-		return nil, err
-	}
-	if len(users) == 0 {
-		return nil, servererrs.ErrUserIDNotFound.WrapMsg(fmt.Sprintf("user %s not found", userID))
-	}
-	info, ok := users[0].(*sdkws.UserInfo)
-	if !ok {
-		info = &sdkws.UserInfo{
-			UserID:   users[0].GetUserID(),
-			Nickname: users[0].GetNickname(),
-			FaceURL:  users[0].GetFaceURL(),
-			Ex:       users[0].GetEx(),
-		}
-	}
-	return convert.Db2PbGroupRequest(request, info, nil), nil
-}
-
-func (g *NotificationSender) JoinGroupApplicationNotification(ctx context.Context, req *pbgroup.JoinGroupReq, dbReq *model.GroupRequest) {
+func (g *NotificationSender) JoinGroupApplicationNotification(ctx context.Context, req *pbgroup.JoinGroupReq) {
 	var err error
 	defer func() {
 		if err != nil {
 			log.ZError(ctx, stringutil.GetFuncName(1)+" failed", err)
 		}
 	}()
-	request, err := g.getGroupRequest(ctx, dbReq.GroupID, dbReq.UserID)
-	if err != nil {
-		log.ZError(ctx, "JoinGroupApplicationNotification getGroupRequest", err, "dbReq", dbReq)
-		return
-	}
 	var group *sdkws.GroupInfo
 	group, err = g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
@@ -421,13 +387,7 @@ func (g *NotificationSender) JoinGroupApplicationNotification(ctx context.Contex
 		return
 	}
 	userIDs = append(userIDs, req.InviterUserID, mcontext.GetOpUserID(ctx))
-	tips := &sdkws.JoinGroupApplicationTips{
-		Group:     group,
-		Applicant: user,
-		ReqMsg:    req.ReqMessage,
-		Uuid:      g.uuid(),
-		Request:   request,
-	}
+	tips := &sdkws.JoinGroupApplicationTips{Group: group, Applicant: user, ReqMsg: req.ReqMessage}
 	for _, userID := range datautil.Distinct(userIDs) {
 		g.Notification(ctx, mcontext.GetOpUserID(ctx), userID, constant.JoinGroupApplicationNotification, tips)
 	}
@@ -457,11 +417,6 @@ func (g *NotificationSender) GroupApplicationAcceptedNotification(ctx context.Co
 			log.ZError(ctx, stringutil.GetFuncName(1)+" failed", err)
 		}
 	}()
-	request, err := g.getGroupRequest(ctx, req.GroupID, req.FromUserID)
-	if err != nil {
-		log.ZError(ctx, "GroupApplicationAcceptedNotification getGroupRequest", err, "req", req)
-		return
-	}
 	var group *sdkws.GroupInfo
 	group, err = g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
@@ -477,14 +432,8 @@ func (g *NotificationSender) GroupApplicationAcceptedNotification(ctx context.Co
 	if err = g.fillOpUser(ctx, &opUser, group.GroupID); err != nil {
 		return
 	}
-	tips := &sdkws.GroupApplicationAcceptedTips{
-		Group:     group,
-		OpUser:    opUser,
-		HandleMsg: req.HandledMsg,
-		Uuid:      g.uuid(),
-		Request:   request,
-	}
 	for _, userID := range append(userIDs, req.FromUserID) {
+		tips := &sdkws.GroupApplicationAcceptedTips{Group: group, OpUser: opUser, HandleMsg: req.HandledMsg}
 		if userID == req.FromUserID {
 			tips.ReceiverAs = applicantReceiver
 		} else {
@@ -501,11 +450,6 @@ func (g *NotificationSender) GroupApplicationRejectedNotification(ctx context.Co
 			log.ZError(ctx, stringutil.GetFuncName(1)+" failed", err)
 		}
 	}()
-	request, err := g.getGroupRequest(ctx, req.GroupID, req.FromUserID)
-	if err != nil {
-		log.ZError(ctx, "GroupApplicationAcceptedNotification getGroupRequest", err, "req", req)
-		return
-	}
 	var group *sdkws.GroupInfo
 	group, err = g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
@@ -521,14 +465,8 @@ func (g *NotificationSender) GroupApplicationRejectedNotification(ctx context.Co
 	if err = g.fillOpUser(ctx, &opUser, group.GroupID); err != nil {
 		return
 	}
-	tips := &sdkws.GroupApplicationRejectedTips{
-		Group:     group,
-		OpUser:    opUser,
-		HandleMsg: req.HandledMsg,
-		Uuid:      g.uuid(),
-		Request:   request,
-	}
 	for _, userID := range append(userIDs, req.FromUserID) {
+		tips := &sdkws.GroupApplicationAcceptedTips{Group: group, OpUser: opUser, HandleMsg: req.HandledMsg}
 		if userID == req.FromUserID {
 			tips.ReceiverAs = applicantReceiver
 		} else {

internal/rpc/group/statistics.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/tools/errs"
 )
@@ -27,9 +26,6 @@ func (g *groupServer) GroupCreateCount(ctx context.Context, req *group.GroupCrea
 	if req.Start > req.End {
 		return nil, errs.ErrArgs.WrapMsg("start > end: %d > %d", req.Start, req.End)
 	}
-	if err := authverify.CheckAdmin(ctx); err != nil {
-		return nil, err
-	}
 	total, err := g.db.CountTotal(ctx, nil)
 	if err != nil {
 		return nil, err

internal/rpc/group/sync.go

@@ -11,6 +11,9 @@ import (
 	"github.com/openimsdk/protocol/constant"
 	pbgroup "github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/errs"
+	"github.com/openimsdk/tools/mcontext"
+	"github.com/openimsdk/tools/utils/datautil"
 )
 
 const versionSyncLimit = 500
@@ -20,8 +23,10 @@ func (g *groupServer) GetFullGroupMemberUserIDs(ctx context.Context, req *pbgrou
 	if err != nil {
 		return nil, err
 	}
-	if err := authverify.CheckAccessIn(ctx, userIDs...); err != nil {
-		return nil, err
+	if opUserID := mcontext.GetOpUserID(ctx); !datautil.Contain(opUserID, g.config.Share.IMAdminUserID...) {
+		if !datautil.Contain(opUserID, userIDs...) {
+			return nil, errs.ErrNoPermission.WrapMsg("user not in group")
+		}
 	}
 	vl, err := g.db.FindMaxGroupMemberVersionCache(ctx, req.GroupID)
 	if err != nil {
@@ -64,9 +69,6 @@ func (g *groupServer) GetFullJoinGroupIDs(ctx context.Context, req *pbgroup.GetF
 }
 
 func (g *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgroup.GetIncrementalGroupMemberReq) (*pbgroup.GetIncrementalGroupMemberResp, error) {
-	if err := g.checkAdminOrInGroup(ctx, req.GroupID); err != nil {
-		return nil, err
-	}
 	group, err := g.db.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -74,6 +76,9 @@ func (g *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
 	if group.Status == constant.GroupStatusDismissed {
 		return nil, servererrs.ErrDismissedAlready.Wrap()
 	}
+	if _, err := g.db.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx)); err != nil {
+		return nil, err
+	}
 	var (
 		hasGroupUpdate bool
 		sortVersion    uint64

internal/rpc/msg/as_read.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"errors"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
 	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/protocol/msg"
@@ -30,9 +29,6 @@ import (
 )
 
 func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *msg.GetConversationsHasReadAndMaxSeqReq) (*msg.GetConversationsHasReadAndMaxSeqResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	var conversationIDs []string
 	if len(req.ConversationIDs) == 0 {
 		var err error
@@ -86,9 +82,6 @@ func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *m
 }
 
 func (m *msgServer) SetConversationHasReadSeq(ctx context.Context, req *msg.SetConversationHasReadSeqReq) (*msg.SetConversationHasReadSeqResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID)
 	if err != nil {
 		return nil, err
@@ -104,8 +97,8 @@ func (m *msgServer) SetConversationHasReadSeq(ctx context.Context, req *msg.SetC
 }
 
 func (m *msgServer) MarkMsgsAsRead(ctx context.Context, req *msg.MarkMsgsAsReadReq) (*msg.MarkMsgsAsReadResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
+	if len(req.Seqs) < 1 {
+		return nil, errs.ErrArgs.WrapMsg("seqs must not be empty")
 	}
 	maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID)
 	if err != nil {
@@ -146,9 +139,6 @@ func (m *msgServer) MarkMsgsAsRead(ctx context.Context, req *msg.MarkMsgsAsReadR
 }
 
 func (m *msgServer) MarkConversationAsRead(ctx context.Context, req *msg.MarkConversationAsReadReq) (*msg.MarkConversationAsReadResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	conversation, err := m.ConversationLocalCache.GetConversation(ctx, req.UserID, req.ConversationID)
 	if err != nil {
 		return nil, err
@@ -226,4 +216,5 @@ func (m *msgServer) sendMarkAsReadNotification(ctx context.Context, conversation
 		HasReadSeq:       hasReadSeq,
 	}
 	m.notificationSender.NotificationWithSessionType(ctx, sendID, recvID, constant.HasReadReceipt, sessionType, tips)
+
 }

internal/rpc/msg/delete.go

@@ -94,9 +94,6 @@ func (m *msgServer) DeleteMsgs(ctx context.Context, req *msg.DeleteMsgsReq) (*ms
 }
 
 func (m *msgServer) DeleteMsgPhysicalBySeq(ctx context.Context, req *msg.DeleteMsgPhysicalBySeqReq) (*msg.DeleteMsgPhysicalBySeqResp, error) {
-	if err := authverify.CheckAdmin(ctx); err != nil {
-		return nil, err
-	}
 	err := m.MsgDatabase.DeleteMsgsPhysicalBySeqs(ctx, req.ConversationID, req.Seqs)
 	if err != nil {
 		return nil, err

internal/rpc/msg/send.go

@@ -17,7 +17,6 @@ package msg
 import (
 	"context"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
@@ -38,9 +37,6 @@ func (m *msgServer) SendMsg(ctx context.Context, req *pbmsg.SendMsgReq) (*pbmsg.
 	if req.MsgData == nil {
 		return nil, errs.ErrArgs.WrapMsg("msgData is nil")
 	}
-	if err := authverify.CheckAccess(ctx, req.MsgData.SendID); err != nil {
-		return nil, err
-	}
 	before := new(*sdkws.MsgData)
 	resp, err := m.sendMsg(ctx, req, before)
 	if err != nil {
@@ -176,7 +172,13 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
 	isSend := true
 	isNotification := msgprocessor.IsNotificationByMsg(req.MsgData)
 	if !isNotification {
-		isSend, err = m.modifyMessageByUserMessageReceiveOpt(authverify.WithTempAdmin(ctx), req.MsgData.RecvID, conversationutil.GenConversationIDForSingle(req.MsgData.SendID, req.MsgData.RecvID), constant.SingleChatType, req)
+		isSend, err = m.modifyMessageByUserMessageReceiveOpt(
+			ctx,
+			req.MsgData.RecvID,
+			conversationutil.GenConversationIDForSingle(req.MsgData.SendID, req.MsgData.RecvID),
+			constant.SingleChatType,
+			req,
+		)
 		if err != nil {
 			return nil, err
 		}
@@ -201,25 +203,3 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
 		}, nil
 	}
 }
-
-func (m *msgServer) SendSimpleMsg(ctx context.Context, req *pbmsg.SendSimpleMsgReq) (*pbmsg.SendSimpleMsgResp, error) {
-	if req.MsgData == nil {
-		return nil, errs.ErrArgs.WrapMsg("msg data is nil")
-	}
-	sender, err := m.UserLocalCache.GetUserInfo(ctx, req.MsgData.SendID)
-	if err != nil {
-		return nil, err
-	}
-	req.MsgData.SenderFaceURL = sender.FaceURL
-	req.MsgData.SenderNickname = sender.Nickname
-	resp, err := m.SendMsg(ctx, &pbmsg.SendMsgReq{MsgData: req.MsgData})
-	if err != nil {
-		return nil, err
-	}
-	return &pbmsg.SendSimpleMsgResp{
-		ServerMsgID: resp.ServerMsgID,
-		ClientMsgID: resp.ClientMsgID,
-		SendTime:    resp.SendTime,
-		Modify:      resp.Modify,
-	}, nil
-}

internal/rpc/msg/seq.go

@@ -17,10 +17,9 @@ package msg
 import (
 	"context"
 	"errors"
-	"sort"
-
 	pbmsg "github.com/openimsdk/protocol/msg"
 	"github.com/redis/go-redis/v9"
+	"sort"
 )
 
 func (m *msgServer) GetConversationMaxSeq(ctx context.Context, req *pbmsg.GetConversationMaxSeqReq) (*pbmsg.GetConversationMaxSeqResp, error) {

internal/rpc/msg/statistics.go

@@ -16,10 +16,8 @@ package msg
 
 import (
 	"context"
-	"time"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
+	"time"
 
 	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/sdkws"
@@ -27,9 +25,6 @@ import (
 )
 
 func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) {
-	if err := authverify.CheckAdmin(ctx); err != nil {
-		return nil, err
-	}
 	msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Group, req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	if err != nil {
 		return nil, err
@@ -65,9 +60,6 @@ func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq
 }
 
 func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupReq) (*msg.GetActiveGroupResp, error) {
-	if err := authverify.CheckAdmin(ctx); err != nil {
-		return nil, err
-	}
 	msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	if err != nil {
 		return nil, err

internal/rpc/msg/sync_msg.go

@@ -29,9 +29,6 @@ import (
 )
 
 func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	resp := &sdkws.PullMessageBySeqsResp{}
 	resp.Msgs = make(map[string]*sdkws.PullMsgs)
 	resp.NotificationMsgs = make(map[string]*sdkws.PullMsgs)

internal/rpc/relation/black.go

@@ -46,9 +46,6 @@ func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *relation.Ge
 }
 
 func (s *friendServer) IsBlack(ctx context.Context, req *relation.IsBlackReq) (*relation.IsBlackResp, error) {
-	if err := authverify.CheckAccessIn(ctx, req.UserID1, req.UserID2); err != nil {
-		return nil, err
-	}
 	in1, in2, err := s.blackDatabase.CheckIn(ctx, req.UserID1, req.UserID2)
 	if err != nil {
 		return nil, err

internal/rpc/relation/friend.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/dbbuild"
-	"github.com/openimsdk/open-im-server/v3/pkg/notification/common_user"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 
 	"github.com/openimsdk/tools/mq/memamq"
@@ -101,24 +100,23 @@ func Start(ctx context.Context, config *Config, client discovery.Conn, server gr
 		return err
 	}
 	userClient := rpcli.NewUserClient(userConn)
-	database := controller.NewFriendDatabase(
-		friendMongoDB,
-		friendRequestMongoDB,
-		redis.NewFriendCacheRedis(rdb, &config.LocalCacheConfig, friendMongoDB),
-		mgocli.GetTx(),
-	)
+
 	// Initialize notification sender
 	notificationSender := NewFriendNotificationSender(
 		&config.NotificationConfig,
 		rpcli.NewMsgClient(msgConn),
 		WithRpcFunc(userClient.GetUsersInfo),
-		WithFriendDB(database),
 	)
 	localcache.InitLocalCache(&config.LocalCacheConfig)
 
 	// Register Friend server with refactored MongoDB and Redis integrations
 	relation.RegisterFriendServer(server, &friendServer{
-		db: database,
+		db: controller.NewFriendDatabase(
+			friendMongoDB,
+			friendRequestMongoDB,
+			redis.NewFriendCacheRedis(rdb, &config.LocalCacheConfig, friendMongoDB),
+			mgocli.GetTx(),
+		),
 		blackDatabase: controller.NewBlackDatabase(
 			blackMongoDB,
 			redis.NewBlackCacheRedis(rdb, &config.LocalCacheConfig, blackMongoDB),
@@ -282,9 +280,6 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *relation.SetFri
 }
 
 func (s *friendServer) GetFriendInfo(ctx context.Context, req *relation.GetFriendInfoReq) (*relation.GetFriendInfoResp, error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	friends, err := s.db.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs)
 	if err != nil {
 		return nil, err
@@ -293,9 +288,6 @@ func (s *friendServer) GetFriendInfo(ctx context.Context, req *relation.GetFrien
 }
 
 func (s *friendServer) GetDesignatedFriends(ctx context.Context, req *relation.GetDesignatedFriendsReq) (resp *relation.GetDesignatedFriendsResp, err error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	resp = &relation.GetDesignatedFriendsResp{}
 	if datautil.Duplicate(req.FriendUserIDs) {
 		return nil, errs.ErrArgs.WrapMsg("friend userID repeated")
@@ -321,16 +313,15 @@ func (s *friendServer) getFriend(ctx context.Context, ownerUserID string, friend
 }
 
 // Get the list of friend requests sent out proactively.
-func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context, req *relation.GetDesignatedFriendsApplyReq) (resp *relation.GetDesignatedFriendsApplyResp, err error) {
-	if err := authverify.CheckAccessIn(ctx, req.FromUserID, req.ToUserID); err != nil {
-		return nil, err
-	}
+func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context,
+	req *relation.GetDesignatedFriendsApplyReq,
+) (resp *relation.GetDesignatedFriendsApplyResp, err error) {
 	friendRequests, err := s.db.FindBothFriendRequests(ctx, req.FromUserID, req.ToUserID)
 	if err != nil {
 		return nil, err
 	}
 	resp = &relation.GetDesignatedFriendsApplyResp{}
-	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.getCommonUserMap)
+	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err
 	}
@@ -343,16 +334,13 @@ func (s *friendServer) GetPaginationFriendsApplyTo(ctx context.Context, req *rel
 		return nil, err
 	}
 
-	handleResults := datautil.Slice(req.HandleResults, func(e int32) int {
-		return int(e)
-	})
-	total, friendRequests, err := s.db.PageFriendRequestToMe(ctx, req.UserID, handleResults, req.Pagination)
+	total, friendRequests, err := s.db.PageFriendRequestToMe(ctx, req.UserID, req.Pagination)
 	if err != nil {
 		return nil, err
 	}
 
 	resp = &relation.GetPaginationFriendsApplyToResp{}
-	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.getCommonUserMap)
+	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err
 	}
@@ -363,20 +351,18 @@ func (s *friendServer) GetPaginationFriendsApplyTo(ctx context.Context, req *rel
 }
 
 func (s *friendServer) GetPaginationFriendsApplyFrom(ctx context.Context, req *relation.GetPaginationFriendsApplyFromReq) (resp *relation.GetPaginationFriendsApplyFromResp, err error) {
+	resp = &relation.GetPaginationFriendsApplyFromResp{}
+
 	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 
-	handleResults := datautil.Slice(req.HandleResults, func(e int32) int {
-		return int(e)
-	})
-	total, friendRequests, err := s.db.PageFriendRequestFromMe(ctx, req.UserID, handleResults, req.Pagination)
+	total, friendRequests, err := s.db.PageFriendRequestFromMe(ctx, req.UserID, req.Pagination)
 	if err != nil {
 		return nil, err
 	}
 
-	resp = &relation.GetPaginationFriendsApplyFromResp{}
-	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.getCommonUserMap)
+	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err
 	}
@@ -388,9 +374,6 @@ func (s *friendServer) GetPaginationFriendsApplyFrom(ctx context.Context, req *r
 
 // ok.
 func (s *friendServer) IsFriend(ctx context.Context, req *relation.IsFriendReq) (resp *relation.IsFriendResp, err error) {
-	if err := authverify.CheckAccessIn(ctx, req.UserID1, req.UserID2); err != nil {
-		return nil, err
-	}
 	resp = &relation.IsFriendResp{}
 	resp.InUser1Friends, resp.InUser2Friends, err = s.db.CheckIn(ctx, req.UserID1, req.UserID2)
 	if err != nil {
@@ -443,9 +426,6 @@ func (s *friendServer) GetSpecifiedFriendsInfo(ctx context.Context, req *relatio
 		return nil, errs.ErrArgs.WrapMsg("userIDList repeated")
 	}
 
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
 	userMap, err := s.userClient.GetUsersInfoMap(ctx, req.UserIDList)
 	if err != nil {
 		return nil, err
@@ -514,7 +494,10 @@ func (s *friendServer) GetSpecifiedFriendsInfo(ctx context.Context, req *relatio
 	return resp, nil
 }
 
-func (s *friendServer) UpdateFriends(ctx context.Context, req *relation.UpdateFriendsReq) (*relation.UpdateFriendsResp, error) {
+func (s *friendServer) UpdateFriends(
+	ctx context.Context,
+	req *relation.UpdateFriendsReq,
+) (*relation.UpdateFriendsResp, error) {
 	if len(req.FriendUserIDs) == 0 {
 		return nil, errs.ErrArgs.WrapMsg("friendIDList is empty")
 	}
@@ -522,10 +505,6 @@ func (s *friendServer) UpdateFriends(ctx context.Context, req *relation.UpdateFr
 		return nil, errs.ErrArgs.WrapMsg("friendIDList repeated")
 	}
 
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
-
 	_, err := s.db.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs)
 	if err != nil {
 		return nil, err
@@ -551,28 +530,3 @@ func (s *friendServer) UpdateFriends(ctx context.Context, req *relation.UpdateFr
 	s.notificationSender.FriendsInfoUpdateNotification(ctx, req.OwnerUserID, req.FriendUserIDs)
 	return resp, nil
 }
-
-func (s *friendServer) GetSelfUnhandledApplyCount(ctx context.Context, req *relation.GetSelfUnhandledApplyCountReq) (*relation.GetSelfUnhandledApplyCountResp, error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
-
-	count, err := s.db.GetUnhandledCount(ctx, req.UserID, req.Time)
-	if err != nil {
-		return nil, err
-	}
-
-	return &relation.GetSelfUnhandledApplyCountResp{
-		Count: count,
-	}, nil
-}
-
-func (s *friendServer) getCommonUserMap(ctx context.Context, userIDs []string) (map[string]common_user.CommonUser, error) {
-	users, err := s.userClient.GetUsersInfo(ctx, userIDs)
-	if err != nil {
-		return nil, err
-	}
-	return datautil.SliceToMapAny(users, func(e *sdkws.UserInfo) (string, common_user.CommonUser) {
-		return e.UserID, e
-	}), nil
-}

internal/rpc/relation/notification.go

@@ -19,9 +19,6 @@ import (
 
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 	"github.com/openimsdk/protocol/msg"
-	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/utils/datautil"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/versionctx"
@@ -55,7 +52,9 @@ func WithFriendDB(db controller.FriendDatabase) friendNotificationSenderOptions
 	}
 }
 
-func WithDBFunc(fn func(ctx context.Context, userIDs []string) (users []*relationtb.User, err error)) friendNotificationSenderOptions {
+func WithDBFunc(
+	fn func(ctx context.Context, userIDs []string) (users []*relationtb.User, err error),
+) friendNotificationSenderOptions {
 	return func(s *FriendNotificationSender) {
 		f := func(ctx context.Context, userIDs []string) (result []common_user.CommonUser, err error) {
 			users, err := fn(ctx, userIDs)
@@ -71,7 +70,9 @@ func WithDBFunc(fn func(ctx context.Context, userIDs []string) (users []*relatio
 	}
 }
 
-func WithRpcFunc(fn func(ctx context.Context, userIDs []string) ([]*sdkws.UserInfo, error)) friendNotificationSenderOptions {
+func WithRpcFunc(
+	fn func(ctx context.Context, userIDs []string) ([]*sdkws.UserInfo, error),
+) friendNotificationSenderOptions {
 	return func(s *FriendNotificationSender) {
 		f := func(ctx context.Context, userIDs []string) (result []common_user.CommonUser, err error) {
 			users, err := fn(ctx, userIDs)
@@ -99,7 +100,10 @@ func NewFriendNotificationSender(conf *config.Notification, msgClient *rpcli.Msg
 	return f
 }
 
-func (f *FriendNotificationSender) getUsersInfoMap(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error) {
+func (f *FriendNotificationSender) getUsersInfoMap(
+	ctx context.Context,
+	userIDs []string,
+) (map[string]*sdkws.UserInfo, error) {
 	users, err := f.getUsersInfo(ctx, userIDs)
 	if err != nil {
 		return nil, err
@@ -112,7 +116,10 @@ func (f *FriendNotificationSender) getUsersInfoMap(ctx context.Context, userIDs
 }
 
 //nolint:unused
-func (f *FriendNotificationSender) getFromToUserNickname(ctx context.Context, fromUserID, toUserID string) (string, string, error) {
+func (f *FriendNotificationSender) getFromToUserNickname(
+	ctx context.Context,
+	fromUserID, toUserID string,
+) (string, string, error) {
 	users, err := f.getUsersInfoMap(ctx, []string{fromUserID, toUserID})
 	if err != nil {
 		return "", "", nil
@@ -125,107 +132,60 @@ func (f *FriendNotificationSender) UserInfoUpdatedNotification(ctx context.Conte
 	f.Notification(ctx, mcontext.GetOpUserID(ctx), changedUserID, constant.UserInfoUpdatedNotification, &tips)
 }
 
-func (f *FriendNotificationSender) getCommonUserMap(ctx context.Context, userIDs []string) (map[string]common_user.CommonUser, error) {
-	users, err := f.getUsersInfo(ctx, userIDs)
-	if err != nil {
-		return nil, err
-	}
-	return datautil.SliceToMap(users, func(e common_user.CommonUser) string {
-		return e.GetUserID()
-	}), nil
-}
-
-func (f *FriendNotificationSender) getFriendRequests(ctx context.Context, fromUserID, toUserID string) (*sdkws.FriendRequest, error) {
-	if f.db == nil {
-		return nil, errs.ErrInternalServer.WithDetail("db is nil")
-	}
-	friendRequests, err := f.db.FindBothFriendRequests(ctx, fromUserID, toUserID)
-	if err != nil {
-		return nil, err
-	}
-	requests, err := convert.FriendRequestDB2Pb(ctx, friendRequests, f.getCommonUserMap)
-	if err != nil {
-		return nil, err
-	}
-	for _, request := range requests {
-		if request.FromUserID == fromUserID && request.ToUserID == toUserID {
-			return request, nil
-		}
-	}
-	return nil, errs.ErrRecordNotFound.WrapMsg("friend request not found", "fromUserID", fromUserID, "toUserID", toUserID)
-}
-
 func (f *FriendNotificationSender) FriendApplicationAddNotification(ctx context.Context, req *relation.ApplyToAddFriendReq) {
-	request, err := f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
-	if err != nil {
-		log.ZError(ctx, "FriendApplicationAddNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
-		return
-	}
-	tips := sdkws.FriendApplicationTips{
-		FromToUserID: &sdkws.FromToUserID{
-			FromUserID: req.FromUserID,
-			ToUserID:   req.ToUserID,
-		},
-		Request: request,
-	}
+	tips := sdkws.FriendApplicationTips{FromToUserID: &sdkws.FromToUserID{
+		FromUserID: req.FromUserID,
+		ToUserID:   req.ToUserID,
+	}}
 	f.Notification(ctx, req.FromUserID, req.ToUserID, constant.FriendApplicationNotification, &tips)
 }
 
-func (f *FriendNotificationSender) FriendApplicationAgreedNotification(ctx context.Context, req *relation.RespondFriendApplyReq) {
-	request, err := f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
-	if err != nil {
-		log.ZError(ctx, "FriendApplicationAgreedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
-		return
-	}
-	tips := sdkws.FriendApplicationApprovedTips{
-		FromToUserID: &sdkws.FromToUserID{
-			FromUserID: req.FromUserID,
-			ToUserID:   req.ToUserID,
-		},
-		HandleMsg: req.HandleMsg,
-		Request:   request,
-	}
+func (f *FriendNotificationSender) FriendApplicationAgreedNotification(
+	ctx context.Context,
+	req *relation.RespondFriendApplyReq,
+) {
+	tips := sdkws.FriendApplicationApprovedTips{FromToUserID: &sdkws.FromToUserID{
+		FromUserID: req.FromUserID,
+		ToUserID:   req.ToUserID,
+	}, HandleMsg: req.HandleMsg}
 	f.Notification(ctx, req.ToUserID, req.FromUserID, constant.FriendApplicationApprovedNotification, &tips)
 }
 
-func (f *FriendNotificationSender) FriendApplicationRefusedNotification(ctx context.Context, req *relation.RespondFriendApplyReq) {
-	request, err := f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
-	if err != nil {
-		log.ZError(ctx, "FriendApplicationRefusedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
-		return
-	}
-	tips := sdkws.FriendApplicationRejectedTips{
-		FromToUserID: &sdkws.FromToUserID{
-			FromUserID: req.FromUserID,
-			ToUserID:   req.ToUserID,
-		},
-		HandleMsg: req.HandleMsg,
-		Request:   request,
-	}
+func (f *FriendNotificationSender) FriendApplicationRefusedNotification(
+	ctx context.Context,
+	req *relation.RespondFriendApplyReq,
+) {
+	tips := sdkws.FriendApplicationApprovedTips{FromToUserID: &sdkws.FromToUserID{
+		FromUserID: req.FromUserID,
+		ToUserID:   req.ToUserID,
+	}, HandleMsg: req.HandleMsg}
 	f.Notification(ctx, req.ToUserID, req.FromUserID, constant.FriendApplicationRejectedNotification, &tips)
 }
 
-//func (f *FriendNotificationSender) FriendAddedNotification(ctx context.Context, operationID, opUserID, fromUserID, toUserID string) error {
-//	tips := sdkws.FriendAddedTips{Friend: &sdkws.FriendInfo{}, OpUser: &sdkws.PublicUserInfo{}}
-//	user, err := f.getUsersInfo(ctx, []string{opUserID})
-//	if err != nil {
-//		return err
-//	}
-//	tips.OpUser.UserID = user[0].GetUserID()
-//	tips.OpUser.Ex = user[0].GetEx()
-//	tips.OpUser.Nickname = user[0].GetNickname()
-//	tips.OpUser.FaceURL = user[0].GetFaceURL()
-//	friends, err := f.db.FindFriendsWithError(ctx, fromUserID, []string{toUserID})
-//	if err != nil {
-//		return err
-//	}
-//	tips.Friend, err = convert.FriendDB2Pb(ctx, friends[0], f.getUsersInfoMap)
-//	if err != nil {
-//		return err
-//	}
-//	f.Notification(ctx, fromUserID, toUserID, constant.FriendAddedNotification, &tips)
-//	return nil
-//}
+func (f *FriendNotificationSender) FriendAddedNotification(
+	ctx context.Context,
+	operationID, opUserID, fromUserID, toUserID string,
+) error {
+	tips := sdkws.FriendAddedTips{Friend: &sdkws.FriendInfo{}, OpUser: &sdkws.PublicUserInfo{}}
+	user, err := f.getUsersInfo(ctx, []string{opUserID})
+	if err != nil {
+		return err
+	}
+	tips.OpUser.UserID = user[0].GetUserID()
+	tips.OpUser.Ex = user[0].GetEx()
+	tips.OpUser.Nickname = user[0].GetNickname()
+	tips.OpUser.FaceURL = user[0].GetFaceURL()
+	friends, err := f.db.FindFriendsWithError(ctx, fromUserID, []string{toUserID})
+	if err != nil {
+		return err
+	}
+	tips.Friend, err = convert.FriendDB2Pb(ctx, friends[0], f.getUsersInfoMap)
+	if err != nil {
+		return err
+	}
+	f.Notification(ctx, fromUserID, toUserID, constant.FriendAddedNotification, &tips)
+	return nil
+}
 
 func (f *FriendNotificationSender) FriendDeletedNotification(ctx context.Context, req *relation.DeleteFriendReq) {
 	tips := sdkws.FriendDeletedTips{FromToUserID: &sdkws.FromToUserID{

internal/rpc/third/log.go

@@ -25,7 +25,6 @@ import (
 	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/protocol/third"
 	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/mcontext"
 	"github.com/openimsdk/tools/utils/datautil"
 )
 
@@ -46,7 +45,7 @@ func genLogID() string {
 
 func (t *thirdServer) UploadLogs(ctx context.Context, req *third.UploadLogsReq) (*third.UploadLogsResp, error) {
 	var dbLogs []*relationtb.Log
-	userID := mcontext.GetOpUserID(ctx)
+	userID := ctx.Value(constant.OpUserID).(string)
 	platform := constant.PlatformID2Name[int(req.Platform)]
 	for _, fileURL := range req.FileURLs {
 		log := relationtb.Log{

internal/rpc/third/third.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/mcache"
 	"github.com/openimsdk/open-im-server/v3/pkg/dbbuild"
@@ -149,9 +148,6 @@ func (t *thirdServer) FcmUpdateToken(ctx context.Context, req *third.FcmUpdateTo
 }
 
 func (t *thirdServer) SetAppBadge(ctx context.Context, req *third.SetAppBadgeReq) (resp *third.SetAppBadgeResp, err error) {
-	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
-		return nil, err
-	}
 	err = t.thirdDatabase.SetAppBadge(ctx, req.UserID, int(req.AppUnreadCount))
 	if err != nil {
 		return nil, err

internal/rpc/user/user.go

@@ -197,7 +197,6 @@ func (s *userServer) UpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUse
 	}
 
 	s.friendNotificationSender.UserInfoUpdatedNotification(ctx, req.UserInfo.UserID)
-
 	//friends, err := s.friendRpcClient.GetFriendIDs(ctx, req.UserInfo.UserID)
 	//if err != nil {
 	//	return nil, err
@@ -210,7 +209,6 @@ func (s *userServer) UpdateUserInfoEx(ctx context.Context, req *pbuser.UpdateUse
 	//for _, friendID := range friends {
 	//	s.friendNotificationSender.FriendInfoUpdatedNotification(ctx, req.UserInfo.UserID, friendID)
 	//}
-
 	s.webhookAfterUpdateUserInfoEx(ctx, &s.config.WebhooksConfig.AfterUpdateUserInfoEx, req)
 	if err := s.NotificationUserInfoUpdate(ctx, req.UserInfo.UserID, oldUser); err != nil {
 		return nil, err

pkg/authverify/token.go

@@ -64,57 +64,16 @@ func GetIMAdminUserIDs(ctx context.Context) []string {
 }
 
 func IsAdmin(ctx context.Context) bool {
-	return IsTempAdmin(ctx) || IsSystemAdmin(ctx)
+	return datautil.Contain(mcontext.GetOpUserID(ctx), GetIMAdminUserIDs(ctx)...)
 }
 
 func CheckAccess(ctx context.Context, ownerUserID string) error {
-	if mcontext.GetOpUserID(ctx) == ownerUserID {
+	opUserID := mcontext.GetOpUserID(ctx)
+	if opUserID == ownerUserID {
 		return nil
 	}
-	if IsAdmin(ctx) {
+	if datautil.Contain(mcontext.GetOpUserID(ctx), GetIMAdminUserIDs(ctx)...) {
 		return nil
 	}
 	return servererrs.ErrNoPermission.WrapMsg("ownerUserID", ownerUserID)
 }
-
-func CheckAccessIn(ctx context.Context, ownerUserIDs ...string) error {
-	opUserID := mcontext.GetOpUserID(ctx)
-	for _, userID := range ownerUserIDs {
-		if opUserID == userID {
-			return nil
-		}
-	}
-	if IsAdmin(ctx) {
-		return nil
-	}
-	return servererrs.ErrNoPermission.WrapMsg("opUser in ownerUserIDs")
-}
-
-var tempAdminValue = []string{"1"}
-
-const ctxTempAdminKey = "ctxImTempAdminKey"
-
-func WithTempAdmin(ctx context.Context) context.Context {
-	keys, _ := ctx.Value(constant.RpcCustomHeader).([]string)
-	if datautil.Contain(ctxTempAdminKey, keys...) {
-		return ctx
-	}
-	if len(keys) > 0 {
-		temp := make([]string, 0, len(keys)+1)
-		temp = append(temp, keys...)
-		keys = append(temp, ctxTempAdminKey)
-	} else {
-		keys = []string{ctxTempAdminKey}
-	}
-	ctx = context.WithValue(ctx, constant.RpcCustomHeader, keys)
-	return context.WithValue(ctx, ctxTempAdminKey, tempAdminValue)
-}
-
-func IsTempAdmin(ctx context.Context) bool {
-	values, _ := ctx.Value(ctxTempAdminKey).([]string)
-	return datautil.Equal(tempAdminValue, values)
-}
-
-func IsSystemAdmin(ctx context.Context) bool {
-	return datautil.Contain(mcontext.GetOpUserID(ctx), GetIMAdminUserIDs(ctx)...)
-}

pkg/common/convert/friend.go

@@ -17,9 +17,7 @@ package convert
 import (
 	"context"
 	"fmt"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
-	"github.com/openimsdk/open-im-server/v3/pkg/notification/common_user"
 	"github.com/openimsdk/protocol/relation"
 
 	"github.com/openimsdk/protocol/sdkws"
@@ -100,7 +98,7 @@ func FriendOnlyDB2PbOnly(friendsDB []*model.Friend) []*relation.FriendInfoOnly {
 	})
 }
 
-func FriendRequestDB2Pb(ctx context.Context, friendRequests []*model.FriendRequest, getUsers func(ctx context.Context, userIDs []string) (map[string]common_user.CommonUser, error)) ([]*sdkws.FriendRequest, error) {
+func FriendRequestDB2Pb(ctx context.Context, friendRequests []*model.FriendRequest, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) ([]*sdkws.FriendRequest, error) {
 	if len(friendRequests) == 0 {
 		return nil, nil
 	}
@@ -119,11 +117,11 @@ func FriendRequestDB2Pb(ctx context.Context, friendRequests []*model.FriendReque
 		fromUser := users[friendRequest.FromUserID]
 		res = append(res, &sdkws.FriendRequest{
 			FromUserID:    friendRequest.FromUserID,
-			FromNickname:  fromUser.GetNickname(),
-			FromFaceURL:   fromUser.GetFaceURL(),
+			FromNickname:  fromUser.Nickname,
+			FromFaceURL:   fromUser.FaceURL,
 			ToUserID:      friendRequest.ToUserID,
-			ToNickname:    toUser.GetNickname(),
-			ToFaceURL:     toUser.GetFaceURL(),
+			ToNickname:    toUser.Nickname,
+			ToFaceURL:     toUser.FaceURL,
 			HandleResult:  friendRequest.HandleResult,
 			ReqMsg:        friendRequest.ReqMsg,
 			CreateTime:    friendRequest.CreateTime.UnixMilli(),

pkg/common/storage/controller/friend.go

@@ -17,11 +17,10 @@ package controller
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
+	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
 	"github.com/openimsdk/protocol/constant"
@@ -62,10 +61,10 @@ type FriendDatabase interface {
 	PageInWhoseFriends(ctx context.Context, friendUserID string, pagination pagination.Pagination) (total int64, friends []*model.Friend, err error)
 
 	// PageFriendRequestFromMe retrieves the friend requests sent by the user with pagination
-	PageFriendRequestFromMe(ctx context.Context, userID string, handleResults []int, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error)
+	PageFriendRequestFromMe(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error)
 
 	// PageFriendRequestToMe retrieves the friend requests received by the user with pagination
-	PageFriendRequestToMe(ctx context.Context, userID string, handleResults []int, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error)
+	PageFriendRequestToMe(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error)
 
 	// FindFriendsWithError fetches specified friends of a user and returns an error if any do not exist
 	FindFriendsWithError(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*model.Friend, err error)
@@ -88,8 +87,6 @@ type FriendDatabase interface {
 	FindFriendUserID(ctx context.Context, friendUserID string) ([]string, error)
 
 	OwnerIncrVersion(ctx context.Context, ownerUserID string, friendUserIDs []string, state int32) error
-
-	GetUnhandledCount(ctx context.Context, userID string, ts int64) (int64, error)
 }
 
 type friendDatabase struct {
@@ -337,13 +334,13 @@ func (f *friendDatabase) PageInWhoseFriends(ctx context.Context, friendUserID st
 }
 
 // PageFriendRequestFromMe retrieves friend requests sent by me. It does not return an error if the result is empty.
-func (f *friendDatabase) PageFriendRequestFromMe(ctx context.Context, userID string, handleResults []int, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error) {
-	return f.friendRequest.FindFromUserID(ctx, userID, handleResults, pagination)
+func (f *friendDatabase) PageFriendRequestFromMe(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error) {
+	return f.friendRequest.FindFromUserID(ctx, userID, pagination)
 }
 
 // PageFriendRequestToMe retrieves friend requests received by me. It does not return an error if the result is empty.
-func (f *friendDatabase) PageFriendRequestToMe(ctx context.Context, userID string, handleResults []int, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error) {
-	return f.friendRequest.FindToUserID(ctx, userID, handleResults, pagination)
+func (f *friendDatabase) PageFriendRequestToMe(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, friends []*model.FriendRequest, err error) {
+	return f.friendRequest.FindToUserID(ctx, userID, pagination)
 }
 
 // FindFriendsWithError retrieves specified friends' information for ownerUserID. Returns an error if any friend does not exist.
@@ -400,7 +397,3 @@ func (f *friendDatabase) OwnerIncrVersion(ctx context.Context, ownerUserID strin
 	}
 	return f.cache.DelMaxFriendVersion(ownerUserID).ChainExecDel(ctx)
 }
-
-func (f *friendDatabase) GetUnhandledCount(ctx context.Context, userID string, ts int64) (int64, error) {
-	return f.friendRequest.GetUnhandledCount(ctx, userID, ts)
-}

pkg/common/storage/controller/group.go

@@ -68,7 +68,7 @@ type GroupDatabase interface {
 	// FindUserManagedGroupID retrieves group IDs managed by a user.
 	FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
 	// PageGroupRequest paginates through group requests for specified groups.
-	PageGroupRequest(ctx context.Context, groupIDs []string, handleResults []int, pagination pagination.Pagination) (int64, []*model.GroupRequest, error)
+	PageGroupRequest(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (int64, []*model.GroupRequest, error)
 	// GetGroupRoleLevelMemberIDs retrieves user IDs of group members with a specific role level.
 	GetGroupRoleLevelMemberIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
 
@@ -100,7 +100,7 @@ type GroupDatabase interface {
 	// FindGroupRequests retrieves multiple group join requests.
 	FindGroupRequests(ctx context.Context, groupID string, userIDs []string) ([]*model.GroupRequest, error)
 	// PageGroupRequestUser paginates through group join requests made by a user.
-	PageGroupRequestUser(ctx context.Context, userID string, groupIDs []string, handleResults []int, pagination pagination.Pagination) (int64, []*model.GroupRequest, error)
+	PageGroupRequestUser(ctx context.Context, userID string, pagination pagination.Pagination) (int64, []*model.GroupRequest, error)
 
 	// CountTotal counts the total number of groups as of a certain date.
 	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
@@ -124,8 +124,6 @@ type GroupDatabase interface {
 	SearchJoinGroup(ctx context.Context, userID string, keyword string, pagination pagination.Pagination) (int64, []*model.Group, error)
 
 	FindJoinGroupID(ctx context.Context, userID string) ([]string, error)
-
-	GetGroupApplicationUnhandledCount(ctx context.Context, groupIDs []string, ts int64) (int64, error)
 }
 
 func NewGroupDatabase(
@@ -306,8 +304,8 @@ func (g *groupDatabase) FindUserManagedGroupID(ctx context.Context, userID strin
 	return g.groupMemberDB.FindUserManagedGroupID(ctx, userID)
 }
 
-func (g *groupDatabase) PageGroupRequest(ctx context.Context, groupIDs []string, handleResults []int, pagination pagination.Pagination) (int64, []*model.GroupRequest, error) {
-	return g.groupRequestDB.PageGroup(ctx, groupIDs, handleResults, pagination)
+func (g *groupDatabase) PageGroupRequest(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (int64, []*model.GroupRequest, error) {
+	return g.groupRequestDB.PageGroup(ctx, groupIDs, pagination)
 }
 
 func (g *groupDatabase) PageGetJoinGroup(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, totalGroupMembers []*model.GroupMember, err error) {
@@ -465,12 +463,16 @@ func (g *groupDatabase) CreateGroupRequest(ctx context.Context, requests []*mode
 	})
 }
 
-func (g *groupDatabase) TakeGroupRequest(ctx context.Context, groupID string, userID string) (*model.GroupRequest, error) {
+func (g *groupDatabase) TakeGroupRequest(
+	ctx context.Context,
+	groupID string,
+	userID string,
+) (*model.GroupRequest, error) {
 	return g.groupRequestDB.Take(ctx, groupID, userID)
 }
 
-func (g *groupDatabase) PageGroupRequestUser(ctx context.Context, userID string, groupIDs []string, handleResults []int, pagination pagination.Pagination) (int64, []*model.GroupRequest, error) {
-	return g.groupRequestDB.Page(ctx, userID, groupIDs, handleResults, pagination)
+func (g *groupDatabase) PageGroupRequestUser(ctx context.Context, userID string, pagination pagination.Pagination) (int64, []*model.GroupRequest, error) {
+	return g.groupRequestDB.Page(ctx, userID, pagination)
 }
 
 func (g *groupDatabase) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {
@@ -563,7 +565,3 @@ func (g *groupDatabase) MemberGroupIncrVersion(ctx context.Context, groupID stri
 	}
 	return g.cache.DelMaxGroupMemberVersion(groupID).ChainExecDel(ctx)
 }
-
-func (g *groupDatabase) GetGroupApplicationUnhandledCount(ctx context.Context, groupIDs []string, ts int64) (int64, error) {
-	return g.groupRequestDB.GetUnhandledCount(ctx, groupIDs, ts)
-}

pkg/common/storage/database/friend_request.go

@@ -16,7 +16,6 @@ package database
 
 import (
 	"context"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/tools/db/pagination"
 )
@@ -34,9 +33,8 @@ type FriendRequest interface {
 	Find(ctx context.Context, fromUserID, toUserID string) (friendRequest *model.FriendRequest, err error)
 	Take(ctx context.Context, fromUserID, toUserID string) (friendRequest *model.FriendRequest, err error)
 	// Get list of friend requests received by toUserID
-	FindToUserID(ctx context.Context, toUserID string, handleResults []int, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error)
+	FindToUserID(ctx context.Context, toUserID string, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error)
 	// Get list of friend requests sent by fromUserID
-	FindFromUserID(ctx context.Context, fromUserID string, handleResults []int, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error)
+	FindFromUserID(ctx context.Context, fromUserID string, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error)
 	FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*model.FriendRequest, err error)
-	GetUnhandledCount(ctx context.Context, userID string, ts int64) (int64, error)
 }

pkg/common/storage/database/group_request.go

@@ -16,7 +16,6 @@ package database
 
 import (
 	"context"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/tools/db/pagination"
 )
@@ -27,7 +26,6 @@ type GroupRequest interface {
 	UpdateHandler(ctx context.Context, groupID string, userID string, handledMsg string, handleResult int32) (err error)
 	Take(ctx context.Context, groupID string, userID string) (groupRequest *model.GroupRequest, err error)
 	FindGroupRequests(ctx context.Context, groupID string, userIDs []string) ([]*model.GroupRequest, error)
-	Page(ctx context.Context, userID string, groupIDs []string, handleResults []int, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error)
-	PageGroup(ctx context.Context, groupIDs []string, handleResults []int, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error)
-	GetUnhandledCount(ctx context.Context, groupIDs []string, ts int64) (int64, error)
+	Page(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error)
+	PageGroup(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error)
 }

pkg/common/storage/database/mgo/friend_request.go

@@ -16,35 +16,24 @@ package mgo
 
 import (
 	"context"
-	"time"
-
-	"go.mongodb.org/mongo-driver/mongo/options"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/pagination"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func NewFriendRequestMongo(db *mongo.Database) (database.FriendRequest, error) {
 	coll := db.Collection(database.FriendRequestName)
-	_, err := coll.Indexes().CreateMany(context.Background(), []mongo.IndexModel{
-		{
-			Keys: bson.D{
-				{Key: "from_user_id", Value: 1},
-				{Key: "to_user_id", Value: 1},
-			},
-			Options: options.Index().SetUnique(true),
-		},
-		{
-			Keys: bson.D{
-				{Key: "create_time", Value: -1},
-			},
+	_, err := coll.Indexes().CreateOne(context.Background(), mongo.IndexModel{
+		Keys: bson.D{
+			{Key: "from_user_id", Value: 1},
+			{Key: "to_user_id", Value: 1},
 		},
+		Options: options.Index().SetUnique(true),
 	})
 	if err != nil {
 		return nil, err
@@ -56,24 +45,12 @@ type FriendRequestMgo struct {
 	coll *mongo.Collection
 }
 
-func (f *FriendRequestMgo) sort() any {
-	return bson.D{{Key: "create_time", Value: -1}}
+func (f *FriendRequestMgo) FindToUserID(ctx context.Context, toUserID string, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error) {
+	return mongoutil.FindPage[*model.FriendRequest](ctx, f.coll, bson.M{"to_user_id": toUserID}, pagination)
 }
 
-func (f *FriendRequestMgo) FindToUserID(ctx context.Context, toUserID string, handleResults []int, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error) {
-	filter := bson.M{"to_user_id": toUserID}
-	if len(handleResults) > 0 {
-		filter["handle_result"] = bson.M{"$in": handleResults}
-	}
-	return mongoutil.FindPage[*model.FriendRequest](ctx, f.coll, filter, pagination, options.Find().SetSort(f.sort()))
-}
-
-func (f *FriendRequestMgo) FindFromUserID(ctx context.Context, fromUserID string, handleResults []int, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error) {
-	filter := bson.M{"from_user_id": fromUserID}
-	if len(handleResults) > 0 {
-		filter["handle_result"] = bson.M{"$in": handleResults}
-	}
-	return mongoutil.FindPage[*model.FriendRequest](ctx, f.coll, filter, pagination, options.Find().SetSort(f.sort()))
+func (f *FriendRequestMgo) FindFromUserID(ctx context.Context, fromUserID string, pagination pagination.Pagination) (total int64, friendRequests []*model.FriendRequest, err error) {
+	return mongoutil.FindPage[*model.FriendRequest](ctx, f.coll, bson.M{"from_user_id": fromUserID}, pagination)
 }
 
 func (f *FriendRequestMgo) FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*model.FriendRequest, err error) {
@@ -133,11 +110,3 @@ func (f *FriendRequestMgo) Find(ctx context.Context, fromUserID, toUserID string
 func (f *FriendRequestMgo) Take(ctx context.Context, fromUserID, toUserID string) (friendRequest *model.FriendRequest, err error) {
 	return f.Find(ctx, fromUserID, toUserID)
 }
-
-func (f *FriendRequestMgo) GetUnhandledCount(ctx context.Context, userID string, ts int64) (int64, error) {
-	filter := bson.M{"to_user_id": userID, "handle_result": 0}
-	if ts != 0 {
-		filter["create_time"] = bson.M{"$gt": time.Unix(ts, 0)}
-	}
-	return mongoutil.Count(ctx, f.coll, filter)
-}

pkg/common/storage/database/mgo/group_request.go

@@ -16,36 +16,25 @@ package mgo
 
 import (
 	"context"
-	"time"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
-	"github.com/openimsdk/tools/utils/datautil"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/pagination"
 	"github.com/openimsdk/tools/errs"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func NewGroupRequestMgo(db *mongo.Database) (database.GroupRequest, error) {
 	coll := db.Collection(database.GroupRequestName)
-	_, err := coll.Indexes().CreateMany(context.Background(), []mongo.IndexModel{
-		{
-			Keys: bson.D{
-				{Key: "group_id", Value: 1},
-				{Key: "user_id", Value: 1},
-			},
-			Options: options.Index().SetUnique(true),
-		},
-		{
-			Keys: bson.D{
-				{Key: "req_time", Value: -1},
-			},
+	_, err := coll.Indexes().CreateOne(context.Background(), mongo.IndexModel{
+		Keys: bson.D{
+			{Key: "group_id", Value: 1},
+			{Key: "user_id", Value: 1},
 		},
+		Options: options.Index().SetUnique(true),
 	})
 	if err != nil {
 		return nil, errs.Wrap(err)
@@ -77,39 +66,10 @@ func (g *GroupRequestMgo) FindGroupRequests(ctx context.Context, groupID string,
 	return mongoutil.Find[*model.GroupRequest](ctx, g.coll, bson.M{"group_id": groupID, "user_id": bson.M{"$in": userIDs}})
 }
 
-func (g *GroupRequestMgo) sort() any {
-	return bson.D{{Key: "req_time", Value: -1}}
+func (g *GroupRequestMgo) Page(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error) {
+	return mongoutil.FindPage[*model.GroupRequest](ctx, g.coll, bson.M{"user_id": userID}, pagination)
 }
 
-func (g *GroupRequestMgo) Page(ctx context.Context, userID string, groupIDs []string, handleResults []int, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error) {
-	filter := bson.M{"user_id": userID}
-	if len(groupIDs) > 0 {
-		filter["group_id"] = bson.M{"$in": datautil.Distinct(groupIDs)}
-	}
-	if len(handleResults) > 0 {
-		filter["handle_result"] = bson.M{"$in": handleResults}
-	}
-	return mongoutil.FindPage[*model.GroupRequest](ctx, g.coll, filter, pagination, options.Find().SetSort(g.sort()))
-}
-
-func (g *GroupRequestMgo) PageGroup(ctx context.Context, groupIDs []string, handleResults []int, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error) {
-	if len(groupIDs) == 0 {
-		return 0, nil, nil
-	}
-	filter := bson.M{"group_id": bson.M{"$in": groupIDs}}
-	if len(handleResults) > 0 {
-		filter["handle_result"] = bson.M{"$in": handleResults}
-	}
-	return mongoutil.FindPage[*model.GroupRequest](ctx, g.coll, filter, pagination, options.Find().SetSort(g.sort()))
-}
-
-func (g *GroupRequestMgo) GetUnhandledCount(ctx context.Context, groupIDs []string, ts int64) (int64, error) {
-	if len(groupIDs) == 0 {
-		return 0, nil
-	}
-	filter := bson.M{"group_id": bson.M{"$in": groupIDs}, "handle_result": 0}
-	if ts != 0 {
-		filter["req_time"] = bson.M{"$gt": time.Unix(ts, 0)}
-	}
-	return mongoutil.Count(ctx, g.coll, filter)
+func (g *GroupRequestMgo) PageGroup(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (total int64, groups []*model.GroupRequest, err error) {
+	return mongoutil.FindPage[*model.GroupRequest](ctx, g.coll, bson.M{"group_id": bson.M{"$in": groupIDs}}, pagination)
 }

pkg/tools/batcher/batcher.go

@@ -7,7 +7,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/utils/idutil"
 )
@@ -254,14 +253,13 @@ func (b *Batcher[T]) distributeMessage(messages map[string][]*T, totalCount int,
 
 func (b *Batcher[T]) run(channelID int, ch <-chan *Msg[T]) {
 	defer b.wait.Done()
-	ctx := authverify.WithTempAdmin(context.Background())
 	for {
 		select {
 		case messages, ok := <-ch:
 			if !ok {
 				return
 			}
-			b.Do(ctx, channelID, messages)
+			b.Do(context.Background(), channelID, messages)
 			if b.config.syncWait {
 				b.counter.Done()
 			}