Merge branch 'v2.3.0release' into del

internal/demo/register/send_code.go

@@ -34,11 +34,12 @@ func init() {
 }
 
 type paramsVerificationCode struct {
-	Email       string `json:"email"`
+	Email          string `json:"email"`
-	PhoneNumber string `json:"phoneNumber"`
+	PhoneNumber    string `json:"phoneNumber"`
-	OperationID string `json:"operationID" binding:"required"`
+	OperationID    string `json:"operationID" binding:"required"`
-	UsedFor     int    `json:"usedFor"`
+	UsedFor        int    `json:"usedFor"`
-	AreaCode    string `json:"areaCode"`
+	AreaCode       string `json:"areaCode"`
+	InvitationCode string `json:"invitationCode"`
 }
 
 func SendVerificationCode(c *gin.Context) {

internal/demo/register/set_password.go

@@ -30,6 +30,7 @@ type ParamsSetPassword struct {
 	FaceURL          string `json:"faceURL"`
 	OperationID      string `json:"operationID" binding:"required"`
 	AreaCode         string `json:"areaCode"`
+	InvitationCode   string `json:"invitationCode"`
 }
 
 func SetPassword(c *gin.Context) {

internal/msg_gateway/gate/ws_server.go

@@ -144,7 +144,6 @@ func (ws *WServer) MultiTerminalLoginCheckerWithLock(uid string, platformID int,
 	rwLock.Lock()
 	defer rwLock.Unlock()
 	log.NewInfo(operationID, utils.GetSelfFuncName(), " rpc args: ", uid, platformID, token)
-	return
 	switch config.Config.MultiLoginPolicy {
 	case constant.AllLoginButSameTermKick:
 		if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]

internal/rpc/user/user.go

@@ -467,6 +467,10 @@ func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbUser.Se
 		log.NewError(req.OperationID, "SetGlobalRecvMessageOpt failed ", err.Error(), user)
 		return &pbUser.SetGlobalRecvMessageOptResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelUserInfoFromCache(user.UserID); err != nil {
+		log.NewError(req.OperationID, "DelUserInfoFromCache failed ", err.Error(), req.String())
+		return &pbUser.SetGlobalRecvMessageOptResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}}, nil
+	}
 	chat.UserInfoUpdatedNotification(req.OperationID, req.UserID, req.UserID)
 	return &pbUser.SetGlobalRecvMessageOptResp{CommonResp: &pbUser.CommonResp{}}, nil
 }

pkg/base_info/auth_api_struct.go

@@ -30,7 +30,7 @@ type UserTokenReq struct {
 	Secret      string `json:"secret" binding:"required,max=32"`
 	Platform    int32  `json:"platform" binding:"required,min=1,max=8"`
 	UserID      string `json:"userID" binding:"required,min=1,max=64"`
-	LoginIp     string `json:"loginIp" binding:"required,max=15"`
+	LoginIp     string `json:"loginIp"`
 	OperationID string `json:"operationID" binding:"required"`
 }
 

pkg/common/db/RedisModel.go

@@ -253,8 +253,8 @@ func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID str
 	if err != nil {
 		return utils.Wrap(err, "")
 	}
-	if err = d.RDB.Del(ctx, vals...).Err(); err != nil {
+	for _, v := range vals {
-		return utils.Wrap(err, "")
+		err = d.RDB.Del(ctx, v).Err()
 	}
 	return nil
 }

pkg/common/db/model_struct.go

@@ -3,11 +3,17 @@ package db
 import "time"
 
 type Register struct {
-	Account  string `gorm:"column:account;primary_key;type:char(255)" json:"account"`
+	Account        string `gorm:"column:account;primary_key;type:char(255)" json:"account"`
-	Password string `gorm:"column:password;type:varchar(255)" json:"password"`
+	Password       string `gorm:"column:password;type:varchar(255)" json:"password"`
-	Ex       string `gorm:"column:ex;size:1024" json:"ex"`
+	Ex             string `gorm:"column:ex;size:1024" json:"ex"`
-	UserID   string `gorm:"column:user_id;type:varchar(255)" json:"userID"`
+	UserID         string `gorm:"column:user_id;type:varchar(255)" json:"userID"`
-	AreaCode string `gorm:"column:area_code;type:varchar(255)"`
+	AreaCode       string `gorm:"column:area_code;type:varchar(255)"`
+	InvitationCode string `gorm:"column:invitation_code;type:varchar(255)"`
+}
+
+type Invitation struct {
+	InvitationCode string    `gorm:"column:invitation_code;primary_key;type:varchar(255)"`
+	CreateTime     time.Time `gorm:"column:create_time"`
 }
 
 //

pkg/common/db/mysql.go

@@ -78,7 +78,7 @@ func initMysqlDB() {
 		&GroupMember{},
 		&GroupRequest{},
 		&User{},
-		&Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{})
+		&Black{}, &ChatLog{}, &Register{}, &Conversation{}, &AppVersion{}, &Department{}, &BlackList{}, &IpLimit{}, &UserIpLimit{}, &Invitation{})
 	db.Set("gorm:table_options", "CHARSET=utf8")
 	db.Set("gorm:table_options", "collation=utf8_unicode_ci")