diff --git a/controllers/BlogController.go b/controllers/BlogController.go new file mode 100644 index 0000000..013a86c --- /dev/null +++ b/controllers/BlogController.go @@ -0,0 +1,34 @@ +package controllers + +import ( + "github.com/astaxie/beego" + "beeblog/models" + "beeblog/service" + "strconv" +) + +type BlogController struct { + beego.Controller +} + +func (this *BlogController) Save() { + blog := &models.Blog{Title: "ELK+logback+kafska+nginx 搭建分布式日志分析平台"} + err := service.SaveBlog(blog) + if (err == nil) { + this.Data["json"] = blog + } else { + this.Data["json"] = models.ReurnError("保存失败") + } + this.ServeJSON() +} + +func (this *BlogController) Get() { + idStr := this.Ctx.Input.Param(":id") + id, _ := strconv.ParseInt(idStr, 10, 64) + blog, err := service.GetBlog(id) + if (err == nil) { + this.Data["Blog"] = blog + } + //this.Data["IsHome"] = true + this.TplName = "blog.html" +} diff --git a/controllers/IndexController.go b/controllers/IndexController.go index 1ca0e6a..787cfb7 100644 --- a/controllers/IndexController.go +++ b/controllers/IndexController.go @@ -2,6 +2,8 @@ package controllers import ( "github.com/astaxie/beego" + "fmt" + "beeblog/service" ) type IndexController struct { @@ -9,6 +11,9 @@ type IndexController struct { } func (c *IndexController) Get() { + blogs,_ := service.FindBlogs() + fmt.Println(blogs) + c.Data["Blogs"] = blogs c.Data["IsHome"] = true c.TplName = "index.html" } diff --git a/controllers/UserController.go b/controllers/UserController.go index d13aa81..133f556 100644 --- a/controllers/UserController.go +++ b/controllers/UserController.go @@ -16,28 +16,7 @@ type UserController struct { } func (u *UserController) LoginPage() { - //o := orm.NewOrm() - // - //category := &models.Category{Title: "slene", Views: 5, TopicCount: 0} - // - //id,err := o.Insert(category) - //fmt.Printf("ID: %d, ERR: %v\n", id, err) - // - //category.Title = "nelson" - //num, err := o.Update(&category) - //fmt.Printf("NUM: %d, ERR: %v\n", num, err) - // - //c := &models.Category{Id:1} - //err := o.Read(c) - //fmt.Printf("ERR: %v\n", err) - //fmt.Println(c.Title) - ////c.Title = "nelson" - ////num, err := o.Update(c) - ////fmt.Printf("NUM: %d, ERR: %v\n", num, err) - //qs := o.QueryTable(&models.Category{}) - //var tests []*models.Category - //qs.Filter("Title","slene") - //qs.All(&tests) + // //for i:=0; i + {{end}} \ No newline at end of file diff --git a/views/blog.html b/views/blog.html new file mode 100644 index 0000000..fce9ca4 --- /dev/null +++ b/views/blog.html @@ -0,0 +1,14 @@ +{{template "header"}} +博客 - 个人随笔 + + + +
+{{template "nav" .}} +
+

{{.Blog.Title}}

+ +
+
+ + \ No newline at end of file diff --git a/views/index.html b/views/index.html index 63a0a2c..f891893 100644 --- a/views/index.html +++ b/views/index.html @@ -1,9 +1,67 @@ {{template "header"}} 首页 - 个人随笔 + -
+
{{template "nav" .}} -
+
+
+
+ + + + 选择分类 + + + +
+ + +
+
+ 写文章 +
+
+
+
+ 文章标题 +
+
+
+ 类型 + 用户 + 浏览量 + 日期 +
+
+
+
+
+ {{range .Blogs}} +
+
+ +
+
+ {{.CateName}} + {{.UserName}} + 2555 + {{.CtimeStr}} +
+
+
+
+
+ {{end}} \ No newline at end of file diff --git a/views/map.html b/views/map.html index c40f4bd..4bf9e0d 100644 --- a/views/map.html +++ b/views/map.html @@ -3,7 +3,6 @@ -