From f4020a2508483eda82d0db4d919f76c6f45af890 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 18 Apr 2023 10:45:23 +0800
Subject: [PATCH] zap

---
 pkg/common/log/color.go |  2 +-
 pkg/common/log/zap.go   | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkg/common/log/color.go b/pkg/common/log/color.go
index cd68ac519..2cb4fe078 100644
--- a/pkg/common/log/color.go
+++ b/pkg/common/log/color.go
@@ -20,7 +20,7 @@ const (
 
 var (
 	_levelToColor = map[zapcore.Level]Color{
-		zapcore.DebugLevel:  Magenta,
+		zapcore.DebugLevel:  White,
 		zapcore.InfoLevel:   Blue,
 		zapcore.WarnLevel:   Yellow,
 		zapcore.ErrorLevel:  Red,
diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go
index 6f307fab1..2f585e781 100644
--- a/pkg/common/log/zap.go
+++ b/pkg/common/log/zap.go
@@ -58,10 +58,8 @@ func ZError(ctx context.Context, msg string, err error, keysAndValues ...interfa
 }
 
 type ZapLogger struct {
-	zap       *zap.SugaredLogger
-	level     zapcore.Level
-	callerKey string
-	loggerKey string
+	zap   *zap.SugaredLogger
+	level zapcore.Level
 }
 
 func NewZapLogger(logLevel int, isStdout bool, isJson bool, logLocation string, rotateCount uint) (*ZapLogger, error) {
@@ -99,10 +97,6 @@ func (l *ZapLogger) cores(isStdout bool, isJson bool, logLocation string, rotate
 	c.MessageKey = "msg"
 	c.LevelKey = "level"
 	c.TimeKey = "time"
-	l.callerKey = "caller"
-	l.loggerKey = "logger"
-	c.CallerKey = l.callerKey
-	l.loggerKey = c.NameKey
 
 	var fileEncoder zapcore.Encoder
 	if isJson {
@@ -112,13 +106,12 @@ func (l *ZapLogger) cores(isStdout bool, isJson bool, logLocation string, rotate
 		c.EncodeLevel = l.CapitalColorLevelEncoder
 		customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {
 			s := "[" + caller.TrimmedPath() + "]"
-			pid := fmt.Sprintf("["+"PID:"+"%d"+"]", os.Getpid())
 			color, ok := _levelToColor[l.level]
 			if !ok {
 				color = _levelToColor[zapcore.ErrorLevel]
 			}
 			enc.AppendString(color.Add(s))
-			enc.AppendString(color.Add(pid))
+
 		}
 		c.EncodeCaller = customCallerEncoder
 		fileEncoder = zapcore.NewConsoleEncoder(c)
@@ -161,7 +154,9 @@ func (l *ZapLogger) CapitalColorLevelEncoder(level zapcore.Level, enc zapcore.Pr
 	if !ok {
 		s = _unknownLevelColor[zapcore.ErrorLevel]
 	}
-
+	pid := fmt.Sprintf("["+"PID:"+"%d"+"]", os.Getpid())
+	color := _levelToColor[level]
+	enc.AppendString(color.Add(pid))
 	enc.AppendString(s)
 }