From 2a49abc74a5ee6abf8881bb7d9fbec7f1c2e1b30 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 14 Mar 2023 20:05:48 +0800
Subject: [PATCH] zap

---
 internal/api/a2r/api2rpc.go             |  2 --
 pkg/common/log/zap.go                   |  5 -----
 pkg/common/mw/rpc_server_interceptor.go | 13 +++++++------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/internal/api/a2r/api2rpc.go b/internal/api/a2r/api2rpc.go
index 70119d85d..ecdce542d 100644
--- a/internal/api/a2r/api2rpc.go
+++ b/internal/api/a2r/api2rpc.go
@@ -27,13 +27,11 @@ func Call[A, B, C any](
 	}
 	cli, err := client()
 	if err != nil {
-		log.ZError(c, "get rpc client conn failed", err)
 		apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
 		return
 	}
 	data, err := rpc(cli, c, &req)
 	if err != nil {
-		log.ZError(c, "rpc call failed", err)
 		apiresp.GinError(c, err) // RPC调用失败
 		return
 	}
diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go
index 5fe5eefdd..6b809c351 100644
--- a/pkg/common/log/zap.go
+++ b/pkg/common/log/zap.go
@@ -56,7 +56,6 @@ type ZapLogger struct {
 func NewZapLogger() (*ZapLogger, error) {
 	zapConfig := zap.Config{
 		Level:             zap.NewAtomicLevelAt(zapcore.DebugLevel),
-		Development:       true,
 		Encoding:          "json",
 		EncoderConfig:     zap.NewProductionEncoderConfig(),
 		DisableStacktrace: true,
@@ -78,10 +77,6 @@ func NewZapLogger() (*ZapLogger, error) {
 	return zl, nil
 }
 
-func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-	enc.AppendString(t.Format("2006-01-02 15:04:05"))
-}
-
 func (l *ZapLogger) cores() (zap.Option, error) {
 	c := zap.NewProductionEncoderConfig()
 	c.EncodeTime = zapcore.ISO8601TimeEncoder
diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go
index 4ce070026..78b98681a 100644
--- a/pkg/common/mw/rpc_server_interceptor.go
+++ b/pkg/common/mw/rpc_server_interceptor.go
@@ -4,6 +4,7 @@ import (
 	"OpenIM/pkg/common/log"
 	"OpenIM/pkg/common/mw/specialerror"
 	"OpenIM/pkg/errs"
+	"OpenIM/pkg/proto/wrapperspb"
 	"context"
 	"fmt"
 	"google.golang.org/grpc"
@@ -65,12 +66,12 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
 		code = errs.ServerInternalError
 	}
 	grpcStatus := status.New(codes.Code(code), codeErr.Msg())
-	//if unwrap != err {
-	//	stack := fmt.Sprintf("%+v", err)
-	//	if details, err := grpcStatus.WithDetails(wrapperspb.String(stack)); err == nil {
-	//		grpcStatus = details
-	//	}
-	//}
+	if unwrap != err {
+		stack := fmt.Sprintf("%+v", err)
+		if details, err := grpcStatus.WithDetails(wrapperspb.String(stack)); err == nil {
+			grpcStatus = details
+		}
+	}
 	log.ZWarn(ctx, "rpc resp", unwrap, "funcName", funcName)
 	return nil, grpcStatus.Err()
 }