From d20d8324e71aa2bf9a5ba16168ae5a7ad54a9205 Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Sat, 6 Aug 2022 17:48:59 +0800 Subject: [PATCH] fix: #2216 (#2235) --- tools/goctl/api/gogen/config.tpl | 9 +++++++++ tools/goctl/api/gogen/genconfig.go | 16 +++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 tools/goctl/api/gogen/config.tpl diff --git a/tools/goctl/api/gogen/config.tpl b/tools/goctl/api/gogen/config.tpl new file mode 100644 index 00000000..55127efb --- /dev/null +++ b/tools/goctl/api/gogen/config.tpl @@ -0,0 +1,9 @@ +package config + +import {{.authImport}} + +type Config struct { + rest.RestConf + {{.auth}} + {{.jwtTrans}} +} diff --git a/tools/goctl/api/gogen/genconfig.go b/tools/goctl/api/gogen/genconfig.go index 4b11949e..0f3920d7 100644 --- a/tools/goctl/api/gogen/genconfig.go +++ b/tools/goctl/api/gogen/genconfig.go @@ -1,6 +1,7 @@ package gogen import ( + _ "embed" "fmt" "strings" @@ -11,17 +12,7 @@ import ( ) const ( - configFile = "config" - configTemplate = `package config - -import {{.authImport}} - -type Config struct { - rest.RestConf - {{.auth}} - {{.jwtTrans}} -} -` + configFile = "config" jwtTemplate = ` struct { AccessSecret string @@ -35,6 +26,9 @@ type Config struct { ` ) +//go:embed config.tpl +var configTemplate string + func genConfig(dir string, cfg *config.Config, api *spec.ApiSpec) error { filename, err := format.FileNamingFormat(cfg.NamingFormat, configFile) if err != nil {