bsm-infra/full
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix version 1

Browse Source
This commit is contained in:
yanweidong
2026-09-22 21:15:34 +08:00
parent 9f86366638
commit d63d7e8b3a
277 changed files with 9959 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/base/passport/internal/logic/account/set_password.go
View File

@@ -32,7 +32,7 @@ func SetPassword(ctx context.Context, in *pb.SetPasswordRequest) (reply *pb.Stat
return nil, errcode.NewError(187, "Passport Error")
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(in.NewPassword+pa.Salt), bcrypt.MinCost)
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(in.NewPassword+pa.Salt), bcrypt.DefaultCost)
if err != nil {
return nil, errcode.ErrInternal
}

24
module/base/passport/internal/logic/forget/reset.go
View File

@@ -11,6 +11,7 @@ import (
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/printer"
"git.apinb.com/bsm-sdk/core/utils"
"golang.org/x/crypto/bcrypt"
)
// 重罢密码
@@ -19,6 +20,13 @@ func Reset(ctx context.Context, in *pb.ForgetResetRequest) (reply *pb.StatusRepl
return nil, errcode.ErrInvalidArgument
}
// 必须先通过 Verify 写入一次性重置票据，否则拒绝改密
resetKey := vars.ForgetResetTokenPrefix + in.Identity
if err := impl.RedisService.Client.Get(impl.RedisService.Ctx, resetKey).Err(); err != nil {
printer.Error("Forget reset token not found by identity %v error:%v", in.Identity, err)
return nil, errcode.ErrPermissionDenied
}
pa, err := models.GetPassportAccountByField("identity", in.Identity)
if err != nil {
return nil, err
@@ -28,12 +36,26 @@ func Reset(ctx context.Context, in *pb.ForgetResetRequest) (reply *pb.StatusRepl
return nil, errcode.ErrPermissionDenied
}
err = impl.DBService.Model(&models.PassportAccount{}).Where("identity = ? ", pa.Identity).Update("password", utils.Md5(in.Password)).Error
salt := utils.UUID()
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(in.Password+salt), bcrypt.DefaultCost)
if err != nil {
return nil, errcode.ErrInternal
}
err = impl.DBService.Model(&models.PassportAccount{}).Where("identity = ? ", pa.Identity).Updates(map[string]any{
"password": string(hashedPassword),
"salt": salt,
}).Error
if err != nil {
printer.Error("Update passport account password by identity %+v error:%v", in.Identity, err)
return nil, errcode.ErrDB
}
// 改密成功后删除票据（一次性，防重放）
if err := impl.RedisService.Client.Del(impl.RedisService.Ctx, resetKey).Err(); err != nil {
printer.Error("Del forget reset token by identity %v error:%v", in.Identity, err)
}
return &pb.StatusReply{
Message: "OK",
Timeseq: time.Now().UnixMilli(),

14
module/base/passport/internal/logic/forget/verify.go
View File

@@ -4,10 +4,12 @@ import (
"context"
"time"
"bsm/full/module/base/passport/internal/impl"
"bsm/full/module/base/passport/internal/models"
"bsm/full/module/base/passport/internal/vars"
pb "bsm/full/module/base/passport/pb"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/printer"
)
// 验证手机号和验证码
@@ -25,6 +27,18 @@ func Verify(ctx context.Context, in *pb.ForgetVerifyRequest) (reply *pb.StatusRe
return nil, errcode.ErrPermissionDenied
}
// 真实校验短信验证码（一次性）
if err := models.VerifySmsCode(ctx, in.Phone, in.Code); err != nil {
return nil, err
}
// 校验通过后写入一次性重置票据，供 Reset 改密前校验，10 分钟有效
resetKey := vars.ForgetResetTokenPrefix + pa.Identity
if err := impl.RedisService.Client.Set(impl.RedisService.Ctx, resetKey, "1", 10*time.Minute).Err(); err != nil {
printer.Error("Set forget reset token by identity %v error:%v", pa.Identity, err)
return nil, errcode.ErrInternal
}
return &pb.StatusReply{
Timeseq: time.Now().UnixMilli(),
}, nil

5
module/base/passport/internal/logic/login/code.go
View File

@@ -18,6 +18,11 @@ func Code(ctx context.Context, in *pb.LoginByCodeRequest) (reply *pb.LoginReply,
return nil, errcode.ErrInvalidArgument
}
// 校验短信验证码（一次性）
if err := models.VerifySmsCode(ctx, in.Phone, in.Code); err != nil {
return nil, err
}
pa, err := models.GetPassportAccountByField("phone", in.Phone)
if err != nil {
return nil, err

5
module/base/passport/internal/logic/login/quick.go
View File

@@ -22,6 +22,11 @@ func Quick(ctx context.Context, in *pb.LoginByCodeRequest) (reply *pb.LoginReply
return nil, errcode.ErrInvalidArgument
}
// 校验短信验证码（一次性）
if err := models.VerifySmsCode(ctx, in.Phone, in.Code); err != nil {
return nil, err
}
var pa models.PassportAccount
err = impl.DBService.Where("phone = ?", in.Phone).First(&pa).Error
if err != nil {

5
module/base/passport/internal/logic/register/code.go
View File

@@ -27,5 +27,10 @@ func Code(ctx context.Context, in *pb.RegisterRequest) (reply *pb.RegisterReply,
return nil, errcode.ErrAlreadyExists
}
// 校验短信验证码（一次性）
if err := models.VerifySmsCode(ctx, in.Phone, in.Code); err != nil {
return nil, err
}
return Do(in)
}

5
module/base/passport/internal/logic/register/do.go
View File

@@ -8,7 +8,6 @@
package register
import (
"bsm/full/module/base/passport/internal/config"
"bsm/full/module/base/passport/internal/impl"
"bsm/full/module/base/passport/internal/logic/common"
"bsm/full/module/base/passport/internal/models"
@@ -27,7 +26,7 @@ func Do(in *pb.RegisterRequest) (*pb.RegisterReply, error) {
var salt string
if in.Password != "" {
salt = utils.UUID()
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(in.Password+salt), bcrypt.MinCost)
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(in.Password+salt), bcrypt.DefaultCost)
if err != nil {
return nil, errcode.ErrInternal
}
@@ -81,7 +80,7 @@ func Do(in *pb.RegisterRequest) (*pb.RegisterReply, error) {
}
//save token to cache.
err = impl.RedisService.Client.Set(impl.RedisService.Ctx, config.Spec.Token.Prefix+pa.Identity, token, _vars.JwtExpire).Err()
err = impl.RedisService.Client.Set(impl.RedisService.Ctx, vars.TokenPrefix+pa.Identity, token, _vars.JwtExpire).Err()
if err != nil {
printer.Error("Set redis cache by key %v error:%v", vars.TokenPrefix+pa.Identity, err)
return nil, errcode.ErrInternal