diff --git a/TODO b/TODO index c00233e7d..4741eb126 100644 --- a/TODO +++ b/TODO @@ -22,7 +22,10 @@ ghttp增加route name特性,并同时支持backend和template(提供内置函 ghttp日志增加客户端IP信息; ghttp.Client自动Close机制; gvalid校验支持当第一个规则失败后便不再校验后续的规则,最好做成链式操作; -gvalid返回的数据类型调整map[string]map[string]string->map[string]map[string]error,这样更容易被第三方框架兼容; +检查ghttp.Server超时问题; + + + DONE: 1. gconv完善针对不同类型的判断,例如:尽量减少sprintf("%v", xxx)来执行string类型的转换; diff --git a/g/os/gview/gview.go b/g/os/gview/gview.go index 2590c3305..784de6ee6 100644 --- a/g/os/gview/gview.go +++ b/g/os/gview/gview.go @@ -152,3 +152,4 @@ func (view *View) funcInclude(file string, data...map[string]interface{}) templa } return template.HTML(content) } + diff --git a/geg/os/gview/template/main.go b/geg/os/gview/template/main.go new file mode 100644 index 000000000..4676f9e71 --- /dev/null +++ b/geg/os/gview/template/main.go @@ -0,0 +1,19 @@ +package main + + +import ( + "fmt" + "gitee.com/johng/gf/g" + "gitee.com/johng/gf/g/os/gfile" +) + +func main() { + v := g.View() + // 设置模板目录为当前main.go所在目录下的template目录 + v.AddPath(gfile.MainPkgPath() + gfile.Separator + "template") + b, err := v.Parse("index.html", map[string]interface{} { + "k" : "v", + }) + fmt.Println(err) + fmt.Println(string(b)) +} \ No newline at end of file diff --git a/geg/os/gview/template/template/index.html b/geg/os/gview/template/template/index.html new file mode 100644 index 000000000..f534c4417 --- /dev/null +++ b/geg/os/gview/template/template/index.html @@ -0,0 +1,2 @@ +{{include "subs/sub.html" .}} + diff --git a/geg/os/gview/template/template/subs/sub.html b/geg/os/gview/template/template/subs/sub.html new file mode 100644 index 000000000..91012a681 --- /dev/null +++ b/geg/os/gview/template/template/subs/sub.html @@ -0,0 +1 @@ +{{.}} \ No newline at end of file