Merge remote-tracking branch 'origin/errcode' into errcode

internal/rpc/admin_cms/admin_cms.go

@@ -3,7 +3,6 @@ package admin_cms
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
@@ -300,32 +299,23 @@ func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatL
 }
 
 func (s *adminCMSServer) GetActiveGroup(_ context.Context, req *pbAdminCMS.GetActiveGroupReq) (*pbAdminCMS.GetActiveGroupResp, error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req", req.String())
+	resp := &pbAdminCMS.GetActiveGroupResp{}
-	resp := &pbAdminCMS.GetActiveGroupResp{CommonResp: &pbAdminCMS.CommonResp{}}
 	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
 	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error())
+		return resp, err
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = err.Error()
-		return resp, nil
 	}
-	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "time: ", fromTime, toTime)
 	activeGroups, err := imdb.GetActiveGroups(fromTime, toTime, 12)
 	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveGroups failed", err.Error())
+		return resp, err
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = err.Error()
-		return resp, nil
 	}
 	for _, activeGroup := range activeGroups {
 		resp.Groups = append(resp.Groups,
 			&pbAdminCMS.GroupResp{
 				GroupName:  activeGroup.Name,
-				GroupId:    activeGroup.Id,
+				GroupID:    activeGroup.Id,
 				MessageNum: int32(activeGroup.MessageNum),
 			})
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
 	return resp, nil
 }
 
@@ -516,9 +506,9 @@ func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS
 		resp.CommonResp.ErrMsg = err.Error()
 		return resp, nil
 	}
-	privateMessageNum, err := imdb.GetPrivateMessageNum(fromTime, toTime.Add(time.Hour*24))
+	privateMessageNum, err := imdb.GetSingleChatMessageNum(fromTime, toTime.Add(time.Hour*24))
 	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetPrivateMessageNum failed", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSingleChatMessageNum failed", err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
 		resp.CommonResp.ErrMsg = err.Error()
 		return resp, nil
@@ -542,7 +532,7 @@ func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS
 		go func(wg *sync.WaitGroup, index int, v [2]time.Time) {
 			defer wg.Done()
 
-			num, err := imdb.GetPrivateMessageNum(v[0], v[1])
+			num, err := imdb.GetSingleChatMessageNum(v[0], v[1])
 			if err != nil {
 				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
 			}

internal/rpc/user/user.go

@@ -13,11 +13,9 @@ import (
 	"Open_IM/pkg/getcdv3"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	pbFriend "Open_IM/pkg/proto/friend"
-	sdkws "Open_IM/pkg/proto/sdk_ws"
 	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
-	"errors"
 	"net"
 	"strconv"
 	"strings"
@@ -26,7 +24,6 @@ import (
 
 	utils2 "Open_IM/internal/utils"
 	"google.golang.org/grpc"
-	"gorm.io/gorm"
 )
 
 type userServer struct {
@@ -559,74 +556,48 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
 	}
 
 	if req.UserName != "" {
-		usersDB, err = imdb.GetUserByName(req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber)
+		usersDB, total, err := s.GetByName(ctx, req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber)
 		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber, err.Error())
+			return nil, err
-			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-			resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
-			return resp, nil
 		}
-		resp.TotalNums, err = imdb.GetUsersCount(req.UserName)
+		resp.Total = int32(total)
-		if err != nil {
+		for _, v := range usersDB {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), req.UserName, err.Error())
+			u1, err := utils2.NewDBUser(v).Convert()
-			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			if err != nil {
-			resp.CommonResp.ErrMsg = err.Error()
+				return nil, err
-			return resp, nil
+			}
+			resp.Users = append(resp.Users, u1)
 		}
-
+		return &resp, nil
 	} else if req.Content != "" {
-		var count int64
+		usersDB, total, err := s.GetByNameAndID(ctx, req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber)
-		usersDB, count, err = imdb.GetUsersByNameAndID(req.Content, req.Pagination.ShowNumber, req.Pagination.PageNumber)
 		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUsers failed", req.Pagination.ShowNumber, req.Pagination.PageNumber, err.Error())
+			return nil, err
-			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-			resp.CommonResp.ErrMsg = err.Error()
-			return resp, nil
 		}
-		resp.TotalNums = int32(count)
+		resp.Total = int32(total)
+		for _, v := range usersDB {
+			u1, err := utils2.NewDBUser(v).Convert()
+			if err != nil {
+				return nil, err
+			}
+			resp.Users = append(resp.Users, u1)
+		}
+		return &resp, nil
 	}
 
-	else {
+	usersDB, total, err := s.Get(ctx, req.Pagination.ShowNumber, req.Pagination.PageNumber)
-		usersDB, err = imdb.GetUsers(req.Pagination.ShowNumber, req.Pagination.PageNumber)
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUsers failed", req.Pagination.ShowNumber, req.Pagination.PageNumber, err.Error())
-			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-			resp.CommonResp.ErrMsg = err.Error()
-			return resp, nil
-		}
-		resp.TotalNums, err = imdb.GetTotalUserNum()
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-			resp.CommonResp.ErrMsg = err.Error()
-			return resp, nil
-		}
-	}
-	for _, userDB := range usersDB {
-		var user sdkws.UserInfo
-		utils.CopyStructFields(&user, userDB)
-		user.CreateTime = uint32(userDB.CreateTime.Unix())
-		user.BirthStr = utils.TimeToString(userDB.Birth)
-		resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user})
-	}
-
-	var userIDList []string
-	for _, v := range resp.UserList {
-		userIDList = append(userIDList, v.User.UserID)
-	}
-	isBlockUser, err := imdb.UsersIsBlock(userIDList)
 	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userIDList)
+		return nil, err
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = err.Error()
-		return resp, nil
 	}
 
-	for _, v := range resp.UserList {
+	resp.Total = int32(total)
-		if utils.IsContain(v.User.UserID, isBlockUser) {
+
-			v.IsBlock = true
+	for _, userDB := range usersDB {
+		u, err := utils2.NewDBUser(userDB).Convert()
+		if err != nil {
+			return nil, err
 		}
+		resp.Users = append(resp.Users, u)
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	return &resp, nil
-	return resp, nil
 }

internal/utils/convert.go

@@ -281,7 +281,7 @@ func (pb *PBUser) Convert() (*relation.User, error) {
 func (db *DBUser) Convert() (*sdk.UserInfo, error) {
 	dst := &sdk.UserInfo{}
 	utils.CopyStructFields(dst, db)
-	dst.CreateTime = uint32(db.CreateTime.Unix())
+	dst.CreateTime = db.CreateTime.Unix()
 	dst.Birthday = db.Birth.Unix()
 	return dst, nil
 }

pkg/common/db/controller/admin_cms.go

@@ -0,0 +1,142 @@
+package controller
+
+import (
+	"Open_IM/pkg/common/db/relation"
+	"gorm.io/gorm"
+	"time"
+)
+
+type AdminCMSInterface interface {
+	GetActiveUserNum(from, to time.Time) (num int64, err error)
+	GetIncreaseUserNum(from, to time.Time) (num int64, err error)
+	GetTotalUserNum() (num int64, err error)
+	GetTotalUserNumByDate(to time.Time) (num int64, err error)
+	GetSingleChatMessageNum(from, to time.Time) (num int64, err error)
+	GetGroupMessageNum(from, to time.Time) (num int64, err error)
+	GetIncreaseGroupNum(from, to time.Time) (num int64, err error)
+	GetTotalGroupNum() (num int64, err error)
+	GetGroupNum(to time.Time) (num int64, err error)
+	GetActiveGroups(from, to time.Time, limit int) (activeGroups []*relation.ActiveGroup, err error)
+	GetActiveUsers(from, to time.Time, limit int) (activeUsers []*relation.ActiveUser, err error)
+}
+
+type AdminCMSController struct {
+	database AdminCMSDatabaseInterface
+}
+
+func NewAdminCMSController(db *gorm.DB) AdminCMSInterface {
+	adminCMSController := &AdminCMSController{
+		database: newAdminCMSDatabase(db),
+	}
+	return adminCMSController
+}
+
+func newAdminCMSDatabase(db *gorm.DB) AdminCMSDatabaseInterface {
+	return &AdminCMSDatabase{Statistics: relation.NewStatistics(db)}
+}
+
+func (admin *AdminCMSController) GetActiveUserNum(from, to time.Time) (num int64, err error) {
+	return admin.database.GetActiveUserNum(from, to)
+}
+
+func (admin *AdminCMSController) GetIncreaseUserNum(from, to time.Time) (num int64, err error) {
+	return admin.database.GetIncreaseUserNum(from, to)
+}
+
+func (admin *AdminCMSController) GetTotalUserNum() (num int64, err error) {
+	return admin.database.GetTotalUserNum()
+}
+
+func (admin *AdminCMSController) GetTotalUserNumByDate(to time.Time) (num int64, err error) {
+	return admin.database.GetTotalUserNumByDate(to)
+}
+
+func (admin *AdminCMSController) GetSingleChatMessageNum(from, to time.Time) (num int64, err error) {
+	return admin.GetSingleChatMessageNum(from, to)
+}
+
+func (admin *AdminCMSController) GetGroupMessageNum(from, to time.Time) (num int64, err error) {
+	return admin.database.GetGroupMessageNum(from, to)
+}
+
+func (admin *AdminCMSController) GetIncreaseGroupNum(from, to time.Time) (num int64, err error) {
+	return admin.database.GetIncreaseGroupNum(from, to)
+}
+
+func (admin *AdminCMSController) GetTotalGroupNum() (num int64, err error) {
+	return admin.database.GetTotalGroupNum()
+}
+
+func (admin *AdminCMSController) GetGroupNum(to time.Time) (num int64, err error) {
+	return admin.database.GetGroupNum(to)
+}
+
+func (admin *AdminCMSController) GetActiveGroups(from, to time.Time, limit int) ([]*relation.ActiveGroup, error) {
+	return admin.database.GetActiveGroups(from, to, limit)
+}
+
+func (admin *AdminCMSController) GetActiveUsers(from, to time.Time, limit int) (activeUsers []*relation.ActiveUser, err error) {
+	return admin.database.GetActiveUsers(from, to, limit)
+}
+
+type AdminCMSDatabaseInterface interface {
+	GetActiveUserNum(from, to time.Time) (num int64, err error)
+	GetIncreaseUserNum(from, to time.Time) (num int64, err error)
+	GetTotalUserNum() (num int64, err error)
+	GetTotalUserNumByDate(to time.Time) (num int64, err error)
+	GetSingleChatMessageNum(from, to time.Time) (num int64, err error)
+	GetGroupMessageNum(from, to time.Time) (num int64, err error)
+	GetIncreaseGroupNum(from, to time.Time) (num int64, err error)
+	GetTotalGroupNum() (num int64, err error)
+	GetGroupNum(to time.Time) (num int64, err error)
+	GetActiveGroups(from, to time.Time, limit int) ([]*relation.ActiveGroup, error)
+	GetActiveUsers(from, to time.Time, limit int) (activeUsers []*relation.ActiveUser, err error)
+}
+
+type AdminCMSDatabase struct {
+	Statistics *relation.Statistics
+}
+
+func (admin *AdminCMSDatabase) GetActiveUserNum(from, to time.Time) (num int64, err error) {
+	return admin.Statistics.GetActiveUserNum(from, to)
+}
+
+func (admin *AdminCMSDatabase) GetIncreaseUserNum(from, to time.Time) (num int64, err error) {
+	return admin.Statistics.GetIncreaseUserNum(from, to)
+}
+
+func (admin *AdminCMSDatabase) GetTotalUserNum() (num int64, err error) {
+	return admin.Statistics.GetTotalUserNum()
+}
+
+func (admin *AdminCMSDatabase) GetTotalUserNumByDate(to time.Time) (num int64, err error) {
+	return admin.Statistics.GetTotalUserNumByDate(to)
+}
+
+func (admin *AdminCMSDatabase) GetSingleChatMessageNum(from, to time.Time) (num int64, err error) {
+	return admin.Statistics.GetSingleChatMessageNum(from, to)
+}
+
+func (admin *AdminCMSDatabase) GetGroupMessageNum(from, to time.Time) (num int64, err error) {
+	return admin.Statistics.GetGroupMessageNum(from, to)
+}
+
+func (admin *AdminCMSDatabase) GetIncreaseGroupNum(from, to time.Time) (num int64, err error) {
+	return admin.Statistics.GetIncreaseGroupNum(from, to)
+}
+
+func (admin *AdminCMSDatabase) GetTotalGroupNum() (num int64, err error) {
+	return admin.Statistics.GetTotalGroupNum()
+}
+
+func (admin *AdminCMSDatabase) GetGroupNum(to time.Time) (num int64, err error) {
+	return admin.Statistics.GetGroupNum(to)
+}
+
+func (admin *AdminCMSDatabase) GetActiveGroups(from, to time.Time, limit int) ([]*relation.ActiveGroup, error) {
+	return admin.Statistics.GetActiveGroups(from, to, limit)
+}
+
+func (admin *AdminCMSDatabase) GetActiveUsers(from, to time.Time, limit int) (activeUsers []*relation.ActiveUser, err error) {
+	return admin.Statistics.GetActiveUsers(from, to, limit)
+}

pkg/common/db/controller/group.go

@@ -33,7 +33,7 @@ type GroupInterface interface {
 }
 
 type GroupController struct {
-	database DataBase
+	database GroupDataBaseInterface
 }
 
 func NewGroupController(db *gorm.DB, rdb redis.UniversalClient, mgoDB *mongo.Client) GroupInterface {
@@ -65,16 +65,10 @@ func (g *GroupController) CreateSuperGroup(ctx context.Context, groupID string,
 	return g.database.CreateSuperGroup(ctx, groupID, initMemberIDList)
 }
 
-func (g *GroupController) GetJoinedGroupList(ctx context.Context, userID string) ([]*relation.Group, error) {
+type GroupDataBaseInterface interface {
-	return g.database.GetJoinedGroupList(ctx, userID)
-}
-
-type DataBase interface {
 	FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error)
 	CreateGroup(ctx context.Context, groups []*relation.Group, groupMember []*relation.GroupMember) error
 	DeleteGroupByIDs(ctx context.Context, groupIDs []string) error
-	GetJoinedGroupList(ctx context.Context, userID string) ([]*relation.Group, error)
-
 	TakeGroupByID(ctx context.Context, groupID string) (group *relation.Group, err error)
 	GetSuperGroupByID(ctx context.Context, groupID string) (superGroup *unrelation.SuperGroup, err error)
 	CreateSuperGroup(ctx context.Context, groupID string, initMemberIDList []string) error
@@ -90,7 +84,7 @@ type GroupDataBase struct {
 	mongoDB *unrelation.SuperGroupMgoDB
 }
 
-func newGroupDatabase(db *gorm.DB, rdb redis.UniversalClient, mgoDB *mongo.Client) DataBase {
+func newGroupDatabase(db *gorm.DB, rdb redis.UniversalClient, mgoDB *mongo.Client) GroupDataBaseInterface {
 	groupDB := relation.NewGroupDB(db)
 	groupMemberDB := relation.NewGroupMemberDB(db)
 	groupRequestDB := relation.NewGroupRequest(db)

pkg/common/db/controller/user.go

@@ -12,7 +12,9 @@ type UserInterface interface {
 	Take(ctx context.Context, userID string) (user *relation.User, err error)
 	Update(ctx context.Context, users []*relation.User) (err error)
 	UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error)
-	GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, err error)
+	GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error)
+	GetByNameAndID(ctx context.Context, content string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error)
+	Get(ctx context.Context, showNumber, pageNumber int32) (users []*relation.User, count int64, err error)
 }
 
 type UserController struct {
@@ -34,10 +36,15 @@ func (u *UserController) Update(ctx context.Context, users []*relation.User) (er
 func (u *UserController) UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) {
 	return u.database.UpdateByMap(ctx, userID, args)
 }
-func (u *UserController) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, err error) {
+func (u *UserController) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
 	return u.database.GetByName(ctx, userName, showNumber, pageNumber)
 }
-
+func (u *UserController) GetByNameAndID(ctx context.Context, content string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
+	return u.database.GetByNameAndID(ctx, content, showNumber, pageNumber)
+}
+func (u *UserController) Get(ctx context.Context, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
+	return u.database.Get(ctx, showNumber, pageNumber)
+}
 func NewUserController(db *gorm.DB) UserInterface {
 	controller := &UserController{database: newUserDatabase(db)}
 	return controller
@@ -49,7 +56,9 @@ type UserDatabaseInterface interface {
 	Take(ctx context.Context, userID string) (user *relation.User, err error)
 	Update(ctx context.Context, users []*relation.User) (err error)
 	UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error)
-	GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, err error)
+	GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error)
+	GetByNameAndID(ctx context.Context, content string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error)
+	Get(ctx context.Context, showNumber, pageNumber int32) (users []*User, count int64, err error)
 }
 
 type UserDatabase struct {
@@ -80,6 +89,12 @@ func (u *UserDatabase) Update(ctx context.Context, users []*relation.User) (err
 func (u *UserDatabase) UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) {
 	return u.sqlDB.UpdateByMap(ctx, userID, args)
 }
-func (u *UserDatabase) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, err error) {
+func (u *UserDatabase) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
 	return u.sqlDB.GetByName(ctx, userName, showNumber, pageNumber)
 }
+func (u *UserDatabase) GetByNameAndID(ctx context.Context, content string, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
+	return u.sqlDB.GetByNameAndID(ctx, content, showNumber, pageNumber)
+}
+func (u *UserDatabase) Get(ctx context.Context, showNumber, pageNumber int32) (users []*relation.User, count int64, err error) {
+	return u.sqlDB.Get(ctx, showNumber, pageNumber)
+}

pkg/common/db/relation/statistics_model.go

@@ -46,7 +46,7 @@ func (s *Statistics) GetTotalUserNumByDate(to time.Time) (num int64, err error)
 	return num, err
 }
 
-func (s *Statistics) GetPrivateMessageNum(from, to time.Time) (num int64, err error) {
+func (s *Statistics) GetSingleChatMessageNum(from, to time.Time) (num int64, err error) {
 	err = s.getChatLogModel().Where("send_time >= ? and send_time <= ? and session_type = ?", from, to, constant.SingleChatType).Count(&num).Error
 	return num, err
 }
@@ -71,18 +71,18 @@ func (s *Statistics) GetGroupNum(to time.Time) (num int64, err error) {
 	return num, err
 }
 
-type activeGroup struct {
+type ActiveGroup struct {
 	Name       string
-	Id         string `gorm:"column:recv_id"`
+	ID         string `gorm:"column:recv_id"`
 	MessageNum int    `gorm:"column:message_num"`
 }
 
-func (s *Statistics) GetActiveGroups(from, to time.Time, limit int) ([]*activeGroup, error) {
+func (s *Statistics) GetActiveGroups(from, to time.Time, limit int) ([]*ActiveGroup, error) {
-	var activeGroups []*activeGroup
+	var activeGroups []*ActiveGroup
 	err := s.getChatLogModel().Select("recv_id, count(*) as message_num").Where("send_time >= ? and send_time <= ? and session_type in (?)", from, to, []int{constant.GroupChatType, constant.SuperGroupChatType}).Group("recv_id").Limit(limit).Order("message_num DESC").Find(&activeGroups).Error
 	for _, activeGroup := range activeGroups {
 		group := Group{
-			GroupID: activeGroup.Id,
+			GroupID: activeGroup.ID,
 		}
 		s.getGroupModel().Where("group_id= ? ", group.GroupID).Find(&group)
 		activeGroup.Name = group.GroupName
@@ -90,13 +90,13 @@ func (s *Statistics) GetActiveGroups(from, to time.Time, limit int) ([]*activeGr
 	return activeGroups, err
 }
 
-type activeUser struct {
+type ActiveUser struct {
 	Name       string
 	ID         string `gorm:"column:send_id"`
 	MessageNum int    `gorm:"column:message_num"`
 }
 
-func (s *Statistics) GetActiveUsers(from, to time.Time, limit int) (activeUsers []*activeUser, err error) {
+func (s *Statistics) GetActiveUsers(from, to time.Time, limit int) (activeUsers []*ActiveUser, err error) {
 	err = s.getChatLogModel().Select("send_id, count(*) as message_num").Where("send_time >= ? and send_time <= ? and session_type in (?)", from, to, []int{constant.SingleChatType, constant.GroupChatType, constant.SuperGroupChatType}).Group("send_id").Limit(limit).Order("message_num DESC").Find(&activeUsers).Error
 	for _, activeUser := range activeUsers {
 		user := User{

pkg/common/db/relation/user_model_k.go

@@ -71,10 +71,37 @@ func (u *User) Take(ctx context.Context, userID string) (user *User, err error)
 	return user, err
 }
 
-func (u *User) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*User, err error) {
+func (u *User) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*User, count int64, err error) {
 	defer func() {
-		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userName", userName, "showNumber", showNumber, "pageNumber", pageNumber, "users", users)
+		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userName", userName, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count)
 	}()
-	err = u.DB.Where(" name like ?", fmt.Sprintf("%%%s%%", userName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&users).Error
+	err = u.DB.Where(" name like ?", fmt.Sprintf("%%%s%%", userName)).Limit(int(showNumber)).Offset(int(showNumber * pageNumber)).Find(&users).Error
-	return users, utils.Wrap(err, "")
+	if err != nil {
+		return nil, 0, utils.Wrap(err, "")
+	}
+	return users, count, utils.Wrap(u.DB.Where(" name like ? ", fmt.Sprintf("%%%s%%", userName)).Count(&count).Error, "")
+}
+
+func (u *User) GetByNameAndID(ctx context.Context, content string, showNumber, pageNumber int32) (users []*User, count int64, err error) {
+	defer func() {
+		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "content", content, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count)
+	}()
+	db := u.DB.Where(" name like ? or user_id = ? ", fmt.Sprintf("%%%s%%", content), content)
+	if err := db.Count(&count).Error; err != nil {
+		return nil, 0, utils.Wrap(err, "")
+	}
+	err = utils.Wrap(db.Limit(int(showNumber)).Offset(int(showNumber*pageNumber)).Find(&users).Error, "")
+	return
+}
+
+func (u *User) Get(ctx context.Context, showNumber, pageNumber int32) (users []*User, count int64, err error) {
+	defer func() {
+		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count)
+	}()
+	err = u.DB.Model(u).Count(&count).Error
+	if err != nil {
+		return nil, 0, utils.Wrap(err, "")
+	}
+	err = utils.Wrap(u.DB.Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&users).Error, "")
+	return
 }

pkg/proto/admin_cms/admin_cms.proto

@@ -92,7 +92,6 @@ message DateNumList {
 
 message GetMessageStatisticsReq {
     StatisticsReq StatisticsReq = 1;
-    string OperationID = 2;
 }
 
 
@@ -101,12 +100,10 @@ message GetMessageStatisticsResp {
     int32 GroupMessageNum = 2;
     repeated DateNumList PrivateMessageNumList = 3;
     repeated DateNumList GroupMessageNumList = 4;
-    CommonResp commonResp = 5;
 }
 
 message GetGroupStatisticsReq {
     StatisticsReq StatisticsReq = 1;
-    string OperationID = 2;
 }
 
 
@@ -115,7 +112,6 @@ message GetGroupStatisticsResp {
     int32 TotalGroupNum = 2;
     repeated DateNumList IncreaseGroupNumList = 3;
     repeated DateNumList TotalGroupNumList = 4;
-    CommonResp commonResp = 5;
 }
 
 message GetUserStatisticsReq {