fix(jzero): fix gen rpc with proto include (#370)

* fix(jzero): fix gen rpc with proto include

* feat(docs): add v1.1.2 release

Author: jaronnie

cmd/jzero/internal/command/gen/gen.go

@@ -114,6 +114,7 @@ func GetCommand() *cobra.Command {
 
 		genZRpcClientCmd.Flags().StringSliceP("desc", "", []string{}, "set desc path")
 		genZRpcClientCmd.Flags().StringSliceP("desc-ignore", "", []string{}, "set desc ignore path")
+		genZRpcClientCmd.Flags().StringSliceP("proto-include", "", []string{}, "proto include path")
 		genZRpcClientCmd.Flags().StringP("output", "o", "zrpcclient-go", "generate rpcclient code")
 		genZRpcClientCmd.Flags().StringP("goModule", "", "", "set go module name")
 		genZRpcClientCmd.Flags().StringP("goVersion", "", "", "set go version, only effect when having goModule flag")

cmd/jzero/internal/command/gen/genrpc/genrpc.go

@@ -186,6 +186,9 @@ func (jr *JzeroRpc) Gen() (map[string]rpcparser.Proto, error) {
 	protoDir := filepath.Join("desc", "proto")
 	thirdPartyProtoDir := filepath.Join("desc", "proto", "third_party")
 	protoParser.ImportPaths = []string{protoDir, thirdPartyProtoDir}
+	for _, v := range config.C.Gen.ProtoInclude {
+		protoParser.ImportPaths = append(protoParser.ImportPaths, v)
+	}
 	protoParser.IncludeSourceCodeInfo = true
 
 	for _, v := range protoFiles {

cmd/jzero/internal/command/gen/genzrpcclient/genzrpcclient.go

@@ -193,6 +193,9 @@ func Generate(genModule bool) (err error) {
 		protoDir := filepath.Join("desc", "proto")
 		thirdPartyProtoDir := filepath.Join("desc", "proto", "third_party")
 		protoParser.ImportPaths = []string{protoDir, thirdPartyProtoDir}
+		for _, v := range config.C.Gen.Zrpcclient.ProtoInclude {
+			protoParser.ImportPaths = append(protoParser.ImportPaths, v)
+		}
 		protoParser.IncludeSourceCodeInfo = true
 
 		rel, err := filepath.Rel(config.C.ProtoDir(), fp)
@@ -281,8 +284,8 @@ func Generate(genModule bool) (err error) {
 			}())
 		}
 
-		if len(config.C.Gen.ProtoInclude) > 0 {
-			protocCmd += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.ProtoInclude, " -I"))
+		if len(config.C.Gen.Zrpcclient.ProtoInclude) > 0 {
+			protocCmd += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.Zrpcclient.ProtoInclude, " -I"))
 		}
 
 		logx.Debugf(protocCmd)
@@ -427,6 +430,10 @@ func generatePluginFiles(plugins []plugin.Plugin) error {
 			protoParser.InferImportPaths = false
 
 			protoParser.ImportPaths = []string{pluginProtoDir, pluginThirdPartyProtoDir}
+
+			for _, v := range config.C.Gen.Zrpcclient.ProtoInclude {
+				protoParser.ImportPaths = append(protoParser.ImportPaths, v)
+			}
 			protoParser.IncludeSourceCodeInfo = true
 
 			rel, err := filepath.Rel(pluginProtoDir, fp)
@@ -504,8 +511,8 @@ func generatePluginFiles(plugins []plugin.Plugin) error {
 				}())
 			}
 
-			if len(config.C.Gen.ProtoInclude) > 0 {
-				protocCmd += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.ProtoInclude, " -I"))
+			if len(config.C.Gen.Zrpcclient.ProtoInclude) > 0 {
+				protocCmd += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.Zrpcclient.ProtoInclude, " -I"))
 			}
 
 			logx.Debugf(protocCmd)
@@ -677,8 +684,8 @@ func genPluginNoRpcServiceExcludeThirdPartyProto(plugin plugin.Plugin, goModule,
 			}(),
 		)
 
-		if len(config.C.Gen.ProtoInclude) > 0 {
-			command += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.ProtoInclude, " -I"))
+		if len(config.C.Gen.Zrpcclient.ProtoInclude) > 0 {
+			command += fmt.Sprintf(" -I%s ", strings.Join(config.C.Gen.Zrpcclient.ProtoInclude, " -I"))
 		}
 
 		logx.Debug(command)

cmd/jzero/internal/config/config.go

@@ -146,12 +146,13 @@ type GenSwaggerConfig struct {
 type GenZrpcclientConfig struct {
 	Hooks HooksConfig `mapstructure:"hooks"`
 
-	Desc       []string `mapstructure:"desc"`
-	DescIgnore []string `mapstructure:"desc-ignore"`
-	Output     string   `mapstructure:"output"`
-	GoVersion  string   `mapstructure:"goVersion"`
-	GoModule   string   `mapstructure:"goModule"`
-	GoPackage  string   `mapstructure:"goPackage"`
+	Desc         []string `mapstructure:"desc"`
+	DescIgnore   []string `mapstructure:"desc-ignore"`
+	ProtoInclude []string `mapstructure:"proto-include"`
+	Output       string   `mapstructure:"output"`
+	GoVersion    string   `mapstructure:"goVersion"`
+	GoModule     string   `mapstructure:"goModule"`
+	GoPackage    string   `mapstructure:"goPackage"`
 }
 
 type TemplateConfig struct {

docs/src/release/v1.0.1.md

@@ -18,4 +18,5 @@ order: 2
 
 ```shell
 jzero upgrade --channel v1.0.1
+jzero gen
 ```

docs/src/release/v1.1.0.md

@@ -38,4 +38,5 @@ order: 3
 
 ```shell
 jzero upgrade --channel v1.1.0
+jzero gen
 ```

docs/src/release/v1.1.1.md

@@ -15,4 +15,5 @@ order: 4
 
 ```shell
 jzero upgrade --channel v1.1.1
+jzero gen
 ```

docs/src/release/v1.1.2.md

@@ -0,0 +1,18 @@
+---
+title: v1.1.2
+icon: catppuccin:release
+order: 5
+---
+
+## 问题修复
+
+### cmd/jzero
+
+* 修复生成 rpc 代码: 指定 proto-include 时不生效.([#370](https://github.com/jzero-io/jzero/pull/370))
+
+## 更新步骤
+
+```shell
+jzero upgrade --channel v1.1.2
+jzero gen
+```