diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 91692aaf4..225d40881 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -15,7 +15,6 @@ import ( "net" "strconv" "strings" - "time" "Open_IM/pkg/common/config" @@ -30,13 +29,13 @@ func (rpc *rpcAuth) UserRegister(_ context.Context, req *pbAuth.UserRegisterReq) user.Birth = utils.UnixSecondToTime(int64(req.UserInfo.Birth)) } log.Debug(req.OperationID, "copy ", user, req.UserInfo) - Limited, LimitError := imdb.IsLimitRegisterIp(req.UserInfo.CreateIp) - if LimitError != nil { - return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: LimitError.Error()}}, nil - } - if Limited { - return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.RegisterLimit, ErrMsg: "Register Limit"}}, nil - } + // Limited, LimitError := imdb.IsLimitRegisterIp(req.UserInfo.CreateIp) + // if LimitError != nil { + // return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: LimitError.Error()}}, nil + // } + // if Limited { + // return &pbAuth.UserRegisterResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.RegisterLimit, ErrMsg: "Register Limit"}}, nil + // } err := imdb.UserRegister(user) if err != nil { errMsg := req.OperationID + " imdb.UserRegister failed " + err.Error() + user.UserID @@ -50,43 +49,20 @@ func (rpc *rpcAuth) UserRegister(_ context.Context, req *pbAuth.UserRegisterReq) func (rpc *rpcAuth) UserToken(_ context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) - user, err := imdb.GetUserByUserID(req.FromUserID) + _, err := imdb.GetUserByUserID(req.FromUserID) if err != nil { errMsg := req.OperationID + " imdb.GetUserByUserID failed " + err.Error() + req.FromUserID log.NewError(req.OperationID, errMsg) return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}}, nil } - var Limited bool - var LimitError error - if user.LoginLimit == 0 { - Limited, LimitError = imdb.IsLimitLoginIp(req.LoginIp) - } else if user.LoginLimit == 1 { - Limited, LimitError = imdb.IsLimitUserLoginIp(user.UserID, req.LoginIp) - } else if user.LoginLimit == 2 { - Limited, LimitError = imdb.UserIsBlock(user.UserID) - } - if LimitError != nil { - return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: LimitError.Error()}}, nil - } - if Limited { - return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.LoginLimit, ErrMsg: "用户被限制"}}, nil - } + tokens, expTime, err := token_verify.CreateToken(req.FromUserID, int(req.Platform)) if err != nil { errMsg := req.OperationID + " token_verify.CreateToken failed " + err.Error() + req.FromUserID + utils.Int32ToString(req.Platform) log.NewError(req.OperationID, errMsg) return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}}, nil } - //增加用户登录信息 - user.LoginTimes = user.LoginTimes + 1 - user.LastLoginIp = req.LoginIp - user.LastLoginTime = time.Now() - err = imdb.UpdateUserInfo(*user) - if err != nil { - errMsg := req.OperationID + " imdb.UpdateUserInfo failed " + err.Error() + req.FromUserID - log.NewError(req.OperationID, errMsg) - return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}}, nil - } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{}, Token: tokens, ExpiredTime: expTime}) return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{}, Token: tokens, ExpiredTime: expTime}, nil }