feat,fix:新增和修改了grpc,micro部分

example/transport/grpc/client/main.go

@@ -7,21 +7,20 @@ import (
 )
 
 // 和proto一起生成的客户端模板的大致形式
-func HelloClient() (pb.HelloServiceClient, error) {
+func HelloClient() (pb.HelloServiceClient, func(), error) {
 	center, err := etcd.NewEtcdDiscovery()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	client, err := grpc.NewGRPCClient(
 		grpc.WithServiceDiscovery(center),
 		grpc.WithDiscoveryName("test"),
 	)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
-	defer client.Close()
 
 	c := pb.NewHelloServiceClient(client.Conn())
-	return c, nil
+	return c, func() { _ = client.Close() }, nil
 }

example/transport/grpc/server/main.go

@@ -1,21 +1,27 @@
 package server
 
 import (
-	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc"
+	pb "github.com/muxi-Infra/muxi-micro/example/transport/grpc/proto"
+	mgrpc "github.com/muxi-Infra/muxi-micro/pkg/transport/grpc"
 	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/registry/etcd"
+	"google.golang.org/grpc"
 )
 
 // 和proto一起生成的服务端模板的大致形式
-func HelloServer() (*grpc.GRPCServer, error) {
+func HelloServer(srv pb.HelloServiceServer) (*mgrpc.GRPCServer, error) {
 	center, err := etcd.NewEtcdRegistry()
 	if err != nil {
 		return nil, err
 	}
 
-	server := grpc.NewGRPCServer(
-		grpc.WithName("test"),
-		grpc.WithRegistrationCenter(center),
+	server := mgrpc.NewGRPCServer(
+		mgrpc.WithName("test"),
+		mgrpc.WithRegistrationCenter(center),
 	)
 
+	server.ProtoRegister(func(s *grpc.Server) {
+		pb.RegisterHelloServiceServer(s, srv)
+	})
+
 	return server, nil
 }

go.mod

@@ -59,6 +59,7 @@ require (
 	github.com/aliyun/aliyun-secretsmanager-client-go v1.1.5 // indirect
 	github.com/aliyun/credentials-go v1.4.3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bufbuild/protocompile v0.14.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/bytedance/sonic v1.14.0 // indirect
 	github.com/bytedance/sonic/loader v0.3.0 // indirect
@@ -101,6 +102,7 @@ require (
 	github.com/jcmturner/gofork v1.7.6 // indirect
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
+	github.com/jhump/protoreflect v1.17.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect

go.sum

@@ -88,6 +88,8 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLj
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
+github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0=
@@ -285,6 +287,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6
 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
+github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=

pkg/transport/grpc/client.go

@@ -9,6 +9,7 @@ import (
 	"github.com/muxi-Infra/muxi-micro/pkg/logger/logx"
 	"github.com/muxi-Infra/muxi-micro/pkg/tracer"
 	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/discovery"
+	grpclog "github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/resolver"
@@ -85,6 +86,11 @@ func NewGRPCClient(opts ...ClientOption) (*GRPCClient, error) {
 		opt(client)
 	}
 
+	client.interceptors = append(
+		[]grpc.UnaryClientInterceptor{grpclog.GlobalLoggerClientInterceptor()},
+		client.interceptors...,
+	)
+
 	if client.discoveryCenter == nil {
 		conn, err := grpc.NewClient(
 			client.addr,

pkg/transport/grpc/log/log.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/muxi-Infra/muxi-micro/pkg/logger"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 )
 
 const (
@@ -13,6 +14,10 @@ const (
 	DefaultLogID = "without logID"
 )
 
+func SetLogID(ctx context.Context, logID string) context.Context {
+	return context.WithValue(ctx, LogIDKey, logID)
+}
+
 // 为了保证获取的便利性这里用的是context.Context
 func GetLogID(ctx context.Context) string {
 	value, ok := ctx.Value(LogIDKey).(string)
@@ -43,12 +48,35 @@ func GlobalLoggerServerInterceptor(l logger.Logger) grpc.UnaryServerInterceptor
 		info *grpc.UnaryServerInfo,
 		handler grpc.UnaryHandler,
 	) (interface{}, error) {
-		logID := GetLogID(ctx)
+		logID := DefaultLogID
+		md, ok := metadata.FromIncomingContext(ctx)
+		if ok {
+			if values := md.Get(LogIDKey); len(values) > 0 {
+				logID = values[0]
+			}
+		}
 		l = l.With(
 			logger.Field{"logID": logID},
 		)
 
-		newCtx := SetLogger(ctx, l)
+		newCtx := SetLogID(ctx, logID)
+		newCtx = SetLogger(newCtx, l)
 		return handler(newCtx, req)
 	}
 }
+
+func GlobalLoggerClientInterceptor() grpc.UnaryClientInterceptor {
+	return func(
+		ctx context.Context,
+		method string,
+		req, reply interface{},
+		cc *grpc.ClientConn,
+		invoker grpc.UnaryInvoker,
+		opts ...grpc.CallOption,
+	) error {
+		logID := GetLogID(ctx)
+
+		ctx = metadata.AppendToOutgoingContext(ctx, LogIDKey, logID)
+		return invoker(ctx, method, req, reply, cc, opts...)
+	}
+}

pkg/transport/grpc/registry/etcd/etcd.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/muxi-Infra/muxi-micro/pkg/logger"
 	"github.com/muxi-Infra/muxi-micro/pkg/logger/logx"
-	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/registry"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
@@ -96,12 +95,7 @@ func NewEtcdRegistry(opts ...ServerOption) (*EtcdRegistry, error) {
 }
 
 // ===== 核心方法 =====
-func (r *EtcdRegistry) Register(ctx context.Context, serviceName, _, port string) error {
-	host, err := registry.GetLocalIP()
-	if err != nil {
-		return err
-	}
-
+func (r *EtcdRegistry) Register(ctx context.Context, serviceName, host, port string) error {
 	key := fmt.Sprintf("%s/%s/%s:%s", r.namespace, serviceName, host, port)
 	val := fmt.Sprintf("%s:%s", host, port)
 

pkg/transport/grpc/server.go

@@ -34,6 +34,7 @@ func WithName(name string) Option {
 	}
 }
 
+// WithHost 设置服务主机地址, 用于服务注册，默认会使用本机内网IP
 func WithHost(host string) Option {
 	return func(s *GRPCServer) {
 		s.host = host
@@ -80,7 +81,6 @@ func WithRegistrationCenter(registrationCenter registry.RegistrationCenter) Opti
 func NewGRPCServer(opts ...Option) *GRPCServer {
 	s := &GRPCServer{
 		name:    DefaultName,
-		host:    DefaultHost,
 		port:    DefaultPort,
 		timeout: DefaultTimeout,
 		l:       logx.NewStdLogger(),
@@ -90,14 +90,15 @@ func NewGRPCServer(opts ...Option) *GRPCServer {
 		o(s)
 	}
 
-	interceptor := []grpc.UnaryServerInterceptor{
-		grpclog.GlobalLoggerServerInterceptor(s.l),
-	}
-	interceptor = append(interceptor, s.interceptors...)
+	// 优先执行全局 logger 拦截器
+	s.interceptors = append(
+		[]grpc.UnaryServerInterceptor{grpclog.GlobalLoggerServerInterceptor(s.l)},
+		s.interceptors...,
+	)
 
 	s.grpcServer = grpc.NewServer(
 		grpc.ConnectionTimeout(s.timeout),
-		grpc.ChainUnaryInterceptor(interceptor...),
+		grpc.ChainUnaryInterceptor(s.interceptors...),
 	)
 
 	return s
@@ -106,6 +107,13 @@ func NewGRPCServer(opts ...Option) *GRPCServer {
 func (s *GRPCServer) Serve(ctx context.Context) error {
 	// 注册服务到注册中心,如果有的话
 	if s.registrationCenter != nil {
+		if s.host == "" {
+			var err error
+			s.host, err = registry.GetLocalIP()
+			if err != nil {
+				return err
+			}
+		}
 		err := s.registrationCenter.Register(ctx, s.name, s.host, s.port)
 		if err != nil {
 			return err
@@ -125,3 +133,11 @@ func (s *GRPCServer) Serve(ctx context.Context) error {
 
 	return nil
 }
+
+type registerFunc func(*grpc.Server)
+
+func (s *GRPCServer) ProtoRegister(fn ...registerFunc) {
+	for _, f := range fn {
+		f(s.grpcServer)
+	}
+}

tool/gin/create/CreateLogic.go

@@ -13,7 +13,7 @@ import (
 func CreateLogic(addr, pkg string, service []*parse.Service) error {
 	for _, s := range service {
 		dir := path.Join(addr, s.Handler+".go")
-		if _, err := os.Stat(dir); os.IsExist(err) {
+		if _, err := os.Stat(dir); err == nil {
 			continue
 		}
 		if s.Method.Req != "" {

tool/gin/create/CreateMain.go

@@ -8,9 +8,9 @@ import (
 )
 
 // 存在不覆盖
-func CreateMain(addr, project string) error {
+func CreateMain(addr string) error {
 	dir := path.Join(addr, "main.go")
-	if _, err := os.Stat(dir); os.IsExist(err) {
+	if _, err := os.Stat(dir); err == nil {
 		return nil
 	}
 
@@ -29,13 +29,7 @@ func CreateMain(addr, project string) error {
 
 	defer file.Close()
 
-	data := struct {
-		Project string
-	}{
-		Project: project,
-	}
-
-	if err := t.ExecuteTemplate(file, "main", data); err != nil {
+	if err := t.ExecuteTemplate(file, "main", nil); err != nil {
 		return err
 	}
 

tool/gin/create/CreateRouter.go

@@ -15,9 +15,9 @@ type Name struct {
 }
 
 // 存在不覆盖
-func CreateRouter(addr, project string, apis []*parse.Api) error {
+func CreateRouter(addr string, apis []*parse.Api) error {
 	dir := path.Join(addr, "router.go")
-	if _, err := os.Stat(dir); os.IsExist(err) {
+	if _, err := os.Stat(dir); err == nil {
 		return nil
 	}
 
@@ -37,11 +37,9 @@ func CreateRouter(addr, project string, apis []*parse.Api) error {
 	defer file.Close()
 
 	data := struct {
-		Project string
-		Name    []*Name
+		Name []*Name
 	}{
-		Project: project,
-		Name:    MaxFirstLetter(apis),
+		Name: MaxFirstLetter(apis),
 	}
 
 	if err := t.ExecuteTemplate(file, "router", data); err != nil {

tool/gin/create/service.go

@@ -3,7 +3,6 @@ package create
 import (
 	"os"
 	"path"
-	"path/filepath"
 
 	"github.com/muxi-Infra/muxi-micro/tool/gin/parse"
 )
@@ -37,18 +36,11 @@ func CreateAllService(addr string, apis []*parse.Api) error {
 			return err
 		}
 	}
-	// 获取根目录名
-	dir := GetDirName(addr)
-	if err := CreateRouter(path.Join(addr, "router"), dir, apis); err != nil {
+	if err := CreateRouter(path.Join(addr, "router"), apis); err != nil {
 		return err
 	}
-	if err := CreateMain(addr, dir); err != nil {
+	if err := CreateMain(addr); err != nil {
 		return err
 	}
 	return nil
 }
-
-func GetDirName(addr string) string {
-	currentDir, _ := os.Getwd()
-	return filepath.Base(filepath.Join(currentDir, addr))
-}

tool/gin/template/router.tpl

@@ -4,7 +4,7 @@ package router
 import (
     {{- $outer := . -}}
 	{{- range $name := .Name}}
-    "{{$outer.Project}}/handler/{{$name.Min}}"
+    "YourPath/handler/{{$name.Min}}"
     {{- end}}
     "github.com/gin-gonic/gin"
 	"github.com/muxi-Infra/muxi-micro/pkg/transport/http/ginx/engine"

tool/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/muxi-Infra/muxi-micro/tool/curd"
 	"github.com/muxi-Infra/muxi-micro/tool/gin"
+	"github.com/muxi-Infra/muxi-micro/tool/micro"
 	"github.com/muxi-Infra/muxi-micro/tool/tests"
 	"github.com/spf13/cobra"
 )
@@ -16,6 +17,7 @@ func main() {
 	muxiCmd.AddCommand(curd.InitCurdCobra())
 	muxiCmd.AddCommand(gin.InitGinCobra())
 	muxiCmd.AddCommand(tests.InitTestCobra())
+	muxiCmd.AddCommand(micro.InitMicroCobra())
 
 	_ = muxiCmd.Execute()
 }