From e67aed5af59dc44391f8a65b40f169e2aa4b224f Mon Sep 17 00:00:00 2001
From: BanTanger <88583317+BanTanger@users.noreply.github.com>
Date: Sun, 23 Jul 2023 11:59:32 +0800
Subject: [PATCH] fix: changing naming irregularities under pkg and internal
 packages (#520)

---
 pkg/common/convert/black.go             | 1 +
 pkg/common/mw/rpc_server_interceptor.go | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go
index ba0e2a5da..f8d69ef29 100644
--- a/pkg/common/convert/black.go
+++ b/pkg/common/convert/black.go
@@ -54,5 +54,6 @@ func BlackDB2Pb(
 		}
 		blackPbs = append(blackPbs, blackPb)
 	}
+
 	return blackPbs, nil
 }
diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go
index 0dba76103..981f7454d 100644
--- a/pkg/common/mw/rpc_server_interceptor.go
+++ b/pkg/common/mw/rpc_server_interceptor.go
@@ -110,13 +110,15 @@ func RpcServerInterceptor(
 	}
 	log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req))
 	resp, err = func() (interface{}, error) {
-		if err := checker.Validate(req); err != nil {
+		if err = checker.Validate(req); err != nil {
 			return nil, err
 		}
+
 		return handler(ctx, req)
 	}()
 	if err == nil {
 		log.ZInfo(ctx, "rpc server resp", "funcName", funcName, "resp", rpcString(resp))
+
 		return resp, nil
 	}
 	log.ZError(ctx, "rpc server resp", err, "funcName", funcName)
@@ -134,7 +136,7 @@ func RpcServerInterceptor(
 	grpcStatus := status.New(codes.Code(code), codeErr.Msg())
 	var errInfo *errinfo.ErrorInfo
 	if config.Config.Log.WithStack {
-		if unwrap != err {
+		if errors.Is(err, unwrap) {
 			var sti interface{ StackTrace() errors.StackTrace }
 			if errors.As(err, &sti) {
 				log.ZWarn(
@@ -172,6 +174,7 @@ func RpcServerInterceptor(
 	details, err := grpcStatus.WithDetails(errInfo)
 	if err != nil {
 		log.ZWarn(ctx, "rpc server resp WithDetails error", err, "funcName", funcName)
+
 		return nil, errs.Wrap(err)
 	}
 	log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName)