zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typo

Browse Source
This commit is contained in:
MaysWind
2020-11-08 20:02:59 +08:00
parent 234b5a7465
commit 180ae7cb72
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/datastore/database.go
+1 -1
View File
@@ -6,7 +6,7 @@ type Database struct {
*xorm.EngineGroup
}
func (db *Database) DoTranscation(fn func(sess *xorm.Session) error) (err error) {
func (db *Database) DoTransaction(fn func(sess *xorm.Session) error) (err error) {
sess := db.NewSession()
defer sess.Close()
pkg/datastore/datastore.go
+2 -2
View File
@@ -18,8 +18,8 @@ func (s *DataStore) Query(key int64) *xorm.Session {
return s.Choose(key).NewSession()
}
func (s *DataStore) DoTranscation(key int64, fn func(sess *xorm.Session) error) (err error) {
return s.Choose(key).DoTranscation(fn)
func (s *DataStore) DoTransaction(key int64, fn func(sess *xorm.Session) error) (err error) {
return s.Choose(key).DoTransaction(fn)
}
func (s *DataStore) SyncStructs(beans... interface{}) error {
pkg/services/tokens.go
+3 -3
View File
@@ -105,7 +105,7 @@ func (s *TokenService) DeleteToken(tokenRecord *models.TokenRecord) error {
return errs.ErrInvalidUserTokenId
}
return s.TokenDB(tokenRecord.Uid).DoTranscation(func(sess *xorm.Session) error {
return s.TokenDB(tokenRecord.Uid).DoTransaction(func(sess *xorm.Session) error {
deletedRows, err := sess.Where("uid=? AND user_token_id=? AND created_unix_time=?", tokenRecord.Uid, tokenRecord.UserTokenId, tokenRecord.CreatedUnixTime).Delete(&models.TokenRecord{})
if deletedRows < 1 {
@@ -137,7 +137,7 @@ func (s *TokenService) DeleteTokensBeforeTime(uid int64, expireTime int64) error
return errs.ErrUserIdInvalid
}
return s.TokenDB(uid).DoTranscation(func(sess *xorm.Session) error {
return s.TokenDB(uid).DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Where("uid=? AND created_unix_time<?", uid, expireTime).Delete(&models.TokenRecord{})
return err
})
@@ -253,7 +253,7 @@ func (s *TokenService) createTokenRecord(tokenRecord *models.TokenRecord) error
return errs.ErrInvalidUserTokenId
}
return s.TokenDB(tokenRecord.Uid).DoTranscation(func(sess *xorm.Session) error {
return s.TokenDB(tokenRecord.Uid).DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Insert(tokenRecord)
return err
})
pkg/services/twofactor_authorizations.go
+5 -5
View File
@@ -94,7 +94,7 @@ func (s *TwoFactorAuthorizationService) CreateTwoFactorSetting(twoFactor *models
twoFactor.CreatedUnixTime = time.Now().Unix()
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Insert(twoFactor)
return err
})
@@ -105,7 +105,7 @@ func (s *TwoFactorAuthorizationService) DeleteTwoFactorSetting(uid int64) error
return errs.ErrUserIdInvalid
}
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
deletedRows, err := sess.Where("uid=?", uid).Delete(&models.TwoFactor{})
if deletedRows < 1 {
@@ -138,7 +138,7 @@ func (s *TwoFactorAuthorizationService) GetAndUseUserTwoFactorRecoveryCode(uid i
return errs.ErrTwoFactorRecoveryCodeNotExist
}
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Cols("used", "used_unix_time").Where("uid=? AND recovery_code=?", uid, recoveryCode).Update(&models.TwoFactorRecoveryCode{Used: true, UsedUnixTime: time.Now().Unix()})
return err
})
@@ -172,7 +172,7 @@ func (s *TwoFactorAuthorizationService) CreateTwoFactorRecoveryCodes(uid int64,
}
}
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Where("uid=?", uid).Delete(&models.TwoFactorRecoveryCode{})
if err != nil {
@@ -197,7 +197,7 @@ func (s *TwoFactorAuthorizationService) DeleteTwoFactorRecoveryCodes(uid int64)
return errs.ErrUserIdInvalid
}
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Where("uid=?", uid).Delete(&models.TwoFactorRecoveryCode{})
return err
})
pkg/services/users.go
+3 -3
View File
@@ -140,7 +140,7 @@ func (s *UserService) CreateUser(user *models.User) error {
user.UpdatedUnixTime = time.Now().Unix()
user.LastLoginUnixTime = time.Now().Unix()
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.Insert(user)
return err
})
@@ -181,7 +181,7 @@ func (s *UserService) UpdateUser(user *models.User) (keyProfileUpdated bool, err
user.UpdatedUnixTime = now
updateCols = append(updateCols, "updated_unix_time")
err = s.UserDB().DoTranscation(func(sess *xorm.Session) error {
err = s.UserDB().DoTransaction(func(sess *xorm.Session) error {
updatedRows, err := sess.ID(user.Uid).Where("deleted=?", false).Cols(updateCols...).Update(user)
if updatedRows < 1 {
@@ -203,7 +203,7 @@ func (s *UserService) UpdateUserLastLoginTime(uid int64) error {
return errs.ErrUserIdInvalid
}
return s.UserDB().DoTranscation(func(sess *xorm.Session) error {
return s.UserDB().DoTransaction(func(sess *xorm.Session) error {
_, err := sess.ID(uid).Where("deleted=?", false).Cols("last_login_unix_time").Update(&models.User{LastLoginUnixTime: time.Now().Unix()})
return err
})