From a60dc3189cdfa87e1758f666e20359acd576864d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 18:11:03 +0800 Subject: [PATCH 1/3] user update --- pkg/common/mw/rpc_server_interceptor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go index 0c72f473d..b48d7cecc 100644 --- a/pkg/common/mw/rpc_server_interceptor.go +++ b/pkg/common/mw/rpc_server_interceptor.go @@ -35,7 +35,7 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary log.ZError(ctx, "rpc panic", nil, "FullMethod", info.FullMethod, "type:", fmt.Sprintf("%T", r), "panic:", r) fmt.Println("stack info:", string(debug.Stack())) pc, file, line, ok := runtime.Caller(4) - if ok { + if !ok { panic("get runtime.Caller failed") } errInfo := &errinfo.ErrorInfo{ From 5c38ffa15e48b1c54bcfeb37ecb411271b256dca Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 16 Mar 2023 18:18:59 +0800 Subject: [PATCH 2/3] user update --- pkg/common/mw/rpc_server_interceptor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go index b48d7cecc..cb4df6dc6 100644 --- a/pkg/common/mw/rpc_server_interceptor.go +++ b/pkg/common/mw/rpc_server_interceptor.go @@ -45,9 +45,9 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary Cause: fmt.Sprintf("%s", r), Warp: nil, } - sta, err := status.New(codes.Code(errs.ErrInternalServer.Code()), errs.ErrInternalServer.Msg()).WithDetails(errInfo) - if err != nil { - panic(err) + sta, err_ := status.New(codes.Code(errs.ErrInternalServer.Code()), errs.ErrInternalServer.Msg()).WithDetails(errInfo) + if err_ != nil { + panic(err_) } err = sta.Err() } From c331d6f200afb754804f8ce6722582c9a398d1b1 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 16 Mar 2023 18:54:01 +0800 Subject: [PATCH 3/3] code error --- internal/api/a2r/api2rpc.go | 4 ++-- internal/api/route.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/api/a2r/api2rpc.go b/internal/api/a2r/api2rpc.go index 693520b84..708088898 100644 --- a/internal/api/a2r/api2rpc.go +++ b/internal/api/a2r/api2rpc.go @@ -17,12 +17,12 @@ func Call[A, B, C any]( var req A if err := c.BindJSON(&req); err != nil { log.ZWarn(c, "gin bind json error", err, "req", req) - apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error())) // 参数错误 + apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap()) // 参数错误 return } if check, ok := any(&req).(interface{ Check() error }); ok { if err := check.Check(); err != nil { - log.ZWarn(c, "custom check error", err, "req", req) + log.ZWarn(c, "custom check error", err, "req", req) apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error())) // 参数校验失败 return } diff --git a/internal/api/route.go b/internal/api/route.go index 488f98f79..a8697a8fc 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -41,7 +41,7 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal userRouterGroupChildToken.POST("/account_check", u.AccountCheck) // todo userRouterGroupChildToken.POST("/get_users", u.GetUsers) } - ////friend routing group + //friend routing group friendRouterGroup := r.Group("/friend") { f := NewFriend(zk)