diff --git a/pkg/interceptor/interceptor.go b/pkg/interceptor/interceptor.go index e55d2bb..152415e 100644 --- a/pkg/interceptor/interceptor.go +++ b/pkg/interceptor/interceptor.go @@ -21,7 +21,7 @@ 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) + 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)) @@ -31,19 +31,6 @@ func NewInterceptor(name string, urlWhitelist map[string]int) grpc.UnaryServerIn 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 - } - - 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) - 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))) - } return } } @@ -75,17 +62,3 @@ func handleWithAuth(ctx context.Context, req interface{}, info *grpc.UnaryServer } return handler(ctx, req) } - -// handleMasterAuth 处理站长权限 -func handleMasterAuth(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, 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 handler(ctx, req) -} diff --git a/pkg/pb/logic.ext.pb.go b/pkg/pb/logic.ext.pb.go index 6792332..72822da 100644 --- a/pkg/pb/logic.ext.pb.go +++ b/pkg/pb/logic.ext.pb.go @@ -2772,9 +2772,6 @@ func _LogicExt_SendMessage_Handler(srv interface{}, ctx context.Context, dec fun if err := dec(in); err != nil { return nil, err } - utils.FilePutContents("LogicExt_SendMessage_Handler", utils.SerializeStr(map[string]interface{}{ - "data": interceptor, - })) if interceptor == nil { return srv.(LogicExtServer).SendMessage(ctx, in) }