Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix "gf gen pb" api and ctrl not working well. #3076

Merged
merged 11 commits into from
Nov 8, 2023
Merged

fix "gf gen pb" api and ctrl not working well. #3076

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfc87d2
fix api and ctrl not working well.
joy999 Oct 22, 2023
27cee73
Merge branch 'master' into fix/gf_gen_pb
joy999 Oct 23, 2023
d1a1646
fix a word
joy999 Oct 25, 2023
d0bf90f
Merge branch 'fix/gf_gen_pb' of github.com:gogf/gf into fix/gf_gen_pb
joy999 Oct 25, 2023
ad9409f
Revert "fix api and ctrl not working well."
joy999 Oct 25, 2023
bb066a8
Merge branch 'master' into fix/gf_gen_pb
hailaz Nov 2, 2023
5b2bbba
fix: 修改单词错误filed改为field
hailaz Nov 2, 2023
3b46a92
fix gcmd tag name found
joy999 Nov 4, 2023
8180bb8
improved
joy999 Nov 4, 2023
652ec00
fix: 修复gcmd无法读取name tag的问题
hailaz Nov 7, 2023
668f3c1
Merge branch 'master' into fix/gf_gen_pb
joy999 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmd/gf/internal/cmd/genpb/genpb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
type (
CGenPb struct{}
CGenPbInput struct {
g.Meta `name:"pb" config:"{CGenPbConfig}" brief:"{CGenPbBrief}" eg:"{CGenPbEg}"`
Path string `name:"path" short:"p" dc:"protobuf file folder path" d:"manifest/protobuf"`
OutputApi string `name:"api" short:"a" dc:"output folder path storing generated go files of api" d:"api"`
OutputCtrl string `name:"ctrl" short:"c" dc:"output folder path storing generated go files of controller" d:"internal/controller"`
g.Meta `name:"pb" config:"{CGenPbConfig}" brief:"{CGenPbBrief}" eg:"{CGenPbEg}"`
Path string `name:"path" short:"p" dc:"protobuf file folder path" d:"manifest/protobuf"`
Api string `name:"api" short:"a" dc:"output folder path storing generated go files of api" d:"api"`
Ctrl string `name:"ctrl" short:"c" dc:"output folder path storing generated go files of controller" d:"internal/controller"`
}
CGenPbOutput struct{}
)
Expand Down Expand Up @@ -68,20 +68,20 @@ func (c CGenPb) Pb(ctx context.Context, in CGenPbInput) (out *CGenPbOutput, err
}
}
// output path checks.
outputApiPath := gfile.RealPath(in.OutputApi)
outputApiPath := gfile.RealPath(in.Api)
if outputApiPath == "" {
if isParsingPWD {
outputApiPath = protoPath
} else {
mlog.Fatalf(`output api folder "%s" does not exist`, in.OutputApi)
mlog.Fatalf(`output api folder "%s" does not exist`, in.Api)
}
}
outputCtrlPath := gfile.RealPath(in.OutputCtrl)
outputCtrlPath := gfile.RealPath(in.Ctrl)
if outputCtrlPath == "" {
if isParsingPWD {
outputCtrlPath = ""
} else {
mlog.Fatalf(`output controller folder "%s" does not exist`, in.OutputCtrl)
mlog.Fatalf(`output controller folder "%s" does not exist`, in.Ctrl)
}
}

Expand Down