Password

app/admin/models/sys_user.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"go-admin/common/models"
-	"golang.org/x/crypto/bcrypt"
 	"gorm.io/gorm"
 )
 
@@ -46,17 +45,17 @@ func (e *SysUser) GetId() interface{} {
 
 //加密
 func (e *SysUser) Encrypt() (err error) {
-	if e.Password == "" {
-		return
-	}
+	//if e.Password == "" {
+	return
+	//}
 
-	var hash []byte
-	if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil {
-		return
-	} else {
-		e.Password = string(hash)
-		return
-	}
+	//var hash []byte
+	//if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil {
+	//	return
+	//} else {
+	//	e.Password = string(hash)
+	//	return
+	//}
 }
 
 func (e *SysUser) BeforeCreate(_ *gorm.DB) error {
@@ -65,9 +64,9 @@ func (e *SysUser) BeforeCreate(_ *gorm.DB) error {
 
 func (e *SysUser) BeforeUpdate(_ *gorm.DB) error {
 	var err error
-	//if e.Password != "" {
-	//	err = e.Encrypt()
-	//}
+	if e.Password != "" {
+		err = e.Encrypt()
+	}
 	return err
 }
 

app/admin/service/dto/sys_user.go

@@ -2,6 +2,7 @@ package dto
 
 import (
 	"go-admin/app/admin/models"
+	"golang.org/x/crypto/bcrypt"
 
 	"go-admin/common/dto"
 	common "go-admin/common/models"
@@ -51,7 +52,7 @@ func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
 	if s.UserId != 0 {
 		model.UserId = s.UserId
 	}
-	model.Password = s.Password
+	model.Password = Encrypt(s.Password)
 }
 
 type UpdateSysUserAvatarReq struct {
@@ -112,7 +113,7 @@ func (s *SysUserInsertReq) Generate(model *models.SysUser) {
 		model.UserId = s.UserId
 	}
 	model.Username = s.Username
-	model.Password = s.Password
+	model.Password = Encrypt(s.Password)
 	model.NickName = s.NickName
 	model.Phone = s.Phone
 	model.RoleId = s.RoleId
@@ -191,3 +192,17 @@ type PassWord struct {
 	NewPassword string `json:"newPassword" vd:"len($)>0"`
 	OldPassword string `json:"oldPassword" vd:"len($)>0"`
 }
+
+func Encrypt(password string) string {
+	if password == "" {
+		return ""
+	}
+
+	var hash []byte
+	var err error
+	if hash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost); err != nil {
+		return ""
+	} else {
+		return string(hash)
+	}
+}