fix: 修正行为解析bug

Author: tangtanglove

go.mod

@@ -97,7 +97,6 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/julienschmidt/httprouter v1.3.0
 	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/labstack/echo/v4 v4.10.0

go.sum

@@ -736,7 +736,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

pkg/adapter/fiberadapter/fiberadapter.go

@@ -65,6 +65,10 @@ func Adapter(b *builder.Engine, app *fiber.App) {
 			app.Delete(v.Path, func(ctx *fiber.Ctx) error {
 				return RouteAdapter(b, ctx)
 			})
+		case "Any":
+			app.All(v.Path, func(ctx *fiber.Ctx) error {
+				return RouteAdapter(b, ctx)
+			})
 		}
 	}
 }

pkg/adapter/ginadapter/ginadapter.go

@@ -75,6 +75,10 @@ func Adapter(b *builder.Engine, app *gin.Engine) {
 			app.DELETE(v.Path, func(ctx *gin.Context) {
 				RouteAdapter(b, ctx)
 			})
+		case "Any":
+			app.Any(v.Path, func(ctx *gin.Context) {
+				RouteAdapter(b, ctx)
+			})
 		}
 	}
 }

pkg/adapter/hertzadapter/hertzadapter.go

@@ -73,6 +73,10 @@ func Adapter(b *builder.Engine, r *server.Hertz) {
 			r.DELETE(v.Path, func(c context.Context, ctx *app.RequestContext) {
 				RouteAdapter(b, ctx)
 			})
+		case "Any":
+			r.Any(v.Path, func(c context.Context, ctx *app.RequestContext) {
+				RouteAdapter(b, ctx)
+			})
 		}
 	}
 }

pkg/adapter/zeroadapter/zeroadapter.go

@@ -19,7 +19,6 @@ func RouteAdapter(b *builder.Engine, routePath string) http.HandlerFunc {
 		context.SetFullPath(routePath)
 
 		b.Render(context)
-		return
 	}
 }
 
@@ -34,11 +33,34 @@ func Adapter(b *builder.Engine, server *rest.Server) {
 
 	// 解析服务
 	for _, v := range routePaths {
-		routes = append(routes, rest.Route{
-			Method:  v.Method,
-			Path:    v.Path,
-			Handler: RouteAdapter(b, v.Path),
-		})
+		if v.Method == "Any" {
+			routes = append(routes, rest.Route{
+				Method:  http.MethodGet,
+				Path:    v.Path,
+				Handler: RouteAdapter(b, v.Path),
+			})
+			routes = append(routes, rest.Route{
+				Method:  http.MethodPost,
+				Path:    v.Path,
+				Handler: RouteAdapter(b, v.Path),
+			})
+			routes = append(routes, rest.Route{
+				Method:  http.MethodDelete,
+				Path:    v.Path,
+				Handler: RouteAdapter(b, v.Path),
+			})
+			routes = append(routes, rest.Route{
+				Method:  http.MethodPut,
+				Path:    v.Path,
+				Handler: RouteAdapter(b, v.Path),
+			})
+		} else {
+			routes = append(routes, rest.Route{
+				Method:  v.Method,
+				Path:    v.Path,
+				Handler: RouteAdapter(b, v.Path),
+			})
+		}
 	}
 
 	server.AddRoutes(routes)

pkg/app/handler/admin/actions/delete.go

@@ -1,8 +1,6 @@
 package actions
 
 import (
-	"fmt"
-
 	"github.com/quarkcms/quark-go/pkg/builder"
 	"github.com/quarkcms/quark-go/pkg/builder/actions"
 	"github.com/quarkcms/quark-go/pkg/msg"
@@ -62,7 +60,5 @@ func (p *Delete) Handle(ctx *builder.Context, model *gorm.DB) interface{} {
 		return ctx.JSON(200, msg.Error(err.Error(), ""))
 	}
 
-	fmt.Println("abcd")
-
 	return ctx.JSON(200, msg.Success("操作成功", "", ""))
 }

pkg/builder/engine.go

@@ -378,6 +378,10 @@ func (p *Engine) routeMappingParser() {
 			p.DELETE(routePath.Path, func(ctx *Context) error {
 				return p.handleParser(ctx)
 			})
+		case "Any":
+			p.Any(routePath.Path, func(ctx *Context) error {
+				return p.handleParser(ctx)
+			})
 		}
 	}
 }

pkg/builder/template/adminresource/handlers_action.go

@@ -1,7 +1,6 @@
 package adminresource
 
 import (
-	"fmt"
 	"reflect"
 	"strings"
 
@@ -49,24 +48,21 @@ func (p *ActionRequest) Handle(ctx *builder.Context) interface{} {
 					GetUriKey(interface{}) string
 				}).GetUriKey(dropdownAction)
 
-				fmt.Println(uriKey)
-				fmt.Println(ctx.Param("uriKey"))
-				fmt.Println(ctx.Param("uriKey") == uriKey)
-
 				if ctx.Param("uriKey") == uriKey {
 					result = dropdownAction.(interface {
 						Handle(*builder.Context, *gorm.DB) interface{}
 					}).Handle(ctx, model)
+
+					return result
 				}
 			}
 		} else {
-			fmt.Println(uriKey)
-			fmt.Println(ctx.Param("uriKey"))
-			fmt.Println(ctx.Param("uriKey") == uriKey)
 			if ctx.Param("uriKey") == uriKey {
 				result = v.(interface {
 					Handle(*builder.Context, *gorm.DB) interface{}
 				}).Handle(ctx, model)
+
+				return result
 			}
 		}
 	}

pkg/builder/template/adminresource/resource.go

@@ -51,7 +51,7 @@ func (p *Template) TemplateInit() interface{} {
 	// 注册路由映射
 	p.GET(IndexRoute, "Render")          // 后台增删改查，列表路由
 	p.GET(EditableRoute, "Render")       // 后台增删改查，表格行内编辑路由
-	p.ANY(ActionRoute, "Render")         // 后台增删改查，执行行为路由
+	p.Any(ActionRoute, "Render")         // 后台增删改查，执行行为路由
 	p.GET(CreateRoute, "Render")         // 后台增删改查，创建页面路由
 	p.POST(StoreRoute, "Render")         // 后台增删改查，创建方法路由
 	p.GET(EditRoute, "Render")           // 后台增删改查，编辑页面路由

pkg/builder/template/template.go

@@ -54,14 +54,8 @@ func (p *AdminTemplate) AddRouteMapping(method string, path string, handlerName
 }
 
 // ANY is a shortcut for router.Handle(http.MethodGet, path, handle)
-func (p *AdminTemplate) ANY(path string, handlerName string) {
-	p.GET(path, handlerName)
-	p.HEAD(path, handlerName)
-	p.OPTIONS(path, handlerName)
-	p.POST(path, handlerName)
-	p.PUT(path, handlerName)
-	p.PATCH(path, handlerName)
-	p.DELETE(path, handlerName)
+func (p *AdminTemplate) Any(path string, handlerName string) {
+	p.AddRouteMapping("Any", path, handlerName)
 }
 
 // GET is a shortcut for router.Handle(http.MethodGet, path, handle)