zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: refactor (#2087)

Browse Source
This commit is contained in:
Kevin Wan
2022-07-02 14:03:11 +08:00
committed by GitHub
parent 6a2d6786c6
commit e0e3f97c7c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/goctl/api/gogen/genhandlers.go
View File

@@ -91,14 +91,15 @@ func genHandlers(dir, rootPkg string, cfg *config.Config, api *spec.ApiSpec) err
} }
func genHandlerImports(group spec.Group, route spec.Route, parentPkg string) string { func genHandlerImports(group spec.Group, route spec.Route, parentPkg string) string {
var imports []string imports := []string{
imports = append(imports, fmt.Sprintf("\"%s\"", fmt.Sprintf("\"%s\"", pathx.JoinPackages(parentPkg, getLogicFolderPath(group, route))),
pathx.JoinPackages(parentPkg, getLogicFolderPath(group, route)))) fmt.Sprintf("\"%s\"", pathx.JoinPackages(parentPkg, contextDir)),
imports = append(imports, fmt.Sprintf("\"%s\"", pathx.JoinPackages(parentPkg, contextDir))) }
if len(route.RequestTypeName()) > 0 { if len(route.RequestTypeName()) > 0 {
imports = append(imports, fmt.Sprintf("\"%s\"\n", pathx.JoinPackages(parentPkg, typesDir))) imports = append(imports, fmt.Sprintf("\"%s\"\n", pathx.JoinPackages(parentPkg, typesDir)))
} }
imports = append(imports, fmt.Sprintf("\"%s/rest/httpx\"", vars.ProjectOpenSourceURL)) imports = append(imports, fmt.Sprintf("\"%s/rest/httpx\"", vars.ProjectOpenSourceURL))
return strings.Join(imports, "\n\t") return strings.Join(imports, "\n\t")
} }
@@ -107,6 +108,7 @@ func getHandlerBaseName(route spec.Route) (string, error) {
handler = strings.TrimSpace(handler) handler = strings.TrimSpace(handler)
handler = strings.TrimSuffix(handler, "handler") handler = strings.TrimSuffix(handler, "handler")
handler = strings.TrimSuffix(handler, "Handler") handler = strings.TrimSuffix(handler, "Handler")
return handler, nil return handler, nil
} }
@@ -121,6 +123,7 @@ func getHandlerFolderPath(group spec.Group, route spec.Route) string {
folder = strings.TrimPrefix(folder, "/") folder = strings.TrimPrefix(folder, "/")
folder = strings.TrimSuffix(folder, "/") folder = strings.TrimSuffix(folder, "/")
return path.Join(handlerDir, folder) return path.Join(handlerDir, folder)
} }