diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index 0bfb6107..ed932ff3 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -4,6 +4,7 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/config" "go-admin/app/admin/models" + "golang.org/x/crypto/bcrypt" "net/http" "github.com/gin-gonic/gin" @@ -356,12 +357,12 @@ func (e SysUser) UpdatePwd(c *gin.Context) { if user.GetUserId(c) == 1 && config.ApplicationConfig.Mode == "demo" { req.NewPassword = "123456" } - + var hash []byte if hash, err = bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost); err != nil { req.NewPassword = string(hash) } - + err = s.UpdatePwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p) if err != nil { e.Logger.Error(err) diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index cdfe30d9..2a03c034 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -233,7 +233,9 @@ func (e *SysUser) UpdatePwd(id int, oldPassword, newPassword string, p *actions. return err } c.Password = newPassword - db := e.Orm.Model(c).Where("user_id = ?", id).Select("Password", "Salt").Updates(c) + db := e.Orm.Model(c).Where("user_id = ?", id). + Select("Password", "Salt"). + Updates(c) if err = db.Error; err != nil { e.Log.Errorf("db error: %s", err) return err