feat: 支持多路由方法

go-jarvis · Dec 9, 2021 · bf31c58 · bf31c58
1 parent b0e501d
commit bf31c58
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/internal/example/apis/index/index.go b/internal/example/apis/index/index.go
@@ -5,14 +5,22 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-jarvis/rum-gonic/internal/example/injector/redis"
-	"github.com/go-jarvis/rum-gonic/pkg/httpx"
 )
 
 type Index struct {
-	httpx.MethodGet `path:"/index"`
-	Name            string `query:"name"`
+	// httpx.MethodGet `path:"/index"`
+
+	// httpx.MethodRoutes `path:"/index"`
+	Name string `query:"name"`
 }
 
+// func (index *Index) Method() string {
+// 	return "GET,HEAD"
+// }
+// func (index *Index) Path() string {
+// 	return "/index"
+// }
+
 func (index *Index) Output(c *gin.Context) (interface{}, error) {
 
 	return logic(c, index), nil

diff --git a/pkg/httpx/method.go b/pkg/httpx/method.go
@@ -1,6 +1,9 @@
 package httpx
 
-import net_http "net/http"
+import (
+	net_http "net/http"
+	"strings"
+)
 
 type Method struct {
 }
@@ -58,3 +61,18 @@ type MethodTrace struct{}
 func (MethodTrace) Method() string {
 	return net_http.MethodTrace
 }
+
+type MethodMulti struct {
+	Routes []string
+}
+
+func (m MethodMulti) Method() string {
+	return MarshalMethods(m.Routes)
+}
+
+func MarshalMethods(ms []string) string {
+	return strings.Join(ms, ",")
+}
+func UnmarshalMethods(str string) []string {
+	return strings.Split(str, ",")
+}
diff --git a/rum/group.go b/rum/group.go
@@ -2,8 +2,10 @@ package rum
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-jarvis/rum-gonic/pkg/httpx"
 	"github.com/tangx/ginbinder"
 )
 
@@ -110,7 +112,11 @@ func (r *RouterGroup) hanlde(op Operator) bool {
 
 	mop := op.(MethodOperator)
 
-	r.ginRG.Handle(mop.Method(), path, r.handlerfunc(op))
+	for _, method := range httpx.UnmarshalMethods(mop.Method()) {
+		method = strings.TrimSpace(method)
+		r.ginRG.Handle(method, path, r.handlerfunc(op))
+	}
+
 	return true
 }