diff --git a/model/cache.go b/model/cache.go index 3ff9d7c5..c9e5b229 100644 --- a/model/cache.go +++ b/model/cache.go @@ -22,19 +22,14 @@ var ( func CacheGetTokenByKey(key string) (*Token, error) { var token Token - whereItem := "`key` = ?" - if common.UsingPostgreSQL { - // Make cmd compatible with PostgreSQL - whereItem = "\"key\" = ?" - } if !common.RedisEnabled { - err := DB.Where(whereItem, key).First(&token).Error + err := DB.Where(&Token{Key: key}).First(&token).Error return &token, err } tokenObjectString, err := common.RedisGet(fmt.Sprintf("token:%s", key)) if err != nil { - err := DB.Where(whereItem, key).First(&token).Error + err := DB.Where(&Token{Key: key}).First(&token).Error if err != nil { return nil, err } diff --git a/model/redemption.go b/model/redemption.go index 67dfe290..9fa71971 100644 --- a/model/redemption.go +++ b/model/redemption.go @@ -52,14 +52,7 @@ func Redeem(key string, userId int) (quota int, err error) { redemption := &Redemption{} err = DB.Transaction(func(tx *gorm.DB) error { - whereItem := "`key` = ?" - - if common.UsingPostgreSQL { - // Make cmd compatible with PostgreSQL - whereItem = "\"key\" = ?" - } - - err := tx.Set("gorm:query_option", "FOR UPDATE").Where(whereItem, key).First(redemption).Error + err := tx.Set("gorm:query_option", "FOR UPDATE").Where(&Redemption{Key: key}).First(redemption).Error if err != nil { return errors.New("无效的兑换码") } diff --git a/model/user.go b/model/user.go index 8f563776..044c1f6b 100644 --- a/model/user.go +++ b/model/user.go @@ -293,13 +293,7 @@ func GetUserEmail(id int) (email string, err error) { } func GetUserGroup(id int) (group string, err error) { - selectItem := "`group`" - - if common.UsingPostgreSQL { - selectItem = "\"group\"" - } - - err = DB.Model(&User{}).Where("id = ?", id).Select(selectItem).Find(&group).Error + err = DB.Model(&User{}).Where(&User{Id: id}).Select("group").Find(&group).Error return group, err }