diff --git a/cmd/db/db.go b/cmd/db/db.go index 6f26b71..7495ff1 100644 --- a/cmd/db/db.go +++ b/cmd/db/db.go @@ -1,22 +1,21 @@ package db -import "schisandra-cloud-album/global" +import ( + "schisandra-cloud-album/global" + "schisandra-cloud-album/model" +) func MakeMigration() { var err error global.LOG.Infof("开始迁移数据库") err = global.DB.Set("gorm:table_options", "ENGINE=InnoDB").AutoMigrate( - //&models.ImageModel{}, - //&models.TagModel{}, - //&models.MessageModel{}, - //&models.AdvertModel{}, - //&models.UserModel{}, - //&models.CommentModel{}, - //&models.ArticleModel{}, - //&models.MenuModel{}, - //&models.MenuImageModel{}, - //&models.FeedbackModel{}, - //&models.LoginDataModel{}, + &model.ScaAuthUser{}, + &model.ScaAuthPermission{}, + &model.ScaAuthRole{}, + &model.ScaAuthRolePermission{}, + &model.ScaAuthUserRole{}, + &model.ScaAuthUserDevice{}, + &model.ScaAuthUserSocial{}, ) if err != nil { global.LOG.Error("数据库迁移失败: %v", err) diff --git a/middleware/cors.go b/middleware/cors.go index 867bede..82165d5 100644 --- a/middleware/cors.go +++ b/middleware/cors.go @@ -5,7 +5,7 @@ import ( "net/http" ) -// Cors 跨域中间件 +// Cors 自定义跨域中间件 func Cors() gin.HandlerFunc { return func(c *gin.Context) { method := c.Request.Method diff --git a/utils/encrypt.go b/utils/encrypt.go new file mode 100644 index 0000000..9eb8115 --- /dev/null +++ b/utils/encrypt.go @@ -0,0 +1,20 @@ +package utils + +import "golang.org/x/crypto/bcrypt" + +// Encrypt 加密 +func Encrypt(val string) (string, error) { + // 使用bcrypt库的GenerateFromPassword函数进行哈希处理 + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(val), bcrypt.DefaultCost) + if err != nil { + return "", err + } + return string(hashedPassword), err +} + +// Verify 验证 +func Verify(hashedVal, val string) bool { + // 使用bcrypt库的CompareHashAndPassword函数比较密码 + err := bcrypt.CompareHashAndPassword([]byte(hashedVal), []byte(val)) + return err == nil +}