Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

pkg/common/config/config.go

@@ -74,6 +74,16 @@ type config struct {
 			StorageTime         int    `yaml:"storageTime"`
 			IsDistributedMod    bool   `yaml:"isDistributedMod"`
 		} `yaml:"minio"`
+		Aws struct {
+			AccessKeyID     string `yaml:"accessKeyID"`
+			AccessKeySecret string `yaml:"accessKeySecret"`
+			Region          string `yaml:"region"`
+			Bucket          string `yaml:"bucket"`
+			FinalHost       string `yaml:"finalHost"`
+			RoleArn         string `yaml:"roleArn"`
+			ExternalId      string `yaml:"externalId"`
+			RoleSessionName string `yaml:"roleSessionName"`
+		} `yaml:"aws"`
 	}
 
 	Dtm struct {
@@ -215,10 +225,10 @@ type config struct {
 			Addr  []string `yaml:"addr"`
 			Topic string   `yaml:"topic"`
 		}
-		Ws2mschatOffline struct {
-			Addr  []string `yaml:"addr"`
-			Topic string   `yaml:"topic"`
-		}
+		//Ws2mschatOffline struct {
+		//	Addr  []string `yaml:"addr"`
+		//	Topic string   `yaml:"topic"`
+		//}
 		MsgToMongo struct {
 			Addr  []string `yaml:"addr"`
 			Topic string   `yaml:"topic"`
@@ -492,6 +502,7 @@ type config struct {
 		}
 		TestDepartMentID     string   `yaml:"testDepartMentID"`
 		ImAPIURL             string   `yaml:"imAPIURL"`
+		NeedInvitationCode   bool     `yaml:"needInvitationCode"`
 		OnboardProcess       bool     `yaml:"onboardProcess"`
 		JoinDepartmentIDList []string `yaml:"joinDepartmentIDList"`
 		JoinDepartmentGroups bool     `yaml:"joinDepartmentGroups"`

pkg/common/constant/constant.go

@@ -185,7 +185,8 @@ const (
 
 	//Minio
 	MinioDurationTimes = 3600
-
+	//Aws
+	AwsDurationTimes = 3600
 	// verificationCode used for
 	VerificationCodeForRegister       = 1
 	VerificationCodeForReset          = 2

pkg/common/constant/error.go

@@ -50,6 +50,7 @@ var (
 	DBMsg                       = errors.New("db failed")
 	ArgsMsg                     = errors.New("args failed")
 	CallBackMsg                 = errors.New("callback failed")
+	InvitationMsg               = errors.New("invitationCode error")
 
 	ThirdPartyMsg = errors.New("third party error")
 )
@@ -69,6 +70,7 @@ const (
 	ResetPasswordFailed  = 10011
 	RegisterLimit        = 10012
 	LoginLimit           = 10013
+	InvitationError      = 10014
 	DatabaseError        = 10002
 	ServerError          = 10004
 	HttpError            = 10005

pkg/common/db/model_struct.go

@@ -9,11 +9,15 @@ type Register struct {
 	UserID         string `gorm:"column:user_id;type:varchar(255)" json:"userID"`
 	AreaCode       string `gorm:"column:area_code;type:varchar(255)"`
 	InvitationCode string `gorm:"column:invitation_code;type:varchar(255)"`
+	RegisterIP     string `gorm:"column:register_ip;type:varchar(255)"`
 }
 
 type Invitation struct {
-	InvitationCode string    `gorm:"column:invitation_code;primary_key;type:varchar(255)"`
+	InvitationCode string    `gorm:"column:invitation_code;primary_key;type:varchar(32)"`
 	CreateTime     time.Time `gorm:"column:create_time"`
+	UserID         string    `gorm:"column:user_id"`
+	LastTime       time.Time `gorm:"column:last_time"`
+	Status         int32     `gorm:"column:status"`
 }
 
 //
@@ -180,6 +184,7 @@ type User struct {
 	LoginLimit       int32     `gorm:"column:login_limit"`
 	AppMangerLevel   int32     `gorm:"column:app_manger_level"`
 	GlobalRecvMsgOpt int32     `gorm:"column:global_recv_msg_opt"`
+	InvitationCode   string    `gorm:"column:invitation_code"`
 	status           int32     `gorm:"column:status"`
 }
 
@@ -325,3 +330,11 @@ type AppVersion struct {
 func (AppVersion) TableName() string {
 	return "app_version"
 }
+
+type RegisterAddFriend struct {
+	UserID string `gorm:"column:user_id;primary_key;size:64"`
+}
+
+func (RegisterAddFriend) TableName() string {
+	return "register_add_friend"
+}

pkg/common/db/mysql.go

@@ -78,7 +78,7 @@ func initMysqlDB() {
 		&GroupMember{},
 		&GroupRequest{},
 		&User{},
-		&Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{}, &Invitation{})
+		&Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{}, &Invitation{}, &RegisterAddFriend{})
 	db.Set("gorm:table_options", "CHARSET=utf8")
 	db.Set("gorm:table_options", "collation=utf8_unicode_ci")
 
@@ -154,6 +154,15 @@ func initMysqlDB() {
 		fmt.Println("CreateTable UserIpLimit")
 		db.Migrator().CreateTable(&UserIpLimit{})
 	}
+
+	if !db.Migrator().HasTable(&RegisterAddFriend{}) {
+		fmt.Println("CreateTable RegisterAddFriend")
+		db.Migrator().CreateTable(&RegisterAddFriend{})
+	}
+	if !db.Migrator().HasTable(&Invitation{}) {
+		fmt.Println("CreateTable Invitation")
+		db.Migrator().CreateTable(&Invitation{})
+	}
 	DB.MysqlDB.db = db
 	return
 }

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

@@ -2,6 +2,7 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
+	"errors"
 	_ "gorm.io/gorm"
 )
 
@@ -11,13 +12,14 @@ func GetRegister(account, areaCode, userID string) (*db.Register, error) {
 		userID, "", account, account, areaCode).Take(&r).Error
 }
 
-func SetPassword(account, password, ex, userID, areaCode string) error {
+func SetPassword(account, password, ex, userID, areaCode, ip string) error {
 	r := db.Register{
-		Account:  account,
-		Password: password,
-		Ex:       ex,
-		UserID:   userID,
-		AreaCode: areaCode,
+		Account:    account,
+		Password:   password,
+		Ex:         ex,
+		UserID:     userID,
+		RegisterIP: ip,
+		AreaCode:   areaCode,
 	}
 	return db.DB.MysqlDB.DefaultGormDB().Table("registers").Create(&r).Error
 }
@@ -28,3 +30,42 @@ func ResetPassword(account, password string) error {
 	}
 	return db.DB.MysqlDB.DefaultGormDB().Table("registers").Where("account = ?", account).Updates(&r).Error
 }
+
+func GetRegisterAddFriendList(showNumber, pageNumber int32) ([]string, error) {
+	var IDList []string
+	var err error
+	model := db.DB.MysqlDB.DefaultGormDB().Model(&db.RegisterAddFriend{})
+	if showNumber == 0 {
+		err = model.Pluck("user_id", &IDList).Error
+	} else {
+		err = model.Limit(int(showNumber)).Offset(int(showNumber*(pageNumber-1))).Pluck("user_id", &IDList).Error
+	}
+	return IDList, err
+}
+
+func AddUserRegisterAddFriendIDList(userIDList ...string) error {
+	var list []db.RegisterAddFriend
+	for _, v := range userIDList {
+		list = append(list, db.RegisterAddFriend{UserID: v})
+	}
+	result := db.DB.MysqlDB.DefaultGormDB().Create(list)
+	if int(result.RowsAffected) < len(userIDList) {
+		return errors.New("some line insert failed")
+	}
+	err := result.Error
+	return err
+}
+
+func ReduceUserRegisterAddFriendIDList(userIDList ...string) error {
+	var list []db.RegisterAddFriend
+	for _, v := range userIDList {
+		list = append(list, db.RegisterAddFriend{UserID: v})
+	}
+	err := db.DB.MysqlDB.DefaultGormDB().Delete(list).Error
+	return err
+}
+
+func DeleteAllRegisterAddFriendIDList() error {
+	err := db.DB.MysqlDB.DefaultGormDB().Where("1 = 1").Delete(&db.RegisterAddFriend{}).Error
+	return err
+}

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

@@ -140,14 +140,6 @@ func IsExistGroupMember(groupID, userID string) bool {
 	return true
 }
 
-func RemoveGroupMember(groupID string, UserID string) error {
-	return DeleteGroupMemberByGroupIDAndUserID(groupID, UserID)
-}
-
-func GetMemberInfoByID(groupID string, userID string) (*db.GroupMember, error) {
-	return GetGroupMemberInfoByGroupIDAndUserID(groupID, userID)
-}
-
 func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumber int32) ([]db.GroupMember, error) {
 	var memberList []db.GroupMember
 	var err error

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

@@ -1,12 +1,9 @@
 package im_mysql_model
 
 import (
-	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
-	"errors"
 	"fmt"
-	"gorm.io/gorm"
 	"time"
 )
 
@@ -36,32 +33,35 @@ func InsertIntoGroup(groupInfo db.Group) error {
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
-func GetGroupInfoByGroupID(groupId string) (*db.Group, error) {
+func GetGroupInfoByGroupID(groupID string) (*db.Group, error) {
 	var groupInfo db.Group
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupId).Take(&groupInfo).Error
-	if err != nil {
-		return nil, err
-	}
-	return &groupInfo, nil
+	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupID).Take(&groupInfo).Error
+	return &groupInfo, err
 }
 
 func SetGroupInfo(groupInfo db.Group) error {
 	return db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupInfo.GroupID).Updates(&groupInfo).Error
 }
 
-func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]db.Group, error) {
-	var groups []db.Group
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where(fmt.Sprintf(" name like '%%%s%%' ", groupName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groups).Error
+type GroupWithNum struct {
+	db.Group
+	MemberCount int `gorm:"column:num"`
+}
+
+func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]GroupWithNum, error) {
+	var groups []GroupWithNum
+	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Select("groups.*, (select count(*) from group_members where group_members.group_id=groups.group_id) as num").
+		Where(fmt.Sprintf(" name like '%%%s%%' ", groupName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groups).Error
 	return groups, err
 }
 
-func GetGroups(pageNumber, showNumber int) ([]db.Group, error) {
-	var groups []db.Group
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error; err != nil {
+func GetGroups(pageNumber, showNumber int) ([]GroupWithNum, error) {
+	var groups []GroupWithNum
+	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Select("groups.*, (select count(*) from group_members where group_members.group_id=groups.group_id) as num").
+		Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error; err != nil {
 		return groups, err
 	}
 	return groups, nil
@@ -78,77 +78,6 @@ func OperateGroupStatus(groupId string, groupStatus int32) error {
 	return nil
 }
 
-func DeleteGroup(groupId string) error {
-	var group db.Group
-	var groupMembers []db.GroupMember
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupId).Delete(&group).Error; err != nil {
-		return err
-	}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id=?", groupId).Delete(groupMembers).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string, error) {
-	groupMember := db.GroupMember{
-		UserID:  userId,
-		GroupID: groupId,
-	}
-	updateInfo := db.GroupMember{
-		RoleLevel: roleLevel,
-	}
-	groupMaster := db.GroupMember{}
-	var err error
-	switch roleLevel {
-	case constant.GroupOwner:
-		err = db.DB.MysqlDB.DefaultGormDB().Transaction(func(tx *gorm.DB) error {
-			result := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster).Updates(&db.GroupMember{
-				RoleLevel: constant.GroupOrdinaryUsers,
-			})
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-
-			result = db.DB.MysqlDB.DefaultGormDB().Table("group_members").First(&groupMember).Updates(updateInfo)
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-			return nil
-		})
-
-	case constant.GroupOrdinaryUsers:
-		err = db.DB.MysqlDB.DefaultGormDB().Transaction(func(tx *gorm.DB) error {
-			result := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster)
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-			if groupMaster.UserID == userId {
-				return errors.New(fmt.Sprintf("user %s is master of %s, cant set to ordinary user", userId, groupId))
-			} else {
-				result = db.DB.MysqlDB.DefaultGormDB().Table("group_members").Find(&groupMember).Updates(updateInfo)
-				if result.Error != nil {
-					return result.Error
-				}
-				if result.RowsAffected == 0 {
-					return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-				}
-			}
-			return nil
-		})
-	}
-	return "", "", err
-}
-
 func GetGroupsCountNum(group db.Group) (int32, error) {
 	var count int64
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where(fmt.Sprintf(" name like '%%%s%%' ", group.GroupName)).Count(&count).Error; err != nil {
@@ -157,34 +86,10 @@ func GetGroupsCountNum(group db.Group) (int32, error) {
 	return int32(count), nil
 }
 
-func GetGroupById(groupId string) (db.Group, error) {
-	group := db.Group{
-		GroupID: groupId,
-	}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Find(&group).Error; err != nil {
-		return group, err
-	}
-	return group, nil
-}
-
-func GetGroupMaster(groupId string) (db.GroupMember, error) {
-	groupMember := db.GroupMember{}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("role_level=? and group_id=?", constant.GroupOwner, groupId).Find(&groupMember).Error; err != nil {
-		return groupMember, err
-	}
-	return groupMember, nil
-}
-
 func UpdateGroupInfoDefaultZero(groupID string, args map[string]interface{}) error {
 	return db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id = ? ", groupID).Updates(args).Error
 }
 
-func GetAllGroupIDList() ([]string, error) {
-	var groupIDList []string
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Pluck("group_id", &groupIDList).Error
-	return groupIDList, err
-}
-
 func GetGroupIDListByGroupType(groupType int) ([]string, error) {
 	var groupIDList []string
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_type = ? ", groupType).Pluck("group_id", &groupIDList).Error; err != nil {

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

@@ -0,0 +1,113 @@
+package im_mysql_model
+
+import (
+	"Open_IM/pkg/common/db"
+	"errors"
+	"github.com/jinzhu/gorm"
+	"math/rand"
+	"time"
+)
+
+/**
+ * 批量生成邀请码
+ */
+func BatchCreateInvitationCodes(CodeNums int, CodeLen int) ([]string, error) {
+	i := CodeNums
+	var codes []string
+	for {
+		if i == 0 {
+			break
+		}
+		code := CreateRandomString(CodeLen)
+		invitation := new(db.Invitation)
+		invitation.CreateTime = time.Now()
+		invitation.InvitationCode = code
+		invitation.LastTime = time.Now()
+		invitation.Status = 0
+		invitation.UserID = ""
+		result := db.DB.MysqlDB.DefaultGormDB().Table("invitations").Create(&invitation)
+		if result.Error != nil {
+			continue
+		}
+		if result.RowsAffected > 0 {
+			i = i - 1
+		}
+		codes = append(codes, code)
+	}
+	return codes, nil
+}
+
+/**
+ * 检查邀请码
+ */
+func CheckInvitationCode(code string) error {
+	var invitationCode db.Invitation
+	err := db.DB.MysqlDB.DefaultGormDB().Table("invitations").Where("invitation_code=?", code).Take(&invitationCode).Error
+	if err != nil {
+		return err
+	}
+	if invitationCode.InvitationCode != code {
+		return errors.New("邀请码不存在")
+	}
+	if invitationCode.Status != 0 {
+		return errors.New("邀请码已经被使用")
+	}
+	return nil
+}
+
+/**
+ * 尝试加锁模式解决邀请码抢占的问题
+ */
+func TryLockInvitationCode(Code string, UserID string) bool {
+	Data := make(map[string]interface{}, 0)
+	Data["user_id"] = UserID
+	Data["status"] = 1
+	Data["last_time"] = time.Now()
+	result := db.DB.MysqlDB.DefaultGormDB().Table("invitations").Where("invitation_code=? and user_id=? and status=?", Code, "", 0).Updates(Data)
+	if result.Error != nil {
+		return false
+	}
+	return result.RowsAffected > 0
+}
+
+/**
+ * 完成邀请码的状态
+ */
+func FinishInvitationCode(Code string, UserId string) bool {
+	Data := make(map[string]interface{}, 0)
+	Data["status"] = 2
+	result := db.DB.MysqlDB.DefaultGormDB().Table("invitations").Where("invitation_code=? and user_id=? and status=?", Code, UserId, 1).Updates(Data)
+	if result.Error != nil {
+		return false
+	}
+	return result.RowsAffected > 0
+}
+
+func GetInvitationCode(code string) (*db.Invitation, error) {
+	invitation := &db.Invitation{
+		InvitationCode: code,
+	}
+	err := db.DB.MysqlDB.DefaultGormDB().Model(invitation).Find(invitation).Error
+	if gorm.IsRecordNotFoundError(err) {
+		return invitation, nil
+	}
+	return invitation, err
+}
+
+func CreateRandomString(strlen int) string {
+	str := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	bytes := []byte(str)
+	result := []byte{}
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	for i := 0; i < strlen; i++ {
+		result = append(result, bytes[r.Intn(len(bytes))])
+	}
+	return string(result)
+}
+
+func GetInvitationCodes(showNumber, pageNumber, status int32) ([]db.Invitation, error) {
+	var invitationList []db.Invitation
+	err := db.DB.MysqlDB.DefaultGormDB().Model(db.Invitation{}).Limit(int(showNumber)).Offset(int(showNumber*(pageNumber-1))).Where("status=?", status).
+		Order("create_time desc").Find(&invitationList).Error
+	return invitationList, err
+}

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

@@ -0,0 +1,76 @@
+package im_mysql_model
+
+import (
+	"Open_IM/pkg/common/db"
+	"time"
+)
+
+func IsLimitRegisterIp(RegisterIp string) (bool, error) {
+	//如果已经存在则限制
+	var count int64
+	if err := db.DB.MysqlDB.DefaultGormDB().Table("ip_limits").Where("ip=? and limit_register=? and limit_time>now()", RegisterIp, 1).Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func IsLimitLoginIp(LoginIp string) (bool, error) {
+	//如果已经存在则限制
+	var count int64
+	if err := db.DB.MysqlDB.DefaultGormDB().Table("ip_limits").Where("ip=? and limit_login=? and limit_time>now()", LoginIp, 1).Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func IsLimitUserLoginIp(userID string, LoginIp string) (bool, error) {
+	//如果已经存在则放行
+	var count int64
+	if err := db.DB.MysqlDB.DefaultGormDB().Table("user_ip_limits").Where("ip=? and user_id=?", LoginIp, userID).Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count == 0, nil
+}
+
+func QueryIPLimits(ip string) (*db.IpLimit, error) {
+	var ipLimit db.IpLimit
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.IpLimit{}).Where("ip=?", ip).First(&ipLimit).Error
+	return &ipLimit, err
+}
+
+func QueryUserIPLimits(ip string) ([]db.UserIpLimit, error) {
+	var ips []db.UserIpLimit
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpLimit{}).Where("ip=?", ip).Find(&ips).Error
+	return ips, err
+}
+
+func InsertOneIntoIpLimits(ipLimits db.IpLimit) error {
+	return db.DB.MysqlDB.DefaultGormDB().Model(&db.IpLimit{}).Create(ipLimits).Error
+}
+
+func DeleteOneFromIpLimits(ip string) error {
+	ipLimits := &db.IpLimit{Ip: ip}
+	return db.DB.MysqlDB.DefaultGormDB().Model(ipLimits).Where("ip=?", ip).Delete(ipLimits).Error
+}
+
+func GetIpLimitsLoginByUserID(userID string) ([]db.UserIpLimit, error) {
+	var ips []db.UserIpLimit
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpLimit{}).Where("user_id=?", userID).Find(&ips).Error
+	return ips, err
+}
+
+func InsertUserIpLimitsLogin(userIp *db.UserIpLimit) error {
+	userIp.CreateTime = time.Now()
+	return db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpLimit{}).Create(userIp).Error
+}
+
+func DeleteUserIpLimitsLogin(userID, ip string) error {
+	userIp := db.UserIpLimit{UserID: userID, Ip: ip}
+	return db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpLimit{}).Delete(&userIp).Error
+}
+
+func GetRegisterUserNum(ip string) ([]string, error) {
+	var userIDList []string
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.Register{}).Where("register_ip=?", ip).Pluck("user_id", &userIDList).Error
+	return userIDList, err
+}

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

@@ -6,6 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
 	"fmt"
+	"strconv"
 	"time"
 )
 
@@ -72,6 +73,12 @@ func GetUserByUserID(userID string) (*db.User, error) {
 	return &user, nil
 }
 
+func GetUsersByUserIDList(userIDList []string) ([]*db.User, error) {
+	var userList []*db.User
+	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where("user_id in (?)", userIDList).Find(&userList).Error
+	return userList, err
+}
+
 func GetUserNameByUserID(userID string) (string, error) {
 	var user db.User
 	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Select("name").Where("user_id=?", userID).First(&user).Error
@@ -117,13 +124,31 @@ func GetUsers(showNumber, pageNumber int32) ([]db.User, error) {
 	return users, err
 }
 
-func AddUser(userId, phoneNumber, name string) error {
+func AddUser(userId string, phoneNumber string, name string, email string, gender string, photo string, birth string) error {
+	_gender, _err := strconv.Atoi(gender)
+	if _err != nil {
+		_gender = 0
+	}
+	_birth, _err := time.ParseInLocation("2006-01-02", birth, time.Local)
+	if _err != nil {
+		_birth = time.Now()
+	}
 	user := db.User{
-		PhoneNumber: phoneNumber,
-		Birth:       time.Now(),
-		CreateTime:  time.Now(),
-		UserID:      userId,
-		Nickname:    name,
+		UserID:         userId,
+		Nickname:       name,
+		FaceURL:        photo,
+		Gender:         int32(_gender),
+		PhoneNumber:    phoneNumber,
+		Birth:          _birth,
+		Email:          email,
+		Ex:             "",
+		CreateTime:     time.Now(),
+		CreateIp:       "",
+		LastLoginTime:  time.Now(),
+		LastLoginIp:    "",
+		LoginTimes:     0,
+		LoginLimit:     0,
+		InvitationCode: "",
 	}
 	result := db.DB.MysqlDB.DefaultGormDB().Table("users").Create(&user)
 	return result.Error
@@ -202,8 +227,12 @@ func GetBlockUserById(userId string) (BlockUserInfo, error) {
 		return blockUserInfo, err
 	}
 	blockUserInfo.User.UserID = user.UserID
-	blockUserInfo.User.FaceURL = user.UserID
+	blockUserInfo.User.FaceURL = user.FaceURL
 	blockUserInfo.User.Nickname = user.Nickname
+	blockUserInfo.User.Birth = user.Birth
+	blockUserInfo.User.PhoneNumber = user.PhoneNumber
+	blockUserInfo.User.Email = user.Email
+	blockUserInfo.User.Gender = user.Gender
 	blockUserInfo.BeginDisableTime = blockUser.BeginDisableTime
 	blockUserInfo.EndDisableTime = blockUser.EndDisableTime
 	return blockUserInfo, nil
@@ -220,9 +249,13 @@ func GetBlockUsers(showNumber, pageNumber int32) ([]BlockUserInfo, error) {
 		if err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where("user_id=?", blockUser.UserId).First(&user).Error; err == nil {
 			blockUserInfos = append(blockUserInfos, BlockUserInfo{
 				User: db.User{
-					UserID:   user.UserID,
-					Nickname: user.Nickname,
-					FaceURL:  user.FaceURL,
+					UserID:      user.UserID,
+					Nickname:    user.Nickname,
+					FaceURL:     user.FaceURL,
+					Birth:       user.Birth,
+					PhoneNumber: user.PhoneNumber,
+					Email:       user.Email,
+					Gender:      user.Gender,
 				},
 				BeginDisableTime: blockUser.BeginDisableTime,
 				EndDisableTime:   blockUser.EndDisableTime,
@@ -253,30 +286,3 @@ func GetBlockUsersNumCount() (int32, error) {
 	}
 	return int32(count), nil
 }
-
-func IsLimitRegisterIp(RegisterIp string) (bool, error) {
-	//如果已经存在则限制
-	var count int64
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("ip_limits").Where("ip=? and limit_register=? and limit_time>now()", RegisterIp, 1).Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
-}
-
-func IsLimitLoginIp(LoginIp string) (bool, error) {
-	//如果已经存在则限制
-	var count int64
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("ip_limits").Where("ip=? and limit_login=? and limit_time>now()", LoginIp, 1).Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
-}
-
-func IsLimitUserLoginIp(userID string, LoginIp string) (bool, error) {
-	//如果已经存在则放行
-	var count int64
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("user_ip_limits").Where("ip=? and user_id=?", LoginIp, userID).Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count == 0, nil
-}