new feature: add batch send msg (#560)

* new feature: add batch send msg

* new feature: add batch send msg

* new feature: add batch send msg

* new feature: add batch send msg

* new feature: add batch send msg

* new feature: add batch send msg

internal/api/auth.go

@@ -18,15 +18,14 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/auth"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
 
 type AuthApi rpcclient.Auth
 
-func NewAuthApi(discov discoveryregistry.SvcDiscoveryRegistry) AuthApi {
+func NewAuthApi(client rpcclient.Auth) AuthApi {
-	return AuthApi(*rpcclient.NewAuth(discov))
+	return AuthApi(client)
 }
 
 func (o *AuthApi) UserToken(c *gin.Context) {

internal/api/conversation.go

@@ -18,15 +18,14 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
 
 type ConversationApi rpcclient.Conversation
 
-func NewConversationApi(discov discoveryregistry.SvcDiscoveryRegistry) ConversationApi {
+func NewConversationApi(client rpcclient.Conversation) ConversationApi {
-	return ConversationApi(*rpcclient.NewConversation(discov))
+	return ConversationApi(client)
 }
 
 func (o *ConversationApi) GetAllConversations(c *gin.Context) {

internal/api/friend.go

@@ -16,7 +16,6 @@ package api
 
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/friend"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 
@@ -25,8 +24,8 @@ import (
 
 type FriendApi rpcclient.Friend
 
-func NewFriendApi(discov discoveryregistry.SvcDiscoveryRegistry) FriendApi {
+func NewFriendApi(client rpcclient.Friend) FriendApi {
-	return FriendApi(*rpcclient.NewFriend(discov))
+	return FriendApi(client)
 }
 
 func (o *FriendApi) ApplyToAddFriend(c *gin.Context) {

internal/api/group.go

@@ -16,7 +16,6 @@ package api
 
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 
@@ -25,8 +24,8 @@ import (
 
 type GroupApi rpcclient.Group
 
-func NewGroupApi(discov discoveryregistry.SvcDiscoveryRegistry) GroupApi {
+func NewGroupApi(client rpcclient.Group) GroupApi {
-	return GroupApi(*rpcclient.NewGroup(discov))
+	return GroupApi(client)
 }
 
 func (o *GroupApi) CreateGroup(c *gin.Context) {

internal/api/msg.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
@@ -35,12 +34,13 @@ import (
 )
 
 type MessageApi struct {
-	rpcclient.Message
+	*rpcclient.Message
 	validate      *validator.Validate
+	userRpcClient *rpcclient.UserRpcClient
 }
 
-func NewMessageApi(discov discoveryregistry.SvcDiscoveryRegistry) MessageApi {
+func NewMessageApi(msgRpcClient *rpcclient.Message, userRpcClient *rpcclient.User) MessageApi {
-	return MessageApi{Message: *rpcclient.NewMessage(discov), validate: validator.New()}
+	return MessageApi{Message: msgRpcClient, validate: validator.New(), userRpcClient: rpcclient.NewUserRpcClientByUser(userRpcClient)}
 }
 
 func (MessageApi) SetOptions(options map[string]bool, value bool) {
@@ -50,9 +50,10 @@ func (MessageApi) SetOptions(options map[string]bool, value bool) {
 	utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, value)
 }
 
-func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.ManagementSendMsgReq) *msg.SendMsgReq {
+func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg) *msg.SendMsgReq {
 	var newContent string
 	var err error
+	options := make(map[string]bool, 5)
 	switch params.ContentType {
 	case constant.Text:
 		newContent = params.Content["text"].(string)
@@ -70,11 +71,9 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.Manageme
 		fallthrough
 	case constant.CustomOnlineOnly:
 		fallthrough
-	case constant.Revoke:
-		newContent = params.Content["revokeMsgClientID"].(string)
 	default:
+		newContent = utils.StructToJsonString(params.Content)
 	}
-	options := make(map[string]bool, 5)
 	if params.IsOnlineOnly {
 		m.SetOptions(options, false)
 	}
@@ -98,7 +97,6 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.Manageme
 			MsgFrom:          constant.SysMsgType,
 			ContentType:      params.ContentType,
 			Content:          []byte(newContent),
-			RecvID:           params.RecvID,
 			CreateTime:       utils.GetCurrentTimestampByMill(),
 			Options:          options,
 			OfflinePushInfo:  params.OfflinePushInfo,
@@ -163,19 +161,9 @@ func (m *MessageApi) DeleteMsgPhysical(c *gin.Context) {
 	a2r.Call(msg.MsgClient.DeleteMsgPhysical, m.Client, c)
 }
 
-func (m *MessageApi) SendMessage(c *gin.Context) {
+func (m *MessageApi) getSendMsgReq(c *gin.Context, req apistruct.SendMsg) (sendMsgReq *msg.SendMsgReq, err error) {
-	params := apistruct.ManagementSendMsgReq{}
-	if err := c.BindJSON(&params); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
-	if !tokenverify.IsAppManagerUid(c) {
-		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
-		return
-	}
-
 	var data interface{}
-	switch params.ContentType {
+	switch req.ContentType {
 	case constant.Text:
 		data = apistruct.TextElem{}
 	case constant.Picture:
@@ -192,25 +180,44 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 		data = apistruct.RevokeElem{}
 	case constant.OANotification:
 		data = apistruct.OANotificationElem{}
-		params.SessionType = constant.NotificationChatType
+		req.SessionType = constant.NotificationChatType
 	case constant.CustomNotTriggerConversation:
 		data = apistruct.CustomElem{}
 	case constant.CustomOnlineOnly:
 		data = apistruct.CustomElem{}
 	default:
-		apiresp.GinError(c, errs.ErrArgs.WithDetail("not support err contentType").Wrap())
+		return nil, errs.ErrArgs.WithDetail("not support err contentType")
+	}
+	if err := mapstructure.WeakDecode(req.Content, &data); err != nil {
+		return nil, err
+	}
+	log.ZDebug(c, "getSendMsgReq", "data", data)
+	if err := m.validate.Struct(data); err != nil {
+		return nil, err
+	}
+	return m.newUserSendMsgReq(c, &req), nil
+}
+
+func (m *MessageApi) SendMessage(c *gin.Context) {
+	req := apistruct.SendMsgReq{}
+	if err := c.BindJSON(&req); err != nil {
+		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
 		return
 	}
-	if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
+	log.ZInfo(c, "SendMessage", "req", req)
-		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+	if !tokenverify.IsAppManagerUid(c) {
-		return
+		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
-	} else if err := m.validate.Struct(params); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
 		return
 	}
-	pbReq := m.newUserSendMsgReq(c, &params)
+
+	sendMsgReq, err := m.getSendMsgReq(c, req.SendMsg)
+	if err != nil {
+		log.ZError(c, "decodeData failed", err)
+		apiresp.GinError(c, err)
+	}
+	sendMsgReq.MsgData.RecvID = req.RecvID
 	var status int
-	respPb, err := m.Client.SendMsg(c, pbReq)
+	respPb, err := m.Client.SendMsg(c, sendMsgReq)
 	if err != nil {
 		status = constant.MsgSendFailed
 		apiresp.GinError(c, err)
@@ -226,107 +233,62 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 	apiresp.GinSuccess(c, respPb)
 }
 
-func (m *MessageApi) ManagementBatchSendMsg(c *gin.Context) {
+func (m *MessageApi) BatchSendMsg(c *gin.Context) {
-	params := apistruct.ManagementBatchSendMsgReq{}
+	var (
-	resp := apistruct.ManagementBatchSendMsgResp{}
+		req  apistruct.BatchSendMsgReq
-	var msgSendFailedFlag bool
+		resp apistruct.BatchSendMsgResp
-	if err := c.BindJSON(&params); err != nil {
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.ZError(c, "BatchSendMsg BindJSON failed", err)
 		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
 		return
 	}
-	if !tokenverify.IsAppManagerUid(c) {
+	log.ZInfo(c, "BatchSendMsg", "req", req)
+	if err := tokenverify.CheckAdmin(c); err != nil {
 		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
 		return
 	}
 
-	var data interface{}
+	var recvIDs []string
-	switch params.ContentType {
+	var err error
-	case constant.Text:
+	if req.IsSendAll {
-		data = apistruct.TextElem{}
+		pageNumber := 1
-	case constant.Picture:
+		showNumber := 500
-		data = apistruct.PictureElem{}
+		for {
-	case constant.Voice:
+			recvIDsPart, err := m.userRpcClient.GetAllUserIDs(c, int32(pageNumber), int32(showNumber))
-		data = apistruct.SoundElem{}
-	case constant.Video:
-		data = apistruct.VideoElem{}
-	case constant.File:
-		data = apistruct.FileElem{}
-	case constant.Custom:
-		data = apistruct.CustomElem{}
-	case constant.Revoke:
-		data = apistruct.RevokeElem{}
-	case constant.OANotification:
-		data = apistruct.OANotificationElem{}
-		params.SessionType = constant.NotificationChatType
-	case constant.CustomNotTriggerConversation:
-		data = apistruct.CustomElem{}
-	case constant.CustomOnlineOnly:
-		data = apistruct.CustomElem{}
-	default:
-		apiresp.GinError(c, errs.ErrArgs.WithDetail("not support err contentType").Wrap())
-		return
-	}
-	if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-		return
-	} else if err := m.validate.Struct(params); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-		return
-	}
-
-	t := &apistruct.ManagementSendMsgReq{
-		SendID:           params.SendID,
-		GroupID:          params.GroupID,
-		SenderNickname:   params.SenderNickname,
-		SenderFaceURL:    params.SenderFaceURL,
-		SenderPlatformID: params.SenderPlatformID,
-		Content:          params.Content,
-		ContentType:      params.ContentType,
-		SessionType:      params.SessionType,
-		IsOnlineOnly:     params.IsOnlineOnly,
-		NotOfflinePush:   params.NotOfflinePush,
-		OfflinePushInfo:  params.OfflinePushInfo,
-	}
-	pbReq := m.newUserSendMsgReq(c, t)
-	var recvList []string
-	if params.IsSendAll {
-		// req2 := &user.GetAllUserIDReq{}
-		// resp2, err := m.Message.GetAllUserID(c, req2)
-		// if err != nil {
-		// 	apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-		// 	return
-		// }
-		// recvList = resp2.UserIDs
-	} else {
-		recvList = params.RecvIDList
-	}
-
-	for _, recvID := range recvList {
-		pbReq.MsgData.RecvID = recvID
-		rpcResp, err := m.Client.SendMsg(c, pbReq)
 			if err != nil {
-			resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
+				log.ZError(c, "GetAllUserIDs failed", err)
-			msgSendFailedFlag = true
+				apiresp.GinError(c, err)
+			}
+			if len(recvIDsPart) < showNumber {
+				recvIDs = append(recvIDs, recvIDsPart...)
+				break
+			}
+			pageNumber++
+		}
+	} else {
+		recvIDs = req.RecvIDs
+	}
+	log.ZDebug(c, "BatchSendMsg nums", "nums ", len(recvIDs))
+	sendMsgReq, err := m.getSendMsgReq(c, req.SendMsg)
+	if err != nil {
+		log.ZError(c, "decodeData failed", err)
+		apiresp.GinError(c, err)
+	}
+	for _, recvID := range recvIDs {
+		sendMsgReq.MsgData.RecvID = recvID
+		rpcResp, err := m.Client.SendMsg(c, sendMsgReq)
+		if err != nil {
+			resp.FailedIDs = append(resp.FailedIDs, recvID)
 			continue
 		}
-		resp.Data.ResultList = append(resp.Data.ResultList, &apistruct.SingleReturnResult{
+		resp.Results = append(resp.Results, &apistruct.SingleReturnResult{
 			ServerMsgID: rpcResp.ServerMsgID,
 			ClientMsgID: rpcResp.ClientMsgID,
 			SendTime:    rpcResp.SendTime,
 			RecvID:      recvID,
 		})
 	}
-	var status int32
-	if msgSendFailedFlag {
-		status = constant.MsgSendFailed
-	} else {
-		status = constant.MsgSendSuccessed
-	}
-	_, err := m.Client.SetSendMsgStatus(c, &msg.SetSendMsgStatusReq{Status: status})
-	if err != nil {
-		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-		return
-	}
 	apiresp.GinSuccess(c, resp)
 }
 

internal/api/route.go

@@ -29,6 +29,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
 
 func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.UniversalClient) *gin.Engine {
@@ -40,8 +41,17 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	}
 	log.ZInfo(context.Background(), "load config", "config", config.Config)
 	r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID())
-	u := NewUserApi(discov)
+	// init rpc client here
-	m := NewMessageApi(discov)
+	userRpc := rpcclient.NewUser(discov)
+	groupRpc := rpcclient.NewGroup(discov)
+	friendRpc := rpcclient.NewFriend(discov)
+	messageRpc := rpcclient.NewMessage(discov)
+	conversationRpc := rpcclient.NewConversation(discov)
+	authRpc := rpcclient.NewAuth(discov)
+	thirdRpc := rpcclient.NewThird(discov)
+
+	u := NewUserApi(*userRpc)
+	m := NewMessageApi(messageRpc, userRpc)
 	if config.Config.Prometheus.Enable {
 		prome.NewApiRequestCounter()
 		prome.NewApiRequestFailedCounter()
@@ -65,7 +75,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	//friend routing group
 	friendRouterGroup := r.Group("/friend", ParseToken)
 	{
-		f := NewFriendApi(discov)
+		f := NewFriendApi(*friendRpc)
 		friendRouterGroup.POST("/delete_friend", f.DeleteFriend)
 		friendRouterGroup.POST("/get_friend_apply_list", f.GetFriendApplyList)
 		friendRouterGroup.POST("/get_self_friend_apply_list", f.GetSelfApplyList)
@@ -79,7 +89,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		friendRouterGroup.POST("/import_friend", f.ImportFriends)
 		friendRouterGroup.POST("/is_friend", f.IsFriend)
 	}
-	g := NewGroupApi(discov)
+	g := NewGroupApi(*groupRpc)
 	groupRouterGroup := r.Group("/group", ParseToken)
 	{
 		groupRouterGroup.POST("/create_group", g.CreateGroup)
@@ -113,7 +123,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	//certificate
 	authRouterGroup := r.Group("/auth")
 	{
-		a := NewAuthApi(discov)
+		a := NewAuthApi(*authRpc)
 		authRouterGroup.POST("/user_token", a.UserToken)
 		authRouterGroup.POST("/parse_token", a.ParseToken)
 		authRouterGroup.POST("/force_logout", ParseToken, a.ForceLogout)
@@ -121,7 +131,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	//Third service
 	thirdGroup := r.Group("/third", ParseToken)
 	{
-		t := NewThirdApi(discov)
+		t := NewThirdApi(*thirdRpc)
 		thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
 		thirdGroup.POST("/set_app_badge", t.SetAppBadge)
 
@@ -154,13 +164,13 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		msgGroup.POST("/delete_msg_phsical_by_seq", m.DeleteMsgPhysicalBySeq)
 		msgGroup.POST("/delete_msg_physical", m.DeleteMsgPhysical)
 
-		msgGroup.POST("/batch_send_msg", m.ManagementBatchSendMsg)
+		msgGroup.POST("/batch_send_msg", m.BatchSendMsg)
 		msgGroup.POST("/check_msg_is_send_success", m.CheckMsgIsSendSuccess)
 	}
 	//Conversation
 	conversationGroup := r.Group("/conversation", ParseToken)
 	{
-		c := NewConversationApi(discov)
+		c := NewConversationApi(*conversationRpc)
 		conversationGroup.POST("/get_all_conversations", c.GetAllConversations)
 		conversationGroup.POST("/get_conversation", c.GetConversation)
 		conversationGroup.POST("/get_conversations", c.GetConversations)

internal/api/statistics.go

@@ -18,15 +18,14 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
 
 type StatisticsApi rpcclient.User
 
-func NewStatisticsApi(discov discoveryregistry.SvcDiscoveryRegistry) StatisticsApi {
+func NewStatisticsApi(client rpcclient.User) StatisticsApi {
-	return StatisticsApi(*rpcclient.NewUser(discov))
+	return StatisticsApi(client)
 }
 
 func (s *StatisticsApi) UserRegister(c *gin.Context) {

internal/api/third.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
@@ -31,8 +30,8 @@ import (
 
 type ThirdApi rpcclient.Third
 
-func NewThirdApi(discov discoveryregistry.SvcDiscoveryRegistry) ThirdApi {
+func NewThirdApi(client rpcclient.Third) ThirdApi {
-	return ThirdApi(*rpcclient.NewThird(discov))
+	return ThirdApi(client)
 }
 
 func (o *ThirdApi) FcmUpdateToken(c *gin.Context) {

internal/api/user.go

@@ -22,7 +22,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msggateway"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user"
@@ -31,8 +30,8 @@ import (
 
 type UserApi rpcclient.User
 
-func NewUserApi(discov discoveryregistry.SvcDiscoveryRegistry) UserApi {
+func NewUserApi(client rpcclient.User) UserApi {
-	return UserApi(*rpcclient.NewUser(discov))
+	return UserApi(client)
 }
 
 func (u *UserApi) UserRegister(c *gin.Context) {

internal/rpc/user/user.go

@@ -17,10 +17,11 @@ package user
 import (
 	"context"
 	"errors"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"strings"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
@@ -233,7 +234,7 @@ func (s *userServer) GetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.Ge
 }
 
 func (s *userServer) GetAllUserID(ctx context.Context, req *pbuser.GetAllUserIDReq) (resp *pbuser.GetAllUserIDResp, err error) {
-	userIDs, err := s.UserDatabase.GetAllUserID(ctx)
+	userIDs, err := s.UserDatabase.GetAllUserID(ctx, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	if err != nil {
 		return nil, err
 	}

pkg/apistruct/auth.go

@@ -1,68 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type UserRegisterReq struct {
-	Secret   string `json:"secret"      binding:"required,max=32"`
-	Platform int32  `json:"platform"    binding:"required,min=1,max=12"`
-	ApiUserInfo
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type UserTokenInfo struct {
-	UserID      string `json:"userID"`
-	Token       string `json:"token"`
-	ExpiredTime int64  `json:"expiredTime"`
-}
-type UserRegisterResp struct {
-	UserToken UserTokenInfo `json:"data"`
-}
-
-type UserTokenReq struct {
-	Secret      string `json:"secret"      binding:"required,max=32"`
-	Platform    int32  `json:"platform"    binding:"required,min=1,max=12"`
-	UserID      string `json:"userID"      binding:"required,min=1,max=64"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type UserTokenResp struct {
-	UserToken UserTokenInfo `json:"data"`
-}
-
-type ForceLogoutReq struct {
-	Platform    int32  `json:"platform"    binding:"required,min=1,max=12"`
-	FromUserID  string `json:"fromUserID"  binding:"required,min=1,max=64"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type ForceLogoutResp struct{}
-
-type ParseTokenReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-//type ParseTokenResp struct {
-//
-//	ExpireTime int64 `json:"expireTime" binding:"required"`
-//}
-
-type ExpireTime struct {
-	ExpireTimeSeconds uint32 `json:"expireTimeSeconds"`
-}
-
-type ParseTokenResp struct {
-	Data       map[string]interface{} `json:"data" swaggerignore:"true"`
-	ExpireTime ExpireTime             `json:"-"`
-}

pkg/apistruct/aws.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type AwsStorageCredentialReq struct {
-	OperationID string `json:"operationID"`
-}
-
-type AwsStorageCredentialRespData struct {
-	AccessKeyId     string `json:"accessKeyID"`
-	SecretAccessKey string `json:"secretAccessKey"`
-	SessionToken    string `json:"sessionToken"`
-	RegionID        string `json:"regionId"`
-	Bucket          string `json:"bucket"`
-	FinalHost       string `json:"FinalHost"`
-}
-
-type AwsStorageCredentialResp struct {
-	CosData AwsStorageCredentialRespData
-	Data    map[string]interface{} `json:"data"`
-}

pkg/apistruct/conversation.go

@@ -1,131 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type OptResult struct {
-	ConversationID string `json:"conversationID"`
-	Result         *int32 `json:"result"`
-}
-type GetAllConversationMessageOptReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"`
-}
-type GetAllConversationMessageOptResp struct {
-	ConversationOptResultList []*OptResult `json:"data"`
-}
-type GetReceiveMessageOptReq struct {
-	ConversationIDList []string `json:"conversationIDList" binding:"required"`
-	OperationID        string   `json:"operationID"        binding:"required"`
-	FromUserID         string   `json:"fromUserID"         binding:"required"`
-}
-type GetReceiveMessageOptResp struct {
-	ConversationOptResultList []*OptResult `json:"data"`
-}
-type SetReceiveMessageOptReq struct {
-	FromUserID         string   `json:"fromUserID"         binding:"required"`
-	OperationID        string   `json:"operationID"        binding:"required"`
-	Opt                *int32   `json:"opt"                binding:"required"`
-	ConversationIDList []string `json:"conversationIDList" binding:"required"`
-}
-type SetReceiveMessageOptResp struct {
-	ConversationOptResultList []*OptResult `json:"data"`
-}
-
-type Conversation struct {
-	OwnerUserID           string `json:"ownerUserID"           binding:"required"`
-	ConversationID        string `json:"conversationID"        binding:"required"`
-	ConversationType      int32  `json:"conversationType"      binding:"required"`
-	UserID                string `json:"userID"`
-	GroupID               string `json:"groupID"`
-	RecvMsgOpt            int32  `json:"recvMsgOpt"            binding:"omitempty,oneof=0 1 2"`
-	UnreadCount           int32  `json:"unreadCount"           binding:"omitempty"`
-	DraftTextTime         int64  `json:"draftTextTime"`
-	IsPinned              bool   `json:"isPinned"              binding:"omitempty"`
-	IsPrivateChat         bool   `json:"isPrivateChat"`
-	BurnDuration          int32  `json:"burnDuration"`
-	GroupAtType           int32  `json:"groupAtType"`
-	IsNotInGroup          bool   `json:"isNotInGroup"`
-	UpdateUnreadCountTime int64  `json:"updateUnreadCountTime"`
-	AttachedInfo          string `json:"attachedInfo"`
-	Ex                    string `json:"ex"`
-}
-
-type SetConversationReq struct {
-	Conversation
-	NotificationType int32  `json:"notificationType"`
-	OperationID      string `json:"operationID"      binding:"required"`
-}
-
-type SetConversationResp struct{}
-type ModifyConversationFieldReq struct {
-	Conversation
-	FieldType   int32    `json:"fieldType"   binding:"required"`
-	UserIDList  []string `json:"userIDList"  binding:"required"`
-	OperationID string   `json:"operationID" binding:"required"`
-}
-type ModifyConversationFieldResp struct{}
-
-type BatchSetConversationsReq struct {
-	Conversations    []Conversation `json:"conversations"    binding:"required"`
-	NotificationType int32          `json:"notificationType"`
-	OwnerUserID      string         `json:"ownerUserID"      binding:"required"`
-	OperationID      string         `json:"operationID"      binding:"required"`
-}
-
-type BatchSetConversationsResp struct {
-	Data struct {
-		Success []string `json:"success"`
-		Failed  []string `json:"failed"`
-	} `json:"data"`
-}
-
-type GetConversationReq struct {
-	ConversationID string `json:"conversationID" binding:"required"`
-	OwnerUserID    string `json:"ownerUserID"    binding:"required"`
-	OperationID    string `json:"operationID"    binding:"required"`
-}
-
-type GetConversationResp struct {
-	Conversation Conversation `json:"data"`
-}
-
-type GetAllConversationsReq struct {
-	OwnerUserID string `json:"ownerUserID" binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type GetAllConversationsResp struct {
-	Conversations []Conversation `json:"data"`
-}
-
-type GetConversationsReq struct {
-	ConversationIDs []string `json:"conversationIDs" binding:"required"`
-	OwnerUserID     string   `json:"ownerUserID"     binding:"required"`
-	OperationID     string   `json:"operationID"     binding:"required"`
-}
-
-type GetConversationsResp struct {
-	Conversations []Conversation `json:"data"`
-}
-
-type SetRecvMsgOptReq struct {
-	OwnerUserID      string `json:"ownerUserID"      binding:"required"`
-	ConversationID   string `json:"conversationID"`
-	RecvMsgOpt       int32  `json:"recvMsgOpt"       binding:"omitempty,oneof=0 1 2"`
-	OperationID      string `json:"operationID"      binding:"required"`
-	NotificationType int32  `json:"notificationType"`
-}
-
-type SetRecvMsgOptResp struct{}

pkg/apistruct/cos.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-import sts "github.com/tencentyun/qcloud-cos-sts-sdk/go"
-
-type TencentCloudStorageCredentialReq struct {
-	OperationID string `json:"operationID"`
-}
-
-type TencentCloudStorageCredentialRespData struct {
-	*sts.CredentialResult
-	Region string `json:"region"`
-	Bucket string `json:"bucket"`
-}
-
-type TencentCloudStorageCredentialResp struct {
-	CosData TencentCloudStorageCredentialRespData `json:"-"`
-
-	Data map[string]interface{} `json:"data"`
-}

pkg/apistruct/friend.go

@@ -1,282 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-//type ParamsCommFriend struct {
-//	OperationID string `json:"operationID" binding:"required"`
-//	ToUserID    string `json:"toUserID" binding:"required"`
-//	FromUserID  string `json:"fromUserID" binding:"required"`
-//}
-//
-//type AddBlacklistReq struct {
-//	ParamsCommFriend
-//}
-//type AddBlacklistResp struct {
-//
-//}
-//
-//type ImportFriendReq struct {
-//	FriendUserIDList []string `json:"friendUserIDList" binding:"required"`
-//	OperationID      string   `json:"operationID" binding:"required"`
-//	FromUserID       string   `json:"fromUserID" binding:"required"`
-//}
-//type UserIDResult struct {
-//	UserID string `json:"userID"`
-//	Result int32  `json:"result"`
-//}
-//type ImportFriendResp struct {
-//
-//	UserIDResultList []UserIDResult `json:"data"`
-//}
-//
-//type AddFriendReq struct {
-//	ParamsCommFriend
-//	ReqMsg string `json:"reqMsg"`
-//}
-//type AddFriendResp struct {
-//
-//}
-//
-//type AddFriendResponseReq struct {
-//	ParamsCommFriend
-//	Flag      int32  `json:"flag" binding:"required,oneof=-1 0 1"`
-//	HandleMsg string `json:"handleMsg"`
-//}
-//type AddFriendResponseResp struct {
-//
-//}
-//
-//type DeleteFriendReq struct {
-//	ParamsCommFriend
-//}
-//type DeleteFriendResp struct {
-//
-//}
-//
-//type GetBlackListReq struct {
-//	OperationID string `json:"operationID" binding:"required"`
-//	FromUserID  string `json:"fromUserID" binding:"required"`
-//}
-//type GetBlackListResp struct {
-//
-//	BlackUserInfoList []*sdkws.PublicUserInfo `json:"-"`
-//	Map              []map[string]interface{}      `json:"data" swaggerignore:"true"`
-//}
-//
-////type PublicUserInfo struct {
-////	UserID   string `json:"userID"`
-////	Nickname string `json:"nickname"`
-////	FaceUrl  string `json:"faceUrl"`
-////	Gender   int32  `json:"gender"`
-////}
-//
-//type SetFriendRemarkReq struct {
-//	ParamsCommFriend
-//	Remark string `json:"remark"`
-//}
-//type SetFriendRemarkResp struct {
-//
-//}
-//
-//type RemoveBlacklistReq struct {
-//	ParamsCommFriend
-//}
-//type RemoveBlacklistResp struct {
-//
-//}
-//
-//type IsFriendReq struct {
-//	ParamsCommFriend
-//}
-//type Response struct {
-//	Friend bool `json:"isFriend"`
-//}
-//type IsFriendResp struct {
-//
-//	Response Response `json:"data"`
-//}
-//
-//type GetFriendsInfoReq struct {
-//	ParamsCommFriend
-//}
-//type GetFriendsInfoResp struct {
-//
-//	FriendInfoList []*sdkws.FriendInfo `json:"-"`
-//	Map           []map[string]interface{}  `json:"data" swaggerignore:"true"`
-//}
-//
-//type GetFriendListReq struct {
-//	OperationID string `json:"operationID" binding:"required"`
-//	FromUserID  string `json:"fromUserID" binding:"required"`
-//}
-//type GetFriendListResp struct {
-//
-//	FriendInfoList []*sdkws.FriendInfo `json:"-"`
-//	Map           []map[string]interface{}  `json:"data" swaggerignore:"true"`
-//}
-//
-//type GetFriendApplyListReq struct {
-//	OperationID string `json:"operationID" binding:"required"`
-//	FromUserID  string `json:"fromUserID" binding:"required"`
-//}
-//type GetFriendApplyListResp struct {
-//
-//	FriendRequestList []*sdkws.FriendRequest `json:"-"`
-//	Map              []map[string]interface{}     `json:"data" swaggerignore:"true"`
-//}
-//
-//type GetSelfApplyListReq struct {
-//	OperationID string `json:"operationID" binding:"required"`
-//	FromUserID  string `json:"fromUserID" binding:"required"`
-//}
-//type GetSelfApplyListResp struct {
-//
-//	FriendRequestList []*sdkws.FriendRequest `json:"-"`
-//	Map              []map[string]interface{}     `json:"data" swaggerignore:"true"`
-//}
-
-type FriendInfo struct {
-	UserID   string `json:"userID"`
-	Nickname string `json:"nickname"`
-	FaceURL  string `json:"faceURL"`
-	Gender   int32  `json:"gender"`
-	Ex       string `json:"ex"`
-}
-
-type PublicUserInfo struct {
-	UserID   string `json:"userID"`
-	Nickname string `json:"nickname"`
-	FaceURL  string `json:"faceURL"`
-	Gender   int32  `json:"gender"`
-	Ex       string `json:"ex"`
-}
-
-type FriendRequest struct {
-	FromUserID    string `json:"fromUserID"`
-	FromNickname  string `json:"fromNickname"`
-	FromFaceURL   string `json:"fromFaceURL"`
-	FromGender    int32  `json:"fromGender"`
-	ToUserID      string `json:"toUserID"`
-	ToNickname    string `json:"toNickname"`
-	ToFaceURL     string `json:"toFaceURL"`
-	ToGender      int32  `json:"toGender"`
-	HandleResult  int32  `json:"handleResult"`
-	ReqMsg        string `json:"reqMsg"`
-	CreateTime    uint32 `json:"createTime"`
-	HandlerUserID string `json:"handlerUserID"`
-	HandleMsg     string `json:"handleMsg"`
-	HandleTime    uint32 `json:"handleTime"`
-	Ex            string `json:"ex"`
-}
-
-type AddBlacklistReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-}
-type AddBlacklistResp struct{}
-
-type ImportFriendReq struct {
-	FriendUserIDList []string `json:"friendUserIDList" binding:"required"`
-	FromUserID       string   `json:"fromUserID"       binding:"required"`
-}
-
-type ImportFriendResp struct {
-	//
-}
-
-type AddFriendReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-	ReqMsg     string `json:"reqMsg"`
-}
-type AddFriendResp struct {
-	//
-}
-
-type AddFriendResponseReq struct {
-	ToUserID     string `json:"toUserID"   binding:"required"`
-	FromUserID   string `json:"fromUserID" binding:"required"`
-	HandleResult int32  `json:"flag"       binding:"required,oneof=-1 0 1"`
-	HandleMsg    string `json:"handleMsg"`
-}
-type AddFriendResponseResp struct{}
-
-type DeleteFriendReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-}
-type DeleteFriendResp struct{}
-
-type GetBlackListReq struct {
-	FromUserID string `json:"fromUserID" binding:"required"`
-}
-type GetBlackListResp struct {
-	BlackUserInfoList []PublicUserInfo `json:"blackUserInfoList"`
-}
-
-type SetFriendRemarkReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-	Remark     string `json:"remark"`
-}
-type SetFriendRemarkResp struct{}
-
-type RemoveBlacklistReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-}
-type RemoveBlacklistResp struct{}
-
-type IsFriendReq struct {
-	ToUserID   string `json:"toUserID"   binding:"required"`
-	FromUserID string `json:"fromUserID" binding:"required"`
-}
-type Response struct {
-	Friend bool `json:"isFriend"`
-}
-type IsFriendResp struct {
-	Response Response `json:"data"`
-}
-
-type GetFriendListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"`
-}
-type GetFriendListResp struct {
-	OwnerUserID    string `json:"ownerUserID"`
-	Remark         string `json:"remark"`
-	CreateTime     uint32 `json:"createTime"`
-	AddSource      int32  `json:"addSource"`
-	OperatorUserID string `json:"operatorUserID"`
-	Ex             string `json:"ex"`
-	// FriendUser           *UserInfo // TODO
-}
-
-type GetFriendApplyListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"`
-}
-
-type GetFriendApplyListResp struct {
-	FriendRequestList []FriendRequest `json:"friendRequestList"`
-}
-
-type GetSelfApplyListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"`
-}
-type GetSelfApplyListResp struct {
-	FriendRequestList []FriendRequest `json:"friendRequestList"`
-}

pkg/apistruct/group.go

@@ -1,272 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-import (
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-)
-
-type KickGroupMemberReq struct {
-	GroupID          string   `json:"groupID"          binding:"required"`
-	KickedUserIDList []string `json:"kickedUserIDList" binding:"required"`
-	Reason           string   `json:"reason"`
-	OperationID      string   `json:"operationID"      binding:"required"`
-}
-type KickGroupMemberResp struct {
-	// UserIDResultList []*UserIDResult `json:"data"`
-}
-
-type GetGroupMembersInfoReq struct {
-	GroupID     string   `json:"groupID"     binding:"required"`
-	MemberList  []string `json:"memberList"  binding:"required"`
-	OperationID string   `json:"operationID" binding:"required"`
-}
-type GetGroupMembersInfoResp struct {
-	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
-	Data       []map[string]interface{}     `json:"data" swaggerignore:"true"`
-}
-
-type InviteUserToGroupReq struct {
-	GroupID           string   `json:"groupID"           binding:"required"`
-	InvitedUserIDList []string `json:"invitedUserIDList" binding:"required"`
-	Reason            string   `json:"reason"`
-	OperationID       string   `json:"operationID"       binding:"required"`
-}
-type InviteUserToGroupResp struct {
-	// UserIDResultList []*UserIDResult `json:"data"`
-}
-
-type GetJoinedGroupListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"`
-}
-type GetJoinedGroupListResp struct {
-	GroupInfoList []*sdkws.GroupInfo       `json:"-"`
-	Data          []map[string]interface{} `json:"data" swaggerignore:"true"`
-}
-
-type GetGroupMemberListReq struct {
-	GroupID     string `json:"groupID"`
-	Filter      int32  `json:"filter"`
-	NextSeq     int32  `json:"nextSeq"`
-	OperationID string `json:"operationID"`
-}
-type GetGroupMemberListResp struct {
-	NextSeq    int32                        `json:"nextSeq"`
-	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
-	Data       []map[string]interface{}     `json:"data"    swaggerignore:"true"`
-}
-
-type GetGroupAllMemberReq struct {
-	GroupID     string `json:"groupID"     binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-	Offset      int32  `json:"offset"`
-	Count       int32  `json:"count"`
-}
-type GetGroupAllMemberResp struct {
-	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
-	Data       []map[string]interface{}     `json:"data" swaggerignore:"true"`
-}
-
-//
-//type GetGroupAllMemberListBySplitReq struct {
-//	GroupID     string `json:"groupID" binding:"required"`
-//	OperationID string `json:"operationID" binding:"required"`
-//	Offset      int32  `json:"offset" binding:"required"`
-//	Count       int32  `json:"count" binding:"required"`
-//}
-//type GetGroupAllMemberListBySplitResp struct {
-//
-//	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
-//	Map       []map[string]interface{}           `json:"data" swaggerignore:"true"`
-//}
-
-type CreateGroupReq struct {
-	MemberList   []*GroupAddMemberInfo `json:"memberList"`
-	OwnerUserID  string                `json:"ownerUserID"`
-	GroupType    int32                 `json:"groupType"`
-	GroupName    string                `json:"groupName"`
-	Notification string                `json:"notification"`
-	Introduction string                `json:"introduction"`
-	FaceURL      string                `json:"faceURL"`
-	Ex           string                `json:"ex"`
-	OperationID  string                `json:"operationID"  binding:"required"`
-	GroupID      string                `json:"groupID"`
-}
-type CreateGroupResp struct {
-	GroupInfo sdkws.GroupInfo        `json:"-"`
-	Data      map[string]interface{} `json:"data" swaggerignore:"true"`
-}
-
-type GetGroupApplicationListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"` // 作为管理员或群主收到的 进群申请
-}
-
-type GetGroupApplicationListResp struct {
-	GroupRequestList []*sdkws.GroupRequest    `json:"-"`
-	Data             []map[string]interface{} `json:"data" swaggerignore:"true"`
-}
-
-type GetUserReqGroupApplicationListReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	UserID      string `json:"userID"      binding:"required"`
-}
-
-type GetUserRespGroupApplicationResp struct {
-	GroupRequestList []*sdkws.GroupRequest `json:"data"`
-}
-
-type GetGroupInfoReq struct {
-	GroupIDList []string `json:"groupIDList" binding:"required"`
-	OperationID string   `json:"operationID" binding:"required"`
-}
-type GetGroupInfoResp struct {
-	GroupInfoList []*sdkws.GroupInfo       `json:"-"`
-	Data          []map[string]interface{} `json:"data" swaggerignore:"true"`
-}
-
-//type GroupInfoAlias struct {
-//	sdkws.GroupInfo
-//	NeedVerification int32 `protobuf:"bytes,13,opt,name=needVerification" json:"needVerification,omitempty"`
-//}
-
-//type GroupInfoAlias struct {
-//	GroupID          string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"`
-//	GroupName        string `protobuf:"bytes,2,opt,name=groupName" json:"groupName,omitempty"`
-//	Notification     string `protobuf:"bytes,3,opt,name=notification" json:"notification,omitempty"`
-//	Introduction     string `protobuf:"bytes,4,opt,name=introduction" json:"introduction,omitempty"`
-//	FaceURL          string `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"`
-//	OwnerUserID      string `protobuf:"bytes,6,opt,name=ownerUserID" json:"ownerUserID,omitempty"`
-//	CreateTime       uint32 `protobuf:"varint,7,opt,name=createTime" json:"createTime,omitempty"`
-//	MemberCount      uint32 `protobuf:"varint,8,opt,name=memberCount" json:"memberCount,omitempty"`
-//	Ex               string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"`
-//	Status           int32  `protobuf:"varint,10,opt,name=status" json:"status,omitempty"`
-//	CreatorUserID    string `protobuf:"bytes,11,opt,name=creatorUserID" json:"creatorUserID,omitempty"`
-//	GroupType        int32  `protobuf:"varint,12,opt,name=groupType" json:"groupType,omitempty"`
-//	NeedVerification int32  `protobuf:"bytes,13,opt,name=needVerification" json:"needVerification,omitempty"`
-//}
-
-type ApplicationGroupResponseReq struct {
-	OperationID  string `json:"operationID"  binding:"required"`
-	GroupID      string `json:"groupID"      binding:"required"`
-	FromUserID   string `json:"fromUserID"   binding:"required"` // application from FromUserID
-	HandledMsg   string `json:"handledMsg"`
-	HandleResult int32  `json:"handleResult" binding:"required,oneof=-1 1"`
-}
-type ApplicationGroupResponseResp struct{}
-
-type JoinGroupReq struct {
-	GroupID       string `json:"groupID"       binding:"required"`
-	ReqMessage    string `json:"reqMessage"`
-	OperationID   string `json:"operationID"   binding:"required"`
-	JoinSource    int32  `json:"joinSource"`
-	InviterUserID string `json:"inviterUserID"`
-}
-
-type JoinGroupResp struct{}
-
-type QuitGroupReq struct {
-	GroupID     string `json:"groupID"     binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-type QuitGroupResp struct{}
-
-type SetGroupInfoReq struct {
-	GroupID           string `json:"groupID"           binding:"required"`
-	GroupName         string `json:"groupName"`
-	Notification      string `json:"notification"`
-	Introduction      string `json:"introduction"`
-	FaceURL           string `json:"faceURL"`
-	Ex                string `json:"ex"`
-	OperationID       string `json:"operationID"       binding:"required"`
-	NeedVerification  *int32 `json:"needVerification"`
-	LookMemberInfo    *int32 `json:"lookMemberInfo"`
-	ApplyMemberFriend *int32 `json:"applyMemberFriend"`
-}
-
-type SetGroupInfoResp struct{}
-
-type TransferGroupOwnerReq struct {
-	GroupID        string `json:"groupID"        binding:"required"`
-	OldOwnerUserID string `json:"oldOwnerUserID" binding:"required"`
-	NewOwnerUserID string `json:"newOwnerUserID" binding:"required"`
-	OperationID    string `json:"operationID"    binding:"required"`
-}
-type TransferGroupOwnerResp struct{}
-
-type DismissGroupReq struct {
-	GroupID     string `json:"groupID"     binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-type DismissGroupResp struct{}
-
-type MuteGroupMemberReq struct {
-	OperationID  string `json:"operationID"  binding:"required"`
-	GroupID      string `json:"groupID"      binding:"required"`
-	UserID       string `json:"userID"       binding:"required"`
-	MutedSeconds uint32 `json:"mutedSeconds" binding:"required"`
-}
-type MuteGroupMemberResp struct{}
-
-type CancelMuteGroupMemberReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	GroupID     string `json:"groupID"     binding:"required"`
-	UserID      string `json:"userID"      binding:"required"`
-}
-type CancelMuteGroupMemberResp struct{}
-
-type MuteGroupReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	GroupID     string `json:"groupID"     binding:"required"`
-}
-type MuteGroupResp struct{}
-
-type CancelMuteGroupReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	GroupID     string `json:"groupID"     binding:"required"`
-}
-type CancelMuteGroupResp struct{}
-
-type SetGroupMemberNicknameReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	GroupID     string `json:"groupID"     binding:"required"`
-	UserID      string `json:"userID"      binding:"required"`
-	Nickname    string `json:"nickname"`
-}
-
-type SetGroupMemberNicknameResp struct{}
-
-type SetGroupMemberInfoReq struct {
-	OperationID string  `json:"operationID"      binding:"required"`
-	GroupID     string  `json:"groupID"          binding:"required"`
-	UserID      string  `json:"userID"           binding:"required"`
-	Nickname    *string `json:"nickname"`
-	FaceURL     *string `json:"userGroupFaceUrl"`
-	RoleLevel   *int32  `json:"roleLevel"                           validate:"gte=1,lte=3"`
-	Ex          *string `json:"ex"`
-}
-
-type SetGroupMemberInfoResp struct{}
-
-type GetGroupAbstractInfoReq struct {
-	OperationID string `json:"operationID"`
-	GroupID     string `json:"groupID"`
-}
-
-type GetGroupAbstractInfoResp struct {
-	GroupMemberNumber   int32  `json:"groupMemberNumber"`
-	GroupMemberListHash uint64 `json:"groupMemberListHash"`
-}

pkg/apistruct/manage.go

@@ -18,34 +18,7 @@ import (
 	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
-type DeleteUsersReq struct {
+type SendMsg struct {
-	OperationID      string   `json:"operationID"      binding:"required"`
-	DeleteUserIDList []string `json:"deleteUserIDList" binding:"required"`
-}
-type DeleteUsersResp struct {
-	FailedUserIDList []string `json:"data"`
-}
-type GetAllUsersUidReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-}
-type GetAllUsersUidResp struct {
-	UserIDList []string `json:"data"`
-}
-type GetUsersOnlineStatusReq struct {
-	OperationID string   `json:"operationID" binding:"required"`
-	UserIDList  []string `json:"userIDList"  binding:"required,lte=200"`
-}
-type GetUsersOnlineStatusResp struct {
-	// SuccessResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult `json:"data"`
-}
-
-type AccountCheckReq struct {
-	OperationID     string   `json:"operationID"     binding:"required"`
-	CheckUserIDList []string `json:"checkUserIDList" binding:"required,lte=100"`
-}
-type AccountCheckResp struct{}
-
-type ManagementSendMsg struct {
 	SendID           string                 `json:"sendID"           binding:"required"`
 	GroupID          string                 `json:"groupID"          binding:"required_if=SessionType 2|required_if=SessionType 3"`
 	SenderNickname   string                 `json:"senderNickname"`
@@ -59,48 +32,25 @@ type ManagementSendMsg struct {
 	OfflinePushInfo  *sdkws.OfflinePushInfo `json:"offlinePushInfo"`
 }
 
-type ManagementSendMsgReq struct {
+type SendMsgReq struct {
-	SendID           string                 `json:"sendID"           binding:"required"`
 	RecvID string `json:"recvID"           binding:"required_if" message:"recvID is required if sessionType is SingleChatType or NotificationChatType"`
-	GroupID          string                 `json:"groupID"          binding:"required_if" message:"groupID is required if sessionType is GroupChatType or SuperGroupChatType"`
+	SendMsg
-	SenderNickname   string                 `json:"senderNickname"`
-	SenderFaceURL    string                 `json:"senderFaceURL"`
-	SenderPlatformID int32                  `json:"senderPlatformID"`
-	Content          map[string]interface{} `json:"content"          binding:"required"                                                                                          swaggerignore:"true"`
-	ContentType      int32                  `json:"contentType"      binding:"required"`
-	SessionType      int32                  `json:"sessionType"      binding:"required"`
-	IsOnlineOnly     bool                   `json:"isOnlineOnly"`
-	NotOfflinePush   bool                   `json:"notOfflinePush"`
-	OfflinePushInfo  *sdkws.OfflinePushInfo `json:"offlinePushInfo"`
 }
 
-type ManagementSendMsgResp struct {
+type BatchSendMsgReq struct {
-	ResultList sdkws.UserSendMsgResp `json:"data"`
+	SendMsg
-}
-
-type ManagementBatchSendMsgReq struct {
-	ManagementSendMsg
 	IsSendAll bool     `json:"isSendAll"`
-	RecvIDList []string `json:"recvIDList"`
+	RecvIDs   []string `json:"recvIDs"`
 }
 
-type ManagementBatchSendMsgResp struct {
+type BatchSendMsgResp struct {
-	Data struct {
+	Results   []*SingleReturnResult `json:"results"`
-		ResultList   []*SingleReturnResult `json:"resultList"`
+	FailedIDs []string              `json:"failedUserIDs"`
-		FailedIDList []string
-	} `json:"data"`
 }
+
 type SingleReturnResult struct {
 	ServerMsgID string `json:"serverMsgID"`
 	ClientMsgID string `json:"clientMsgID"`
 	SendTime    int64  `json:"sendTime"`
 	RecvID      string `json:"recvID"`
 }
-
-type CheckMsgIsSendSuccessReq struct {
-	OperationID string `json:"operationID"`
-}
-
-type CheckMsgIsSendSuccessResp struct {
-	Status int32 `json:"status"`
-}

pkg/apistruct/msg.go

@@ -14,46 +14,6 @@
 
 package apistruct
 
-type DelMsgReq struct {
-	UserID      string   `json:"userID,omitempty"      binding:"required"`
-	SeqList     []uint32 `json:"seqList,omitempty"     binding:"required"`
-	OperationID string   `json:"operationID,omitempty" binding:"required"`
-}
-
-type DelMsgResp struct{}
-
-type CleanUpMsgReq struct {
-	UserID      string `json:"userID"      binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type CleanUpMsgResp struct{}
-
-type DelSuperGroupMsgReq struct {
-	UserID      string   `json:"userID"            binding:"required"`
-	GroupID     string   `json:"groupID"           binding:"required"`
-	SeqList     []uint32 `json:"seqList,omitempty"`
-	IsAllDelete bool     `json:"isAllDelete"`
-	OperationID string   `json:"operationID"       binding:"required"`
-}
-
-type DelSuperGroupMsgResp struct{}
-
-type MsgDeleteNotificationElem struct {
-	GroupID     string   `json:"groupID"`
-	IsAllDelete bool     `json:"isAllDelete"`
-	SeqList     []uint32 `json:"seqList"`
-}
-
-type SetMsgMinSeqReq struct {
-	UserID      string `json:"userID"      binding:"required"`
-	GroupID     string `json:"groupID"`
-	MinSeq      uint32 `json:"minSeq"      binding:"required"`
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type SetMsgMinSeqResp struct{}
-
 type PictureBaseInfo struct {
 	UUID   string `mapstructure:"uuid"`
 	Type   string `mapstructure:"type"`
@@ -113,7 +73,7 @@ type CustomElem struct {
 	Extension   string `mapstructure:"extension"`
 }
 type TextElem struct {
-	Content string `mapstructure:"content" validate:"required"`
+	Text string `mapstructure:"text" validate:"required"`
 }
 
 type RevokeElem struct {

pkg/apistruct/oss.go

@@ -1,35 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type OSSCredentialReq struct {
-	OperationID string `json:"operationID"`
-	Filename    string `json:"filename"`
-	FileType    string `json:"file_type"`
-}
-
-type OSSCredentialRespData struct {
-	Endpoint        string `json:"endpoint"`
-	AccessKeyId     string `json:"access_key_id"`
-	AccessKeySecret string `json:"access_key_secret"`
-	Token           string `json:"token"`
-	Bucket          string `json:"bucket"`
-	FinalHost       string `json:"final_host"`
-}
-
-type OSSCredentialResp struct {
-	OssData OSSCredentialRespData  `json:"-"`
-	Data    map[string]interface{} `json:"data"`
-}

pkg/apistruct/pagination.go

@@ -1,20 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type Pagination struct {
-	PageNumber int32 `json:"pageNumber" binding:"required"`
-	ShowNumber int32 `json:"showNumber" binding:"required"`
-}

pkg/apistruct/public.go

@@ -14,18 +14,6 @@
 
 package apistruct
 
-type ApiUserInfo struct {
-	UserID      string `json:"userID"      binding:"required,min=1,max=64"  swaggo:"true,用户ID,"`
-	Nickname    string `json:"nickname"    binding:"omitempty,min=1,max=64" swaggo:"true,my id,19"`
-	FaceURL     string `json:"faceURL"     binding:"omitempty,max=1024"`
-	Gender      int32  `json:"gender"      binding:"omitempty,oneof=0 1 2"`
-	PhoneNumber string `json:"phoneNumber" binding:"omitempty,max=32"`
-	Birth       int64  `json:"birth"       binding:"omitempty"`
-	Email       string `json:"email"       binding:"omitempty,max=64"`
-	CreateTime  int64  `json:"createTime"`
-	Ex          string `json:"ex"          binding:"omitempty,max=1024"`
-}
-
 type GroupAddMemberInfo struct {
 	UserID    string `json:"userID"    binding:"required"`
 	RoleLevel int32  `json:"roleLevel" binding:"required,oneof= 1 3"`

pkg/apistruct/super_group.go

@@ -1,31 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-type GetJoinedSuperGroupListReq struct {
-	GetJoinedGroupListReq
-}
-
-type GetJoinedSuperGroupListResp struct {
-	GetJoinedGroupListResp
-}
-
-type GetSuperGroupsInfoReq struct {
-	GetGroupInfoReq
-}
-
-type GetSuperGroupsInfoResp struct {
-	GetGroupInfoResp
-}

pkg/apistruct/third.go

@@ -1,128 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package apistruct
-
-import "mime/multipart"
-
-type MinioStorageCredentialReq struct {
-	OperationID string `json:"operationID"`
-}
-
-type MiniostorageCredentialResp struct {
-	SecretAccessKey  string `json:"secretAccessKey"`
-	AccessKeyID      string `json:"accessKeyID"`
-	SessionToken     string `json:"sessionToken"`
-	BucketName       string `json:"bucketName"`
-	StsEndpointURL   string `json:"stsEndpointURL"`
-	StorageTime      int    `json:"storageTime"`
-	IsDistributedMod bool   `json:"isDistributedMod"`
-}
-
-type MinioUploadFileReq struct {
-	OperationID string `form:"operationID" binding:"required"`
-	FileType    int    `form:"fileType"    binding:"required"`
-}
-
-type MinioUploadFile struct {
-	URL             string `json:"URL"`
-	NewName         string `json:"newName"`
-	SnapshotURL     string `json:"snapshotURL,omitempty"`
-	SnapshotNewName string `json:"snapshotName,omitempty"`
-}
-
-type MinioUploadFileResp struct {
-	Data struct {
-		MinioUploadFile
-	} `json:"data"`
-}
-
-type UploadUpdateAppReq struct {
-	OperationID string                `form:"operationID" binding:"required"`
-	Type        int                   `form:"type"        binding:"required"`
-	Version     string                `form:"version"     binding:"required"`
-	File        *multipart.FileHeader `form:"file"        binding:"required"`
-	Yaml        *multipart.FileHeader `form:"yaml"`
-	ForceUpdate bool                  `form:"forceUpdate"`
-	UpdateLog   string                `form:"updateLog"   binding:"required"`
-}
-
-type UploadUpdateAppResp struct{}
-
-type GetDownloadURLReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	Type        int    `json:"type"        binding:"required"`
-	Version     string `json:"version"     binding:"required"`
-}
-
-type GetDownloadURLResp struct {
-	Data struct {
-		HasNewVersion bool   `json:"hasNewVersion"`
-		ForceUpdate   bool   `json:"forceUpdate"`
-		FileURL       string `json:"fileURL"`
-		YamlURL       string `json:"yamlURL"`
-		Version       string `json:"version"`
-		UpdateLog     string `json:"update_log"`
-	} `json:"data"`
-}
-
-type GetRTCInvitationInfoReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	ClientMsgID string `json:"clientMsgID" binding:"required"`
-}
-
-type GetRTCInvitationInfoResp struct {
-	Data struct {
-		OpUserID   string `json:"opUserID"`
-		Invitation struct {
-			InviterUserID     string   `json:"inviterUserID"`
-			InviteeUserIDList []string `json:"inviteeUserIDList"`
-			GroupID           string   `json:"groupID"`
-			RoomID            string   `json:"roomID"`
-			Timeout           int32    `json:"timeout"`
-			MediaType         string   `json:"mediaType"`
-			SessionType       int32    `json:"sessionType"`
-			InitiateTime      int32    `json:"initiateTime"`
-			PlatformID        int32    `json:"platformID"`
-			CustomData        string   `json:"customData"`
-		} `json:"invitation"`
-		OfflinePushInfo struct{} `json:"offlinePushInfo"`
-	} `json:"data"`
-}
-
-type GetRTCInvitationInfoStartAppReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-}
-
-type GetRTCInvitationInfoStartAppResp struct {
-	GetRTCInvitationInfoResp
-}
-
-/**
- * FCM第三方上报Token.
- */
-type FcmUpdateTokenReq struct {
-	OperationID string `json:"operationID" binding:"required"`
-	Platform    int    `json:"platform"    binding:"required,min=1,max=2"` // only for ios + android
-	FcmToken    string `json:"fcmToken"    binding:"required"`
-}
-
-type FcmUpdateTokenResp struct{}
-type SetAppBadgeReq struct {
-	OperationID    string `json:"operationID"    binding:"required"`
-	FromUserID     string `json:"fromUserID"     binding:"required"`
-	AppUnreadCount int32  `json:"appUnreadCount"`
-}
-
-type SetAppBadgeResp struct{}

pkg/common/db/controller/user.go

@@ -41,7 +41,7 @@ type UserDatabase interface {
 	//只要有一个存在就为true
 	IsExist(ctx context.Context, userIDs []string) (exist bool, err error)
 	//获取所有用户ID
-	GetAllUserID(ctx context.Context) ([]string, error)
+	GetAllUserID(ctx context.Context, pageNumber, showNumber int32) ([]string, error)
 	//函数内部先查询db中是否存在，存在则什么都不做；不存在则插入
 	InitOnce(ctx context.Context, users []*relation.UserModel) (err error)
 	// 获取用户总数
@@ -147,8 +147,8 @@ func (u *userDatabase) IsExist(ctx context.Context, userIDs []string) (exist boo
 	return false, nil
 }
 
-func (u *userDatabase) GetAllUserID(ctx context.Context) (userIDs []string, err error) {
+func (u *userDatabase) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) {
-	return u.userDB.GetAllUserID(ctx)
+	return u.userDB.GetAllUserID(ctx, pageNumber, showNumber)
 }
 
 func (u *userDatabase) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {

pkg/common/db/relation/user_model.go

@@ -84,9 +84,8 @@ func (u *UserGorm) Page(
 }
 
 // 获取所有用户ID
-func (u *UserGorm) GetAllUserID(ctx context.Context) (userIDs []string, err error) {
+func (u *UserGorm) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) {
-	err = u.db(ctx).Pluck("user_id", &userIDs).Error
+	return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)
-	return userIDs, err
 }
 
 func (u *UserGorm) GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error) {

pkg/common/db/table/relation/user.go

@@ -63,7 +63,7 @@ type UserModelInterface interface {
 	Take(ctx context.Context, userID string) (user *UserModel, err error)
 	// 获取用户信息 不存在，不返回错误
 	Page(ctx context.Context, pageNumber, showNumber int32) (users []*UserModel, count int64, err error)
-	GetAllUserID(ctx context.Context) (userIDs []string, err error)
+	GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error)
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	// 获取用户总数
 	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)

pkg/rpcclient/user.go

@@ -46,6 +46,11 @@ func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User {
 
 type UserRpcClient User
 
+func NewUserRpcClientByUser(user *User) *UserRpcClient {
+	rpc := UserRpcClient(*user)
+	return &rpc
+}
+
 func NewUserRpcClient(client discoveryregistry.SvcDiscoveryRegistry) UserRpcClient {
 	return UserRpcClient(*NewUser(client))
 }
@@ -141,3 +146,11 @@ func (u *UserRpcClient) Access(ctx context.Context, ownerUserID string) error {
 	}
 	return tokenverify.CheckAccessV3(ctx, ownerUserID)
 }
+
+func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumber int32) ([]string, error) {
+	resp, err := u.Client.GetAllUserID(ctx, &user.GetAllUserIDReq{Pagination: &sdkws.RequestPagination{PageNumber: pageNumber, ShowNumber: showNumber}})
+	if err != nil {
+		return nil, err
+	}
+	return resp.UserIDs, nil
+}