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

fix issue #861 (#862)

Browse Source 
* fix issue #861

* fix issue #861

Co-authored-by: anqiansong <anqiansong@xiaoheiban.cn>
This commit is contained in:
anqiansong
2021-08-01 23:00:57 +08:00
committed by GitHub
parent a5e1d0d0dc
commit c8428a7f65
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/goctl/rpc/generator/genpb.go
View File

@@ -23,12 +23,24 @@ func (g *DefaultGenerator) GenPb(ctx DirContext, protoImportPath []string, proto
directory = filepath.Clean(directory) directory = filepath.Clean(directory)
cw.WriteString("protoc ") cw.WriteString("protoc ")
protoImportPathSet := collection.NewSet() protoImportPathSet := collection.NewSet()
isSamePackage := true
for _, ip := range protoImportPath { for _, ip := range protoImportPath {
pip := " --proto_path=" + ip pip := " --proto_path=" + ip
if protoImportPathSet.Contains(pip) { if protoImportPathSet.Contains(pip) {
continue continue
} }
abs, err := filepath.Abs(ip)
if err != nil {
return err
}
if abs == directory {
isSamePackage = true
} else {
isSamePackage = false
}
protoImportPathSet.AddStr(pip) protoImportPathSet.AddStr(pip)
cw.WriteString(pip) cw.WriteString(pip)
} }
@@ -36,6 +48,7 @@ func (g *DefaultGenerator) GenPb(ctx DirContext, protoImportPath []string, proto
if !protoImportPathSet.Contains(currentPath) { if !protoImportPathSet.Contains(currentPath) {
cw.WriteString(currentPath) cw.WriteString(currentPath)
} }
cw.WriteString(" " + proto.Name) cw.WriteString(" " + proto.Name)
if strings.Contains(proto.GoPackage, "/") { if strings.Contains(proto.GoPackage, "/") {
cw.WriteString(" --go_out=plugins=grpc:" + ctx.GetMain().Filename) cw.WriteString(" --go_out=plugins=grpc:" + ctx.GetMain().Filename)
@@ -57,13 +70,18 @@ func (g *DefaultGenerator) GenPb(ctx DirContext, protoImportPath []string, proto
} }
var currentFileOpt string var currentFileOpt string
if filepath.IsAbs(proto.GoPackage) { if !isSamePackage || (len(proto.GoPackage) > 0 && proto.GoPackage != proto.Package.Name) {
currentFileOpt = " --go_opt=M" + base + "=" + proto.GoPackage if filepath.IsAbs(proto.GoPackage) {
} else if strings.Contains(proto.GoPackage, string(filepath.Separator)) { currentFileOpt = " --go_opt=M" + base + "=" + proto.GoPackage
currentFileOpt = " --go_opt=M" + base + "=./" + proto.GoPackage } else if strings.Contains(proto.GoPackage, string(filepath.Separator)) {
currentFileOpt = " --go_opt=M" + base + "=./" + proto.GoPackage
} else {
currentFileOpt = " --go_opt=M" + base + "=../" + proto.GoPackage
}
} else { } else {
currentFileOpt = " --go_opt=M" + base + "=../" + proto.GoPackage currentFileOpt = " --go_opt=M" + base + "=."
} }
if !optSet.Contains(currentFileOpt) { if !optSet.Contains(currentFileOpt) {
cw.WriteString(currentFileOpt) cw.WriteString(currentFileOpt)
} }

2
tools/goctl/rpc/generator/genserver.go
View File

@@ -19,7 +19,7 @@ const (
package server package server
import ( import (
"context" {{if .notStream}}"context"{{end}}
{{.imports}} {{.imports}}
) )