login

6 лет назад · 6b34183810
--- a/controllers/BlogController.go
+++ b/controllers/BlogController.go
@ -5,7 +5,6 @@ import (
 	"beeblog/models"
 	"beeblog/service"
 	"strconv"
-	"fmt"
 )

 type BlogController struct {
@ -18,9 +17,8 @@ func (this *BlogController) Save() {
 	catory := this.GetString("catory")
 	catoryId, _ := strconv.ParseInt(catory, 10, 64)
 	labels := this.GetStrings("labels[]")
-	fmt.Println(title,blogHtml,catoryId,labels,labels[0])
-	blog := &models.Blog{Title: title,BlogHtml:blogHtml,CategoryId:catoryId}
-	err := service.SaveBlog(blog,labels)
+	blog := &models.Blog{Title: title, BlogHtml: blogHtml, CategoryId: catoryId, UserId: 1}
+	err := service.SaveBlog(blog, labels)
 	if (err == nil) {
 		this.Data["json"] = blog
 	} else {
@ -36,10 +34,9 @@ func (this *BlogController) Get() {
 	if (err == nil) {
 		this.Data["Blog"] = blog
 	}
-	//this.Data["IsHome"] = true
 	this.TplName = "blog.html"
 }

 func (this *BlogController) New() {
 	this.TplName = "newblog.html"
-}
+}
--- a/controllers/UserController.go
+++ b/controllers/UserController.go
@ -25,7 +25,8 @@ func (u *UserController) LoginPage() {
 	//num, err = o.Delete(&u)
 	//fmt.Printf("NUM: %d, ERR: %v\n", num, err)

-	u.Ctx.WriteString("login page")
+	//u.Ctx.WriteString("login page")
+	u.TplName = "login.html"
 }

 func (this *UserController) Login() {
--- a/data/beeblog.db
+++ b/data/beeblog.db
--- a/models/DataInit.go
+++ b/models/DataInit.go
@ -19,7 +19,7 @@ func RegistDB()  {
 		os.Create(_DB_NAME)
 	}
 	//orm.RegisterModel(new(Attachment),new(Topic))
-	orm.RegisterModel(new(Attachment),new(User),new(Blog))
+	orm.RegisterModel(new(Attachment),new(User),new(Blog),new(NLabel))
 	orm.RegisterDriver(_SQLITE3_DRIVER,orm.DRSqlite)
 	orm.RegisterDataBase("default",_SQLITE3_DRIVER,_DB_NAME,10)
 }
--- a/models/NLabel.go
+++ b/models/NLabel.go
@ -6,5 +6,6 @@ type NLabel struct {
 	Id     int64
 	Title  string
 	UserId int64
+	BlogId int64
 	Ctime  time.Time `orm:"auto_now_add;type(datetime)"`
 }
--- a/service/BlogService.go
+++ b/service/BlogService.go
@ -31,18 +31,22 @@ func FindBlogs() ([]*models.Blog, error) {

 func SaveBlog(blog *models.Blog, strs []string) error {
 	o := orm.NewOrm()
+	o.Begin()
 	id, eror := o.Insert(blog)
 	if eror != nil {
+		o.Rollback()
 		return eror
 	} else {
 		blog.Id = id
 		if strs != nil && len(strs) > 0 {
-			nlabels := make([]*models.NLabel,len(strs))
-			//var nlabels [len(*strs)]*models.NLabel
+			nlabels := make([]*models.NLabel, len(strs))
 			for i := 0; i < len(strs); i++ {
-				nlabels[i] = &models.NLabel{Title:strs[i]}
+				nlabels[i] = &models.NLabel{Title: strs[i], BlogId: id, UserId: blog.UserId}
+			}
+			if _, err := o.InsertMulti(len(nlabels), nlabels); err != nil {
+				o.Rollback()
+				return err
 			}
-			o.InsertMulti(len(nlabels),nlabels)
 		}
 		o.Commit()
 	}
--- a/static/css/login.css
+++ b/static/css/login.css
@ -0,0 +1,18 @@
+.login-root {
+    background: #f0e7db url("/static/img/login.png") no-repeat;
+    padding-top: 50px;
+    position: absolute;
+    min-height: 100%;
+    width: 100%;
+    overflow: hidden;
+}
+
+.login-root .input-container{
+    position: fixed;
+    left: 65%;
+    background: url("/static/img/loginbg.png") no-repeat center top;
+}
+.login-root .input-container .input-root{
+    width: 370px;
+    height: 500px;
+}
--- a/static/img/login.png
+++ b/static/img/login.png
--- a/static/img/loginbg.png
+++ b/static/img/loginbg.png
--- a/views/login.html
+++ b/views/login.html
@ -0,0 +1,17 @@
+{{template "header"}}
+<title>登录 - 个人随笔</title>
+<link type="text/css" rel="styleSheet" href="/static/css/login.css"/>
+</head>
+<body>
+<div class="root-container">
+{{template "nav" .}}
+    <div class="login-root">
+        <div class="input-container">
+            <div class="input-root">
+                <p>登录</p>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>