diff --git a/.vscode/launch.json b/.vscode/launch.json index 75e8d1c..1008171 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,7 +13,7 @@ "args": [ "gen", "provider", - "/projects/learn/demo01", + "/projects/learn/qq", ] }, { @@ -25,7 +25,7 @@ "args": [ "swag", "init", - "/projects/tt", + "/projects/learn/qq", ] }, { @@ -37,7 +37,7 @@ "args": [ "gen", "route", - "/projects/learn/go-demo", + "/projects/learn/qq", ] } ] diff --git a/pkg/ast/provider/provider.go b/pkg/ast/provider/provider.go index eee20ea..51ef7b5 100644 --- a/pkg/ast/provider/provider.go +++ b/pkg/ast/provider/provider.go @@ -47,15 +47,16 @@ type InjectParam struct { PackageAlias string } type Provider struct { - StructName string - ReturnType string - Mode string - ProviderGroup string - NeedPrepareFunc bool - InjectParams map[string]InjectParam - Imports map[string]string - PkgName string - ProviderFile string + StructName string + ReturnType string + Mode string + ProviderGroup string + GrpcRegisterFunc string + NeedPrepareFunc bool + InjectParams map[string]InjectParam + Imports map[string]string + PkgName string + ProviderFile string } func Parse(source string) []Provider { @@ -255,10 +256,12 @@ func Parse(source string) []Provider { modePkg := gomod.GetModuleName() + "/providers/grpc" + provider.Imports["git.ipao.vip/rogeecn/atom"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports[modePkg] = "" provider.ProviderGroup = "atom.GroupInitial" + provider.GrpcRegisterFunc = provider.ReturnType provider.ReturnType = "contracts.Initial" provider.InjectParams["__grpc"] = InjectParam{ @@ -274,6 +277,7 @@ func Parse(source string) []Provider { modePkg := gomod.GetModuleName() + "/providers/events" + provider.Imports["git.ipao.vip/rogeecn/atom"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports[modePkg] = "" @@ -293,6 +297,7 @@ func Parse(source string) []Provider { modePkg := gomod.GetModuleName() + "/providers/job" + provider.Imports["git.ipao.vip/rogeecn/atom"] = "" provider.Imports["git.ipao.vip/rogeecn/atom/contracts"] = "" provider.Imports["github.com/riverqueue/river"] = "" provider.Imports[modePkg] = "" diff --git a/pkg/ast/provider/provider.go.tpl b/pkg/ast/provider/provider.go.tpl index 99ad9ac..42d0fb7 100644 --- a/pkg/ast/provider/provider.go.tpl +++ b/pkg/ast/provider/provider.go.tpl @@ -31,7 +31,7 @@ func Provide(opts ...opt.Option) error { {{- end }} {{- if eq .Mode "grpc"}} - userv1.RegisterUserServiceServer(__grpc.Server, obj) + {{ .GrpcRegisterFunc }}(__grpc.Server, obj) {{- end }} {{- if eq .Mode "event"}} diff --git a/templates/project/-editorconfig.tpl b/templates/project/-editorconfig.tpl new file mode 100644 index 0000000..90df546 --- /dev/null +++ b/templates/project/-editorconfig.tpl @@ -0,0 +1,19 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false + +[*.{yaml,yml}] +indent_style = space +indent_size = 2 + +[Makefile] +indent_style = tab \ No newline at end of file