Skip to content

Commit ff578aa

Browse files
authored
fix(jzero): fix add api (#426)
fix(jzero): fix add api
1 parent 29a4819 commit ff578aa

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

  • cmd/jzero/internal/command/add/addapi

cmd/jzero/internal/command/add/addapi/addapi.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,25 @@ import (
99
"github.com/zeromicro/go-zero/tools/goctl/api/format"
1010

1111
"github.com/jzero-io/jzero/cmd/jzero/internal/config"
12-
"github.com/jzero-io/jzero/cmd/jzero/internal/desc"
1312
"github.com/jzero-io/jzero/cmd/jzero/internal/embeded"
1413
"github.com/jzero-io/jzero/cmd/jzero/internal/pkg/filex"
14+
"github.com/jzero-io/jzero/cmd/jzero/internal/pkg/stringx"
1515
"github.com/jzero-io/jzero/cmd/jzero/internal/pkg/templatex"
1616
)
1717

1818
func Run(args []string) error {
1919
baseDir := filepath.Join("desc", "api")
2020

21-
service := desc.GetApiServiceName(filepath.Join("desc", "api"))
22-
2321
apiName := args[0]
2422

2523
if strings.HasSuffix(apiName, ".api") {
2624
apiName = strings.TrimSuffix(apiName, ".api")
2725
}
2826

29-
if service == "" {
30-
service = apiName
31-
}
32-
27+
// fix https://github.com/jzero-io/jzero/issues/405.
28+
// For jzero, each api file, the server name can be different.
3329
template, err := templatex.ParseTemplate(filepath.Join("api", "template.api.tpl"), map[string]any{
34-
"Service": service,
30+
"Service": stringx.ToCamel(apiName),
3531
"Group": apiName,
3632
}, embeded.ReadTemplateFile(filepath.Join("api", "template.api.tpl")))
3733
if err != nil {

0 commit comments

Comments
 (0)