From f640eb947d12827e5c3444ffb7fe53c497c4517f Mon Sep 17 00:00:00 2001 From: marvzhang Date: Thu, 16 Apr 2020 13:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/model/task.go | 9 +++------ backend/services/task.go | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) 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