blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-30 22:42:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-03-16 19:02:21 +08:00
commit d2cd3618e0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/a2r/api2rpc.go
View File

@ -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
}

2
internal/api/route.go
View File

@ -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)

8
pkg/common/mw/rpc_server_interceptor.go
View File

@ -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{
@ -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()
}