tidy code

pkg/common/db/mysql_model/im_mysql_model/friend_model.go

@@ -6,17 +6,13 @@ import (
 	"time"
 )
 
-func InsertToFriend(ownerId, friendId string, flag int32) error {
+func InsertToFriend(toInsertFollow *Friend) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	toInsertFollow := Friend{
-		OwnerUserID:  ownerId,
-		FriendUserID: friendId,
-		FriendFlag:   flag,
-		CreateTime:   time.Now(),
-	}
+	toInsertFollow.CreateTime = time.Now()
+
 	err = dbConn.Table("friend").Create(toInsertFollow).Error
 	if err != nil {
 		return err
@@ -24,46 +20,56 @@ func InsertToFriend(ownerId, friendId string, flag int32) error {
 	return nil
 }
 
-func FindFriendRelationshipFromFriend(ownerId, friendId string) (*Friend, error) {
+func FindFriendRelationshipFromFriend(OwnerUserID, FriendUserID string) (*Friend, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var friend Friend
-	err = dbConn.Table("friend").Where("owner_id=? and friend_id=?", ownerId, friendId).Find(&friend).Error
+	err = dbConn.Table("friend").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Find(&friend).Error
 	if err != nil {
 		return nil, err
 	}
 	return &friend, err
 }
 
-func FindUserInfoFromFriend(ownerId string) ([]Friend, error) {
+func FindUserInfoFromFriend(OwnerUserID string) ([]Friend, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var friends []Friend
-	err = dbConn.Table("friend").Where("owner_id=?", ownerId).Find(&friends).Error
+	err = dbConn.Table("friend").Where("owner_user_id=?", OwnerUserID).Find(&friends).Error
 	if err != nil {
 		return nil, err
 	}
 	return friends, nil
 }
 
-func UpdateFriendComment(ownerId, friendId, comment string) error {
+func UpdateFriendComment(OwnerUserID, FriendUserID, Remark string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("update friend set comment=? where owner_id=? and friend_id=?", comment, ownerId, friendId).Error
+	err = dbConn.Exec("update friend set remark=? where owner_user_id=? and friend_user_id=?", Remark, OwnerUserID, FriendUserID).Error
 	return err
 }
 
-func DeleteSingleFriendInfo(ownerId, friendId string) error {
+func DeleteSingleFriendInfo(OwnerUserID, FriendUserID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Table("friend").Where("owner_id=? and friend_id=?", ownerId, friendId).Delete(Friend{}).Error
+	err = dbConn.Table("friend").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Delete(Friend{}).Error
 	return err
 }
+
+//type Friend struct {
+//	OwnerUserID    string    `gorm:"column:owner_user_id;primaryKey;"`
+//	FriendUserID   string    `gorm:"column:friend_user_id;primaryKey;"`
+//	Remark         string    `gorm:"column:remark"`
+//	CreateTime     time.Time `gorm:"column:create_time"`
+//	AddSource      int32     `gorm:"column:add_source"`
+//	OperatorUserID string    `gorm:"column:operator_user_id"`
+//	Ex             string    `gorm:"column:ex"`
+//}

pkg/common/db/mysql_model/im_mysql_model/friend_request_model.go

@@ -2,43 +2,42 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
-	"time"
 )
 
-// reqId add userId
-func ReplaceIntoFriendReq(reqId, userId string, flag int32, reqMessage string) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return err
-	}
-	err = dbConn.Exec("replace into friend_request(req_id,user_id,flag,req_message,create_time) values(?,?,?,?,?)", reqId, userId, flag, reqMessage, time.Now()).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
+//type FriendRequest struct {
+//	FromUserID    string    `gorm:"column:from_user_id;primaryKey;"`
+//	ToUserID      string    `gorm:"column:to_user_id;primaryKey;"`
+//	HandleResult  int32     `gorm:"column:handle_result"`
+//	ReqMessage    string    `gorm:"column:req_message"`
+//	CreateTime    time.Time `gorm:"column:create_time"`
+//	HandlerUserID string    `gorm:"column:handler_user_id"`
+//	HandleMsg     string    `gorm:"column:handle_msg"`
+//	HandleTime    time.Time `gorm:"column:handle_time"`
+//	Ex            string    `gorm:"column:ex"`
+//}
 
-func FindFriendsApplyFromFriendReq(userId string) ([]FriendRequest, error) {
+// who apply to add me
+func GetReceivedFriendsApplicationListByUserID(ToUserID string) ([]FriendRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var usersInfo []FriendRequest
-	//dbConn.LogMode(true)
-	err = dbConn.Table("friend_request").Where("user_id=?", userId).Find(&usersInfo).Error
+	err = dbConn.Table("friend_request").Where("to_user_id=?", ToUserID).Find(&usersInfo).Error
 	if err != nil {
 		return nil, err
 	}
 	return usersInfo, nil
 }
 
-func FindSelfApplyFromFriendReq(userId string) ([]FriendRequest, error) {
+//I apply to add somebody
+func GetSendFriendApplicationListByUserID(FromUserID string) ([]FriendRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var usersInfo []FriendRequest
-	err = dbConn.Table("friend_request").Where("req_id=?", userId).Find(&usersInfo).Error
+	err = dbConn.Table("friend_request").Where("from_user_id=?", FromUserID).Find(&usersInfo).Error
 	if err != nil {
 		return nil, err
 	}
@@ -46,26 +45,25 @@ func FindSelfApplyFromFriendReq(userId string) ([]FriendRequest, error) {
 }
 
 //reqId apply to add userId already
-func FindFriendApplyFromFriendReqByUid(reqId, userId string) (*FriendRequest, error) {
+func FindFriendApplicationByBothUserID(FromUserId, ToUserID string) (*FriendRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var friendRequest FriendRequest
-	err = dbConn.Table("friend_request").Where("req_id=? and user_id=?", reqId, userId).Find(&friendRequest).Error
+	err = dbConn.Table("friend_request").Where("from_user_id=? and to_user_id=?", FromUserId, ToUserID).Find(&friendRequest).Error
 	if err != nil {
 		return nil, err
 	}
 	return &friendRequest, nil
 }
 
-//userId process reqId
-func UpdateFriendRelationshipToFriendReq(reqId, userId string, flag int32) error {
+func UpdateFriendApplication(friendRequest FriendRequest) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("update friend_request set flag=? where req_id=? and user_id=?", flag, reqId, userId).Error
+	err = dbConn.Table("friend_request").Where("from_user_id=? and to_user_id=?", friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest).Error
 	if err != nil {
 		return err
 	}

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -2,15 +2,25 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
-	"time"
 )
 
-func InsertIntoGroupMember(groupId, uid, nickName, userGroupFaceUrl string, administratorLevel int32) error {
+//type GroupMember struct {
+//	GroupID            string    `gorm:"column:group_id;primaryKey;"`
+//	UserID             string    `gorm:"column:user_id;primaryKey;"`
+//	NickName           string    `gorm:"column:nickname"`
+//	FaceUrl            string    `gorm:"user_group_face_url"`
+//	RoleLevel int32     `gorm:"column:role_level"`
+//	JoinTime           time.Time `gorm:"column:join_time"`
+//	JoinSource int32 `gorm:"column:join_source"`
+//	OperatorUserID  string `gorm:"column:operator_user_id"`
+//	Ex string `gorm:"column:ex"`
+//}
+
+func InsertIntoGroupMember(toInsertInfo GroupMember) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	toInsertInfo := GroupMember{GroupID: groupId, UserID: uid, NickName: nickName, AdministratorLevel: administratorLevel, JoinTime: time.Now(), FaceUrl: userGroupFaceUrl}
 	err = dbConn.Table("group_member").Create(toInsertInfo).Error
 	if err != nil {
 		return err
@@ -18,154 +28,154 @@ func InsertIntoGroupMember(groupId, uid, nickName, userGroupFaceUrl string, admi
 	return nil
 }
 
-func FindGroupMemberListByUserId(uid string) ([]GroupMember, error) {
+func GetGroupMemberListByUserID(userID string) ([]GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var groupMemberList []GroupMember
-	err = dbConn.Raw("select * from `group_member` where uid=?", uid).Find(&groupMemberList).Error
+	err = dbConn.Table("group_member").Where("user_id=?", userID).Find(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}
 	return groupMemberList, nil
 }
 
-func FindGroupMemberListByGroupId(groupId string) ([]GroupMember, error) {
+func GetGroupMemberListByGroupID(groupID string) ([]GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var groupMemberList []GroupMember
-	err = dbConn.Raw("select * from `group_member` where group_id=?", groupId).Find(&groupMemberList).Error
+	err = dbConn.Table("group_member").Where("group_id=?", groupID).Find(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}
 	return groupMemberList, nil
 }
 
-func FindGroupMemberListByGroupIdAndFilterInfo(groupId string, filter int32) ([]GroupMember, error) {
+func GetGroupMemberListByGroupIDAndFilter(groupID string, filter int32) ([]GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	dbConn.LogMode(true)
 	if err != nil {
 		return nil, err
 	}
 	var groupMemberList []GroupMember
-	err = dbConn.Raw("select * from `group_member` where group_id=? and administrator_level=?", groupId, filter).Find(&groupMemberList).Error
+	err = dbConn.Table("group_member").Where("group_id=? and role_level=?", groupID, filter).Find(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}
 	return groupMemberList, nil
 }
-func FindGroupMemberInfoByGroupIdAndUserId(groupId, uid string) (*GroupMember, error) {
+
+func GetGroupMemberInfoByGroupIDAndUserID(groupID, userID string) (*GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var groupMember GroupMember
-	err = dbConn.Raw("select * from `group_member` where group_id=? and uid=? limit 1", groupId, uid).Find(&groupMember).Error
+	err = dbConn.Table("group_member").Where("group_id=? and user_id=? limit 1", groupID, userID).Find(&groupMember).Error
 	if err != nil {
 		return nil, err
 	}
 	return &groupMember, nil
 }
 
-func DeleteGroupMemberByGroupIdAndUserId(groupId, uid string) error {
+func DeleteGroupMemberByGroupIDAndUserID(groupID, userID string) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("delete  from `group_member` where group_id=? and uid=?", groupId, uid).Error
+	err = dbConn.Table("group_member").Where("group_id=? and user_id=? limit 1", groupID, userID).Delete(&GroupMember{}).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func UpdateOwnerGroupNickName(groupId, userId, groupNickName string) error {
+func UpdateGroupMemberInfo(groupMemberInfo GroupMember) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	err = dbConn.Exec("update `group_member` set nickname=? where group_id=? and uid=?", groupNickName, groupId, userId).Error
+	err = dbConn.Table("group_member").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Update(&groupMemberInfo).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func SelectGroupList(groupID string) ([]string, error) {
-	var groupUserID string
-	var groupList []string
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return groupList, err
-	}
-
-	rows, err := dbConn.Model(&GroupMember{}).Where("group_id = ?", groupID).Select("user_id").Rows()
-	if err != nil {
-		return groupList, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		rows.Scan(&groupUserID)
-		groupList = append(groupList, groupUserID)
-	}
-	return groupList, nil
-}
-
-func UpdateTheUserAdministratorLevel(groupId, uid string, administratorLevel int64) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return err
-	}
-	err = dbConn.Exec("update `group_member` set administrator_level=? where group_id=? and uid=?", administratorLevel, groupId, uid).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func GetOwnerManagerByGroupId(groupId string) ([]GroupMember, error) {
+func GetOwnerManagerByGroupID(groupID string) ([]GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var groupMemberList []GroupMember
-	err = dbConn.Raw("select * from `group_member` where group_id=? and administrator_level > 0", groupId).Find(&groupMemberList).Error
+	err = dbConn.Table("group_member").Where("group_id=? and role_level>0", groupID).Find(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}
 	return groupMemberList, nil
 }
 
-func IsExistGroupMember(groupId, uid string) bool {
+func GetGroupMemberNumByGroupID(groupID string) int32 {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return 0
+	}
+	var number int32
+	err = dbConn.Table("group_member").Where("group_id=?", groupID).Count(&number).Error
+	if err != nil {
+		return 0
+	}
+	return number
+}
+
+func GetGroupOwnerInfoByGroupID(groupID string) (*GroupMember, error) {
+	omList, err := GetOwnerManagerByGroupID(groupID)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range omList {
+		if v.RoleLevel == 1 {
+			return &v, nil
+		}
+	}
+	return nil, nil
+}
+
+func IsExistGroupMember(groupID, userID string) bool {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return false
 	}
 	var number int32
-	err = dbConn.Raw("select count(*) from `group_member` where group_id = ? and uid = ?", groupId, uid).Count(&number).Error
+	err = dbConn.Table("group_member").Where("group_id = ? and user_id = ?", groupID, userID).Count(&number).Error
 	if err != nil {
 		return false
 	}
-
 	if number != 1 {
 		return false
 	}
 	return true
 }
 
-func RemoveGroupMember(groupId string, memberId string) error {
-	return DeleteGroupMemberByGroupIdAndUserId(groupId, memberId)
+func RemoveGroupMember(groupID string, UserID string) error {
+	return DeleteGroupMemberByGroupIDAndUserID(groupID, UserID)
 }
 
-func GetMemberInfoById(groupId string, memberId string) (*GroupMember, error) {
-	return FindGroupMemberInfoByGroupIdAndUserId(groupId, memberId)
+func GetMemberInfoByID(groupID string, userID string) (*GroupMember, error) {
+	return GetGroupMemberInfoByGroupIDAndUserID(groupID, userID)
 }
 
-func GetGroupMemberByGroupId(groupId string, filter int32, begin int32, maxNumber int32) ([]GroupMember, error) {
-	memberList, err := FindGroupMemberListByGroupId(groupId) //sorted by join time
+func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumber int32) ([]GroupMember, error) {
+	var memberList []GroupMember
+	var err error
+	if filter >= 0 {
+		memberList, err = GetGroupMemberListByGroupIDAndFilter(groupID, filter) //sorted by join time
+	} else {
+		memberList, err = GetGroupMemberListByGroupID(groupID)
+	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -182,49 +192,35 @@ func GetGroupMemberByGroupId(groupId string, filter int32, begin int32, maxNumbe
 	return memberList[begin:end], nil
 }
 
-func GetJoinedGroupIdListByMemberId(memberId string) ([]GroupMember, error) {
-	return FindGroupMemberListByUserId(memberId)
-}
-
-func GetGroupMemberNumByGroupId(groupId string) int32 {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return 0
-	}
-	var number int32
-	err = dbConn.Raw("select count(*) from `group_member` where group_id=? ", groupId).Count(&number).Error
-	if err != nil {
-		return 0
-	}
-	return number
-}
-
-func GetGroupOwnerByGroupId(groupId string) string {
-	omList, err := GetOwnerManagerByGroupId(groupId)
-	if err != nil {
-		return ""
-	}
-	for _, v := range omList {
-		if v.AdministratorLevel == 1 {
-			return v.UserID
-		}
-	}
-	return ""
-}
-
-func GetGroupOwnerInfoByGroupId(groupId string) (*GroupMember, error) {
-	omList, err := GetOwnerManagerByGroupId(groupId)
+func GetJoinedGroupIDListByUserID(userID string) ([]string, error) {
+	memberList, err := GetGroupMemberListByUserID(userID)
 	if err != nil {
 		return nil, err
 	}
-	for _, v := range omList {
-		if v.AdministratorLevel == 1 {
-			return v, nil
-		}
+	var groupIDList []string = make([]string, len(memberList))
+	for _, v := range memberList {
+		groupIDList = append(groupIDList, v.GroupID)
 	}
-	return nil, nil
+	return groupIDList, nil
 }
 
-func InsertGroupMember(groupId, userId, nickName, userFaceUrl string, role int32) error {
-	return InsertIntoGroupMember(groupId, userId, nickName, userFaceUrl, role)
-}
+//
+//func SelectGroupList(groupID string) ([]string, error) {
+//	var groupUserID string
+//	var groupList []string
+//	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+//	if err != nil {
+//		return groupList, err
+//	}
+//
+//	rows, err := dbConn.Model(&GroupMember{}).Where("group_id = ?", groupID).Select("user_id").Rows()
+//	if err != nil {
+//		return groupList, err
+//	}
+//	defer rows.Close()
+//	for rows.Next() {
+//		rows.Scan(&groupUserID)
+//		groupList = append(groupList, groupUserID)
+//	}
+//	return groupList, nil
+//}

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -8,17 +8,16 @@ import (
 	"time"
 )
 
-func InsertIntoGroup(groupId, name, introduction, notification, faceUrl, ex string) error {
+func InsertIntoGroup(groupInfo Group) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	//Default group name
-	if name == "" {
-		name = "Group Chat"
+	if groupInfo.GroupName == "" {
+		groupInfo.GroupName = "Group Chat"
 	}
-	toInsertInfo := Group{GroupID: groupId, GroupName: name, Introduction: introduction, Notification: notification, FaceUrl: faceUrl, CreateTime: time.Now(), Ex: ex}
-	err = dbConn.Table("group").Create(toInsertInfo).Error
+	groupInfo.CreateTime = time.Now()
+	err = dbConn.Table("group").Create(groupInfo).Error
 	if err != nil {
 		return err
 	}
@@ -164,7 +163,7 @@ func GetGroupApplicationList(uid string) (*group.GetGroupApplicationListResp, er
 	return reply, nil
 }
 
-func TransferGroupOwner(pb *group.TransferGroupOwnerReq) (*group.CommonResp, error) {
+func TransferGroupOwner(pb *group.TransferGroupOwnerReq) (*group.TransferGroupOwnerResp, error) {
 	oldOwner, err := FindGroupMemberInfoByGroupIdAndUserId(pb.GroupID, pb.OldOwnerUserID)
 	if err != nil {
 		return nil, err
@@ -187,7 +186,7 @@ func TransferGroupOwner(pb *group.TransferGroupOwnerReq) (*group.CommonResp, err
 		return nil, err
 	}
 
-	return &group.CommonResp{}, nil
+	return &group.TransferGroupOwnerResp{CommonResp: &group.CommonResp{ErrCode: 0}}, nil
 }
 
 func GroupApplicationResponse(pb *group.GroupApplicationResponseReq) (*group.CommonResp, error) {

pkg/common/db/mysql_model/im_mysql_model/model_struct.go

@@ -2,69 +2,82 @@ package im_mysql_model
 
 import "time"
 
-type User struct {
-	UserID     string    `gorm:"column:uid;primaryKey;"`
-	Nickname   string    `gorm:"column:name"`
-	FaceUrl    string    `gorm:"column:icon"`
-	Gender     int32     `gorm:"column:gender"`
-	Mobile     string    `gorm:"column:mobile"`
-	Birth      string    `gorm:"column:birth"`
-	Email      string    `gorm:"column:email"`
-	Ex         string    `gorm:"column:ex"`
-	CreateTime time.Time `gorm:"column:create_time"`
+type Friend struct {
+	OwnerUserID    string    `gorm:"column:owner_user_id;primaryKey;"`
+	FriendUserID   string    `gorm:"column:friend_user_id;primaryKey;"`
+	Remark         string    `gorm:"column:remark"`
+	CreateTime     time.Time `gorm:"column:create_time"`
+	AddSource      int32     `gorm:"column:add_source"`
+	OperatorUserID string    `gorm:"column:operator_user_id"`
+	Ex             string    `gorm:"column:ex"`
 }
 
-type Friend struct {
-	OwnerUserID  string    `gorm:"column:owner_id"`
-	FriendUserID string    `gorm:"column:friend_id"`
-	Remark       string    `gorm:"column:comment"`
-	FriendFlag   int32     `gorm:"column:friend_flag"`
-	CreateTime   time.Time `gorm:"column:create_time"`
-}
 type FriendRequest struct {
-	ReqID      string    `gorm:"column:req_id"`
-	UserID     string    `gorm:"column:user_id"`
-	Flag       int32     `gorm:"column:flag"`
-	ReqMessage string    `gorm:"column:req_message"`
-	CreateTime time.Time `gorm:"column:create_time"`
-}
-type BlackList struct {
-	OwnerUserID string    `gorm:"column:owner_id"`
-	BlockUserID string    `gorm:"column:block_id"`
-	CreateTime  time.Time `gorm:"column:create_time"`
+	FromUserID    string    `gorm:"column:from_user_id;primaryKey;"`
+	ToUserID      string    `gorm:"column:to_user_id;primaryKey;"`
+	HandleResult  int32     `gorm:"column:handle_result"`
+	ReqMessage    string    `gorm:"column:req_message"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	HandlerUserID string    `gorm:"column:handler_user_id"`
+	HandleMsg     string    `gorm:"column:handle_msg"`
+	HandleTime    time.Time `gorm:"column:handle_time"`
+	Ex            string    `gorm:"column:ex"`
 }
 
 type Group struct {
-	GroupID      string    `gorm:"column:group_id"`
-	GroupName    string    `gorm:"column:name"`
-	Introduction string    `gorm:"column:introduction"`
-	Notification string    `gorm:"column:notification"`
-	FaceUrl      string    `gorm:"column:face_url"`
-	CreateTime   time.Time `gorm:"column:create_time"`
-	Ext          string    `gorm:"column:ex"`
+	GroupID       string    `gorm:"column:group_id;primaryKey;"`
+	GroupName     string    `gorm:"column:name"`
+	Introduction  string    `gorm:"column:introduction"`
+	Notification  string    `gorm:"column:notification"`
+	FaceUrl       string    `gorm:"column:face_url"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	Status        int32     `gorm:"column:status"`
+	CreatorUserID string    `gorm:"column:creator_user_id"`
+	GroupType     int32     `gorm:"column:group_type"`
+	Ex            string    `gorm:"column:ex"`
 }
 
 type GroupMember struct {
-	GroupID            string    `gorm:"column:group_id"`
-	UserID             string    `gorm:"column:uid"`
-	NickName           string    `gorm:"column:nickname"`
-	AdministratorLevel int32     `gorm:"column:administrator_level"`
-	JoinTime           time.Time `gorm:"column:join_time"`
-	FaceUrl            string    `gorm:"user_group_face_url"`
+	GroupID        string    `gorm:"column:group_id;primaryKey;"`
+	UserID         string    `gorm:"column:user_id;primaryKey;"`
+	NickName       string    `gorm:"column:nickname"`
+	FaceUrl        string    `gorm:"user_group_face_url"`
+	RoleLevel      int32     `gorm:"column:role_level"`
+	JoinTime       time.Time `gorm:"column:join_time"`
+	JoinSource     int32     `gorm:"column:join_source"`
+	OperatorUserID string    `gorm:"column:operator_user_id"`
+	Ex             string    `gorm:"column:ex"`
 }
 
 type GroupRequest struct {
-	ID               string    `gorm:"column:id"`
-	GroupID          string    `gorm:"column:group_id"`
-	FromUserID       string    `gorm:"column:from_user_id"`
-	ToUserID         string    `gorm:"column:to_user_id"`
-	Flag             int32     `gorm:"column:flag"`
-	ReqMsg           string    `gorm:"column:req_msg"`
-	HandledMsg       string    `gorm:"column:handled_msg"`
-	CreateTime       time.Time `gorm:"column:create_time"`
-	FromUserNickname string    `gorm:"from_user_nickname"`
-	ToUserNickname   string    `gorm:"to_user_nickname"`
-	FromUserFaceUrl  string    `gorm:"from_user_face_url"`
-	ToUserFaceUrl    string    `gorm:"to_user_face_url"`
-	HandledUser      string    `gorm:"handled_user"`
+	UserID       string    `gorm:"column:user_id;primaryKey;"`
+	GroupID      string    `gorm:"column:group_id;primaryKey;"`
+	HandleResult string    `gorm:"column:handle_result"`
+	ReqMsg       string    `gorm:"column:req_msg"`
+	HandledMsg   string    `gorm:"column:handled_msg"`
+	ReqTime      time.Time `gorm:"column:req_time"`
+	HandleUserID string    `gorm:"column:handle_user_id"`
+	HandledTime  time.Time `gorm:"column:handle_time"`
+	Ex           string    `gorm:"column:ex"`
+}
+
+type User struct {
+	UserID      string    `gorm:"column:user_id;primaryKey;"`
+	Nickname    string    `gorm:"column:name"`
+	FaceUrl     string    `gorm:"column:icon"`
+	Gender      int32     `gorm:"column:gender"`
+	PhoneNumber string    `gorm:"column:phone_number"`
+	Birth       string    `gorm:"column:birth"`
+	Email       string    `gorm:"column:email"`
+	Ex          string    `gorm:"column:ex"`
+	CreateTime  time.Time `gorm:"column:create_time"`
+}
+
+type BlackList struct {
+	OwnerUserID    string    `gorm:"column:owner_user_id;primaryKey;"`
+	BlockUserID    string    `gorm:"column:block_user_id;primaryKey;"`
+	CreateTime     time.Time `gorm:"column:create_time"`
+	AddSource      int32     `gorm:"column:add_source"`
+	OperatorUserID int32     `gorm:"column:operator_user_id"`
+	Ex             string    `gorm:"column:ex"`
 }