Merge remote-tracking branch 'origin/master'

pirms 6 gadiem · 9e1537e3f0
--- a/controllers/BlogController.go
+++ b/controllers/BlogController.go
@ -1,9 +1,9 @@
 package controllers

 import (
-	"github.com/astaxie/beego"
 	"beeblog/models"
 	"beeblog/service"
+	"github.com/astaxie/beego"
 	"strconv"
 )

@ -19,7 +19,7 @@ func (this *BlogController) Save() {
 	labels := this.GetStrings("labels[]")
 	blog := &models.Blog{Title: title, BlogHtml: blogHtml, CategoryId: catoryId, UserId: 1}
 	err := service.SaveBlog(blog, labels)
-	if (err == nil) {
+	if err == nil {
 		this.Data["json"] = blog
 	} else {
 		this.Data["json"] = models.ReurnError("保存失败")
@ -31,7 +31,7 @@ func (this *BlogController) Get() {
 	idStr := this.Ctx.Input.Param(":id")
 	id, _ := strconv.ParseInt(idStr, 10, 64)
 	blog, err := service.GetBlog(id)
-	if (err == nil) {
+	if err == nil {
 		this.Data["Blog"] = blog
 	}
 	this.TplName = "blog.html"
@ -40,3 +40,6 @@ func (this *BlogController) Get() {
 func (this *BlogController) New() {
 	this.TplName = "newblog.html"
 }
+func (this *BlogController) Blog1() {
+	this.TplName = "blog1.html"
+}
--- a/routers/BlogRouter.go
+++ b/routers/BlogRouter.go
@ -1,12 +1,13 @@
 package routers

 import (
-	"github.com/astaxie/beego"
 	"beeblog/controllers"
+	"github.com/astaxie/beego"
 )

 func init() {
 	beego.Router("/blog/new", &controllers.BlogController{}, "post:Save")
 	beego.Router("/blog/:id([0-9]+)", &controllers.BlogController{}, "get:Get")
 	beego.Router("/blog/new", &controllers.BlogController{}, "get:New")
+	beego.Router("/blog1", &controllers.BlogController{}, "get:Blog1")
 }
--- a/routers/UserRouter.go
+++ b/routers/UserRouter.go
@ -1,8 +1,8 @@
 package routers

 import (
-	"github.com/astaxie/beego"
 	"beeblog/controllers"
+	"github.com/astaxie/beego"
 )

 func init() {
--- a/views/blog1.html
+++ b/views/blog1.html
@ -0,0 +1,59 @@
+{{template "header"}}
+<title>博客 - 个人随笔</title>
+<link type="text/css" rel="styleSheet" href="/static/css/blog.css"/>
+</head>
+<body>
+<div class="root-container">
+{{template "nav" .}}
+    <div class="blog-root">
+        <h1 style="text-align: center">{{.Blog.Title}}</h1>
+        <div style="text-align: center">
+            <span>
+                头像
+            </span>
+            <span>
+                链接
+
+            </span>
+            <span>
+                时间：
+                <span></span>
+            </span>
+            <span>
+                阅读数：
+            </span>
+            <span>
+                标签：
+                <span class="label label-danger">Danger</span>
+            </span>
+        </div>
+        <div>
+            <span>正文</span>
+            <pre>
+
+            </pre>
+            <br>
+            <span>正文</span>
+            <pre>
+
+            </pre>
+            <br>
+            <span>正文</span>
+            <pre>
+
+            </pre>
+            <br>
+            <span>正文</span>
+            <pre>
+
+            </pre>
+            <br>
+        </div>
+        <div>
+            <textarea class="form-control" rows="3" placeholder="是不是得说点啥"></textarea>
+            <a class="btn btn-default" href="#" role="button" >链接</a>
+        </div>
+    </div>
+</div>
+</body>
+</html>