From c5974b9ae785090b3a54383ddd93eb82789d69ec Mon Sep 17 00:00:00 2001
From: charlie <3140647@qq.com>
Date: Sun, 17 Apr 2022 16:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logx/log.go    |  8 ++++++--
 logx/logrus.go | 48 ++++++++++++++++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/logx/log.go b/logx/log.go
index 1ca785f..7a2e117 100644
--- a/logx/log.go
+++ b/logx/log.go
@@ -7,11 +7,15 @@ type Logger interface {
 	SetLevel(level Level)
 	WithField(key string, value any) Logger
 	WithFields(fields Fields) Logger
+	Trace(args ...any)
+	Tracef(format string, args ...any)
+	Debug(args ...any)
+	Debugf(format string, args ...any)
 	Info(args ...any)
 	Infof(format string, args ...any)
-	Warn(args ...any)
-	Error(args ...any)
+	Warn(args ...any)	
 	Warnf(format string, args ...any)
+	Error(args ...any)
 	Errorf(format string, args ...any)
 	Fatalf(format string, args ...any)
 	Println(args ...any)
diff --git a/logx/logrus.go b/logx/logrus.go
index 7470699..09edbcd 100644
--- a/logx/logrus.go
+++ b/logx/logrus.go
@@ -10,7 +10,7 @@ import (
 )
 
 type logrusWrpper struct {
-	logger *logrus.Entry
+	logrus *logrus.Entry
 }
 
 func NewLogrus() Logger {
@@ -24,7 +24,7 @@ func NewLogrus() Logger {
 		})
 
 	return &logrusWrpper{
-		logger: logrus.NewEntry(logger),
+		logrus: logrus.NewEntry(logger),
 	}
 }
 
@@ -34,7 +34,7 @@ func nestedCallerFormatter(f *runtime.Frame) string {
 }
 
 func (l *logrusWrpper) SetLevel(level Level) {
-	l.logger.Logger.SetLevel(logrus.Level(level))
+	l.logrus.Logger.SetLevel(logrus.Level(level))
 }
 
 func (l *logrusWrpper) WithField(key string, value any) Logger {
@@ -43,46 +43,66 @@ func (l *logrusWrpper) WithField(key string, value any) Logger {
 
 func (l *logrusWrpper) WithFields(fields Fields) Logger {
 	return &logrusWrpper{
-		logger: l.logger.WithFields(logrus.Fields(fields)),
+		logrus: l.logrus.WithFields(logrus.Fields(fields)),
 	}
 }
 
+func (l *logrusWrpper) Trace(args ...any) {
+	l.logrus.Trace(args...)
+}
+
+func (l *logrusWrpper) Tracef(format string, args ...any) {
+	l.logrus.Tracef(format, args...)
+}
+
+func (l *logrusWrpper) Debug(args ...any) {
+	l.logrus.Debug(args...)
+}
+
+func (l *logrusWrpper) Debugf(format string, args ...any) {
+	l.logrus.Debugf(format, args...)
+}
+
 func (l *logrusWrpper) Info(args ...any) {
-	l.logger.Info(args...)
+	l.logrus.Info(args...)
 }
 
 func (l *logrusWrpper) Infof(format string, args ...any) {
-	l.logger.Infof(format, args...)
+	l.logrus.Infof(format, args...)
 }
 
 func (l *logrusWrpper) Warn(args ...any) {
-	l.logger.Warn(args...)
+	l.logrus.Warn(args...)
 }
 
 func (l *logrusWrpper) Error(args ...any) {
-	l.logger.Error(args...)
+	l.logrus.Error(args...)
 }
 
 func (l *logrusWrpper) Warnf(format string, args ...any) {
-	l.logger.Warnf(format, args...)
+	l.logrus.Warnf(format, args...)
 }
 
 func (l *logrusWrpper) Errorf(format string, args ...any) {
-	l.logger.Errorf(format, args...)
+	l.logrus.Errorf(format, args...)
+}
+
+func (l *logrusWrpper) Fatal(args ...any) {
+	l.logrus.Fatal(args)
 }
 
 func (l *logrusWrpper) Fatalf(format string, args ...any) {
-	l.logger.Fatalf(format, args...)
+	l.logrus.Fatalf(format, args...)
 }
 
 func (l *logrusWrpper) Println(args ...any) {
-	l.logger.Infoln(args...)
+	l.logrus.Infoln(args...)
 }
 
 func (l *logrusWrpper) Print(args ...any) {
-	l.logger.Info(args...)
+	l.logrus.Info(args...)
 }
 
 func (l *logrusWrpper) Printf(format string, args ...any) {
-	l.logger.Infof(format, args...)
+	l.logrus.Infof(format, args...)
 }