zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes typo (#1511)

Browse Source 
Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
anqiansong
2022-02-08 22:16:38 +08:00
committed by GitHub
parent 7ef0ab3119
commit 77482c8946
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/goctl/rpc/cli/zrpc.go
View File

@@ -8,10 +8,10 @@ import (
"strings" "strings"
"github.com/emicklei/proto" "github.com/emicklei/proto"
"github.com/urfave/cli"
"github.com/zeromicro/go-zero/tools/goctl/rpc/generator" "github.com/zeromicro/go-zero/tools/goctl/rpc/generator"
"github.com/zeromicro/go-zero/tools/goctl/util" "github.com/zeromicro/go-zero/tools/goctl/util"
"github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/zeromicro/go-zero/tools/goctl/util/pathx"
"github.com/urfave/cli"
) )
var ( var (
@@ -75,18 +75,18 @@ func ZRPC(c *cli.Context) error {
} }
goOut = removePluginFlag(goOut) goOut = removePluginFlag(goOut)
goOut, err = parseOutOut(src, goOut, goOpt, goPackage) goOut, err = parseOut(src, goOut, goOpt, goPackage)
if err != nil { if err != nil {
return err return err
} }
var isGoolePlugin = len(grpcOut) > 0 var isGooglePlugin = len(grpcOut) > 0
// If grpcOut is not empty means that user generates grpc code by // If grpcOut is not empty means that user generates grpc code by
// https://google.golang.org/protobuf/cmd/protoc-gen-go and // https://google.golang.org/protobuf/cmd/protoc-gen-go and
// https://google.golang.org/grpc/cmd/protoc-gen-go-grpc, // https://google.golang.org/grpc/cmd/protoc-gen-go-grpc,
// for details please see https://grpc.io/docs/languages/go/quickstart/ // for details please see https://grpc.io/docs/languages/go/quickstart/
if isGoolePlugin { if isGooglePlugin {
grpcOut, err = parseOutOut(src, grpcOut, grpcOpt, goPackage) grpcOut, err = parseOut(src, grpcOut, grpcOpt, goPackage)
if err != nil { if err != nil {
return err return err
} }
@@ -109,7 +109,7 @@ func ZRPC(c *cli.Context) error {
return err return err
} }
if isGoolePlugin && grpcOut != goOut { if isGooglePlugin && grpcOut != goOut {
return fmt.Errorf("the --go_out and --go-grpc_out must be the same") return fmt.Errorf("the --go_out and --go-grpc_out must be the same")
} }
@@ -136,9 +136,9 @@ func ZRPC(c *cli.Context) error {
return g.Generate(source, zrpcOut, nil) return g.Generate(source, zrpcOut, nil)
} }
// parseOutOut calculates the output place to grpc code, about to calculate logic for details // parseOut calculates the output place to grpc code, about to calculate logic for details
// please see https://developers.google.com/protocol-buffers/docs/reference/go-generated#invocation. // please see https://developers.google.com/protocol-buffers/docs/reference/go-generated#invocation.
func parseOutOut(sourceDir, grpcOut, grpcOpt, goPackage string) (string, error) { func parseOut(sourceDir, grpcOut, grpcOpt, goPackage string) (string, error) {
if !filepath.IsAbs(grpcOut) { if !filepath.IsAbs(grpcOut) {
grpcOut = filepath.Join(sourceDir, grpcOut) grpcOut = filepath.Join(sourceDir, grpcOut)
} }