From e9294b3d08a18631145c5eb50c918ff8dc7c64b5 Mon Sep 17 00:00:00 2001 From: anqiansong Date: Tue, 19 Jul 2022 23:27:19 +0800 Subject: [PATCH] Update api template --- tools/goctl/api/gogen/genhandlers.go | 20 +++++++++----------- tools/goctl/api/gogen/handler.tpl | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/goctl/api/gogen/genhandlers.go b/tools/goctl/api/gogen/genhandlers.go index 560ffe946aa1..eae2c2fd2a33 100644 --- a/tools/goctl/api/gogen/genhandlers.go +++ b/tools/goctl/api/gogen/genhandlers.go @@ -12,7 +12,6 @@ import ( "github.com/zeromicro/go-zero/tools/goctl/util" "github.com/zeromicro/go-zero/tools/goctl/util/format" "github.com/zeromicro/go-zero/tools/goctl/util/pathx" - "github.com/zeromicro/go-zero/tools/goctl/vars" ) const defaultLogicPackage = "logic" @@ -48,16 +47,15 @@ func genHandler(dir, rootPkg string, cfg *config.Config, group spec.Group, route } return doGenToFile(dir, handler, cfg, group, route, handlerInfo{ - PkgName: pkgName, - ImportPackages: genHandlerImports(group, route, parentPkg), - ImportHttpxPackage: fmt.Sprintf("\"%s/rest/httpx\"", vars.ProjectOpenSourceURL), - HandlerName: handler, - RequestType: util.Title(route.RequestTypeName()), - LogicName: logicName, - LogicType: strings.Title(getLogicName(route)), - Call: strings.Title(strings.TrimSuffix(handler, "Handler")), - HasResp: len(route.ResponseTypeName()) > 0, - HasRequest: len(route.RequestTypeName()) > 0, + PkgName: pkgName, + ImportPackages: genHandlerImports(group, route, parentPkg), + HandlerName: handler, + RequestType: util.Title(route.RequestTypeName()), + LogicName: logicName, + LogicType: strings.Title(getLogicName(route)), + Call: strings.Title(strings.TrimSuffix(handler, "Handler")), + HasResp: len(route.ResponseTypeName()) > 0, + HasRequest: len(route.RequestTypeName()) > 0, }) } diff --git a/tools/goctl/api/gogen/handler.tpl b/tools/goctl/api/gogen/handler.tpl index 3a9f9bac384a..033dc22ed518 100644 --- a/tools/goctl/api/gogen/handler.tpl +++ b/tools/goctl/api/gogen/handler.tpl @@ -3,8 +3,8 @@ package {{.PkgName}} import ( "net/http" + "github.com/zeromicro/go-zero/rest/httpx" {{.ImportPackages}} - {{.ImportHttpxPackage}} ) func {{.HandlerName}}(svcCtx *svc.ServiceContext) http.HandlerFunc {