diff --git a/rpc/grpc.go b/rpc/grpc.go index 793cd3b..0b4ce45 100644 --- a/rpc/grpc.go +++ b/rpc/grpc.go @@ -67,7 +67,6 @@ func initGrpcClientConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []k options = append(options, kratosGrpc.WithTimeout(timeout)) var ms []middleware.Middleware - ms = append(ms, mds...) if cfg.Client.Grpc.Middleware != nil { if cfg.Client.Grpc.Middleware.GetEnableRecovery() { ms = append(ms, recovery.Recovery()) @@ -82,6 +81,8 @@ func initGrpcClientConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []k ms = append(ms, metadata.Client()) } } + ms = append(ms, mds...) + options = append(options, kratosGrpc.WithMiddleware(ms...)) if cfg.Client.Grpc.Tls != nil { @@ -119,7 +120,6 @@ func initGrpcServerConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []k var options []kratosGrpc.ServerOption var ms []middleware.Middleware - ms = append(ms, mds...) if cfg.Server.Grpc.Middleware != nil { if cfg.Server.Grpc.Middleware.GetEnableRecovery() { ms = append(ms, recovery.Recovery()) @@ -144,6 +144,8 @@ func initGrpcServerConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []k ms = append(ms, metadata.Server()) } } + ms = append(ms, mds...) + options = append(options, kratosGrpc.Middleware(ms...)) if cfg.Server.Grpc.Tls != nil { diff --git a/rpc/rest.go b/rpc/rest.go index 87931c6..4d13f37 100644 --- a/rpc/rest.go +++ b/rpc/rest.go @@ -53,7 +53,6 @@ func initRestConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []kratosR } var ms []middleware.Middleware - ms = append(ms, mds...) if cfg.Server.Rest.Middleware != nil { if cfg.Server.Rest.Middleware.GetEnableRecovery() { ms = append(ms, recovery.Recovery()) @@ -78,6 +77,8 @@ func initRestConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []kratosR ms = append(ms, metadata.Server()) } } + ms = append(ms, mds...) + options = append(options, kratosRest.Middleware(ms...)) if cfg.Server.Rest.Network != "" { diff --git a/tag.bat b/tag.bat index 4d44b08..708d5f9 100644 --- a/tag.bat +++ b/tag.bat @@ -7,7 +7,7 @@ git tag oss/minio/v0.0.9 --force git tag registry/v0.0.9 --force git tag config/v0.0.9 --force git tag logger/v0.0.9 --force -git tag rpc/v0.0.12 --force +git tag rpc/v0.0.13 --force git tag tracer/v0.0.9 --force git tag database/ent/v0.0.9 --force