Pārlūkot izejas kodu

fix(goctl): Fix #2561 (#2562)

* Fix #2561

* format code
anqiansong 2 gadi atpakaļ
vecāks
revīzija
3db64c7d47
2 mainītis faili ar 10 papildinājumiem un 4 dzēšanām
  1. 4 2
      tools/goctl/rpc/cli/cli.go
  2. 6 2
      tools/goctl/rpc/cmd.go

+ 4 - 2
tools/goctl/rpc/cli/cli.go

@@ -104,8 +104,10 @@ func RPCNew(_ *cobra.Command, args []string) error {
 }
 
 // RPCTemplate is the entry for generate rpc template
-func RPCTemplate(_ *cobra.Command, _ []string) error {
-	console.Warning("deprecated: goctl rpc template -o is deprecated and will be removed in the future, use goctl rpc -o instead")
+func RPCTemplate(latest bool) error {
+	if !latest {
+		console.Warning("deprecated: goctl rpc template -o is deprecated and will be removed in the future, use goctl rpc -o instead")
+	}
 	protoFile := VarStringOutput
 	home := VarStringHome
 	remote := VarStringRemote

+ 6 - 2
tools/goctl/rpc/cmd.go

@@ -10,7 +10,9 @@ var (
 	Cmd = &cobra.Command{
 		Use:   "rpc",
 		Short: "Generate rpc code",
-		RunE:  cli.RPCTemplate,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cli.RPCTemplate(true)
+		},
 	}
 
 	newCmd = &cobra.Command{
@@ -23,7 +25,9 @@ var (
 	templateCmd = &cobra.Command{
 		Use:   "template",
 		Short: "Generate proto template",
-		RunE:  cli.RPCTemplate,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cli.RPCTemplate(false)
+		},
 	}
 
 	protocCmd = &cobra.Command{