diff --git a/backend/model/task.go b/backend/model/task.go index 6c2a41b4..06bab66b 100644 --- a/backend/model/task.go +++ b/backend/model/task.go @@ -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 } diff --git a/backend/services/task.go b/backend/services/task.go index 03b71b19..3a237ea0 100644 --- a/backend/services/task.go +++ b/backend/services/task.go @@ -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