fix: generated pb mod name

xinpianchang · Nov 11, 2021 · 449c8d9 · 449c8d9
1 parent aa01604
commit 449c8d9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/example/grpc-service/server/main.go b/example/grpc-service/server/main.go
@@ -21,6 +21,7 @@ func main() {
 		xservice.Name("grpc-service"),
 		xservice.Version("v1.0.0"),
 		xservice.Description("example grpc service with enable grpc gateway"),
+		xservice.WithGrpcServerEnableReflection(true), // optional
 	)
 
 	server := srv.Server()

diff --git a/tools/xservice/gogen/assets/project/cmd/main.go.tpl b/tools/xservice/gogen/assets/project/cmd/main.go.tpl
@@ -10,8 +10,8 @@ import (
 	"github.com/xinpianchang/xservice/core/xservice"
 	"github.com/xinpianchang/xservice/pkg/swaggerui"
 
-	gen "{{.Module}}/pb/gen"
-	v1 "{{.Module}}/pb/gen/v1"
+	gen "{{.Module}}_pb/gen"
+	v1 "{{.Module}}_pb/gen/v1"
 
 	"{{.Module}}/service"
 	"{{.Module}}/version"

diff --git a/tools/xservice/gogen/assets/project/go.mod.tpl b/tools/xservice/gogen/assets/project/go.mod.tpl
@@ -4,4 +4,4 @@ require (
 	github.com/xinpianchang/xservice latest
 )
 
-replace {{.Module}}/pb => ./pb
+replace {{.Module}}_pb => ./pb
diff --git a/tools/xservice/gogen/assets/project/pb/buf/v1/helloworld.proto.tpl b/tools/xservice/gogen/assets/project/pb/buf/v1/helloworld.proto.tpl
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package buf.v1;
-option go_package = "{{.Module}}/pb/gen/v1";
+option go_package = "{{.Module}}_pb/gen/v1";
 
 import "google/api/httpbody.proto";
 import "google/api/annotations.proto";

diff --git a/tools/xservice/gogen/assets/project/pb/go.mod.tpl b/tools/xservice/gogen/assets/project/pb/go.mod.tpl
@@ -1 +1 @@
-module {{.Module}}/pb
+module {{.Module}}_pb
diff --git a/tools/xservice/gogen/assets/project/service/s_helloworld.go.tpl b/tools/xservice/gogen/assets/project/service/s_helloworld.go.tpl
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	pb "{{.Module}}/pb/gen/v1"
+	pb "{{.Module}}_pb/gen/v1"
 )
 
 type HelloWorldServiceServerImpl struct{}