|
@@ -9,115 +9,76 @@ import (
|
|
|
|
|
|
"github.com/tal-tech/go-zero/tools/goctl/api/spec"
|
|
"github.com/tal-tech/go-zero/tools/goctl/api/spec"
|
|
apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util"
|
|
apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util"
|
|
|
|
+ "github.com/tal-tech/go-zero/tools/goctl/templatex"
|
|
"github.com/tal-tech/go-zero/tools/goctl/util"
|
|
"github.com/tal-tech/go-zero/tools/goctl/util"
|
|
"github.com/tal-tech/go-zero/tools/goctl/vars"
|
|
"github.com/tal-tech/go-zero/tools/goctl/vars"
|
|
)
|
|
)
|
|
|
|
|
|
-const (
|
|
|
|
- handlerTemplate = `package handler
|
|
|
|
|
|
+const handlerTemplate = `package handler
|
|
|
|
|
|
import (
|
|
import (
|
|
"net/http"
|
|
"net/http"
|
|
|
|
|
|
- {{.importPackages}}
|
|
|
|
|
|
+ {{.ImportPackages}}
|
|
)
|
|
)
|
|
|
|
|
|
-func {{.handlerName}}(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
+func {{.HandlerName}}(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
- {{.handlerBody}}
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-`
|
|
|
|
- handlerBodyTemplate = `{{.parseRequest}}
|
|
|
|
- {{.processBody}}
|
|
|
|
-`
|
|
|
|
- parseRequestTemplate = `var req {{.requestType}}
|
|
|
|
|
|
+ var req types.{{.RequestType}}
|
|
if err := httpx.Parse(r, &req); err != nil {
|
|
if err := httpx.Parse(r, &req); err != nil {
|
|
httpx.Error(w, err)
|
|
httpx.Error(w, err)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-`
|
|
|
|
- hasRespTemplate = `
|
|
|
|
- l := logic.{{.logic}}(r.Context(), ctx)
|
|
|
|
- {{.logicResponse}} l.{{.callee}}({{.req}})
|
|
|
|
|
|
+
|
|
|
|
+ l := logic.New{{.LogicType}}(r.Context(), ctx)
|
|
|
|
+ {{if .HasResp}}resp, {{end}}err := l.{{.Call}}(req)
|
|
if err != nil {
|
|
if err != nil {
|
|
httpx.Error(w, err)
|
|
httpx.Error(w, err)
|
|
} else {
|
|
} else {
|
|
- {{.respWriter}}
|
|
|
|
|
|
+ {{if .HasResp}}httpx.OkJson(w, resp){{else}}httpx.Ok(w){{end}}
|
|
}
|
|
}
|
|
- `
|
|
|
|
-)
|
|
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+`
|
|
|
|
+
|
|
|
|
+type Handler struct {
|
|
|
|
+ ImportPackages string
|
|
|
|
+ HandlerName string
|
|
|
|
+ RequestType string
|
|
|
|
+ LogicType string
|
|
|
|
+ Call string
|
|
|
|
+ HasResp bool
|
|
|
|
+}
|
|
|
|
|
|
func genHandler(dir string, group spec.Group, route spec.Route) error {
|
|
func genHandler(dir string, group spec.Group, route spec.Route) error {
|
|
handler, ok := apiutil.GetAnnotationValue(route.Annotations, "server", "handler")
|
|
handler, ok := apiutil.GetAnnotationValue(route.Annotations, "server", "handler")
|
|
if !ok {
|
|
if !ok {
|
|
return fmt.Errorf("missing handler annotation for %q", route.Path)
|
|
return fmt.Errorf("missing handler annotation for %q", route.Path)
|
|
}
|
|
}
|
|
- handler = getHandlerName(handler)
|
|
|
|
- var reqBody string
|
|
|
|
- if len(route.RequestType.Name) > 0 {
|
|
|
|
- var bodyBuilder strings.Builder
|
|
|
|
- t := template.Must(template.New("parseRequest").Parse(parseRequestTemplate))
|
|
|
|
- if err := t.Execute(&bodyBuilder, map[string]string{
|
|
|
|
- "requestType": typesPacket + "." + util.Title(route.RequestType.Name),
|
|
|
|
- }); err != nil {
|
|
|
|
- return err
|
|
|
|
- }
|
|
|
|
- reqBody = bodyBuilder.String()
|
|
|
|
- }
|
|
|
|
|
|
|
|
- var req = "req"
|
|
|
|
- if len(route.RequestType.Name) == 0 {
|
|
|
|
- req = ""
|
|
|
|
- }
|
|
|
|
- var logicResponse string
|
|
|
|
- var writeResponse string
|
|
|
|
- var respWriter = `httpx.WriteJson(w, http.StatusOK, resp)`
|
|
|
|
- if len(route.ResponseType.Name) > 0 {
|
|
|
|
- logicResponse = "resp, err :="
|
|
|
|
- writeResponse = "resp, err"
|
|
|
|
- } else {
|
|
|
|
- logicResponse = "err :="
|
|
|
|
- writeResponse = "nil, err"
|
|
|
|
- respWriter = `httpx.Ok(w)`
|
|
|
|
|
|
+ handler = getHandlerName(handler)
|
|
|
|
+ if getHandlerFolderPath(group, route) != handlerDir {
|
|
|
|
+ handler = strings.Title(handler)
|
|
}
|
|
}
|
|
- var logicBodyBuilder strings.Builder
|
|
|
|
- t := template.Must(template.New("hasRespTemplate").Parse(hasRespTemplate))
|
|
|
|
- if err := t.Execute(&logicBodyBuilder, map[string]string{
|
|
|
|
- "logic": "New" + strings.TrimSuffix(strings.Title(handler), "Handler") + "Logic",
|
|
|
|
- "callee": strings.Title(strings.TrimSuffix(handler, "Handler")),
|
|
|
|
- "req": req,
|
|
|
|
- "logicResponse": logicResponse,
|
|
|
|
- "writeResponse": writeResponse,
|
|
|
|
- "respWriter": respWriter,
|
|
|
|
- }); err != nil {
|
|
|
|
|
|
+ parentPkg, err := getParentPackage(dir)
|
|
|
|
+ if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- respBody := logicBodyBuilder.String()
|
|
|
|
-
|
|
|
|
- if !strings.HasSuffix(handler, "Handler") {
|
|
|
|
- handler = handler + "Handler"
|
|
|
|
- }
|
|
|
|
|
|
|
|
- var bodyBuilder strings.Builder
|
|
|
|
- bodyTemplate := template.Must(template.New("handlerBodyTemplate").Parse(handlerBodyTemplate))
|
|
|
|
- if err := bodyTemplate.Execute(&bodyBuilder, map[string]string{
|
|
|
|
- "parseRequest": reqBody,
|
|
|
|
- "processBody": respBody,
|
|
|
|
- }); err != nil {
|
|
|
|
- return err
|
|
|
|
- }
|
|
|
|
- return doGenToFile(dir, handler, group, route, bodyBuilder)
|
|
|
|
|
|
+ return doGenToFile(dir, handler, group, route, Handler{
|
|
|
|
+ ImportPackages: genHandlerImports(group, route, parentPkg),
|
|
|
|
+ HandlerName: handler,
|
|
|
|
+ RequestType: util.Title(route.RequestType.Name),
|
|
|
|
+ LogicType: strings.TrimSuffix(strings.Title(handler), "Handler") + "Logic",
|
|
|
|
+ Call: strings.Title(strings.TrimSuffix(handler, "Handler")),
|
|
|
|
+ HasResp: len(route.ResponseType.Name) > 0,
|
|
|
|
+ })
|
|
}
|
|
}
|
|
|
|
|
|
-func doGenToFile(dir, handler string, group spec.Group, route spec.Route, bodyBuilder strings.Builder) error {
|
|
|
|
|
|
+func doGenToFile(dir, handler string, group spec.Group, route spec.Route, handleObj Handler) error {
|
|
if getHandlerFolderPath(group, route) != handlerDir {
|
|
if getHandlerFolderPath(group, route) != handlerDir {
|
|
handler = strings.Title(handler)
|
|
handler = strings.Title(handler)
|
|
}
|
|
}
|
|
- parentPkg, err := getParentPackage(dir)
|
|
|
|
- if err != nil {
|
|
|
|
- return err
|
|
|
|
- }
|
|
|
|
filename := strings.ToLower(handler)
|
|
filename := strings.ToLower(handler)
|
|
if strings.HasSuffix(filename, "handler") {
|
|
if strings.HasSuffix(filename, "handler") {
|
|
filename = filename + ".go"
|
|
filename = filename + ".go"
|
|
@@ -132,16 +93,18 @@ func doGenToFile(dir, handler string, group spec.Group, route spec.Route, bodyBu
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
defer fp.Close()
|
|
defer fp.Close()
|
|
- t := template.Must(template.New("handlerTemplate").Parse(handlerTemplate))
|
|
|
|
|
|
+
|
|
|
|
+ text, err := templatex.LoadTemplate(category, handlerTemplateFile, handlerTemplate)
|
|
|
|
+ if err != nil {
|
|
|
|
+ return err
|
|
|
|
+ }
|
|
|
|
+
|
|
buffer := new(bytes.Buffer)
|
|
buffer := new(bytes.Buffer)
|
|
- err = t.Execute(buffer, map[string]string{
|
|
|
|
- "importPackages": genHandlerImports(group, route, parentPkg),
|
|
|
|
- "handlerName": handler,
|
|
|
|
- "handlerBody": strings.TrimSpace(bodyBuilder.String()),
|
|
|
|
- })
|
|
|
|
|
|
+ err = template.Must(template.New("handlerTemplate").Parse(text)).Execute(buffer, handleObj)
|
|
if err != nil {
|
|
if err != nil {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
+
|
|
formatCode := formatCode(buffer.String())
|
|
formatCode := formatCode(buffer.String())
|
|
_, err = fp.WriteString(formatCode)
|
|
_, err = fp.WriteString(formatCode)
|
|
return err
|
|
return err
|