修复个人中心修改密码不生效问题
This commit is contained in:
1 parent
78c67185fd
commit
58b439f553
4 files changed
+35
-20
No files matched your search
@@ -326,16 +326,13 @@ func (e *SysUser) SysUserUpdatePwd(c *gin.Context) {
|
|||||||
// 数据权限检查
|
// 数据权限检查
|
||||||
p := actions.GetPermissionFromContext(c)
|
p := actions.GetPermissionFromContext(c)
|
||||||
|
|
||||||
object := &system.SysUser{
|
|
||||||
UserId: p.UserId,
|
|
||||||
Password: pwd.Password,
|
|
||||||
}
|
|
||||||
serviceSysUser := service.SysUser{}
|
serviceSysUser := service.SysUser{}
|
||||||
serviceSysUser.Orm = db
|
serviceSysUser.Orm = db
|
||||||
serviceSysUser.Log = log
|
serviceSysUser.Log = log
|
||||||
err = serviceSysUser.UpdateSysUser(object, p)
|
err = serviceSysUser.UpdateSysUserPwd(user.GetUserId(c), pwd.OldPassword, pwd.NewPassword, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
log.Error(err)
|
||||||
|
e.Error(c, http.StatusForbidden, err, "密码修改失败")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
e.OK(c, nil, "密码修改成功")
|
e.OK(c, nil, "密码修改成功")
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package system
|
package system
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
log "github.com/go-admin-team/go-admin-core/logger"
|
log "github.com/go-admin-team/go-admin-core/logger"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
@@ -20,7 +19,6 @@ func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) {
|
|||||||
log.Errorf("get user error, %s", err.Error())
|
log.Errorf("get user error, %s", err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Println(user.Password, u.Password)
|
|
||||||
_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
|
_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("user login error, %s", err.Error())
|
log.Errorf("user login error, %s", err.Error())
|
||||||
|
|||||||
@@ -113,5 +113,6 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
|
|||||||
|
|
||||||
// PassWord 密码
|
// PassWord 密码
|
||||||
type PassWord struct {
|
type PassWord struct {
|
||||||
Password string `json:"password"`
|
NewPassword string `json:"newPassword" binding:"required"`
|
||||||
|
OldPassword string `json:"oldPassword" binding:"required"`
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,8 @@ package service
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
|
log "github.com/go-admin-team/go-admin-core/logger"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
|
||||||
"go-admin/app/admin/models/system"
|
"go-admin/app/admin/models/system"
|
||||||
@@ -115,29 +117,46 @@ func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *action
|
|||||||
}
|
}
|
||||||
|
|
||||||
// UpdateSysUserPwd 修改SysUser对象密码
|
// UpdateSysUserPwd 修改SysUser对象密码
|
||||||
func (e *SysUser) UpdateSysUserPwd(c *system.SysUser, p *actions.DataPermission) error {
|
func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *actions.DataPermission) error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
if c.Password == "" {
|
if newPassword == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
c := &system.SysUser{}
|
||||||
|
|
||||||
err = c.Encrypt()
|
err = e.Orm.Model(c).
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
db := e.Orm.Model(c).
|
|
||||||
Scopes(
|
Scopes(
|
||||||
actions.Permission(c.TableName(), p),
|
actions.Permission(c.TableName(), p),
|
||||||
).Where(c.GetId()).Updates(c)
|
).Where(id).Select("UserId", "Password", "Salt").First(c).Error
|
||||||
if db.Error != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return errors.New("无权更新该数据")
|
||||||
|
}
|
||||||
|
e.Log.Errorf("db error: %s", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var ok bool
|
||||||
|
ok, err = pkg.CompareHashAndPassword(c.Password, oldPassword)
|
||||||
|
if err != nil {
|
||||||
|
e.Log.Errorf("CompareHashAndPassword error, %s", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
err = errors.New("incorrect Password")
|
||||||
|
e.Log.Warnf("user[%d] %s", id, err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
c.Password = newPassword
|
||||||
|
db := e.Orm.Model(c).Where(id).Select("Password", "Salt").Updates(c)
|
||||||
|
if err = db.Error; err != nil {
|
||||||
e.Log.Errorf("db error: %s", err)
|
e.Log.Errorf("db error: %s", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if db.RowsAffected == 0 {
|
if db.RowsAffected == 0 {
|
||||||
return errors.New("无权更新该数据")
|
err = errors.New("set password error")
|
||||||
|
log.Warnf("db update error")
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user