优化日志

This commit is contained in:
marvzhang
2020-04-16 13:54:22 +08:00
parent 94e1d6c431
commit f640eb947d
2 changed files with 3 additions and 7 deletions

View File

@@ -115,15 +115,12 @@ func (t *Task) GetLogItems(keyword string, page int, pageSize int) (logItems []L
}
if keyword != "" {
query["msg"] = bson.M{
"$regex": bson.RegEx{
Pattern: keyword,
Options: "i",
},
query["$text"] = bson.M{
"$search": keyword,
}
}
logItems, err = GetLogItemList(query, (page - 1) * pageSize, pageSize, "+_id")
logItems, err = GetLogItemList(query, (page-1)*pageSize, pageSize, "+_id")
if err != nil {
return logItems, logTotal, err
}

View File

@@ -628,7 +628,6 @@ func GetTaskLog(id string, keyword string, page int, pageSize int) (logItems []m
return
}
// TODO: 日志分页
logItems, logTotal, err = task.GetLogItems(keyword, page, pageSize)
if err != nil {
return logItems, logTotal, err