From b575fa1ebe076bcc21d3bb73434aea26f0043191 Mon Sep 17 00:00:00 2001
From: Ming Deng <mingflycash@gmail.com>
Date: Fri, 11 Sep 2020 23:48:21 +0800
Subject: [PATCH] fix 4219

---
 pkg/server/web/context/input.go |  2 +-
 pkg/server/web/router_test.go   | 17 +++++++++++++++++
 pkg/server/web/tree.go          | 24 ++++++++++++------------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/pkg/server/web/context/input.go b/pkg/server/web/context/input.go
index a6fec774..f8657f84 100644
--- a/pkg/server/web/context/input.go
+++ b/pkg/server/web/context/input.go
@@ -89,7 +89,7 @@ func (input *BeegoInput) URI() string {
 
 // URL returns the request url path (without query, string and fragment).
 func (input *BeegoInput) URL() string {
-	return input.Context.Request.URL.EscapedPath()
+	return input.Context.Request.URL.Path
 }
 
 // Site returns the base site url as scheme://domain type.
diff --git a/pkg/server/web/router_test.go b/pkg/server/web/router_test.go
index 33b75703..2863da3a 100644
--- a/pkg/server/web/router_test.go
+++ b/pkg/server/web/router_test.go
@@ -212,6 +212,23 @@ func TestAutoExtFunc(t *testing.T) {
 	}
 }
 
+func TestEscape(t *testing.T) {
+
+	r, _ := http.NewRequest("GET", "/search/%E4%BD%A0%E5%A5%BD", nil)
+	w := httptest.NewRecorder()
+
+	handler := NewControllerRegister()
+	handler.Get("/search/:keyword(.+)", func(ctx *context.Context) {
+		value := ctx.Input.Param(":keyword")
+		ctx.Output.Body([]byte(value))
+	})
+	handler.ServeHTTP(w, r)
+	str := w.Body.String()
+	if str != "你好" {
+		t.Errorf("incorrect, %s", str)
+	}
+}
+
 func TestRouteOk(t *testing.T) {
 
 	r, _ := http.NewRequest("GET", "/person/anderson/thomas?learn=kungfu", nil)
diff --git a/pkg/server/web/tree.go b/pkg/server/web/tree.go
index 7213a0c6..55f68076 100644
--- a/pkg/server/web/tree.go
+++ b/pkg/server/web/tree.go
@@ -33,13 +33,13 @@ var (
 // wildcard stores params
 // leaves store the endpoint information
 type Tree struct {
-	//prefix set for static router
+	// prefix set for static router
 	prefix string
-	//search fix route first
+	// search fix route first
 	fixrouters []*Tree
-	//if set, failure to match fixrouters search then search wildcard
+	// if set, failure to match fixrouters search then search wildcard
 	wildcard *Tree
-	//if set, failure to match wildcard search
+	// if set, failure to match wildcard search
 	leaves []*leafInfo
 }
 
@@ -69,13 +69,13 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st
 			filterTreeWithPrefix(tree, wildcards, reg)
 		}
 	}
-	//Rule: /login/*/access match /login/2009/11/access
-	//if already has *, and when loop the access, should as a regexpStr
+	// Rule: /login/*/access match /login/2009/11/access
+	// if already has *, and when loop the access, should as a regexpStr
 	if !iswild && utils.InSlice(":splat", wildcards) {
 		iswild = true
 		regexpStr = seg
 	}
-	//Rule: /user/:id/*
+	// Rule: /user/:id/*
 	if seg == "*" && len(wildcards) > 0 && reg == "" {
 		regexpStr = "(.+)"
 	}
@@ -222,13 +222,13 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
 			t.addseg(segments[1:], route, wildcards, reg)
 			params = params[1:]
 		}
-		//Rule: /login/*/access match /login/2009/11/access
-		//if already has *, and when loop the access, should as a regexpStr
+		// Rule: /login/*/access match /login/2009/11/access
+		// if already has *, and when loop the access, should as a regexpStr
 		if !iswild && utils.InSlice(":splat", wildcards) {
 			iswild = true
 			regexpStr = seg
 		}
-		//Rule: /user/:id/*
+		// Rule: /user/:id/*
 		if seg == "*" && len(wildcards) > 0 && reg == "" {
 			regexpStr = "(.+)"
 		}
@@ -393,7 +393,7 @@ type leafInfo struct {
 }
 
 func (leaf *leafInfo) match(treePattern string, wildcardValues []string, ctx *context.Context) (ok bool) {
-	//fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
+	// fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
 	if leaf.regexps == nil {
 		if len(wildcardValues) == 0 && len(leaf.wildcards) == 0 { // static path
 			return true
@@ -500,7 +500,7 @@ func splitSegment(key string) (bool, []string, string) {
 				continue
 			}
 			if start {
-				//:id:int and :name:string
+				// :id:int and :name:string
 				if v == ':' {
 					if len(key) >= i+4 {
 						if key[i+1:i+4] == "int" {