From 880a3700d10ddf3eb2360da63dae469bead618f1 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 14 Jun 2021 20:07:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_login_log.go | 3 ++- app/admin/service/dto/sys_opera_log.go | 5 +++++ common/middleware/logger.go | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index d5f36d7..c1061df 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -16,10 +16,11 @@ type SysLoginLogSearch struct { LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"` BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_login_log" comment:"创建时间"` EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_login_log" comment:"创建时间"` + SysLoginLogOrder } type SysLoginLogOrder struct { - HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"` } func (m *SysLoginLogSearch) GetNeedSearch() interface{} { diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index a30b6f4..3a9296c 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -18,6 +18,11 @@ type SysOperaLogSearch struct { Status int `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态"` BeginTime string `form:"beginTime" search:"type:gte;column:ctime;table:sys_opera_log" comment:"创建时间"` EndTime string `form:"endTime" search:"type:lte;column:ctime;table:sys_opera_log" comment:"创建时间"` + SysOperaLogOrder +} + +type SysOperaLogOrder struct { + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"` } func (m *SysOperaLogSearch) GetNeedSearch() interface{} { diff --git a/common/middleware/logger.go b/common/middleware/logger.go index 627afd4..0b8d287 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -32,7 +32,7 @@ func LoggerToFile() gin.HandlerFunc { // 处理请求 var body string switch c.Request.Method { - case http.MethodPost, http.MethodPut, http.MethodDelete: + case http.MethodPost, http.MethodPut, http.MethodGet, http.MethodDelete: bf := bytes.NewBuffer(nil) wt := bufio.NewWriter(bf) _, err := io.Copy(wt, c.Request.Body) @@ -94,7 +94,7 @@ func LoggerToFile() gin.HandlerFunc { } log.WithFields(logData).Info() - if c.Request.Method != "OPTIONS" && c.Request.Method != "GET" && config.LoggerConfig.EnabledDB { + if c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB && statusCode != 404 { SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) } }