utils.Md5Pwd

app/admin/service/dto/sys_user.go

@@ -2,6 +2,7 @@ package dto
 
 import (
 	"go-admin/app/admin/models"
+	"go-admin/common/utils"
 	"golang.org/x/crypto/bcrypt"
 
 	"go-admin/common/dto"
@@ -52,7 +53,7 @@ func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
 	if s.UserId != 0 {
 		model.UserId = s.UserId
 	}
-	model.Password = Encrypt(s.Password)
+	model.Password = utils.Md5Pwd(s.Password)
 }
 
 type UpdateSysUserAvatarReq struct {
@@ -113,7 +114,7 @@ func (s *SysUserInsertReq) Generate(model *models.SysUser) {
 		model.UserId = s.UserId
 	}
 	model.Username = s.Username
-	model.Password = Encrypt(s.Password)
+	model.Password = utils.Md5Pwd(s.Password)
 	model.NickName = s.NickName
 	model.Phone = s.Phone
 	model.RoleId = s.RoleId

common/middleware/handler/login.go

@@ -2,7 +2,7 @@ package handler
 
 import (
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"go-admin/common/utils"
 	"gorm.io/gorm"
 )
 
@@ -14,16 +14,19 @@ type Login struct {
 }
 
 func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) {
-	err = tx.Table("sys_user").Where("username = ?  and status = 2", u.Username).First(&user).Error
+	err = tx.Table("sys_user").
+		Where("username = ?  and status = 2", u.Username).
+		Where("password = ?", utils.Md5Pwd(u.Password)).
+		First(&user).Error
 	if err != nil {
 		log.Errorf("get user error, %s", err.Error())
 		return
 	}
-	_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
-	if err != nil {
-		log.Errorf("user login error, %s", err.Error())
-		return
-	}
+	//_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
+	//if err != nil {
+	//	log.Errorf("user login error, %s", err.Error())
+	//	return
+	//}
 	err = tx.Table("sys_role").Where("role_id = ? ", user.RoleId).First(&role).Error
 	if err != nil {
 		log.Errorf("get role error, %s", err.Error())

common/utils/common.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/hex"
 	"fmt"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	uuid "github.com/satori/go.uuid"
@@ -89,3 +91,9 @@ func GetDate() string {
 	day := time.Now().Format("02")
 	return year + month + day
 }
+
+func Md5Pwd(data string) string {
+	h := md5.New()
+	h.Write([]byte(data))
+	return hex.EncodeToString(h.Sum(nil))
+}