diff --git a/g/frame/gins/gins.go b/g/frame/gins/gins.go index 4f62228f3..76d409407 100644 --- a/g/frame/gins/gins.go +++ b/g/frame/gins/gins.go @@ -230,7 +230,7 @@ func Redis(name...string) *gredis.Redis { } // 模板内置方法:config -func funcConfig(pattern string, file...string) gview.HTML { - return gview.HTML(Config().GetString(pattern, file...)) +func funcConfig(pattern string, file...string) string { + return Config().GetString(pattern, file...) } diff --git a/g/net/ghttp/ghttp_response_view.go b/g/net/ghttp/ghttp_response_view.go index aeb2c55e7..7abffa7c3 100644 --- a/g/net/ghttp/ghttp_response_view.go +++ b/g/net/ghttp/ghttp_response_view.go @@ -83,16 +83,16 @@ func (r *Response) buildInFuncs(funcmap map[string]interface{}) map[string]inter } // 模板内置函数: get -func (r *Response) funcGet(key string, def...string) gview.HTML { - return gview.HTML(r.request.GetQueryString(key, def...)) +func (r *Response) funcGet(key string, def...string) string { + return r.request.GetQueryString(key, def...) } // 模板内置函数: post -func (r *Response) funcPost(key string, def...string) gview.HTML { - return gview.HTML(r.request.GetPostString(key, def...)) +func (r *Response) funcPost(key string, def...string) string { + return r.request.GetPostString(key, def...) } // 模板内置函数: request -func (r *Response) funcRequest(key string, def...string) gview.HTML { - return gview.HTML(r.request.Get(key, def...)) +func (r *Response) funcRequest(key string, def...string) string { + return r.request.Get(key, def...) } \ No newline at end of file diff --git a/g/os/gview/gview.go b/g/os/gview/gview.go index a7e0f9c31..7a16c80d6 100644 --- a/g/os/gview/gview.go +++ b/g/os/gview/gview.go @@ -33,9 +33,6 @@ type View struct { delimiters []string // 模板变量分隔符号 } -// 输出到模板页面时保留HTML标签原意,不做自动escape处理 -type HTML = string - // 模板变量 type Params = map[string]interface{} diff --git a/geg/os/gview/build_in_funcs/build_in_funcs.go b/geg/os/gview/build_in_funcs/build_in_funcs.go index 90ea14ca9..462b8d763 100644 --- a/geg/os/gview/build_in_funcs/build_in_funcs.go +++ b/geg/os/gview/build_in_funcs/build_in_funcs.go @@ -11,7 +11,7 @@ func main() { {{"
测试
"|html}} {{"<div>测试</div>"|htmldecode}} {{"https://gfer.me"|url}} -{{"https://gfer.me"|urldecode}} +{{"https%3A%2F%2Fgfer.me"|urldecode}} {{1540822968 | date "Y-m-d"}} {{"1540822968" | date "Y-m-d H:i:s"}} {{compare "A" "B"}} diff --git a/geg/util/gpage/gpage.go b/geg/util/gpage/gpage.go index a9c96fd2d..5de56673f 100644 --- a/geg/util/gpage/gpage.go +++ b/geg/util/gpage/gpage.go @@ -27,10 +27,10 @@ func main() { `, g.Map{ - "page1" : gview.HTML(page.GetContent(1)), - "page2" : gview.HTML(page.GetContent(2)), - "page3" : gview.HTML(page.GetContent(3)), - "page4" : gview.HTML(page.GetContent(4)), + "page1" : page.GetContent(1), + "page2" : page.GetContent(2), + "page3" : page.GetContent(3), + "page4" : page.GetContent(4), }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_ajax.go b/geg/util/gpage/gpage_ajax.go index 6442c9aa9..9fdfa786c 100644 --- a/geg/util/gpage/gpage_ajax.go +++ b/geg/util/gpage/gpage_ajax.go @@ -33,7 +33,7 @@ func main() { `, g.Map{ - "page" : gview.HTML(page.GetContent(1)), + "page" : page.GetContent(1), }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_custom1.go b/geg/util/gpage/gpage_custom1.go index a17209608..532a59758 100644 --- a/geg/util/gpage/gpage_custom1.go +++ b/geg/util/gpage/gpage_custom1.go @@ -38,7 +38,7 @@ func main() { `, g.Map{ - "page" : gview.HTML(content), + "page" : content, }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_custom2.go b/geg/util/gpage/gpage_custom2.go index 0cb99003f..47ff9c56e 100644 --- a/geg/util/gpage/gpage_custom2.go +++ b/geg/util/gpage/gpage_custom2.go @@ -38,7 +38,7 @@ func main() { `, g.Map{ - "page" : gview.HTML(pageContent(page)), + "page" : pageContent(page), }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_static1.go b/geg/util/gpage/gpage_static1.go index c7d986805..313843527 100644 --- a/geg/util/gpage/gpage_static1.go +++ b/geg/util/gpage/gpage_static1.go @@ -27,10 +27,10 @@ func main() { `, g.Map{ - "page1" : gview.HTML(page.GetContent(1)), - "page2" : gview.HTML(page.GetContent(2)), - "page3" : gview.HTML(page.GetContent(3)), - "page4" : gview.HTML(page.GetContent(4)), + "page1" : page.GetContent(1), + "page2" : page.GetContent(2), + "page3" : page.GetContent(3), + "page4" : page.GetContent(4), }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_static2.go b/geg/util/gpage/gpage_static2.go index f67372999..b5c72549b 100644 --- a/geg/util/gpage/gpage_static2.go +++ b/geg/util/gpage/gpage_static2.go @@ -27,10 +27,10 @@ func main() { `, g.Map{ - "page1" : gview.HTML(page.GetContent(1)), - "page2" : gview.HTML(page.GetContent(2)), - "page3" : gview.HTML(page.GetContent(3)), - "page4" : gview.HTML(page.GetContent(4)), + "page1" : page.GetContent(1), + "page2" : page.GetContent(2), + "page3" : page.GetContent(3), + "page4" : page.GetContent(4), }) r.Response.Write(buffer) }) diff --git a/geg/util/gpage/gpage_template.go b/geg/util/gpage/gpage_template.go index 5068235dd..ec1b8e57c 100644 --- a/geg/util/gpage/gpage_template.go +++ b/geg/util/gpage/gpage_template.go @@ -28,10 +28,10 @@ func main() { `, g.Map{ - "page1" : gview.HTML(page.GetContent(1)), - "page2" : gview.HTML(page.GetContent(2)), - "page3" : gview.HTML(page.GetContent(3)), - "page4" : gview.HTML(page.GetContent(4)), + "page1" : page.GetContent(1), + "page2" : page.GetContent(2), + "page3" : page.GetContent(3), + "page4" : page.GetContent(4), }) r.Response.Write(buffer) })