mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-12-09 17:56:08 +08:00
发布v2.3.5版本,本次为优化版本。更新内容请查看:https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md
This commit is contained in:
@@ -256,6 +256,7 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
|
||||
memberInfo *entity.AdminMember
|
||||
memberId = contexts.GetUserId(ctx)
|
||||
)
|
||||
|
||||
if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&memberInfo); err != nil {
|
||||
err = gerror.Wrap(err, consts.ErrorORM)
|
||||
return err
|
||||
@@ -400,10 +401,18 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
|
||||
return gerror.New("超管账号禁止编辑!")
|
||||
}
|
||||
|
||||
// 权限验证
|
||||
var mm = s.FilterAuthModel(ctx, opMemberId).Where("id", in.Id)
|
||||
_, err = mm.Data(in).Update()
|
||||
if err != nil {
|
||||
mod := s.FilterAuthModel(ctx, opMemberId)
|
||||
if in.Password != "" {
|
||||
salt, err := s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Fields(dao.AdminMember.Columns().Salt).Where("id", in.Id).Value()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
in.PasswordHash = gmd5.MustEncryptString(in.Password + salt.String())
|
||||
} else {
|
||||
mod = mod.FieldsEx(dao.AdminMember.Columns().PasswordHash)
|
||||
}
|
||||
|
||||
if _, err = mod.Where("id", in.Id).Data(in).Update(); err != nil {
|
||||
return gerror.Wrap(err, consts.ErrorORM)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user