Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Conflicts: pkg/common/db/relation/friend_model_k.go
2026-05-05 01:25:58 +08:00 · 2023-02-01 17:13:06 +08:00
parent d4952ebc16 d67515f53f
commit c2fbcd1f22
32 changed files with 962 additions and 1203 deletions
@@ -30,9 +30,9 @@ const (
 )

 type GroupCache struct {
-	group        *relation.Group
-	groupMember  *relation.GroupMember
-	groupRequest *relation.GroupRequest
+	group        *relation.GroupGorm
+	groupMember  *relation.GroupMemberGorm
+	groupRequest *relation.GroupRequestGorm
 	mongoDB      *unrelation.SuperGroupMgoDB
 	expireTime   time.Duration
 	redisClient  *RedisClient
@@ -43,7 +43,7 @@ type GroupCache struct {
 	cacheGroupMemberUserIDs map[string]*localcache.GroupMemberIDsHash
 }

-func NewGroupCache(rdb redis.UniversalClient, groupDB *relation.Group, groupMemberDB *relation.GroupMember, groupRequestDB *relation.GroupRequest, mongoClient *unrelation.SuperGroupMgoDB, opts rockscache.Options) *GroupCache {
+func NewGroupCache(rdb redis.UniversalClient, groupDB *relation.GroupGorm, groupMemberDB *relation.GroupMemberGorm, groupRequestDB *relation.GroupRequestGorm, mongoClient *unrelation.SuperGroupMgoDB, opts rockscache.Options) *GroupCache {
 	return &GroupCache{rcClient: rockscache.NewClient(rdb, opts), expireTime: groupExpireTime,
 		group: groupDB, groupMember: groupMemberDB, groupRequest: groupRequestDB, redisClient: NewRedisClient(rdb),
 		mongoDB: mongoClient, cacheGroupMemberUserIDs: make(map[string]*localcache.GroupMemberIDsHash, 0),
@@ -82,7 +82,7 @@ func (g *GroupCache) getGroupMemberNumKey(groupID string) string {
 	return groupMemberNumKey + groupID
 }

-/// groupInfo
+// / groupInfo
 func (g *GroupCache) GetGroupsInfo(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error) {
 	for _, groupID := range groupIDs {
 		group, err := g.GetGroupInfo(ctx, groupID)
@@ -94,7 +94,7 @@ func (g *GroupCache) GetGroupsInfo(ctx context.Context, groupIDs []string) (grou
 	return groups, nil
 }

-func (g *GroupCache) GetGroupInfo(ctx context.Context, groupID string) (group *relation.Group, err error) {
+func (g *GroupCache) GetGroupInfo(ctx context.Context, groupID string) (group *relation.GroupGorm, err error) {
 	getGroup := func() (string, error) {
 		groupInfo, err := g.group.Take(ctx, groupID)
 		if err != nil {
@@ -106,7 +106,7 @@ func (g *GroupCache) GetGroupInfo(ctx context.Context, groupID string) (group *r
 		}
 		return string(bytes), nil
 	}
-	group = &relation.Group{}
+	group = &relation.GroupGorm{}
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "group", *group)
 	}()
@@ -2,17 +2,12 @@ package cache

 import (
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/mongo"
-	"Open_IM/pkg/common/db/mysql"
 	"Open_IM/pkg/common/db/relation"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
-	"github.com/dtm-labs/rockscache"
-	"github.com/go-redis/redis/v8"
-	"gorm.io/gorm"
 	"math/big"
 	"sort"
 	"strconv"
@@ -358,7 +353,7 @@ func DelAllGroupMembersInfoFromCache(ctx context.Context, groupID string) (err e
 	return db.DB.Rc.TagAsDeleted(groupAllMemberInfoCache + groupID)
 }

-//func GetGroupInfoFromCache(ctx context.Context, groupID string) (groupInfo *mysql.Group, err error) {
+//func GetGroupInfoFromCache(ctx context.Context, groupID string) (groupInfo *mysql.GroupGorm, err error) {
 //	getGroupInfo := func() (string, error) {
 //		groupInfo, err := mysql.GetGroupInfoByGroupID(groupID)
 //		if err != nil {
@@ -370,7 +365,7 @@ func DelAllGroupMembersInfoFromCache(ctx context.Context, groupID string) (err e
 //		}
 //		return string(bytes), nil
 //	}
-//	groupInfo = &mysql.Group{}
+//	groupInfo = &mysql.GroupGorm{}
 //	defer func() {
 //		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupInfo", groupInfo)
 //	}()
@@ -2,6 +2,7 @@ package controller

 import (
 	"Open_IM/pkg/common/db/relation"
+	"Open_IM/pkg/common/db/table"
 	"context"
 	"gorm.io/gorm"
 )
@@ -12,25 +13,25 @@ type FriendInterface interface {
 	// AddFriendRequest 增加或者更新好友申请
 	AddFriendRequest(ctx context.Context, fromUserID, toUserID string, reqMsg string, ex string) (err error)
 	// BecomeFriend 先判断是否在好友表，如果在则不插入
-	BecomeFriend(ctx context.Context, friends []*relation.Friend) (err error)
+	BecomeFriend(ctx context.Context, friends []*table.FriendModel) (err error)
 	// RefuseFriendRequest 拒绝好友申请
-	RefuseFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error)
+	RefuseFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error)
 	// AgreeFriendRequest 同意好友申请
-	AgreeFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error)
+	AgreeFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error)
 	// Delete 删除好友
 	Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error)
 	// UpdateRemark 更新好友备注
 	UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error)
 	// FindOwnerFriends 获取ownerUserID的好友列表
-	FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error)
+	FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error)
 	// FindInWhoseFriends friendUserID在哪些人的好友列表中
-	FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error)
+	FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error)
 	// FindFriendRequestFromMe 获取我发出去的好友申请
-	FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error)
+	FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error)
 	// FindFriendRequestToMe 获取我收到的的好友申请
-	FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error)
+	FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error)
 	// FindFriends 获取某人指定好友的信息
-	FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*relation.Friend, err error)
+	FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*table.FriendModel, err error)
 }

 type FriendController struct {
@@ -50,15 +51,15 @@ func (f *FriendController) AddFriendRequest(ctx context.Context, fromUserID, toU
 }

 // BecomeFriend 先判断是否在好友表，如果在则不插入
-func (f *FriendController) BecomeFriend(ctx context.Context, friends []*relation.Friend) (err error) {
+func (f *FriendController) BecomeFriend(ctx context.Context, friends []*table.FriendModel) (err error) {
 }

 // RefuseFriendRequest 拒绝好友申请
-func (f *FriendController) RefuseFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error) {
+func (f *FriendController) RefuseFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error) {
 }

 // AgreeFriendRequest 同意好友申请
-func (f *FriendController) AgreeFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error) {
+func (f *FriendController) AgreeFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error) {
 }

 // Delete 删除好友
@@ -70,23 +71,23 @@ func (f *FriendController) UpdateRemark(ctx context.Context, ownerUserID, friend
 }

 // FindOwnerFriends 获取ownerUserID的好友列表
-func (f *FriendController) FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error) {
+func (f *FriendController) FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error) {
 }

 // FindInWhoseFriends friendUserID在哪些人的好友列表中
-func (f *FriendController) FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error) {
+func (f *FriendController) FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error) {
 }

 // FindFriendRequestFromMe 获取我发出去的好友申请
-func (f *FriendController) FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error) {
+func (f *FriendController) FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error) {
 }

 // FindFriendRequestToMe 获取我收到的的好友申请
-func (f *FriendController) FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error) {
+func (f *FriendController) FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error) {
 }

 // FindFriends 获取某人指定好友的信息
-func (f *FriendController) FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*relation.Friend, err error) {
+func (f *FriendController) FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*table.FriendModel, err error) {
 }

 type FriendDatabaseInterface interface {
@@ -95,37 +96,34 @@ type FriendDatabaseInterface interface {
 	// AddFriendRequest 增加或者更新好友申请
 	AddFriendRequest(ctx context.Context, fromUserID, toUserID string, reqMsg string, ex string) (err error)
 	// BecomeFriend 先判断是否在好友表，如果在则不插入
-	BecomeFriend(ctx context.Context, friends []*relation.Friend) (err error)
+	BecomeFriend(ctx context.Context, friends []*table.FriendModel) (err error)
 	// RefuseFriendRequest 拒绝好友申请
-	RefuseFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error)
+	RefuseFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error)
 	// AgreeFriendRequest 同意好友申请
-	AgreeFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error)
+	AgreeFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error)
 	// Delete 删除好友
 	Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error)
 	// UpdateRemark 更新好友备注
 	UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error)
 	// FindOwnerFriends 获取ownerUserID的好友列表
-	FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error)
+	FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error)
 	// FindInWhoseFriends friendUserID在哪些人的好友列表中
-	FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error)
+	FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error)
 	// FindFriendRequestFromMe 获取我发出去的好友申请
-	FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error)
+	FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error)
 	// FindFriendRequestToMe 获取我收到的的好友申请
-	FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error)
+	FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error)
 	// FindFriends 获取某人指定好友的信息
-	FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*relation.Friend, err error)
+	FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*table.FriendModel, err error)
 }

 type FriendDatabase struct {
-	sqlDB *relation.Friend
+	friend        *relation.FriendGorm
+	friendRequest *relation.FriendRequestGorm
 }

 func NewFriendDatabase(db *gorm.DB) *FriendDatabase {
-	sqlDB := relation.NewFriendDB(db)
-	database := &FriendDatabase{
-		sqlDB: sqlDB,
-	}
-	return database
+	return &FriendDatabase{friend: relation.NewFriendGorm(db), friendRequest: relation.NewFriendRequestGorm(db)}
 }

 // CheckIn 检查user2是否在user1的好友列表中(inUser1Friends==true) 检查user1是否在user2的好友列表中(inUser2Friends==true)
@@ -137,15 +135,15 @@ func (f *FriendDatabase) AddFriendRequest(ctx context.Context, fromUserID, toUse
 }

 // BecomeFriend 先判断是否在好友表，如果在则不插入
-func (f *FriendDatabase) BecomeFriend(ctx context.Context, friends []*relation.Friend) (err error) {
+func (f *FriendDatabase) BecomeFriend(ctx context.Context, friends []*table.FriendModel) (err error) {
 }

 // RefuseFriendRequest 拒绝好友申请
-func (f *FriendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error) {
+func (f *FriendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error) {
 }

 // AgreeFriendRequest 同意好友申请
-func (f *FriendDatabase) AgreeFriendRequest(ctx context.Context, friendRequest *relation.FriendRequest) (err error) {
+func (f *FriendDatabase) AgreeFriendRequest(ctx context.Context, friendRequest *table.FriendRequestModel) (err error) {
 }

 // Delete 删除好友
@@ -157,21 +155,21 @@ func (f *FriendDatabase) UpdateRemark(ctx context.Context, ownerUserID, friendUs
 }

 // FindOwnerFriends 获取ownerUserID的好友列表
-func (f *FriendDatabase) FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error) {
+func (f *FriendDatabase) FindOwnerFriends(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error) {
 }

 // FindInWhoseFriends friendUserID在哪些人的好友列表中
-func (f *FriendDatabase) FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*relation.Friend, err error) {
+func (f *FriendDatabase) FindInWhoseFriends(ctx context.Context, friendUserID string, pageNumber, showNumber int32) (friends []*table.FriendModel, err error) {
 }

 // FindFriendRequestFromMe 获取我发出去的好友申请
-func (f *FriendDatabase) FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error) {
+func (f *FriendDatabase) FindFriendRequestFromMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error) {
 }

 // FindFriendRequestToMe 获取我收到的的好友申请
-func (f *FriendDatabase) FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*relation.FriendRequest, err error) {
+func (f *FriendDatabase) FindFriendRequestToMe(ctx context.Context, userID string, pageNumber, showNumber int32) (friends []*table.FriendRequestModel, err error) {
 }

 // FindFriends 获取某人指定好友的信息
-func (f *FriendDatabase) FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*relation.Friend, err error) {
+func (f *FriendDatabase) FindFriends(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*table.FriendModel, err error) {
 }
@@ -3,6 +3,7 @@ package controller
 import (
 	"Open_IM/pkg/common/db/cache"
 	"Open_IM/pkg/common/db/relation"
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/db/unrelation"
 	"context"
 	"github.com/dtm-labs/rockscache"
@@ -13,23 +14,27 @@ import (
 )

 type GroupInterface interface {
-	FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error)
-	CreateGroup(ctx context.Context, groups []*relation.Group, groupMember []*relation.GroupMember) error
+	FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*table.GroupModel, err error)
+	CreateGroup(ctx context.Context, groups []*table.GroupModel, groupMember []*table.GroupModel) error
 	DeleteGroupByIDs(ctx context.Context, groupIDs []string) error
-	TakeGroupByID(ctx context.Context, groupID string) (group *relation.Group, err error)
-	GetJoinedGroupList(ctx context.Context, userID string) ([]*relation.Group, error)
-	GetGroupMemberList(ctx context.Context, groupID string) ([]*relation.GroupMember, error)
-	GetGroupMemberListByUserID(ctx context.Context, groupID string, userIDs []string) ([]*relation.GroupMember, error)
-	GetGroupMemberFilterList(ctx context.Context, groupID string, filter int32, begin int32, maxNumber int32) ([]*relation.GroupMember, error) // relation.GetGroupMemberByGroupID(req.GroupID, req.Filter, req.NextSeq, 30)
+	TakeGroupByID(ctx context.Context, groupID string) (group *table.GroupModel, err error)
+	TakeGroupMemberByID(ctx context.Context, groupID string, userID string) (groupMember *table.GroupModel, err error)
+	GetJoinedGroupList(ctx context.Context, userID string) ([]*table.GroupModel, error)
+	GetGroupMemberList(ctx context.Context, groupID string) ([]*table.GroupModel, error)
+	GetGroupMemberListByUserID(ctx context.Context, groupID string, userIDs []string) ([]*table.GroupModel, error)
+	GetGroupMemberFilterList(ctx context.Context, groupID string, filter int32, begin int32, maxNumber int32) ([]*table.GroupModel, error) // relation.GetGroupMemberByGroupID(req.GroupID, req.Filter, req.NextSeq, 30)
+	FindGroupMembersByID(ctx context.Context, groupID string, userIDs []string) (groups []*table.GroupModel, err error)
+	DelGroupMember(ctx context.Context, groupID string, userIDs []string) error
 	GetGroupMemberNum(ctx context.Context, groupIDs []string) (map[string]int, error)
 	GetGroupOwnerUserID(ctx context.Context, groupIDs []string) (map[string]string, error)
+	GetGroupRecvApplicationList(ctx context.Context, userID string) ([]*table.GroupRequestModel, error)

-	CreateGroupMember(ctx context.Context, groupMember []*relation.GroupMember) error
-
-	CreateGroupRequest(ctx context.Context, requests []*relation.GroupRequest) error
+	CreateGroupMember(ctx context.Context, groupMember []*table.GroupModel) error
+	CreateGroupRequest(ctx context.Context, requests []*table.GroupRequestModel) error

 	//mongo
 	CreateSuperGroup(ctx context.Context, groupID string, initMemberIDList []string) error
+	DelSuperGroupMember(ctx context.Context, groupID string, userIDs []string) error
 	AddUserToSuperGroup(ctx context.Context, groupID string, userIDs []string) error
 	GetSuperGroupByID(ctx context.Context, groupID string) (superGroup *unrelation.SuperGroup, err error)
 }
@@ -40,22 +45,67 @@ type GroupController struct {
 	database GroupDataBaseInterface
 }

-func (g *GroupController) GetJoinedGroupList(ctx context.Context, userID string) ([]*relation.Group, error) {
+func (g *GroupController) TakeGroupMemberByID(ctx context.Context, groupID string, userID string) (groupMember *table.GroupModel, err error) {
 	//TODO implement me
 	panic("implement me")
 }

-func (g *GroupController) GetGroupMemberList(ctx context.Context, groupID string) ([]*relation.GroupMember, error) {
+func (g *GroupController) FindGroupMembersByID(ctx context.Context, groupID string, userIDs []string) (groups []*table.GroupModel, err error) {
 	//TODO implement me
 	panic("implement me")
 }

-func (g *GroupController) GetGroupMemberListByUserID(ctx context.Context, groupID string, userIDs []string) ([]*relation.GroupMember, error) {
+func (g *GroupController) DelGroupMember(ctx context.Context, groupID string, userIDs []string) error {
 	//TODO implement me
 	panic("implement me")
 }

-func (g *GroupController) GetGroupMemberFilterList(ctx context.Context, groupID string, filter int32, begin int32, maxNumber int32) ([]*relation.GroupMember, error) {
+func (g *GroupController) GetGroupRecvApplicationList(ctx context.Context, userID string) ([]*table.GroupRequestModel, error) {
+	/*
+		var groupRequestList []db.GroupRequest
+			memberList, err := GetGroupMemberListByUserID(userID)
+			if err != nil {
+				return nil, err
+			}
+			for _, v := range memberList {
+				if v.RoleLevel > constant.GroupOrdinaryUsers {
+					list, err := GetGroupRequestByGroupID(v.GroupID)
+					if err != nil {
+						//		fmt.Println("111 GetGroupRequestByGroupID failed ", err.Error())
+						continue
+					}
+					//	fmt.Println("222 GetGroupRequestByGroupID ok ", list)
+					groupRequestList = append(groupRequestList, list...)
+					//	fmt.Println("333 GetGroupRequestByGroupID ok ", groupRequestList)
+				}
+			}
+			return groupRequestList, nil
+	*/
+	//TODO implement me
+	panic("implement me")
+}
+
+func (g *GroupController) DelSuperGroupMember(ctx context.Context, groupID string, userIDs []string) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (g *GroupController) GetJoinedGroupList(ctx context.Context, userID string) ([]*table.GroupModel, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (g *GroupController) GetGroupMemberList(ctx context.Context, groupID string) ([]*table.GroupModel, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (g *GroupController) GetGroupMemberListByUserID(ctx context.Context, groupID string, userIDs []string) ([]*table.GroupModel, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (g *GroupController) GetGroupMemberFilterList(ctx context.Context, groupID string, filter int32, begin int32, maxNumber int32) ([]*table.GroupModel, error) {
 	//TODO implement me
 	panic("implement me")
 }
@@ -70,12 +120,12 @@ func (g *GroupController) GetGroupOwnerUserID(ctx context.Context, groupIDs []st
 	panic("implement me")
 }

-func (g *GroupController) CreateGroupMember(ctx context.Context, groupMember []*relation.GroupMember) error {
+func (g *GroupController) CreateGroupMember(ctx context.Context, groupMember []*table.GroupModel) error {
 	//TODO implement me
 	panic("implement me")
 }

-func (g *GroupController) CreateGroupRequest(ctx context.Context, requests []*relation.GroupRequest) error {
+func (g *GroupController) CreateGroupRequest(ctx context.Context, requests []*table.GroupRequestModel) error {
 	//TODO implement me
 	panic("implement me")
 }
@@ -90,11 +140,11 @@ func NewGroupController(db *gorm.DB, rdb redis.UniversalClient, mgoClient *mongo
 	return groupController
 }

-func (g *GroupController) FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error) {
+func (g *GroupController) FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*table.GroupModel, err error) {
 	return g.database.FindGroupsByID(ctx, groupIDs)
 }

-func (g *GroupController) CreateGroup(ctx context.Context, groups []*relation.Group, groupMember []*relation.GroupMember) error {
+func (g *GroupController) CreateGroup(ctx context.Context, groups []*table.GroupModel, groupMember []*table.GroupModel) error {
 	return g.database.CreateGroup(ctx, groups, groupMember)
 }

@@ -102,7 +152,7 @@ func (g *GroupController) DeleteGroupByIDs(ctx context.Context, groupIDs []strin
 	return g.database.DeleteGroupByIDs(ctx, groupIDs)
 }

-func (g *GroupController) TakeGroupByID(ctx context.Context, groupID string) (group *relation.Group, err error) {
+func (g *GroupController) TakeGroupByID(ctx context.Context, groupID string) (group *table.GroupModel, err error) {
 	return g.database.TakeGroupByID(ctx, groupID)
 }

@@ -115,18 +165,18 @@ func (g *GroupController) CreateSuperGroup(ctx context.Context, groupID string,
 }

 type GroupDataBaseInterface interface {
-	FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error)
-	CreateGroup(ctx context.Context, groups []*relation.Group, groupMember []*relation.GroupMember) error
+	FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*table.GroupModel, err error)
+	CreateGroup(ctx context.Context, groups []*table.GroupModel, groupMember []*table.GroupModel) error
 	DeleteGroupByIDs(ctx context.Context, groupIDs []string) error
-	TakeGroupByID(ctx context.Context, groupID string) (group *relation.Group, err error)
+	TakeGroupByID(ctx context.Context, groupID string) (group *table.GroupModel, err error)
 	GetSuperGroupByID(ctx context.Context, groupID string) (superGroup *unrelation.SuperGroup, err error)
 	CreateSuperGroup(ctx context.Context, groupID string, initMemberIDList []string) error
 }

 type GroupDataBase struct {
-	groupDB        *relation.Group
-	groupMemberDB  *relation.GroupMember
-	groupRequestDB *relation.GroupRequest
+	groupDB        *relation.GroupGorm
+	groupMemberDB  *relation.GroupMemberGorm
+	groupRequestDB *relation.GroupRequestGorm
 	db             *gorm.DB

 	cache   *cache.GroupCache
@@ -155,11 +205,11 @@ func newGroupDatabase(db *gorm.DB, rdb redis.UniversalClient, mgoClient *mongo.C
 	return database
 }

-func (g *GroupDataBase) FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*relation.Group, err error) {
+func (g *GroupDataBase) FindGroupsByID(ctx context.Context, groupIDs []string) (groups []*table.GroupModel, err error) {
 	return g.cache.GetGroupsInfo(ctx, groupIDs)
 }

-func (g *GroupDataBase) CreateGroup(ctx context.Context, groups []*relation.Group, groupMembers []*relation.GroupMember) error {
+func (g *GroupDataBase) CreateGroup(ctx context.Context, groups []*table.GroupModel, groupMembers []*table.GroupMemberModel) error {
 	return g.db.Transaction(func(tx *gorm.DB) error {
 		if len(groups) > 0 {
 			if err := g.groupDB.Create(ctx, groups, tx); err != nil {
@@ -187,11 +237,11 @@ func (g *GroupDataBase) DeleteGroupByIDs(ctx context.Context, groupIDs []string)
 	})
 }

-func (g *GroupDataBase) TakeGroupByID(ctx context.Context, groupID string) (group *relation.Group, err error) {
+func (g *GroupDataBase) TakeGroupByID(ctx context.Context, groupID string) (group *table.GroupModel, err error) {
 	return g.cache.GetGroupInfo(ctx, groupID)
 }

-func (g *GroupDataBase) Update(ctx context.Context, groups []*relation.Group) error {
+func (g *GroupDataBase) Update(ctx context.Context, groups []*table.GroupModel) error {
 	return g.db.Transaction(func(tx *gorm.DB) error {
 		if err := g.groupDB.Update(ctx, groups, tx); err != nil {
 			return err
@@ -207,7 +257,7 @@ func (g *GroupDataBase) Update(ctx context.Context, groups []*relation.Group) er
 	})
 }

-func (g *GroupDataBase) GetJoinedGroupList(ctx context.Context, userID string) ([]*relation.Group, error) {
+func (g *GroupDataBase) GetJoinedGroupList(ctx context.Context, userID string) ([]*table.GroupModel, error) {

 	return nil, nil
 }
@@ -1,105 +1,94 @@
 package relation

 import (
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
-	"time"
 )

-type Friend struct {
-	OwnerUserID    string    `gorm:"column:owner_user_id;primary_key;size:64"`
-	FriendUserID   string    `gorm:"column:friend_user_id;primary_key;size:64"`
-	Remark         string    `gorm:"column:remark;size:255"`
-	CreateTime     time.Time `gorm:"column:create_time"`
-	AddSource      int32     `gorm:"column:add_source"`
-	OperatorUserID string    `gorm:"column:operator_user_id;size:64"`
-	Ex             string    `gorm:"column:ex;size:1024"`
-	DB             *gorm.DB  `gorm:"-"`
+type FriendDB interface {
+	Create(ctx context.Context, friends []*table.FriendModel) (err error)
+	Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error)
+	UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error)
+	Update(ctx context.Context, friends []*table.FriendModel) (err error)
+	UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error)
+	FindOwnerUserID(ctx context.Context, ownerUserID string) (friends []*table.FriendModel, err error)
+}
+
+type FriendGorm struct {
+	DB *gorm.DB `gorm:"-"`
+}
+
+func NewFriendGorm(DB *gorm.DB) *FriendGorm {
+	return &FriendGorm{DB: DB}
 }

 type FriendUser struct {
-	Friend
+	FriendGorm
 	Nickname string `gorm:"column:name;size:255"`
 }

-func NewFriendDB(db *gorm.DB) *Friend {
-	var friend Friend
-	friend.DB = db.Model(friend)
-	return &friend
-}
-
-func (f *Friend) Create(ctx context.Context, friends []*Friend) (err error) {
+func (f *FriendGorm) Create(ctx context.Context, friends []*table.FriendModel) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friends", friends)
 	}()
-	return utils.Wrap(f.DB.Create(&friends).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendModel{}).Create(&friends).Error, "")
 }

-func (f *Friend) Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error) {
+func (f *FriendGorm) Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserIDs", friendUserIDs)
 	}()
-	err = utils.Wrap(f.DB.Where("owner_user_id = ? and friend_user_id = ?", ownerUserID, friendUserIDs).Delete(&Friend{}).Error, "")
+	err = utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("owner_user_id = ? and friend_user_id = ?", ownerUserID, friendUserIDs).Delete(&table.FriendModel{}).Error, "")
 	return err
 }

-func (f *Friend) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
+func (f *FriendGorm) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "args", args)
 	}()
-	return utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Updates(args).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("owner_user_id = ?", ownerUserID).Updates(args).Error, "")
 }

-func (f *Friend) Update(ctx context.Context, friends []*Friend) (err error) {
+func (f *FriendGorm) Update(ctx context.Context, friends []*table.FriendModel) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friends", friends)
 	}()
-	return utils.Wrap(f.DB.Updates(&friends).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendModel{}).Updates(&friends).Error, "")
 }

-func (f *Friend) UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error) {
+func (f *FriendGorm) UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserID", friendUserID, "remark", remark)
 	}()
-	return utils.Wrap(f.DB.Where("owner_user_id = ? and friend_user_id = ?", ownerUserID, friendUserID).Update("remark", remark).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("owner_user_id = ? and friend_user_id = ?", ownerUserID, friendUserID).Update("remark", remark).Error, "")
 }

-func (f *Friend) FindOwnerUserID(ctx context.Context, ownerUserID string) (friends []*Friend, err error) {
+func (f *FriendGorm) FindOwnerUserID(ctx context.Context, ownerUserID string) (friends []*table.FriendModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friends", friends)
 	}()
-	return friends, utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
+	return friends, utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
 }

-func (f *Friend) FindFriendUserID(ctx context.Context, friendUserID string) (friends []*Friend, err error) {
+func (f *FriendGorm) FindFriendUserID(ctx context.Context, friendUserID string) (friends []*table.FriendModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friendUserID", friendUserID, "friends", friends)
 	}()
-	return friends, utils.Wrap(f.DB.Where("friend_user_id = ?", friendUserID).Find(&friends).Error, "")
+	return friends, utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("friend_user_id = ?", friendUserID).Find(&friends).Error, "")
 }

-func (f *Friend) GetFriendIDs(ctx context.Context, ownerUserID string) (friendIDList []string, err error) {
-	defer func() {
-		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendIDList", friendIDList)
-	}()
-	err = f.DB.Where("owner_user_id=?", ownerUserID).Pluck("friend_user_id", &friendIDList).Error
-	if err != nil {
-		return nil, err
-	}
-	return friendIDList, nil
-}
-
-func (f *Friend) Take(ctx context.Context, ownerUserID, friendUserID string) (friend *Friend, err error) {
-	friend = &Friend{}
+func (f *FriendGorm) Take(ctx context.Context, ownerUserID, friendUserID string) (friend *table.FriendModel, err error) {
+	friend = &table.FriendModel{}
 	defer tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserID", friendUserID, "friend", friend)
-	return friend, utils.Wrap(f.DB.Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error, "")
+	return friend, utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error, "")
 }

-func (f *Friend) FindUserState(ctx context.Context, userID1, userID2 string) (friends []*Friend, err error) {
+func (f *FriendGorm) FindUserState(ctx context.Context, userID1, userID2 string) (friends []*table.FriendModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "userID1", userID1, "userID2", userID2)
 	}()
-	return friends, utils.Wrap(f.DB.Where("(owner_user_id = ? and friend_user_id = ?) or (owner_user_id = ? and friend_user_id = ?)", userID1, userID2, userID2, userID1).Find(&friends).Error, "")
+	return friends, utils.Wrap(f.DB.Model(&table.FriendModel{}).Where("(owner_user_id = ? and friend_user_id = ?) or (owner_user_id = ? and friend_user_id = ?)", userID1, userID2, userID2, userID1).Find(&friends).Error, "")
 }
@@ -1,156 +1,76 @@
 package relation

 import (
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
-	"time"
 )

 //var FriendRequestDB *gorm.DB

-type FriendRequest struct {
-	FromUserID    string    `gorm:"column:from_user_id;primary_key;size:64"`
-	ToUserID      string    `gorm:"column:to_user_id;primary_key;size:64"`
-	HandleResult  int32     `gorm:"column:handle_result"`
-	ReqMsg        string    `gorm:"column:req_msg;size:255"`
-	CreateTime    time.Time `gorm:"column:create_time"`
-	HandlerUserID string    `gorm:"column:handler_user_id;size:64"`
-	HandleMsg     string    `gorm:"column:handle_msg;size:255"`
-	HandleTime    time.Time `gorm:"column:handle_time"`
-	Ex            string    `gorm:"column:ex;size:1024"`
-	DB            *gorm.DB  `gorm:"-"`
-}
-
-func NewFriendRequest(db *gorm.DB) *FriendRequest {
-	var fr FriendRequest
+func NewFriendRequestGorm(db *gorm.DB) *FriendRequestGorm {
+	var fr FriendRequestGorm
 	fr.DB = db
 	return &fr
 }

-func (f *FriendRequest) Create(ctx context.Context, friends []*FriendRequest) (err error) {
+type FriendRequestGorm struct {
+	DB *gorm.DB `gorm:"-"`
+}
+
+func (f *FriendRequestGorm) Create(ctx context.Context, friends []*table.FriendRequestModel) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friends", friends)
 	}()
-	return utils.Wrap(f.DB.Create(&friends).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Create(&friends).Error, "")
 }

-func (f *FriendRequest) Delete(ctx context.Context, fromUserID, toUserID string) (err error) {
+func (f *FriendRequestGorm) Delete(ctx context.Context, fromUserID, toUserID string) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "fromUserID", fromUserID, "toUserID", toUserID)
 	}()
-	return utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Delete(&FriendRequest{}).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Delete(&table.FriendRequestModel{}).Error, "")
 }

-func (f *FriendRequest) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
+func (f *FriendRequestGorm) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "args", args)
 	}()
-	return utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Updates(args).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("owner_user_id = ?", ownerUserID).Updates(args).Error, "")
 }

-func (f *FriendRequest) Update(ctx context.Context, friends []*FriendRequest) (err error) {
+func (f *FriendRequestGorm) Update(ctx context.Context, friends []*table.FriendRequestModel) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friends", friends)
 	}()
-	return utils.Wrap(f.DB.Updates(&friends).Error, "")
+	return utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Updates(&friends).Error, "")
 }

-func (f *FriendRequest) Find(ctx context.Context, ownerUserID string) (friends []*FriendRequest, err error) {
+func (f *FriendRequestGorm) Find(ctx context.Context, ownerUserID string) (friends []*table.FriendRequestModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friends", friends)
 	}()
-	return friends, utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
+	return friends, utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
 }

-func (f *FriendRequest) Take(ctx context.Context, fromUserID, toUserID string) (friend *FriendRequest, err error) {
-	friend = &FriendRequest{}
+func (f *FriendRequestGorm) Take(ctx context.Context, fromUserID, toUserID string) (friend *table.FriendRequestModel, err error) {
+	friend = &table.FriendRequestModel{}
 	defer tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "fromUserID", fromUserID, "toUserID", toUserID, "friend", friend)
-	return friend, utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id", fromUserID, toUserID).Take(friend).Error, "")
+	return friend, utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("from_user_id = ? and to_user_id", fromUserID, toUserID).Take(friend).Error, "")
 }

-func (f *FriendRequest) FindToUserID(ctx context.Context, toUserID string) (friends []*FriendRequest, err error) {
+func (f *FriendRequestGorm) FindToUserID(ctx context.Context, toUserID string) (friends []*table.FriendRequestModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "toUserID", toUserID, "friends", friends)
 	}()
-	return friends, utils.Wrap(f.DB.Where("to_user_id = ?", toUserID).Find(&friends).Error, "")
+	return friends, utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("to_user_id = ?", toUserID).Find(&friends).Error, "")
 }

-func (f *FriendRequest) FindFromUserID(ctx context.Context, fromUserID string) (friends []*FriendRequest, err error) {
+func (f *FriendRequestGorm) FindFromUserID(ctx context.Context, fromUserID string) (friends []*table.FriendRequestModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "fromUserID", fromUserID, "friends", friends)
 	}()
-	return friends, utils.Wrap(f.DB.Where("from_user_id = ?", fromUserID).Find(&friends).Error, "")
-}
-
-// who apply to add me
-func GetReceivedFriendsApplicationListByUserID(ToUserID string) ([]FriendRequest, error) {
-	var usersInfo []FriendRequest
-	err := FriendRequestDB.Table("friend_requests").Where("to_user_id=?", ToUserID).Find(&usersInfo).Error
-	if err != nil {
-		return nil, err
-	}
-	return usersInfo, nil
-}
-
-// I apply to add somebody
-func GetSendFriendApplicationListByUserID(FromUserID string) ([]FriendRequest, error) {
-	var usersInfo []FriendRequest
-	err := FriendRequestDB.Table("friend_requests").Where("from_user_id=?", FromUserID).Find(&usersInfo).Error
-	if err != nil {
-		return nil, err
-	}
-	return usersInfo, nil
-}
-
-// FromUserId apply to add ToUserID
-func GetFriendApplicationByBothUserID(FromUserID, ToUserID string) (*FriendRequest, error) {
-	var friendRequest FriendRequest
-	err := FriendRequestDB.Table("friend_requests").Where("from_user_id=? and to_user_id=?", FromUserID, ToUserID).Take(&friendRequest).Error
-	if err != nil {
-		return nil, err
-	}
-	return &friendRequest, nil
-}
-
-func UpdateFriendApplication(friendRequest *FriendRequest) error {
-	friendRequest.CreateTime = time.Now()
-	return FriendRequestDB.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
-		friendRequest.FromUserID, friendRequest.ToUserID).Updates(&friendRequest).Error
-}
-
-func InsertFriendApplication(friendRequest *FriendRequest, args map[string]interface{}) error {
-	if err := FriendRequestDB.Table("friend_requests").Create(friendRequest).Error; err == nil {
-		return nil
-	}
-
-	//t := dbConn.Debug().Table("friend_requests").Where("from_user_id = ? and to_user_id = ?", friendRequest.FromUserID, friendRequest.ToUserID).Select("*").Updates(*friendRequest)
-	//if t.RowsAffected == 0 {
-	//	return utils.Wrap(errors.New("RowsAffected == 0"), "no update")
-	//}
-	//return utils.Wrap(t.Error, "")
-
-	friendRequest.CreateTime = time.Now()
-	args["create_time"] = friendRequest.CreateTime
-	u := FriendRequestDB.Model(friendRequest).Updates(args)
-	//u := dbConn.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
-	// friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest)
-	//u := dbConn.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
-	//	friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest)
-	if u.RowsAffected != 0 {
-		return nil
-	}
-
-	if friendRequest.CreateTime.Unix() < 0 {
-		friendRequest.CreateTime = time.Now()
-	}
-	if friendRequest.HandleTime.Unix() < 0 {
-		friendRequest.HandleTime = utils.UnixSecondToTime(0)
-	}
-	err := FriendRequestDB.Table("friend_requests").Create(friendRequest).Error
-	if err != nil {
-		return err
-	}
-	return nil
+	return friends, utils.Wrap(f.DB.Model(&table.FriendRequestModel{}).Where("from_user_id = ?", fromUserID).Find(&friends).Error, "")
 }
@@ -2,62 +2,48 @@ package relation

 import (
 	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
-	"fmt"
 	"gorm.io/gorm"
-	"time"
 )

-var GroupMemberDB *gorm.DB
-
-type GroupMember struct {
-	GroupID        string    `gorm:"column:group_id;primary_key;size:64"`
-	UserID         string    `gorm:"column:user_id;primary_key;size:64"`
-	Nickname       string    `gorm:"column:nickname;size:255"`
-	FaceURL        string    `gorm:"column:user_group_face_url;size:255"`
-	RoleLevel      int32     `gorm:"column:role_level"`
-	JoinTime       time.Time `gorm:"column:join_time"`
-	JoinSource     int32     `gorm:"column:join_source"`
-	InviterUserID  string    `gorm:"column:inviter_user_id;size:64"`
-	OperatorUserID string    `gorm:"column:operator_user_id;size:64"`
-	MuteEndTime    time.Time `gorm:"column:mute_end_time"`
-	Ex             string    `gorm:"column:ex;size:1024"`
-	DB             *gorm.DB  `gorm:"-" json:"-"`
+type GroupMemberGorm struct {
+	DB *gorm.DB
 }

-func NewGroupMemberDB(db *gorm.DB) *GroupMember {
-	return &GroupMember{DB: db}
+func NewGroupMemberDB(db *gorm.DB) *GroupMemberGorm {
+	return &GroupMemberGorm{DB: db}
 }

-func (g *GroupMember) Create(ctx context.Context, groupMemberList []*GroupMember, tx ...*gorm.DB) (err error) {
+func (g *GroupMemberGorm) Create(ctx context.Context, groupMemberList []*table.GroupMemberModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupMemberList", groupMemberList)
 	}()
 	return utils.Wrap(getDBConn(g.DB, tx).Create(&groupMemberList).Error, "")
 }

-func (g *GroupMember) Delete(ctx context.Context, groupMembers []*GroupMember, tx ...*gorm.DB) (err error) {
+func (g *GroupMemberGorm) Delete(ctx context.Context, groupMembers []*table.GroupMemberModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers)
 	}()
 	return utils.Wrap(getDBConn(g.DB, tx).Delete(groupMembers).Error, "")
 }

-func (g *GroupMember) UpdateByMap(ctx context.Context, groupID string, userID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
+func (g *GroupMemberGorm) UpdateByMap(ctx context.Context, groupID string, userID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "args", args)
 	}()
-	return utils.Wrap(getDBConn(g.DB, tx).Model(&GroupMember{}).Where("group_id = ? and user_id = ?", groupID, userID).Updates(args).Error, "")
+	return utils.Wrap(getDBConn(g.DB, tx).Model(&table.GroupMemberModel{}).Where("group_id = ? and user_id = ?", groupID, userID).Updates(args).Error, "")
 }

-func (g *GroupMember) Update(ctx context.Context, groupMembers []*GroupMember, tx ...*gorm.DB) (err error) {
+func (g *GroupMemberGorm) Update(ctx context.Context, groupMembers []*table.GroupMemberModel, tx ...*gorm.DB) (err error) {
 	defer func() { tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers) }()
 	return utils.Wrap(getDBConn(g.DB, tx).Updates(&groupMembers).Error, "")
 }

-func (g *GroupMember) Find(ctx context.Context, groupMembers []*GroupMember, tx ...*gorm.DB) (groupList []*GroupMember, err error) {
+func (g *GroupMemberGorm) Find(ctx context.Context, groupMembers []*table.GroupMemberModel, tx ...*gorm.DB) (groupList []*table.GroupMemberModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers, "groupList", groupList)
 	}()
@@ -68,230 +54,230 @@ func (g *GroupMember) Find(ctx context.Context, groupMembers []*GroupMember, tx
 	return groupList, utils.Wrap(getDBConn(g.DB, tx).Where("(group_id, user_id) in ?", where).Find(&groupList).Error, "")
 }

-func (g *GroupMember) Take(ctx context.Context, groupID string, userID string, tx ...*gorm.DB) (groupMember *GroupMember, err error) {
+func (g *GroupMemberGorm) Take(ctx context.Context, groupID string, userID string, tx ...*gorm.DB) (groupMember *table.GroupMemberModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "groupMember", *groupMember)
 	}()
-	groupMember = &GroupMember{}
+	groupMember = &table.GroupMemberModel{}
 	return groupMember, utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ? and user_id = ?", groupID, userID).Take(groupMember).Error, "")
 }

-func (g *GroupMember) TakeOwnerInfo(ctx context.Context, groupID string, tx ...*gorm.DB) (groupMember *GroupMember, err error) {
+func (g *GroupMemberGorm) TakeOwnerInfo(ctx context.Context, groupID string, tx ...*gorm.DB) (groupMember *table.GroupMemberModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupMember", *groupMember)
 	}()
-	groupMember = &GroupMember{}
+	groupMember = &table.GroupMemberModel{}
 	return groupMember, utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ? and role_level = ?", groupID, constant.GroupOwner).Take(groupMember).Error, "")
 }

-func InsertIntoGroupMember(toInsertInfo GroupMember) error {
-	toInsertInfo.JoinTime = time.Now()
-	if toInsertInfo.RoleLevel == 0 {
-		toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
-	}
-	toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
-	err := GroupMemberDB.Table("group_members").Create(toInsertInfo).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func BatchInsertIntoGroupMember(toInsertInfoList []*GroupMember) error {
-	for _, toInsertInfo := range toInsertInfoList {
-		toInsertInfo.JoinTime = time.Now()
-		if toInsertInfo.RoleLevel == 0 {
-			toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
-		}
-		toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
-	}
-	return GroupMemberDB.Create(toInsertInfoList).Error
-
-}
-
-func GetGroupMemberListByUserID(userID string) ([]GroupMember, error) {
-	var groupMemberList []GroupMember
-	err := GroupMemberDB.Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMemberList, nil
-}
-
-func GetGroupMemberListByGroupID(groupID string) ([]GroupMember, error) {
-	var groupMemberList []GroupMember
-	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Find(&groupMemberList).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMemberList, nil
-}
-
-func GetGroupMemberIDListByGroupID(groupID string) ([]string, error) {
-	var groupMemberIDList []string
-	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Pluck("user_id", &groupMemberIDList).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMemberIDList, nil
-}
-
-func GetGroupMemberListByGroupIDAndRoleLevel(groupID string, roleLevel int32) ([]GroupMember, error) {
-	var groupMemberList []GroupMember
-	err := GroupMemberDB.Table("group_members").Where("group_id=? and role_level=?", groupID, roleLevel).Find(&groupMemberList).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMemberList, nil
-}
-
-func GetGroupMemberInfoByGroupIDAndUserID(groupID, userID string) (*GroupMember, error) {
-	var groupMember GroupMember
-	err := GroupMemberDB.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Limit(1).Take(&groupMember).Error
-	if err != nil {
-		return nil, err
-	}
-	return &groupMember, nil
-}
-
-func DeleteGroupMemberByGroupIDAndUserID(groupID, userID string) error {
-	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Delete(GroupMember{}).Error
-}
-
-func DeleteGroupMemberByGroupID(groupID string) error {
-	return GroupMemberDB.Table("group_members").Where("group_id=?  ", groupID).Delete(GroupMember{}).Error
-}
-
-func UpdateGroupMemberInfo(groupMemberInfo GroupMember) error {
-	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(&groupMemberInfo).Error
-}
-
-func UpdateGroupMemberInfoByMap(groupMemberInfo GroupMember, m map[string]interface{}) error {
-	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(m).Error
-}
-
-func GetOwnerManagerByGroupID(groupID string) ([]GroupMember, error) {
-	var groupMemberList []GroupMember
-	err := GroupMemberDB.Table("group_members").Where("group_id=? and role_level>?", groupID, constant.GroupOrdinaryUsers).Find(&groupMemberList).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMemberList, nil
-}
-
-func GetGroupMemberNumByGroupID(groupID string) (int64, error) {
-	var number int64
-	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Count(&number).Error
-	if err != nil {
-		return 0, utils.Wrap(err, "")
-	}
-	return number, nil
-}
-
-func GetGroupOwnerInfoByGroupID(groupID string) (*GroupMember, error) {
-	omList, err := GetOwnerManagerByGroupID(groupID)
-	if err != nil {
-		return nil, err
-	}
-	for _, v := range omList {
-		if v.RoleLevel == constant.GroupOwner {
-			return &v, nil
-		}
-	}
-	return nil, utils.Wrap(constant.ErrGroupNoOwner, "")
-}
-
-func IsExistGroupMember(groupID, userID string) bool {
-	var number int64
-	err := GroupMemberDB.Table("group_members").Where("group_id = ? and user_id = ?", groupID, userID).Count(&number).Error
-	if err != nil {
-		return false
-	}
-	if number != 1 {
-		return false
-	}
-	return true
-}
-
-func CheckIsExistGroupMember(ctx context.Context, groupID, userID string) error {
-	var number int64
-	err := GroupMemberDB.Table("group_members").Where("group_id = ? and user_id = ?", groupID, userID).Count(&number).Error
-	if err != nil {
-		return constant.ErrDB.Wrap()
-	}
-	if number != 1 {
-		return constant.ErrData.Wrap()
-	}
-	return nil
-}
-
-func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumber int32) ([]GroupMember, error) {
-	var memberList []GroupMember
-	var err error
-	if filter >= 0 {
-		memberList, err = GetGroupMemberListByGroupIDAndRoleLevel(groupID, filter) //sorted by join time
-	} else {
-		memberList, err = GetGroupMemberListByGroupID(groupID)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	if begin >= int32(len(memberList)) {
-		return nil, nil
-	}
-
-	var end int32
-	if begin+int32(maxNumber) < int32(len(memberList)) {
-		end = begin + maxNumber
-	} else {
-		end = int32(len(memberList))
-	}
-	return memberList[begin:end], nil
-}
-
-func GetJoinedGroupIDListByUserID(userID string) ([]string, error) {
-	memberList, err := GetGroupMemberListByUserID(userID)
-	if err != nil {
-		return nil, err
-	}
-	var groupIDList []string
-	for _, v := range memberList {
-		groupIDList = append(groupIDList, v.GroupID)
-	}
-	return groupIDList, nil
-}
-
-func IsGroupOwnerAdmin(groupID, UserID string) bool {
-	groupMemberList, err := GetOwnerManagerByGroupID(groupID)
-	if err != nil {
-		return false
-	}
-	for _, v := range groupMemberList {
-		if v.UserID == UserID && v.RoleLevel > constant.GroupOrdinaryUsers {
-			return true
-		}
-	}
-	return false
-}
-
-func GetGroupMembersByGroupIdCMS(groupId string, userName string, showNumber, pageNumber int32) ([]GroupMember, error) {
-	var groupMembers []GroupMember
-	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupId).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groupMembers).Error
-	if err != nil {
-		return nil, err
-	}
-	return groupMembers, nil
-}
-
-func GetGroupMembersCount(groupID, userName string) (int64, error) {
-	var count int64
-	if err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Count(&count).Error; err != nil {
-		return count, err
-	}
-	return count, nil
-}
-
-func UpdateGroupMemberInfoDefaultZero(groupMemberInfo GroupMember, args map[string]interface{}) error {
-	return GroupMemberDB.Model(groupMemberInfo).Updates(args).Error
-}
+//func InsertIntoGroupMember(toInsertInfo GroupMemberModel) error {
+//	toInsertInfo.JoinTime = time.Now()
+//	if toInsertInfo.RoleLevel == 0 {
+//		toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
+//	}
+//	toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
+//	err := GroupMemberDB.Table("group_members").Create(toInsertInfo).Error
+//	if err != nil {
+//		return err
+//	}
+//	return nil
+//}
+//
+//func BatchInsertIntoGroupMember(toInsertInfoList []*GroupMemberModel) error {
+//	for _, toInsertInfo := range toInsertInfoList {
+//		toInsertInfo.JoinTime = time.Now()
+//		if toInsertInfo.RoleLevel == 0 {
+//			toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
+//		}
+//		toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
+//	}
+//	return GroupMemberDB.Create(toInsertInfoList).Error
+//
+//}
+//
+//func GetGroupMemberListByUserID(userID string) ([]GroupMemberModel, error) {
+//	var groupMemberList []GroupMemberModel
+//	err := GroupMemberDB.Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMemberList, nil
+//}
+//
+//func GetGroupMemberListByGroupID(groupID string) ([]GroupMemberModel, error) {
+//	var groupMemberList []GroupMemberModel
+//	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Find(&groupMemberList).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMemberList, nil
+//}
+//
+//func GetGroupMemberIDListByGroupID(groupID string) ([]string, error) {
+//	var groupMemberIDList []string
+//	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Pluck("user_id", &groupMemberIDList).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMemberIDList, nil
+//}
+//
+//func GetGroupMemberListByGroupIDAndRoleLevel(groupID string, roleLevel int32) ([]GroupMemberModel, error) {
+//	var groupMemberList []GroupMemberModel
+//	err := GroupMemberDB.Table("group_members").Where("group_id=? and role_level=?", groupID, roleLevel).Find(&groupMemberList).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMemberList, nil
+//}
+//
+//func GetGroupMemberInfoByGroupIDAndUserID(groupID, userID string) (*GroupMemberModel, error) {
+//	var groupMember GroupMemberModel
+//	err := GroupMemberDB.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Limit(1).Take(&groupMember).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return &groupMember, nil
+//}
+//
+//func DeleteGroupMemberByGroupIDAndUserID(groupID, userID string) error {
+//	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Delete(GroupMemberModel{}).Error
+//}
+//
+//func DeleteGroupMemberByGroupID(groupID string) error {
+//	return GroupMemberDB.Table("group_members").Where("group_id=?  ", groupID).Delete(GroupMemberModel{}).Error
+//}
+//
+//func UpdateGroupMemberInfo(groupMemberInfo GroupMemberModel) error {
+//	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(&groupMemberInfo).Error
+//}
+//
+//func UpdateGroupMemberInfoByMap(groupMemberInfo GroupMemberModel, m map[string]interface{}) error {
+//	return GroupMemberDB.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(m).Error
+//}
+//
+//func GetOwnerManagerByGroupID(groupID string) ([]GroupMemberModel, error) {
+//	var groupMemberList []GroupMemberModel
+//	err := GroupMemberDB.Table("group_members").Where("group_id=? and role_level>?", groupID, constant.GroupOrdinaryUsers).Find(&groupMemberList).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMemberList, nil
+//}
+//
+//func GetGroupMemberNumByGroupID(groupID string) (int64, error) {
+//	var number int64
+//	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Count(&number).Error
+//	if err != nil {
+//		return 0, utils.Wrap(err, "")
+//	}
+//	return number, nil
+//}
+//
+//func GetGroupOwnerInfoByGroupID(groupID string) (*GroupMemberModel, error) {
+//	omList, err := GetOwnerManagerByGroupID(groupID)
+//	if err != nil {
+//		return nil, err
+//	}
+//	for _, v := range omList {
+//		if v.RoleLevel == constant.GroupOwner {
+//			return &v, nil
+//		}
+//	}
+//	return nil, utils.Wrap(constant.ErrGroupNoOwner, "")
+//}
+//
+//func IsExistGroupMember(groupID, userID string) bool {
+//	var number int64
+//	err := GroupMemberDB.Table("group_members").Where("group_id = ? and user_id = ?", groupID, userID).Count(&number).Error
+//	if err != nil {
+//		return false
+//	}
+//	if number != 1 {
+//		return false
+//	}
+//	return true
+//}
+//
+//func CheckIsExistGroupMember(ctx context.Context, groupID, userID string) error {
+//	var number int64
+//	err := GroupMemberDB.Table("group_members").Where("group_id = ? and user_id = ?", groupID, userID).Count(&number).Error
+//	if err != nil {
+//		return constant.ErrDB.Wrap()
+//	}
+//	if number != 1 {
+//		return constant.ErrData.Wrap()
+//	}
+//	return nil
+//}
+//
+//func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumber int32) ([]GroupMember, error) {
+//	var memberList []GroupMember
+//	var err error
+//	if filter >= 0 {
+//		memberList, err = GetGroupMemberListByGroupIDAndRoleLevel(groupID, filter) //sorted by join time
+//	} else {
+//		memberList, err = GetGroupMemberListByGroupID(groupID)
+//	}
+//
+//	if err != nil {
+//		return nil, err
+//	}
+//	if begin >= int32(len(memberList)) {
+//		return nil, nil
+//	}
+//
+//	var end int32
+//	if begin+int32(maxNumber) < int32(len(memberList)) {
+//		end = begin + maxNumber
+//	} else {
+//		end = int32(len(memberList))
+//	}
+//	return memberList[begin:end], nil
+//}
+//
+//func GetJoinedGroupIDListByUserID(userID string) ([]string, error) {
+//	memberList, err := GetGroupMemberListByUserID(userID)
+//	if err != nil {
+//		return nil, err
+//	}
+//	var groupIDList []string
+//	for _, v := range memberList {
+//		groupIDList = append(groupIDList, v.GroupID)
+//	}
+//	return groupIDList, nil
+//}
+//
+//func IsGroupOwnerAdmin(groupID, UserID string) bool {
+//	groupMemberList, err := GetOwnerManagerByGroupID(groupID)
+//	if err != nil {
+//		return false
+//	}
+//	for _, v := range groupMemberList {
+//		if v.UserID == UserID && v.RoleLevel > constant.GroupOrdinaryUsers {
+//			return true
+//		}
+//	}
+//	return false
+//}
+//
+//func GetGroupMembersByGroupIdCMS(groupId string, userName string, showNumber, pageNumber int32) ([]GroupMember, error) {
+//	var groupMembers []GroupMember
+//	err := GroupMemberDB.Table("group_members").Where("group_id=?", groupId).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groupMembers).Error
+//	if err != nil {
+//		return nil, err
+//	}
+//	return groupMembers, nil
+//}
+//
+//func GetGroupMembersCount(groupID, userName string) (int64, error) {
+//	var count int64
+//	if err := GroupMemberDB.Table("group_members").Where("group_id=?", groupID).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Count(&count).Error; err != nil {
+//		return count, err
+//	}
+//	return count, nil
+//}
+//
+//func UpdateGroupMemberInfoDefaultZero(groupMemberInfo GroupMember, args map[string]interface{}) error {
+//	return GroupMemberDB.Model(groupMemberInfo).Updates(args).Error
+//}
@@ -1,75 +1,58 @@
 package relation

 import (
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
-	"time"
 )

-type Group struct {
-	GroupID                string    `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
-	GroupName              string    `gorm:"column:name;size:255" json:"groupName"`
-	Notification           string    `gorm:"column:notification;size:255" json:"notification"`
-	Introduction           string    `gorm:"column:introduction;size:255" json:"introduction"`
-	FaceURL                string    `gorm:"column:face_url;size:255" json:"faceURL"`
-	CreateTime             time.Time `gorm:"column:create_time;index:create_time"`
-	Ex                     string    `gorm:"column:ex" json:"ex;size:1024" json:"ex"`
-	Status                 int32     `gorm:"column:status"`
-	CreatorUserID          string    `gorm:"column:creator_user_id;size:64"`
-	GroupType              int32     `gorm:"column:group_type"`
-	NeedVerification       int32     `gorm:"column:need_verification"`
-	LookMemberInfo         int32     `gorm:"column:look_member_info" json:"lookMemberInfo"`
-	ApplyMemberFriend      int32     `gorm:"column:apply_member_friend" json:"applyMemberFriend"`
-	NotificationUpdateTime time.Time `gorm:"column:notification_update_time"`
-	NotificationUserID     string    `gorm:"column:notification_user_id;size:64"`
-	DB                     *gorm.DB
+type GroupGorm struct {
+	DB *gorm.DB
 }

-func NewGroupDB(db *gorm.DB) *Group {
-	var group Group
-	group.DB = db
-	return &group
+func NewGroupDB(db *gorm.DB) *GroupGorm {
+	return &GroupGorm{DB: db}
 }

-func (g *Group) Create(ctx context.Context, groups []*Group, tx ...*gorm.DB) (err error) {
+func (g *GroupGorm) Create(ctx context.Context, groups []*table.GroupModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groups", groups)
 	}()
 	return utils.Wrap(getDBConn(g.DB, tx).Create(&groups).Error, "")
 }

-func (g *Group) Delete(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (err error) {
+func (g *GroupGorm) Delete(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupIDs", groupIDs)
 	}()
-	return utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Delete(&Group{}).Error, "")
+	return utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Delete(&table.GroupModel{}).Error, "")
 }

-func (g *Group) UpdateByMap(ctx context.Context, groupID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
+func (g *GroupGorm) UpdateByMap(ctx context.Context, groupID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "args", args)
 	}()
 	return utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ?", groupID).Model(g).Updates(args).Error, "")
 }

-func (g *Group) Update(ctx context.Context, groups []*Group, tx ...*gorm.DB) (err error) {
+func (g *GroupGorm) Update(ctx context.Context, groups []*table.GroupModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groups", groups)
 	}()
 	return utils.Wrap(getDBConn(g.DB, tx).Updates(&groups).Error, "")
 }

-func (g *Group) Find(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (groups []*Group, err error) {
+func (g *GroupGorm) Find(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (groups []*table.GroupModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupIDs", groupIDs, "groups", groups)
 	}()
 	return groups, utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Find(&groups).Error, "")
 }

-func (g *Group) Take(ctx context.Context, groupID string, tx ...*gorm.DB) (group *Group, err error) {
-	group = &Group{}
+func (g *GroupGorm) Take(ctx context.Context, groupID string, tx ...*gorm.DB) (group *table.GroupModel, err error) {
+	group = &table.GroupModel{}
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "group", *group)
 	}()
@@ -1,69 +1,52 @@
 package relation

 import (
+	"Open_IM/pkg/common/db/table"
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
-	"time"
 )

-var GroupRequestDB *gorm.DB
-
-type GroupRequest struct {
-	UserID        string    `gorm:"column:user_id;primary_key;size:64"`
-	GroupID       string    `gorm:"column:group_id;primary_key;size:64"`
-	HandleResult  int32     `gorm:"column:handle_result"`
-	ReqMsg        string    `gorm:"column:req_msg;size:1024"`
-	HandledMsg    string    `gorm:"column:handle_msg;size:1024"`
-	ReqTime       time.Time `gorm:"column:req_time"`
-	HandleUserID  string    `gorm:"column:handle_user_id;size:64"`
-	HandledTime   time.Time `gorm:"column:handle_time"`
-	JoinSource    int32     `gorm:"column:join_source"`
-	InviterUserID string    `gorm:"column:inviter_user_id;size:64"`
-	Ex            string    `gorm:"column:ex;size:1024"`
-	DB            *gorm.DB
+type GroupRequestGorm struct {
+	DB *gorm.DB
 }

-func NewGroupRequest(db *gorm.DB) *GroupRequest {
-	return &GroupRequest{
+func NewGroupRequest(db *gorm.DB) *GroupRequestGorm {
+	return &GroupRequestGorm{
 		DB: db,
 	}
 }

-func (GroupRequest) TableName() string {
-	return "friend_requests"
-}
-
-func (*GroupRequest) Create(ctx context.Context, groupRequests []*GroupRequest) (err error) {
+func (g *GroupRequestGorm) Create(ctx context.Context, groupRequests []*table.GroupRequestModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupRequests", groupRequests)
 	}()
-	return utils.Wrap(GroupRequestDB.Create(&groupRequests).Error, utils.GetSelfFuncName())
+	return utils.Wrap(getDBConn(g.DB, tx).Create(&groupRequests).Error, utils.GetSelfFuncName())
 }

-func (*GroupRequest) Delete(ctx context.Context, groupRequests []*GroupRequest) (err error) {
+func (g *GroupRequestGorm) Delete(ctx context.Context, groupRequests []*table.GroupRequestModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupRequests", groupRequests)
 	}()
-	return utils.Wrap(GroupRequestDB.Delete(&groupRequests).Error, utils.GetSelfFuncName())
+	return utils.Wrap(getDBConn(g.DB, tx).Delete(&groupRequests).Error, utils.GetSelfFuncName())
 }

-func (*GroupRequest) UpdateByMap(ctx context.Context, groupID string, userID string, args map[string]interface{}) (err error) {
+func (g *GroupRequestGorm) UpdateByMap(ctx context.Context, groupID string, userID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "args", args)
 	}()
-	return utils.Wrap(GroupRequestDB.Where("group_id = ? and user_id = ? ", groupID, userID).Updates(args).Error, utils.GetSelfFuncName())
+	return utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ? and user_id = ? ", groupID, userID).Updates(args).Error, utils.GetSelfFuncName())
 }

-func (*GroupRequest) Update(ctx context.Context, groupRequests []*GroupRequest) (err error) {
+func (g *GroupRequestGorm) Update(ctx context.Context, groupRequests []*table.GroupRequestModel, tx ...*gorm.DB) (err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupRequests", groupRequests)
 	}()
-	return utils.Wrap(GroupRequestDB.Updates(&groupRequests).Error, utils.GetSelfFuncName())
+	return utils.Wrap(getDBConn(g.DB, tx).Updates(&groupRequests).Error, utils.GetSelfFuncName())
 }

-func (*GroupRequest) Find(ctx context.Context, groupRequests []*GroupRequest) (resultGroupRequests []*GroupRequest, err error) {
+func (g *GroupRequestGorm) Find(ctx context.Context, groupRequests []*table.GroupRequestModel, tx ...*gorm.DB) (resultGroupRequests []*table.GroupRequestModel, err error) {
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupRequests", groupRequests, "resultGroupRequests", resultGroupRequests)
 	}()
@@ -71,13 +54,13 @@ func (*GroupRequest) Find(ctx context.Context, groupRequests []*GroupRequest) (r
 	for _, groupMember := range groupRequests {
 		where = append(where, []interface{}{groupMember.GroupID, groupMember.UserID})
 	}
-	return resultGroupRequests, utils.Wrap(GroupRequestDB.Where("(group_id, user_id) in ?", where).Find(&resultGroupRequests).Error, utils.GetSelfFuncName())
+	return resultGroupRequests, utils.Wrap(getDBConn(g.DB, tx).Where("(group_id, user_id) in ?", where).Find(&resultGroupRequests).Error, utils.GetSelfFuncName())
 }

-func (*GroupRequest) Take(ctx context.Context, groupID string, userID string) (groupRequest *GroupRequest, err error) {
-	groupRequest = &GroupRequest{}
+func (g *GroupRequestGorm) Take(ctx context.Context, groupID string, userID string, tx ...*gorm.DB) (groupRequest *table.GroupRequestModel, err error) {
+	groupRequest = &table.GroupRequestModel{}
 	defer func() {
 		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "groupRequest", *groupRequest)
 	}()
-	return groupRequest, utils.Wrap(GroupRequestDB.Where("group_id = ? and user_id = ? ", groupID, userID).Take(groupRequest).Error, utils.GetSelfFuncName())
+	return groupRequest, utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ? and user_id = ? ", groupID, userID).Take(groupRequest).Error, utils.GetSelfFuncName())
 }
@@ -0,0 +1,91 @@
+package table
+
+import (
+	"time"
+)
+
+type FriendModel struct {
+	OwnerUserID    string    `gorm:"column:owner_user_id;primary_key;size:64"`
+	FriendUserID   string    `gorm:"column:friend_user_id;primary_key;size:64"`
+	Remark         string    `gorm:"column:remark;size:255"`
+	CreateTime     time.Time `gorm:"column:create_time"`
+	AddSource      int32     `gorm:"column:add_source"`
+	OperatorUserID string    `gorm:"column:operator_user_id;size:64"`
+	Ex             string    `gorm:"column:ex;size:1024"`
+}
+type ConversationModel struct {
+	OwnerUserID           string `gorm:"column:owner_user_id;primary_key;type:char(128)" json:"OwnerUserID"`
+	ConversationID        string `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
+	ConversationType      int32  `gorm:"column:conversation_type" json:"conversationType"`
+	UserID                string `gorm:"column:user_id;type:char(64)" json:"userID"`
+	GroupID               string `gorm:"column:group_id;type:char(128)" json:"groupID"`
+	RecvMsgOpt            int32  `gorm:"column:recv_msg_opt" json:"recvMsgOpt"`
+	UnreadCount           int32  `gorm:"column:unread_count" json:"unreadCount"`
+	DraftTextTime         int64  `gorm:"column:draft_text_time" json:"draftTextTime"`
+	IsPinned              bool   `gorm:"column:is_pinned" json:"isPinned"`
+	IsPrivateChat         bool   `gorm:"column:is_private_chat" json:"isPrivateChat"`
+	BurnDuration          int32  `gorm:"column:burn_duration;default:30" json:"burnDuration"`
+	GroupAtType           int32  `gorm:"column:group_at_type" json:"groupAtType"`
+	IsNotInGroup          bool   `gorm:"column:is_not_in_group" json:"isNotInGroup"`
+	UpdateUnreadCountTime int64  `gorm:"column:update_unread_count_time" json:"updateUnreadCountTime"`
+	AttachedInfo          string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
+	Ex                    string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+}
+
+type GroupModel struct {
+	GroupID                string    `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
+	GroupName              string    `gorm:"column:name;size:255" json:"groupName"`
+	Notification           string    `gorm:"column:notification;size:255" json:"notification"`
+	Introduction           string    `gorm:"column:introduction;size:255" json:"introduction"`
+	FaceURL                string    `gorm:"column:face_url;size:255" json:"faceURL"`
+	CreateTime             time.Time `gorm:"column:create_time;index:create_time"`
+	Ex                     string    `gorm:"column:ex" json:"ex;size:1024" json:"ex"`
+	Status                 int32     `gorm:"column:status"`
+	CreatorUserID          string    `gorm:"column:creator_user_id;size:64"`
+	GroupType              int32     `gorm:"column:group_type"`
+	NeedVerification       int32     `gorm:"column:need_verification"`
+	LookMemberInfo         int32     `gorm:"column:look_member_info" json:"lookMemberInfo"`
+	ApplyMemberFriend      int32     `gorm:"column:apply_member_friend" json:"applyMemberFriend"`
+	NotificationUpdateTime time.Time `gorm:"column:notification_update_time"`
+	NotificationUserID     string    `gorm:"column:notification_user_id;size:64"`
+}
+
+type FriendRequestModel struct {
+	FromUserID    string    `gorm:"column:from_user_id;primary_key;size:64"`
+	ToUserID      string    `gorm:"column:to_user_id;primary_key;size:64"`
+	HandleResult  int32     `gorm:"column:handle_result"`
+	ReqMsg        string    `gorm:"column:req_msg;size:255"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	HandlerUserID string    `gorm:"column:handler_user_id;size:64"`
+	HandleMsg     string    `gorm:"column:handle_msg;size:255"`
+	HandleTime    time.Time `gorm:"column:handle_time"`
+	Ex            string    `gorm:"column:ex;size:1024"`
+}
+
+type GroupMemberModel struct {
+	GroupID        string    `gorm:"column:group_id;primary_key;size:64"`
+	UserID         string    `gorm:"column:user_id;primary_key;size:64"`
+	Nickname       string    `gorm:"column:nickname;size:255"`
+	FaceURL        string    `gorm:"column:user_group_face_url;size:255"`
+	RoleLevel      int32     `gorm:"column:role_level"`
+	JoinTime       time.Time `gorm:"column:join_time"`
+	JoinSource     int32     `gorm:"column:join_source"`
+	InviterUserID  string    `gorm:"column:inviter_user_id;size:64"`
+	OperatorUserID string    `gorm:"column:operator_user_id;size:64"`
+	MuteEndTime    time.Time `gorm:"column:mute_end_time"`
+	Ex             string    `gorm:"column:ex;size:1024"`
+}
+
+type GroupRequestModel struct {
+	UserID        string    `gorm:"column:user_id;primary_key;size:64"`
+	GroupID       string    `gorm:"column:group_id;primary_key;size:64"`
+	HandleResult  int32     `gorm:"column:handle_result"`
+	ReqMsg        string    `gorm:"column:req_msg;size:1024"`
+	HandledMsg    string    `gorm:"column:handle_msg;size:1024"`
+	ReqTime       time.Time `gorm:"column:req_time"`
+	HandleUserID  string    `gorm:"column:handle_user_id;size:64"`
+	HandledTime   time.Time `gorm:"column:handle_time"`
+	JoinSource    int32     `gorm:"column:join_source"`
+	InviterUserID string    `gorm:"column:inviter_user_id;size:64"`
+	Ex            string    `gorm:"column:ex;size:1024"`
+}
@@ -1,10 +1,6 @@
 package middleware

 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/utils"
 	"bytes"
 	"encoding/json"
 	"github.com/gin-gonic/gin"
@@ -12,27 +8,6 @@ import (
 	"net/http"
 )

-func JWTAuth() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), "")
-		// log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID)
-		c.Set("userID", userID)
-		if !ok {
-			log.NewError("", "GetUserIDFromToken false ", c.Request.Header.Get("token"))
-			c.Abort()
-			c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errInfo})
-			return
-		} else {
-			if !utils.IsContain(userID, config.Config.Manager.AppManagerUid) {
-				c.Abort()
-				c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "user is not admin"})
-				return
-			}
-			log.NewInfo("0", utils.GetSelfFuncName(), "failed: ", errInfo)
-		}
-	}
-}
-
 func CorsHandler() gin.HandlerFunc {
 	return func(context *gin.Context) {
 		context.Writer.Header().Set("Access-Control-Allow-Origin", "*")
@@ -1,73 +0,0 @@
-package multi_terminal_login
-
-//
-//import (
-//	"Open_IM/internal/push/content_struct"
-//	"Open_IM/internal/push/logic"
-//	"Open_IM/pkg/common/config"
-//	"Open_IM/pkg/common/constant"
-//	"Open_IM/pkg/common/db"
-//	pbChat "Open_IM/pkg/proto/msg"
-//	"Open_IM/pkg/utils"
-//)
-//
-//const  DayOfSecond = 24*60*60
-//func MultiTerminalLoginChecker(uid, token string, platformID int32) error {
-//	//	1.check userid and platform class   0 not exists and  1 exists
-//	exists, err := db.DB.ExistsUserIDAndPlatform(uid, constant.PlatformNameToClass(constant.PlatformIDToName(platformID)))
-//	if err != nil {
-//		return err
-//	}
-//	//get config multi login policy
-//	if config.Config.MultiLoginPolicy  {
-//		//OnlyOneTerminalAccess policy need to check all terminal
-//		if constant.PlatformNameToClass(constant.PlatformIDToName(platformID)) == "PC" {
-//			exists, err = db.DB.ExistsUserIDAndPlatform(uid, "Mobile")
-//			if err != nil {
-//				return err
-//			}
-//		} else {
-//			exists, err = db.DB.ExistsUserIDAndPlatform(uid, "PC")
-//			if err != nil {
-//				return err
-//			}
-//		}
-//		if exists == 1 {
-//			err := db.DB.SetUserIDAndPlatform(uid, constant.PlatformNameToClass(constant.PlatformIDToName(platformID)), token, config.Config.TokenPolicy.AccessExpire*DayOfSecond)
-//			if err != nil {
-//				return err
-//			}
-//			PushMessageToTheTerminal(uid, platformID)
-//			return nil
-//		}
-//	} else if config.Config.MultiLoginPolicy.MobileAndPCTerminalAccessButOtherTerminalKickEachOther {
-//		//	common terminal need to kick eich other
-//		if exists == 1 {
-//			err := db.DB.SetUserIDAndPlatform(uid, constant.PlatformNameToClass(constant.PlatformIDToName(platformID)), token, config.Config.TokenPolicy.AccessExpire*DayOfSecond)
-//			if err != nil {
-//				return err
-//			}
-//			PushMessageToTheTerminal(uid, platformID)
-//			return nil
-//		}
-//	}
-//	err = db.DB.SetUserIDAndPlatform(uid, constant.PlatformNameToClass(constant.PlatformIDToName(platformID)), token, config.Config.TokenPolicy.AccessExpire*DayOfSecond)
-//	if err != nil {
-//		return err
-//	}
-//	PushMessageToTheTerminal(uid, platformID)
-//	return nil
-//}
-////
-////func PushMessageToTheTerminal(uid string, platform int32) {
-////
-////	logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
-////		SendID:      uid,
-////		RecvID:      uid,
-////		Content:     content_struct.NewContentStructString(1, "", "Your account is already logged on other terminal,please confirm"),
-////		SendTime:    utils.GetCurrentTimestampBySecond(),
-////		MsgFrom:     constant.SysMsgType,
-////		ContentType: constant.KickOnlineTip,
-////		PlatformID:  platform,
-////	})
-////}