update

context.go

@@ -234,6 +234,7 @@ type Context interface {
 	Accept() *Accepts
 	Protocol() string
 	Site() string
+	FullRequestURI() string
 	RequestURI() string
 	Scheme() string
 	Domain() string

context_x_request.go

@@ -371,8 +371,19 @@ func (c *xContext) Site() string {
 	return c.Scheme() + `://` + c.Request().Host() + `/`
 }
 
+func (c *xContext) FullRequestURI() string {
+	return c.Scheme() + `://` + c.Request().Host() + c.RequestURI()
+}
+
 func (c *xContext) RequestURI() string {
-	return c.Scheme() + `://` + c.Request().Host() + c.Request().URL().String()
+	if len(c.Request().URI()) == 0 {
+		q := c.Request().URL().RawQuery()
+		if len(q) > 0 {
+			q = `?` + q
+		}
+		return c.Request().URL().Path() + q
+	}
+	return c.Request().URI()
 }
 
 // Scheme returns request scheme as `http` or `https`.

echo_test.go

@@ -83,14 +83,17 @@ func TestEchoMiddlewareError(t *testing.T) {
 	e.SetDebug(true)
 	e.Use(mw.Log(), func(next HandlerFunc) HandlerFunc {
 		return func(c Context) error {
+			assert.Equal(t, `/`, c.RequestURI())
+			assert.Equal(t, `https://github.com/`, c.FullRequestURI())
+			assert.Equal(t, ``, c.Request().URI())
 			return errors.New("error")
 		}
 	})
 	e.Get("/", NotFoundHandler)
 
 	e.RebuildRouter()
 
-	c, r := request(GET, "/", e)
+	c, r := request(GET, "https://github.com/", e)
 	assert.Equal(t, http.StatusInternalServerError, c)
 	assert.Equal(t, `error`, r)
 }

engine/standard/url_test.go

@@ -0,0 +1,16 @@
+package standard
+
+import (
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/webx-top/echo"
+)
+
+func TestURL(t *testing.T) {
+	u, err := url.Parse(`https://github.com/webx-top/echo?test=1&name=测试`)
+	assert.NoError(t, err)
+	assert.Equal(t, `https://github.com/webx-top/echo?test=1`, u.String())
+	echo.Dump(u)
+}

render_data.go

@@ -41,7 +41,6 @@ type RenderData struct {
 	Func       template.FuncMap
 	Data       interface{}
 	Stored     param.MapReadonly
-	requestURI string
 }
 
 func (r *RenderData) Now() *com.Time {
@@ -250,10 +249,11 @@ func (r *RenderData) Scheme() string {
 }
 
 func (r *RenderData) RequestURI() string {
-	if len(r.requestURI) == 0 {
-		r.requestURI = r.ctx.RequestURI()
-	}
-	return r.requestURI
+	return r.ctx.RequestURI()
+}
+
+func (r *RenderData) FullRequestURI() string {
+	return r.ctx.FullRequestURI()
 }
 
 func (r *RenderData) GetNextURL(varNames ...string) string {