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

# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/ip_model.go

pkg/common/db/model_struct.go

@@ -9,6 +9,7 @@ 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 {

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

@@ -1,6 +1,10 @@
 package im_mysql_model
 
-import "Open_IM/pkg/common/db"
+import (
+	"Open_IM/pkg/common/db"
+	"github.com/jinzhu/gorm"
+	"time"
+)
 
 func IsLimitRegisterIp(RegisterIp string) (bool, error) {
 	//如果已经存在则限制
@@ -29,6 +33,15 @@ func IsLimitUserLoginIp(userID string, LoginIp string) (bool, error) {
 	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).Take(&ip).Error
+	if gorm.IsRecordNotFoundError(err) {
+		return nil, nil
+	}
+	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
@@ -43,3 +56,25 @@ func DeleteOneFromIpLimits(ip string) error {
 	ipLimits := &db.IpLimit{}
 	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).Take(&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
+}