From 5c4b9b491c0c2414c1a8ba4062240cce3d592318 Mon Sep 17 00:00:00 2001
From: jiangtao <mreden@163.com>
Date: Wed, 25 Aug 2021 14:41:58 +0800
Subject: [PATCH] httprouter to mux

---
 go.mod          | 4 +++-
 go.sum          | 2 ++
 mux/mux.go      | 6 +++---
 test/netpoll.go | 5 ++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 55e4ff0..f9d4b3a 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,6 @@ module github.com/php2go/netpollmux
 
 go 1.15
 
-require github.com/julienschmidt/httprouter v1.3.0
+require (
+	github.com/gorilla/mux v1.8.0
+)
diff --git a/go.sum b/go.sum
index 096c54e..0488809 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,4 @@
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
diff --git a/mux/mux.go b/mux/mux.go
index e5d70ef..d9c5e53 100644
--- a/mux/mux.go
+++ b/mux/mux.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/julienschmidt/httprouter"
+	"github.com/gorilla/mux"
 	"github.com/php2go/netpollmux/internal/logger"
 	"github.com/php2go/netpollmux/netpoll"
 )
@@ -17,7 +17,7 @@ var DefaultServer = NewRoute()
 
 // Route is an HTTP server.
 type Route struct {
-	*httprouter.Router
+	*mux.Router
 	Handler http.Handler
 	// TLSConfig optionally provides a TLS configuration for use
 	// by ServeTLS and ListenAndServeTLS. Note that this value is
@@ -37,7 +37,7 @@ type Route struct {
 
 // NewRoute returns a new NewRouter instance.
 func NewRoute() *Route {
-	return &Route{Router: httprouter.New()}
+	return &Route{Router: mux.NewRouter()}
 }
 
 // SetFast enables the Server to use simple request parser.
diff --git a/test/netpoll.go b/test/netpoll.go
index c46811e..65ea882 100644
--- a/test/netpoll.go
+++ b/test/netpoll.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/julienschmidt/httprouter"
 	"github.com/php2go/netpollmux/internal/logger"
 	"github.com/php2go/netpollmux/mux"
 	"github.com/php2go/netpollmux/netpoll"
@@ -15,9 +14,9 @@ import (
 
 func main() {
 	m := mux.NewRoute()
-	m.GET("/hello/:id", func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
+	m.HandleFunc("/hello/{id}", func(w http.ResponseWriter, req *http.Request) {
 		pp := req.URL.Query()
-		logger.Info("query params：", params, pp)
+		logger.Info("query params：", pp)
 		mux.JSON(w, req, []string{"hello world"}, http.StatusOK)
 	})
 	log.Fatal(m.Run(":8080"))