Browse Source

update

master
DengBiao 2 years ago
parent
commit
679441fc30
2 changed files with 15 additions and 15 deletions
  1. +14
    -14
      pkg/interceptor/interceptor.go
  2. +1
    -1
      test/tcp_conn/main.go

+ 14
- 14
pkg/interceptor/interceptor.go View File

@@ -21,16 +21,17 @@ func NewInterceptor(name string, urlWhitelist map[string]int) grpc.UnaryServerIn
defer gerrors.LogPanic(name, ctx, req, info, &err)

md, _ := metadata.FromIncomingContext(ctx)
resp, err = handleMasterAuth(ctx, req, info, handler)
//logger.Logger.Debug(name, zap.Any("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
// zap.Any("resp", resp), zap.Error(err))

//s, _ := status.FromError(err)
//if s.Code() != 0 && s.Code() < 1000 {
// md, _ := metadata.FromIncomingContext(ctx)
// logger.Logger.Error(name, zap.String("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
// zap.Any("resp", resp), zap.Error(err), zap.String("stack", gerrors.GetErrorStack(s)))
//}
err = handleMasterAuth(ctx, req, info, handler)
logger.Logger.Debug(name, zap.Any("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
zap.Any("resp", resp), zap.Error(err))

s, _ := status.FromError(err)
if s.Code() != 0 && s.Code() < 1000 {
md, _ := metadata.FromIncomingContext(ctx)
logger.Logger.Error(name, zap.String("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
zap.Any("resp", resp), zap.Error(err), zap.String("stack", gerrors.GetErrorStack(s)))
}
if err != nil {
return
}
@@ -38,8 +39,7 @@ func NewInterceptor(name string, urlWhitelist map[string]int) grpc.UnaryServerIn
resp, err = handleWithAuth(ctx, req, info, handler, urlWhitelist)
logger.Logger.Debug(name, zap.Any("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
zap.Any("resp", resp), zap.Error(err))

s, _ := status.FromError(err)
s, _ = status.FromError(err)
if s.Code() != 0 && s.Code() < 1000 {
md, _ := metadata.FromIncomingContext(ctx)
logger.Logger.Error(name, zap.String("method", info.FullMethod), zap.Any("md", md), zap.Any("req", req),
@@ -78,15 +78,15 @@ func handleWithAuth(ctx context.Context, req interface{}, info *grpc.UnaryServer
}

// handleMasterAuth 处理站长权限
func handleMasterAuth(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
func handleMasterAuth(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) error {
serverName := strings.Split(info.FullMethod, "/")[1]
if !strings.HasSuffix(serverName, "Int") {
masterId, err := grpclib.GetCtxMasterId(ctx)
_, err = rpc.GetBusinessIntClient().MasterAuth(ctx, &pb.MasterAuthReq{MasterId: masterId})
if err != nil {
return nil, err
return err
}
}

return handler(ctx, req)
return nil
}

+ 1
- 1
test/tcp_conn/main.go View File

@@ -88,7 +88,7 @@ func (c *TcpClient) SignIn() {
signIn := pb.SignInInput{
UserId: c.UserId,
DeviceId: c.DeviceId,
Token: "WAOLJWZLZNTJRSOVGCLPZHQYDIIPMUFAYKYESISY",
Token: "AIXWNMSQRYTVBOFIICDRZQYXPRHFUNTIXHVTSNVN",
}
c.Output(pb.PackageType_PT_SIGN_IN, time.Now().UnixNano(), &signIn)
}


Loading…
Cancel
Save