TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-09 03:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

用户AccessKey：增加最近访问时间、修复AccessKey没有区分用户的Bug

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-16 10:48:08 +08:00
parent 076e807024
commit 3a25fea374
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/db/models/user_access_key_dao.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/rands"
"time"
)
const (
@@ -34,7 +35,7 @@ func init() {
})
}
// 启用条目
// EnableUserAccessKey 启用条目
func (this *UserAccessKeyDAO) EnableUserAccessKey(tx *dbs.Tx, id int64) error {
_, err := this.Query(tx).
Pk(id).
@@ -43,7 +44,7 @@ func (this *UserAccessKeyDAO) EnableUserAccessKey(tx *dbs.Tx, id int64) error {
return err
}
// 禁用条目
// DisableUserAccessKey 禁用条目
func (this *UserAccessKeyDAO) DisableUserAccessKey(tx *dbs.Tx, id int64) error {
_, err := this.Query(tx).
Pk(id).
@@ -52,7 +53,7 @@ func (this *UserAccessKeyDAO) DisableUserAccessKey(tx *dbs.Tx, id int64) error {
return err
}
// 查找启用中的条目
// FindEnabledUserAccessKey 查找启用中的条目
func (this *UserAccessKeyDAO) FindEnabledUserAccessKey(tx *dbs.Tx, id int64) (*UserAccessKey, error) {
result, err := this.Query(tx).
Pk(id).
@@ -64,7 +65,7 @@ func (this *UserAccessKeyDAO) FindEnabledUserAccessKey(tx *dbs.Tx, id int64) (*U
return result.(*UserAccessKey), err
}
// 创建Key
// CreateAccessKey 创建Key
func (this *UserAccessKeyDAO) CreateAccessKey(tx *dbs.Tx, userId int64, description string) (int64, error) {
if userId <= 0 {
return 0, errors.New("invalid userId")
@@ -79,9 +80,10 @@ func (this *UserAccessKeyDAO) CreateAccessKey(tx *dbs.Tx, userId int64, descript
return this.SaveInt64(tx, op)
}
// 查找用户所有的Key
// FindAllEnabledAccessKeys 查找用户所有的Key
func (this *UserAccessKeyDAO) FindAllEnabledAccessKeys(tx *dbs.Tx, userId int64) (result []*UserAccessKey, err error) {
_, err = this.Query(tx).
Attr("userId", userId).
State(UserAccessKeyStateEnabled).
DescPk().
Slice(&result).
@@ -89,7 +91,7 @@ func (this *UserAccessKeyDAO) FindAllEnabledAccessKeys(tx *dbs.Tx, userId int64)
return
}
// 检查用户的AccessKey
// CheckUserAccessKey 检查用户的AccessKey
func (this *UserAccessKeyDAO) CheckUserAccessKey(tx *dbs.Tx, userId int64, accessKeyId int64) (bool, error) {
return this.Query(tx).
Pk(accessKeyId).
@@ -98,7 +100,7 @@ func (this *UserAccessKeyDAO) CheckUserAccessKey(tx *dbs.Tx, userId int64, acces
Exist()
}
// 设置是否启用
// UpdateAccessKeyIsOn 设置是否启用
func (this *UserAccessKeyDAO) UpdateAccessKeyIsOn(tx *dbs.Tx, accessKeyId int64, isOn bool) error {
if accessKeyId <= 0 {
return errors.New("invalid accessKeyId")
@@ -110,7 +112,7 @@ func (this *UserAccessKeyDAO) UpdateAccessKeyIsOn(tx *dbs.Tx, accessKeyId int64,
return err
}
// 根据UniqueId查找AccessKey
// FindAccessKeyWithUniqueId 根据UniqueId查找AccessKey
func (this *UserAccessKeyDAO) FindAccessKeyWithUniqueId(tx *dbs.Tx, uniqueId string) (*UserAccessKey, error) {
one, err := this.Query(tx).
Attr("uniqueId", uniqueId).
@@ -123,3 +125,11 @@ func (this *UserAccessKeyDAO) FindAccessKeyWithUniqueId(tx *dbs.Tx, uniqueId str
return one.(*UserAccessKey), nil
}
// UpdateAccessKeyAccessedAt 更新AccessKey访问时间
func (this *UserAccessKeyDAO) UpdateAccessKeyAccessedAt(tx *dbs.Tx, accessKeyId int64) error {
return this.Query(tx).
Pk(accessKeyId).
Set("accessedAt", time.Now().Unix()).
UpdateQuickly()
}