add: some user api and all api desc
This commit is contained in:
@@ -7,7 +7,7 @@ import (
|
||||
"juwan-backend/app/users/rpc/internal/svc"
|
||||
utils2 "juwan-backend/app/users/rpc/internal/utils"
|
||||
"juwan-backend/app/users/rpc/pb"
|
||||
"juwan-backend/common/utils"
|
||||
"juwan-backend/common/utils/pwdUtils"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
@@ -36,7 +36,7 @@ func (l *LoginLogic) Login(in *pb.LoginReq) (*pb.LoginResp, error) {
|
||||
return nil, err
|
||||
}
|
||||
logx.Infof("user:%v", user)
|
||||
if !utils.VerifyPassword(user.PasswordHash, in.Passwd) {
|
||||
if !pwdUtils.VerifyPassword(user.PasswordHash, in.Passwd) {
|
||||
logx.WithContext(l.ctx).Errorf("User %s Login failed", user.Username)
|
||||
return nil, errors.New("incorrect password")
|
||||
}
|
||||
|
||||
@@ -8,9 +8,9 @@ import (
|
||||
"fmt"
|
||||
"juwan-backend/app/snowflake/rpc/snowflake"
|
||||
"juwan-backend/app/users/rpc/internal/svc"
|
||||
"juwan-backend/app/users/rpc/internal/utils"
|
||||
"juwan-backend/app/users/rpc/pb"
|
||||
"juwan-backend/common/redisx"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
@@ -56,8 +56,7 @@ func (l *RegisterLogic) Register(in *pb.RegisterReq) (*pb.RegisterResp, error) {
|
||||
return nil, errors.New("invalid verification code")
|
||||
}
|
||||
|
||||
code, err := strconv.ParseInt(vcode, 10, 32)
|
||||
if err != nil || int32(code) != in.Vcode {
|
||||
if vcode != in.Vcode {
|
||||
logx.Error("invalid verification code")
|
||||
return nil, errors.New("invalid verification code")
|
||||
}
|
||||
@@ -80,7 +79,16 @@ func (l *RegisterLogic) Register(in *pb.RegisterReq) (*pb.RegisterResp, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
token, err := l.svcCtx.JwtManager.New(l.ctx, &utils.TokenPayload{
|
||||
UserId: resp.Id,
|
||||
IsAdmin: false,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Errorf("generate token failed, err:%v", err)
|
||||
return nil, errors.New("generate token failed, but user registered successfully")
|
||||
}
|
||||
|
||||
return &pb.RegisterResp{
|
||||
Res: "user registered successfully",
|
||||
Res: token,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -30,6 +30,14 @@ func NewSearchUsersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Searc
|
||||
var SearUsersErr = errors.New("search users failed")
|
||||
|
||||
func (l *SearchUsersLogic) SearchUsers(in *pb.SearchUsersReq) (out *pb.SearchUsersResp, err error) {
|
||||
if in.Page == nil || *in.Page < 0 {
|
||||
logx.Errorf("Invalid page number: %v", in.Page)
|
||||
return nil, errors.New("invalid page number")
|
||||
}
|
||||
if *in.Limit > 1000 {
|
||||
logx.Errorf("Limit exceeds max limit: %d", in.Limit)
|
||||
return nil, errors.New("limit exceeds max limit")
|
||||
}
|
||||
user, err := l.svcCtx.UsersModelRO.Query().
|
||||
Where(users.Or(
|
||||
users.UsernameContainsFold(*in.Username),
|
||||
@@ -37,6 +45,8 @@ func (l *SearchUsersLogic) SearchUsers(in *pb.SearchUsersReq) (out *pb.SearchUse
|
||||
users.EmailContainsFold(*in.Username),
|
||||
users.CurrentRole(*in.CurrentRole),
|
||||
)).
|
||||
Offset(int(*in.Page * *in.Limit)).
|
||||
Limit(int(*in.Limit)).
|
||||
All(l.ctx)
|
||||
if err != nil {
|
||||
logx.Errorf("search users failed, err:%v.", err)
|
||||
|
||||
Reference in New Issue
Block a user