diff --git a/pkg/ast/provider/provider.go b/pkg/ast/provider/provider.go index 51ef7b5..fce1f30 100644 --- a/pkg/ast/provider/provider.go +++ b/pkg/ast/provider/provider.go @@ -275,7 +275,7 @@ func Parse(source string) []Provider { if providerDoc.Mode == "event" { provider.Mode = "event" - modePkg := gomod.GetModuleName() + "/providers/events" + modePkg := gomod.GetModuleName() + "/providers/event" provider.Imports["git.ipao.vip/rogeecn/atom"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" @@ -288,7 +288,7 @@ func Parse(source string) []Provider { Star: "*", Type: "PubSub", Package: modePkg, - PackageAlias: "events", + PackageAlias: "event", } } diff --git a/pkg/ast/route/render.go b/pkg/ast/route/render.go index cdea9ae..1e40939 100644 --- a/pkg/ast/route/render.go +++ b/pkg/ast/route/render.go @@ -71,7 +71,7 @@ func Render(path string, routes []RouteDefinition) error { case PositionURI: return fmt.Sprintf(`URI[%s]("%s")`, item.Type, item.Name), true case PositionQuery: - return fmt.Sprintf(`Query[%s]("%s")`, item.Type, item.Name), true + return fmt.Sprintf(`Query%s[%s]("%s")`, isScalarType(item.Type), item.Type, item.Name), true case PositionHeader: return fmt.Sprintf(`Header[%s]("%s")`, item.Type, item.Name), true case PositionCookie: @@ -108,3 +108,11 @@ func Render(path string, routes []RouteDefinition) error { } return nil } + +func isScalarType(t string) string { + switch t { + case "string", "int", "int32", "int64", "float32", "float64", "bool": + return "Param" + } + return "" +}