Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

internal/demo/register/send_code.go

@@ -34,11 +34,12 @@ func init() {
 }
 
 type paramsVerificationCode struct {
-	Email       string `json:"email"`
-	PhoneNumber string `json:"phoneNumber"`
-	OperationID string `json:"operationID" binding:"required"`
-	UsedFor     int    `json:"usedFor"`
-	AreaCode    string `json:"areaCode"`
+	Email          string `json:"email"`
+	PhoneNumber    string `json:"phoneNumber"`
+	OperationID    string `json:"operationID" binding:"required"`
+	UsedFor        int    `json:"usedFor"`
+	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
 }