From f4695361746f4339d50918dc831886d3d978a38e Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Wed, 27 Jul 2022 21:49:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:=20=20=E6=B7=BB=E5=8A=A0bcrypt?=
 =?UTF-8?q?=E5=8C=85=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/sys_user.go    | 5 +++--
 app/admin/service/sys_user.go | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

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