anqiansong пре 2 година
родитељ
комит
9c448c64ef
2 измењених фајлова са 10 додато и 12 уклоњено
  1. 9 11
      tools/goctl/api/gogen/genhandlers.go
  2. 1 1
      tools/goctl/api/gogen/handler.tpl

+ 9 - 11
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"
 	"github.com/zeromicro/go-zero/tools/goctl/util/format"
 	"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/util/pathx"
-	"github.com/zeromicro/go-zero/tools/goctl/vars"
 )
 )
 
 
 const defaultLogicPackage = "logic"
 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{
 	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,
 	})
 	})
 }
 }
 
 

+ 1 - 1
tools/goctl/api/gogen/handler.tpl

@@ -3,8 +3,8 @@ package {{.PkgName}}
 import (
 import (
 	"net/http"
 	"net/http"
 
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	{{.ImportPackages}}
 	{{.ImportPackages}}
-	{{.ImportHttpxPackage}}
 )
 )
 
 
 func {{.HandlerName}}(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func {{.HandlerName}}(svcCtx *svc.ServiceContext) http.HandlerFunc {