From fe1986e938810196452dabbe9a7102a3761f82a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Fri, 31 Oct 2025 12:29:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logger.go | 2 -- wrapper/http_gin.go | 43 +------------------------------------------ zinc_search.go | 5 +++-- 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/logger.go b/logger.go index 9bee223..d1a2937 100644 --- a/logger.go +++ b/logger.go @@ -12,8 +12,6 @@ import ( "os" "time" - "git.zhangdeman.cn/zhangdeman/consts" - "github.com/pkg/errors" "go.uber.org/zap" diff --git a/wrapper/http_gin.go b/wrapper/http_gin.go index 5cac71d..313fcdc 100644 --- a/wrapper/http_gin.go +++ b/wrapper/http_gin.go @@ -10,18 +10,13 @@ package wrapper import ( "context" - "git.zhangdeman.cn/zhangdeman/consts" "git.zhangdeman.cn/zhangdeman/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) // NewGinLogger 使用gin框架记录日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 3:45 下午 2021/1/3 -func NewGinLogger(loggerLevel consts.LogLevel, consoleOutput bool, encoder zapcore.Encoder, splitConfig *logger.RotateLogConfig, extractFieldList []string, skip int) (*Gin, error) { +func NewGinLogger(loggerLevel logger.LogLevel, consoleOutput bool, encoder zapcore.Encoder, splitConfig *logger.RotateLogConfig, extractFieldList []string, skip int) (*Gin, error) { var ( err error l *zap.Logger @@ -41,20 +36,12 @@ func NewGinLogger(loggerLevel consts.LogLevel, consoleOutput bool, encoder zapco } // Gin 包装gin实例 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 3:59 下午 2021/1/3 type Gin struct { loggerInstance *zap.Logger // zap 的日志实例 extractFieldList []string // 从gin中抽取的字段 } // formatFieldList 格式化日志field列表 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:13 下午 2021/1/3 func (gw *Gin) formatFieldList(ctx context.Context, inputFieldList []zap.Field) []zap.Field { if nil == ctx { ctx = context.Background() @@ -70,70 +57,42 @@ func (gw *Gin) formatFieldList(ctx context.Context, inputFieldList []zap.Field) } // Debug 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:14 下午 2021/1/3 func (gw *Gin) Debug(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.Debug(msg, fieldList...) } // Info 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:28 下午 2021/1/3 func (gw *Gin) Info(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.Info(msg, fieldList...) } // Warn 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:29 下午 2021/1/3 func (gw *Gin) Warn(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.Warn(msg, fieldList...) } // Error 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:29 下午 2021/1/3 func (gw *Gin) Error(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.Error(msg, fieldList...) } // Panic 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:29 下午 2021/1/3 func (gw *Gin) Panic(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.Panic(msg, fieldList...) } // DPanic 日志 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 4:30 下午 2021/1/3 func (gw *Gin) DPanic(ctx context.Context, msg string, field ...zap.Field) { fieldList := gw.formatFieldList(ctx, field) gw.loggerInstance.DPanic(msg, fieldList...) } // GetZapLoggerInstance 获取zap日志实例 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 2021/01/03 22:56:47 func (gw *Gin) GetZapLoggerInstance() *zap.Logger { return gw.loggerInstance } diff --git a/zinc_search.go b/zinc_search.go index 28cd9b7..2e8a521 100644 --- a/zinc_search.go +++ b/zinc_search.go @@ -10,14 +10,15 @@ package logger import ( "bytes" "fmt" - "git.zhangdeman.cn/zhangdeman/consts" - "git.zhangdeman.cn/zhangdeman/serialize" "io" "log" "net/http" "strings" "sync" "time" + + "git.zhangdeman.cn/zhangdeman/consts" + "git.zhangdeman.cn/zhangdeman/serialize" ) func NewZincLogConnect(cfg *ZincConfig) io.Writer {