Fix: failed unit test / Feat: support TTL in redis cache

This commit is contained in:
HFO4
2019-12-13 13:22:10 +08:00
parent 8703f97e20
commit afc0b647ca
14 changed files with 78 additions and 369 deletions

View File

@@ -40,7 +40,7 @@ func (folder *Folder) GetChildFile(name string) (*File, error) {
result := DB.Where("folder_id = ? AND name = ?", folder.ID, name).Find(&file)
if result.Error == nil {
file.Position = path.Join(folder.Position, folder.Name, file.Name)
file.Position = path.Join(folder.Position, folder.Name)
}
return &file, result.Error
}
@@ -49,6 +49,12 @@ func (folder *Folder) GetChildFile(name string) (*File, error) {
func (folder *Folder) GetChildFiles() ([]File, error) {
var files []File
result := DB.Where("folder_id = ?", folder.ID).Find(&files)
if result.Error == nil {
for i := 0; i < len(files); i++ {
files[i].Position = path.Join(folder.Position, folder.Name)
}
}
return files, result.Error
}

View File

@@ -46,6 +46,12 @@ func (folder *Folder) GetChild(name string) (*Folder, error) {
func (folder *Folder) GetChildFolder() ([]Folder, error) {
var folders []Folder
result := DB.Where("parent_id = ?", folder.ID).Find(&folders)
if result.Error == nil {
for i := 0; i < len(folders); i++ {
folders[i].Position = path.Join(folder.Position, folder.Name)
}
}
return folders, result.Error
}

View File

@@ -61,7 +61,7 @@ func GetPolicyByID(ID interface{}) (Policy, error) {
// 写入缓存
if result.Error == nil {
_ = cache.Set(cacheKey, policy)
_ = cache.Set(cacheKey, policy, -1)
}
return policy, result.Error

View File

@@ -31,7 +31,7 @@ func GetSettingByName(name string) string {
// 尝试数据库中查找
result := DB.Where("name = ?", name).First(&setting)
if result.Error == nil {
_ = cache.Set(cacheKey, setting.Value)
_ = cache.Set(cacheKey, setting.Value, -1)
return setting.Value
}
return ""