From f5e8ec7aa7ab534bae1b5e94b8ad07ece48c2536 Mon Sep 17 00:00:00 2001 From: gotoeasy Date: Sun, 14 Apr 2024 12:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=86=99=E6=96=B9=E5=BC=8F=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=B3=BB=E7=BB=9F=E5=90=8D=E3=80=81=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E3=80=81=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glc/ldb/storage/logdata/logdata_storage.go | 6 +++--- glc/www/controller/log_search_controller.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glc/ldb/storage/logdata/logdata_storage.go b/glc/ldb/storage/logdata/logdata_storage.go index 2313e7b..91fc28f 100644 --- a/glc/ldb/storage/logdata/logdata_storage.go +++ b/glc/ldb/storage/logdata/logdata_storage.go @@ -189,13 +189,13 @@ func (s *LogDataStorage) createInvertedIndex() int { // 整理生成关键词 var adds []string if docm.System != "" { - adds = append(adds, "~"+docm.System) + adds = append(adds, "~"+cmn.ToLower(docm.System)) } if docm.LogLevel != "" { - adds = append(adds, "!"+docm.LogLevel) + adds = append(adds, "!"+cmn.ToLower(docm.LogLevel)) } if docm.User != "" { - adds = append(adds, "@"+docm.User) + adds = append(adds, "@"+cmn.ToLower(docm.User)) } tgtStr := docm.System + " " + docm.ServerName + " " + docm.ServerIp + " " + docm.ClientIp + " " + docm.TraceId + " " + docm.LogLevel + " " + docm.User diff --git a/glc/www/controller/log_search_controller.go b/glc/www/controller/log_search_controller.go index ed9f1a1..221b4f2 100644 --- a/glc/www/controller/log_search_controller.go +++ b/glc/www/controller/log_search_controller.go @@ -49,7 +49,7 @@ func LogSearchController(req *gweb.HttpRequest) *gweb.HttpResult { cond.NearStoreName = req.GetFormParameter("nearStoreName") // 相邻检索时新ID对应的日志仓 cond.DatetimeFrom = req.GetFormParameter("datetimeFrom") // 日期范围（From） cond.DatetimeTo = req.GetFormParameter("datetimeTo") // 日期范围（To） - cond.OrgSystem = cmn.Trim(req.GetFormParameter("system")) // 系统 + cond.OrgSystem = cmn.ToLower(cmn.Trim(req.GetFormParameter("system"))) // 系统 cond.User = cmn.ToLower(cmn.Trim(req.GetFormParameter("user"))) // 用户 cond.Loglevel = cmn.ToLower(req.GetFormParameter("loglevel")) // 单选条件 cond.Loglevels = cmn.Split(cond.Loglevel, ",") // 多选条件