pb输出包与package统一

davyxu · Jun 15, 2021 · 84c736c · 84c736c
1 parent 35cbd47
commit 84c736c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/gen/pbscheme/gen_dir.go b/gen/pbscheme/gen_dir.go
@@ -13,7 +13,7 @@ const protoDirCodeTemplate = `// Generated by github.com/davyxu/protoplus
 // DO NOT EDIT!
 syntax = "proto3";
 
-option go_package= "./;proto";
+option go_package= "./;{{.PackageName}}";
 
 package {{.PackageName}};
 

diff --git a/gen/pbscheme/gen_proto.go b/gen/pbscheme/gen_proto.go
@@ -11,7 +11,7 @@ const protoCodeTemplate = `// Generated by github.com/davyxu/protoplus
 // DO NOT EDIT!
 syntax = "proto3";
 
-option go_package= ".;proto";
+option go_package= "./;{{.PackageName}}";
 
 package {{.PackageName}};
 

diff --git a/gen/ppgo/text.go b/gen/ppgo/text.go
@@ -139,10 +139,11 @@ var (
 func init() {
 	{{range .Structs}}
 	cellmeta.Register(&cellmeta.Meta{
-		Codec: cellcodec.MustGetByName("{{StructCodec .}}"),	
-		Type:  reflect.TypeOf((*{{.Name}})(nil)).Elem(),
+		FullName: "{{$.PackageName}}.{{.Name}}",
 		ID:    {{StructMsgID .}},
 		New:  func() interface{} { return &{{.Name}}{} },
+		Type:  reflect.TypeOf((*{{.Name}})(nil)).Elem(),
+		Codec: cellcodec.MustGetByName("{{StructCodec .}}"),
 	}) {{end}}
 }
 `