From f53de8281ac4abf8354fa25eb17e9a7fd614f937 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sat, 6 Jan 2024 17:07:29 +0800 Subject: [PATCH 1/3] go:embed --- cmd/gopcomm/gop_autogen.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/gopcomm/gop_autogen.go b/cmd/gopcomm/gop_autogen.go index a1af593..156bd2c 100644 --- a/cmd/gopcomm/gop_autogen.go +++ b/cmd/gopcomm/gop_autogen.go @@ -6,7 +6,7 @@ import ( "github.com/goplus/yap" "github.com/qiniu/x/errors" ) - +//go:embed yap var yapFS embed.FS //line cmd/gopcomm/community.gop:11 func main() { From f3e013a23079dc216f135ae0be01ab9b15c00990 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sat, 6 Jan 2024 22:41:50 +0800 Subject: [PATCH 2/3] article --- README.md | 2 +- cmd/gopcomm/community.gop | 7 ++++++- cmd/gopcomm/gop_autogen.go | 28 ++++++++++++++++------------ cmd/gopcomm/yap/article.yap | 8 ++++++++ go.mod | 4 ++-- go.sum | 4 ++-- 6 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 cmd/gopcomm/yap/article.yap diff --git a/README.md b/README.md index 4a37b14..d72165c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Go+ Community +Go+ Community written in Go+ ===== [![Build Status](https://github.com/goplus/community/actions/workflows/go.yml/badge.svg)](https://github.com/goplus/community/actions/workflows/go.yml) diff --git a/cmd/gopcomm/community.gop b/cmd/gopcomm/community.gop index aa9b94d..666470d 100644 --- a/cmd/gopcomm/community.gop +++ b/cmd/gopcomm/community.gop @@ -11,5 +11,10 @@ var yapFS embed.FS fsYap := fs.sub(yapFS, "yap")! y := yap.new(fsYap) -y.handle "/p/", ctx => { +y.GET "/p/:id", ctx => { + ctx.YAP 200, "article", yap.H{ + "id": ctx.param("id"), + } } + +y.run ":8080" diff --git a/cmd/gopcomm/gop_autogen.go b/cmd/gopcomm/gop_autogen.go index 156bd2c..33a1d9d 100644 --- a/cmd/gopcomm/gop_autogen.go +++ b/cmd/gopcomm/gop_autogen.go @@ -8,27 +8,31 @@ import ( ) //go:embed yap var yapFS embed.FS -//line cmd/gopcomm/community.gop:11 +//line community.gop:11 func main() { -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 fsYap := func() (_gop_ret fs.FS) { -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 var _gop_err error -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 _gop_ret, _gop_err = fs.Sub(yapFS, "yap") -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 if _gop_err != nil { -//line cmd/gopcomm/community.gop:11:1 - _gop_err = errors.NewFrame(_gop_err, "fs.sub(yapFS, \"yap\")", "cmd/gopcomm/community.gop", 11, "main.main") -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 + _gop_err = errors.NewFrame(_gop_err, "fs.sub(yapFS, \"yap\")", "community.gop", 11, "main.main") +//line community.gop:11:1 panic(_gop_err) } -//line cmd/gopcomm/community.gop:11:1 +//line community.gop:11:1 return }() -//line cmd/gopcomm/community.gop:12:1 +//line community.gop:12:1 y := yap.New(fsYap) -//line cmd/gopcomm/community.gop:14:1 - y.Handle("/p/", func(ctx *yap.Context) { +//line community.gop:14:1 + y.GET("/p/:id", func(ctx *yap.Context) { +//line community.gop:15:1 + ctx.YAP(200, "article", yap.H{"id": ctx.Param("id")}) }) +//line community.gop:20:1 + y.Run(":8080") } diff --git a/cmd/gopcomm/yap/article.yap b/cmd/gopcomm/yap/article.yap new file mode 100644 index 0000000..118d8b6 --- /dev/null +++ b/cmd/gopcomm/yap/article.yap @@ -0,0 +1,8 @@ + + + + + +Article {{.id}} + + diff --git a/go.mod b/go.mod index 677dd7c..5915f8f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/goplus/community go 1.18 require ( - github.com/goplus/yap v0.1.0 - github.com/qiniu/x v1.13.2 + github.com/goplus/yap v0.2.0 + github.com/qiniu/x v1.13.2 ) diff --git a/go.sum b/go.sum index 042a596..eb4e66f 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -github.com/goplus/yap v0.1.0 h1:POiEaS0ZlHPOo6Vw8guq+i9sOUfzF3ZHiSmK0NC+9I8= -github.com/goplus/yap v0.1.0/go.mod h1:VCbGlZo2lUgRWciTZwA5JEOuCUf8T2PhxZZ0HXqzgBk= +github.com/goplus/yap v0.2.0 h1:0RLQBxBOiUxKb+9AY/yhYtlnQKjfPyaOhDv720S1Izk= +github.com/goplus/yap v0.2.0/go.mod h1:VCbGlZo2lUgRWciTZwA5JEOuCUf8T2PhxZZ0HXqzgBk= github.com/qiniu/x v1.13.2 h1:mgWOfB9Rpk6AEtlBoObZVxH+b2FHSntYrxc4KX5Ta98= github.com/qiniu/x v1.13.2/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= From 4afdffe79bfe3f790735430463d5c6cc1070acfd Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sat, 6 Jan 2024 22:43:28 +0800 Subject: [PATCH 3/3] line file --- cmd/gopcomm/gop_autogen.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/gopcomm/gop_autogen.go b/cmd/gopcomm/gop_autogen.go index 33a1d9d..0a73fdd 100644 --- a/cmd/gopcomm/gop_autogen.go +++ b/cmd/gopcomm/gop_autogen.go @@ -8,31 +8,31 @@ import ( ) //go:embed yap var yapFS embed.FS -//line community.gop:11 +//line cmd/gopcomm/community.gop:11 func main() { -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 fsYap := func() (_gop_ret fs.FS) { -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 var _gop_err error -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 _gop_ret, _gop_err = fs.Sub(yapFS, "yap") -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 if _gop_err != nil { -//line community.gop:11:1 - _gop_err = errors.NewFrame(_gop_err, "fs.sub(yapFS, \"yap\")", "community.gop", 11, "main.main") -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 + _gop_err = errors.NewFrame(_gop_err, "fs.sub(yapFS, \"yap\")", "cmd/gopcomm/community.gop", 11, "main.main") +//line cmd/gopcomm/community.gop:11:1 panic(_gop_err) } -//line community.gop:11:1 +//line cmd/gopcomm/community.gop:11:1 return }() -//line community.gop:12:1 +//line cmd/gopcomm/community.gop:12:1 y := yap.New(fsYap) -//line community.gop:14:1 +//line cmd/gopcomm/community.gop:14:1 y.GET("/p/:id", func(ctx *yap.Context) { -//line community.gop:15:1 +//line cmd/gopcomm/community.gop:15:1 ctx.YAP(200, "article", yap.H{"id": ctx.Param("id")}) }) -//line community.gop:20:1 +//line cmd/gopcomm/community.gop:20:1 y.Run(":8080") }