From 8e201cbbc0768ac7c0a9a4912fac6c095c0b2a23 Mon Sep 17 00:00:00 2001 From: "mail_yanpeng@163.com" Date: Wed, 21 Nov 2018 17:40:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/BlogController.go | 8 ++++++++ controllers/IndexController.go | 11 +++-------- data/beeblog.db | Bin 40960 -> 40960 bytes routers/BlogRouter.go | 1 + utils/PageUtil.go | 19 +++++++++++++++++++ views/T.nav.tpl | 9 ++++++--- views/blog.html | 14 -------------- views/{index.html => blogs.html} | 4 ++++ 8 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 utils/PageUtil.go delete mode 100644 views/blog.html rename views/{index.html => blogs.html} (98%) diff --git a/controllers/BlogController.go b/controllers/BlogController.go index f4e6c79..979f116 100644 --- a/controllers/BlogController.go +++ b/controllers/BlogController.go @@ -44,3 +44,11 @@ func (this *BlogController) New() { func (this *BlogController) Blog1() { this.TplName = "blog1.html" } + +func (this *BlogController) BlogsPage() { + blogs,_ := service.FindBlogs() + this.Data["Blogs"] = blogs + this.Data["IsBlog"] = true + this.TplName = "blogs.html" + +} \ No newline at end of file diff --git a/controllers/IndexController.go b/controllers/IndexController.go index 787cfb7..b1e76a5 100644 --- a/controllers/IndexController.go +++ b/controllers/IndexController.go @@ -2,18 +2,13 @@ package controllers import ( "github.com/astaxie/beego" - "fmt" - "beeblog/service" ) type IndexController struct { beego.Controller } -func (c *IndexController) Get() { - blogs,_ := service.FindBlogs() - fmt.Println(blogs) - c.Data["Blogs"] = blogs - c.Data["IsHome"] = true - c.TplName = "index.html" +func (this *IndexController) Get() { + this.Redirect("blogs",302) + return } diff --git a/data/beeblog.db b/data/beeblog.db index 983700914f7fe10603b82d474d8fafd1084b2cc4..17a335d866dd12d8df535ad2bb07408809ddf783 100644 GIT binary patch delta 41 vcmZoTz|?SnX@WGP&qNt#MxTud3+ve!fIxs@Gke1vJ{ATB#@Nlv`yvGa10V~T delta 41 xcmZoTz|?SnX@WGP_e2?IM(>RY3+vhV?lLg)E#A!DFo%!Df|;FR^YXq(K>#0n4F~`L diff --git a/routers/BlogRouter.go b/routers/BlogRouter.go index 7fcf040..e53878b 100644 --- a/routers/BlogRouter.go +++ b/routers/BlogRouter.go @@ -8,6 +8,7 @@ import ( func init() { beego.Router("/blog/new", &controllers.BlogController{}, "post:Save") beego.Router("/blog/:id([0-9]+)", &controllers.BlogController{}, "get:Get") + beego.Router("/blogs", &controllers.BlogController{}, "get:BlogsPage") beego.Router("/blog/new", &controllers.BlogController{}, "get:New") beego.Router("/blog1", &controllers.BlogController{}, "get:Blog1") } diff --git a/utils/PageUtil.go b/utils/PageUtil.go new file mode 100644 index 0000000..83e09ae --- /dev/null +++ b/utils/PageUtil.go @@ -0,0 +1,19 @@ +package utils + +type Page struct { + PageNo int + PageSize int + TotalPage int + TotalCount int + FirstPage bool + LastPage bool + List interface{} +} + +func PageUtil(count int, pageNo int, pageSize int, list interface{}) Page { + tp := count / pageSize + if count % pageSize > 0 { + tp = count / pageSize + 1 + } + return Page{PageNo: pageNo, PageSize: pageSize, TotalPage: tp, TotalCount: count, FirstPage: pageNo == 1, LastPage: pageNo == tp, List: list} +} diff --git a/views/T.nav.tpl b/views/T.nav.tpl index 7f5f8d7..c066d33 100644 --- a/views/T.nav.tpl +++ b/views/T.nav.tpl @@ -7,13 +7,16 @@ {{end}} + +
+ +