diff --git a/controllers/BlogController.go b/controllers/BlogController.go index 9743a93..7a0297f 100644 --- a/controllers/BlogController.go +++ b/controllers/BlogController.go @@ -134,7 +134,6 @@ func (this *BlogController) Edit() { func (this *BlogController) Get() { blogService := service.BlogService{} - likeService := service.LikeService{} userService := service.UserService{} idStr := this.Ctx.Input.Param(":id") id, _ := strconv.ParseInt(idStr, 10, 64) @@ -149,12 +148,6 @@ func (this *BlogController) Get() { if blog.UserId == uid.(int64) { this.Data["IsAuthor"] = true } - if flag, err := likeService.IsLike(id, uid.(int64)); err == nil { - this.Data["IsLike"] = flag - } - } - if blogs, err := blogService.TopBlogByUser(blog.UserId); err == nil { - this.Data["Top"] = blogs } this.Data["Blog"] = blog @@ -174,7 +167,6 @@ func (this *BlogController) Get() { func (this *BlogController) Del() { blogService := service.BlogService{} userService := service.UserService{} - likeService := service.LikeService{} uid := this.GetSession("userid") if uid == nil { this.Data["json"] = models.ReurnError(401, "") @@ -205,7 +197,6 @@ func (this *BlogController) Del() { this.Data["json"] = models.ReurnSuccess("") this.ServeJSON() userService.CountBlog(uid.(int64)) - likeService.DelLikeByBlog(id) return } diff --git a/controllers/CommentController.go b/controllers/CommentController.go deleted file mode 100644 index dd203d4..0000000 --- a/controllers/CommentController.go +++ /dev/null @@ -1,88 +0,0 @@ -package controllers - -import ( - "beeblog/models" - "beeblog/service" - beego "github.com/beego/beego/v2/server/web" - "strconv" -) - -type CommentController struct { - beego.Controller -} - -func (this *CommentController) Save() { - commentService := service.CommentService{} - blogService := service.BlogService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - blogId, berr := this.GetInt64("blog") - if blogId == 0 || berr != nil { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - commVal := this.GetString("commval") - blog, err := blogService.ReadBlog(blogId) - if err != nil { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - comm := &models.Comment{BlogId: blogId, CuserId: uid.(int64), BuserId: blog.UserId, ComVal: commVal} - if pid, _ := this.GetInt64("pid"); pid != 0 { - parent := &models.Comment{Id: pid} - if err := commentService.ReadComment(parent); err == nil { - comm.BuserId = parent.CuserId - } - comm.Pid = pid - } - err = commentService.SaveComment(comm) - if err == nil { - this.Data["json"] = models.ReurnData("", comm) - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - userService.CountComments(uid.(int64), blogId) - return -} - -func (this *CommentController) Del() { - commentService := service.CommentService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - comm := &models.Comment{Id: id} - err := commentService.ReadComment(comm) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - this.ServeJSON() - return - } - if comm.CuserId != uid.(int64) { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - err = commentService.DelComment(id) - if err == nil { - this.Data["json"] = models.ReurnSuccess("") - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - userService.CountComments(uid.(int64), id) - return -} diff --git a/controllers/IndexController.go b/controllers/IndexController.go index ae43217..4bc063c 100644 --- a/controllers/IndexController.go +++ b/controllers/IndexController.go @@ -11,14 +11,10 @@ type IndexController struct { func (this *IndexController) Get() { blogService := service.BlogService{} - timeBlog, _ := blogService.IndexBlogs(12, 0) + timeBlog, _ := blogService.IndexBlogs(20, 0) this.Data["TimeBlog"] = timeBlog - browsBlog, _ := blogService.IndexBlogs(12, 1) + browsBlog, _ := blogService.IndexBlogs(20, 1) this.Data["BrowsBlog"] = browsBlog - likeBlog, _ := blogService.IndexBlogs(12, 2) - this.Data["LikeBlog"] = likeBlog - commentBlog, _ := blogService.IndexBlogs(12, 3) - this.Data["CommBlog"] = commentBlog this.Data["UserId"] = this.GetSession("userid") this.Data["HeadImg"] = this.GetSession("headimg") diff --git a/controllers/LikeController.go b/controllers/LikeController.go deleted file mode 100644 index 06d05c2..0000000 --- a/controllers/LikeController.go +++ /dev/null @@ -1,56 +0,0 @@ -package controllers - -import ( - "beeblog/models" - "beeblog/service" - beego "github.com/beego/beego/v2/server/web" - "strconv" -) - -type LikeController struct { - beego.Controller -} - -func (this *LikeController) Save() { - likeService := service.LikeService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - like := &models.Like{BlogId: id, UserId: uid.(int64)} - if _, err := likeService.SaveLike(like); err != nil { - this.Data["json"] = models.ReurnError(500, "保存失败") - } else { - this.Data["json"] = models.ReurnSuccess("") - } - this.ServeJSON() - userService.CountLike(uid.(int64), id) - return -} - -func (this *LikeController) Delete() { - likeService := service.LikeService{} - userService := service.UserService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - like := &models.Like{BlogId: id, UserId: uid.(int64)} - if _, err := likeService.DelLike(like); err != nil { - this.Data["json"] = models.ReurnError(500, "保存失败") - } else { - this.Data["json"] = models.ReurnSuccess("") - } - this.ServeJSON() - userService.CountLike(uid.(int64), id) - return -} diff --git a/controllers/NoteController.go b/controllers/NoteController.go deleted file mode 100644 index 27658a2..0000000 --- a/controllers/NoteController.go +++ /dev/null @@ -1,236 +0,0 @@ -package controllers - -import ( - "beeblog/models" - "beeblog/service" - beego "github.com/beego/beego/v2/server/web" - "strconv" -) - -type NoteController struct { - beego.Controller -} - -func (this *NoteController) Save() { - noteService := service.NoteService{} - pid, _ := this.GetInt64("pid") - title := this.GetString("title") - uid := this.GetSession("userid") - noteHtml := this.GetString("noteHtml") - noteVal := this.GetString("noteVal") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "保存失败") - this.ServeJSON() - return - } - note := &models.Note{Title: title, Pid: pid, UserId: uid.(int64), NoteVal: noteVal, NoteHtml: noteHtml} - err := noteService.SaveNote(note) - if err == nil { - this.Data["json"] = note - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - return -} -func (this *NoteController) Edit() { - noteService := service.NoteService{} - idStr := this.Ctx.Input.Param(":id") - noteHtml := this.GetString("noteHtml") - noteVal := this.GetString("noteVal") - id, _ := strconv.ParseInt(idStr, 10, 64) - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - note := &models.Note{Id: id} - err1 := noteService.GetNote(note) - if err1 != nil { - this.Data["json"] = models.ReurnError(500, "保存失败") - this.ServeJSON() - return - } - if uid != note.UserId { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - note.NoteHtml = noteHtml - note.NoteVal = noteVal - err := noteService.EditNote(note) - if err == nil { - this.Data["json"] = models.ReurnSuccess("") - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - return -} - -func (this *NoteController) SaveNoteColl() { - noteService := service.NoteService{} - title := this.GetString("title") - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - note := &models.NoteColl{Title: title, UserId: uid.(int64)} - err := noteService.SaveNoteColl(note) - if err == nil { - this.Data["json"] = models.ReurnData("", note) - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - return -} - -func (this *NoteController) EditNoteColl() { - noteService := service.NoteService{} - title := this.GetString("title") - id, _ := this.GetInt64("id") - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - err := noteService.EditNoteColl(title, id, uid.(int64)) - if err == nil { - this.Data["json"] = models.ReurnSuccess("") - } else { - this.Data["json"] = models.ReurnError(500, "保存失败") - } - this.ServeJSON() - return -} - -func (this *NoteController) Get() { - noteService := service.NoteService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - note := &models.Note{Id: id} - err := noteService.GetNote(note) - if err == nil { - this.Data["json"] = note - } - if note.UserId != uid.(int64) { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - this.ServeJSON() - return -} -func (this *NoteController) DelNoteColl() { - noteService := service.NoteService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - err := noteService.DelNoteColl(id, uid.(int64)) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - } else { - this.Data["json"] = models.ReurnSuccess("") - } - this.ServeJSON() - return -} - -func (this *NoteController) Delete() { - noteService := service.NoteService{} - uid := this.GetSession("userid") - if uid == nil { - this.Data["json"] = models.ReurnError(401, "") - this.ServeJSON() - return - } - idStr := this.Ctx.Input.Param(":id") - id, _ := strconv.ParseInt(idStr, 10, 64) - note := &models.Note{Id: id} - err := noteService.GetNote(note) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - this.ServeJSON() - return - } - if note.UserId != uid.(int64) { - this.Data["json"] = models.ReurnError(403, "") - this.ServeJSON() - return - } - err = noteService.DelNote(note) - if err != nil { - this.Data["json"] = models.ReurnError(500, "") - this.ServeJSON() - return - } - this.Data["json"] = models.ReurnSuccess("") - this.ServeJSON() - return -} - -func (this *NoteController) Note() { - noteService := service.NoteService{} - uid := this.GetSession("userid") - if uid == nil { - this.Redirect("/login", 302) - return - } - noteColls, err := noteService.GetNoteColl(uid.(int64)) - if err == nil { - if len(noteColls) > 0 { - for i := 0; i < len(noteColls); i++ { - notes, err1 := noteService.GetNoteByPid(noteColls[i].Id) - if err1 == nil { - noteColls[i].Notes = notes - } - } - } - } else { - noteColls = make([]*models.NoteColl, 0) - } - this.Data["HeadImg"] = this.GetSession("headimg") - this.Data["NickName"] = this.GetSession("nickname") - this.Data["NoteColls"] = noteColls - this.TplName = "note.html" -} - -func (this *NoteController) NoteApi() { - noteService := service.NoteService{} - uid := this.GetSession("userid") - if uid == nil { - this.Redirect("/login", 302) - return - } - noteColls, err := noteService.GetNoteColl(uid.(int64)) - if err == nil { - if len(noteColls) > 0 { - for i := 0; i < len(noteColls); i++ { - notes, err1 := noteService.GetNoteByPid(noteColls[i].Id) - if err1 == nil { - noteColls[i].Notes = notes - } - } - } - } else { - noteColls = make([]*models.NoteColl, 0) - } - this.Data["json"] = noteColls - this.ServeJSON() -} diff --git a/models/Blog.go b/models/Blog.go index 6575343..14d7ef6 100644 --- a/models/Blog.go +++ b/models/Blog.go @@ -8,14 +8,12 @@ type Blog struct { Id int64 UserId int64 Title string - BlogValue string `orm:"type(text)"` - BlogHtml string `orm:"type(text)"` + BlogValue string `orm:"type(text)"` + BlogHtml string `orm:"type(text)"` BlogDesc string Ctime time.Time `orm:"auto_now_add;type(datetime)"` Utime time.Time `orm:"auto_now_add;type(datetime)"` Browses int64 `orm:"default(0)"` - Likes int64 `orm:"default(0)"` - Comments int64 `orm:"default(0)"` Top int `orm:"default(0)"` Hot int `orm:"default(0)"` Ttime time.Time `orm:"null;type(date)"` @@ -23,10 +21,9 @@ type Blog struct { Delflag int `orm:"default(0)"` CategoryId int64 - User *User `orm:"-"` - UserName string `orm:"-"` - HeadImg string `orm:"-"` - CateName string `orm:"-"` - Lables []*NLabel `orm:"-"` - Comms []*Comment `orm:"-"` + User *User `orm:"-"` + UserName string `orm:"-"` + HeadImg string `orm:"-"` + CateName string `orm:"-"` + Lables []*NLabel `orm:"-"` } diff --git a/models/Comment.go b/models/Comment.go deleted file mode 100644 index 8cead8d..0000000 --- a/models/Comment.go +++ /dev/null @@ -1,17 +0,0 @@ -package models - -import "time" - -type Comment struct { - Id int64 - CuserId int64 `orm:"default(0)"` - BuserId int64 `orm:"default(0)"` - BlogId int64 `orm:"default(0)"` - Ctime time.Time `orm:"auto_now_add;type(datetime)"` - Pid int64 `orm:"default(0)"` - ComVal string `orm:"type(text)"` - - Childs []*Comment `orm:"-"` - CUser *User `orm:"-"` - BUser *User `orm:"-"` -} diff --git a/models/DataInit.go b/models/DataInit.go index 4d80618..3b68f56 100644 --- a/models/DataInit.go +++ b/models/DataInit.go @@ -12,7 +12,7 @@ func RegistDB() { fmt.Println(dbUrl) orm.RegisterDriver("mysql", orm.DRMySQL) orm.RegisterDataBase("default", "mysql", "root:"+dbUrl+"/beeblog?charset=utf8&loc=Local") - orm.RegisterModel(new(User), new(Blog), new(NLabel), new(Note), new(NoteColl), new(Category), new(Like), new(Comment)) + orm.RegisterModel(new(User), new(Blog), new(NLabel), new(Category)) orm.RunSyncdb("default", false, true) } diff --git a/models/Like.go b/models/Like.go deleted file mode 100644 index 46b4610..0000000 --- a/models/Like.go +++ /dev/null @@ -1,16 +0,0 @@ -package models - -import "time" - -type Like struct { - Id int64 - UserId int64 - BlogId int64 - Ltime time.Time `orm:"auto_now_add;type(datetime)"` - - Blog *Blog `orm:"-"` -} - -func (u *Like) TableName() string { - return "tb_like" -} \ No newline at end of file diff --git a/models/Note.go b/models/Note.go deleted file mode 100644 index 63fdbb2..0000000 --- a/models/Note.go +++ /dev/null @@ -1,16 +0,0 @@ -package models - -import "time" - -/** - 笔记 - */ -type Note struct { - Id int64 - UserId int64 - Title string - NoteHtml string `orm:"type(text)"` - NoteVal string `orm:"type(text)"` - Pid int64 - Utime time.Time `orm:"auto_now_add;type(datetime)"` -} diff --git a/models/NoteColl.go b/models/NoteColl.go deleted file mode 100644 index 7f955a5..0000000 --- a/models/NoteColl.go +++ /dev/null @@ -1,13 +0,0 @@ -package models - -/** - 文章 - */ -type NoteColl struct { - Id int64 - UserId int64 - Title string - - Notes []*Note `orm:"-"` - Count int64 `orm:"-"` -} diff --git a/routers/CommentRouter.go b/routers/CommentRouter.go deleted file mode 100644 index 8c435b5..0000000 --- a/routers/CommentRouter.go +++ /dev/null @@ -1,11 +0,0 @@ -package routers - -import ( - "beeblog/controllers" - beego "github.com/beego/beego/v2/server/web" -) - -func init() { - beego.Router("/api/comms/save", &controllers.CommentController{}, "post:Save") - beego.Router("/api/comms/del/:id([0-9]+)", &controllers.CommentController{}, "get:Del") -} diff --git a/routers/LikeRouter.go b/routers/LikeRouter.go deleted file mode 100644 index 4791d25..0000000 --- a/routers/LikeRouter.go +++ /dev/null @@ -1,11 +0,0 @@ -package routers - -import ( - "beeblog/controllers" - beego "github.com/beego/beego/v2/server/web" -) - -func init() { - beego.Router("/api/like/:id([0-9]+)", &controllers.LikeController{}, "get:Save") - beego.Router("/api/unlike/:id([0-9]+)", &controllers.LikeController{}, "get:Delete") -} diff --git a/routers/NoteRouter.go b/routers/NoteRouter.go deleted file mode 100644 index f91cfff..0000000 --- a/routers/NoteRouter.go +++ /dev/null @@ -1,18 +0,0 @@ -package routers - -import ( - "beeblog/controllers" - beego "github.com/beego/beego/v2/server/web" -) - -func init() { - beego.Router("/api/note/:id([0-9]+)", &controllers.NoteController{}, "get:Get") - beego.Router("/note", &controllers.NoteController{}, "get:Note") - beego.Router("/api/note", &controllers.NoteController{}, "get:NoteApi") - beego.Router("/api/notecoll/save", &controllers.NoteController{}, "post:SaveNoteColl") - beego.Router("/api/notecoll/edit", &controllers.NoteController{}, "post:EditNoteColl") - beego.Router("/api/note/save", &controllers.NoteController{}, "post:Save") - beego.Router("/api/note/edit/:id([0-9]+)", &controllers.NoteController{}, "post:Edit") - beego.Router("/api/note/del/:id([0-9]+)", &controllers.NoteController{}, "post:Delete") - beego.Router("/api/notecol/del/:id([0-9]+)", &controllers.NoteController{}, "post:DelNoteColl") -} diff --git a/service/BlogService.go b/service/BlogService.go index a0cb824..b94e284 100644 --- a/service/BlogService.go +++ b/service/BlogService.go @@ -60,7 +60,6 @@ func (this *BlogService) ReadBlog(id int64) (*models.Blog, error) { } func (this *BlogService) GetBlog(id int64) (*models.Blog, error) { - commentService := CommentService{} o := orm.NewOrm() blog := &models.Blog{Id: id} err := o.Read(blog) @@ -78,9 +77,9 @@ func (this *BlogService) GetBlog(id int64) (*models.Blog, error) { if err == nil { blog.Lables = labels } - comms, berr := commentService.FindCommentByBlog(id) - if berr == nil { - blog.Comms = comms + category := &models.Category{Id: blog.CategoryId} + if err := o.Read(category); err == nil { + blog.CateName = category.Title } return blog, nil } diff --git a/service/CommentService.go b/service/CommentService.go deleted file mode 100644 index 04b0570..0000000 --- a/service/CommentService.go +++ /dev/null @@ -1,83 +0,0 @@ -package service - -import ( - "beeblog/models" - "fmt" - "github.com/beego/beego/v2/client/orm" -) - -type CommentService struct { -} - -func (this *CommentService) FindCommentByBlog(bid int64) ([]*models.Comment, error) { - var comms []*models.Comment - o := orm.NewOrm() - _, err := o.QueryTable(&models.Comment{}).Filter("Pid", 0).Filter("BlogId", bid).OrderBy("-Ctime").All(&comms) - if err != nil { - return nil, err - } - if len(comms) > 0 { - for i := 0; i < len(comms); i++ { - var childs []*models.Comment - _, childerrr := o.QueryTable(&models.Comment{}).Filter("Pid", comms[i].Id).OrderBy("-Ctime").All(&childs) - if childerrr == nil { - if len(childs) > 0 { - comms[i].Childs = childs - for j := 0; j < len(childs); j++ { - cuser := &models.User{Id: childs[j].CuserId} - o.Read(cuser) - childs[j].CUser = cuser - buser := &models.User{Id: childs[j].BuserId} - o.Read(buser) - childs[j].BUser = buser - } - } - } - cuser := &models.User{Id: comms[i].CuserId} - o.Read(cuser) - comms[i].CUser = cuser - } - } - return comms, nil -} - -func (this *CommentService) SaveComment(comment *models.Comment) error { - o := orm.NewOrm() - id, err := o.Insert(comment) - if err == nil { - comment.Id = id - cuser := &models.User{Id: comment.CuserId} - o.Read(cuser) - comment.CUser = cuser - if comment.BuserId != 0 { - buser := &models.User{Id: comment.BuserId} - o.Read(buser) - comment.BUser = buser - } - return nil - } - return err -} - -func (this *CommentService) ReadComment(comment *models.Comment) error { - return orm.NewOrm().Read(comment) -} - -func (this *CommentService) DelComment(id int64) error { - comm := &models.Comment{Id: id} - o := orm.NewOrm() - err := o.Read(comm) - if err != nil { - return err - } - if comm.Pid != 0 { - if _, err := o.QueryTable(models.Comment{}).Filter("Pid", id).Delete(); err != nil { - fmt.Println(err) - } - - } - if _, err := o.Delete(comm); err != nil { - return err - } - return nil -} diff --git a/service/LikeService.go b/service/LikeService.go deleted file mode 100644 index e512be7..0000000 --- a/service/LikeService.go +++ /dev/null @@ -1,71 +0,0 @@ -package service - -import ( - "beeblog/models" - "beeblog/utils" - "fmt" - "github.com/beego/beego/v2/client/orm" -) - -type LikeService struct { -} - -func (this *LikeService) SaveLike(like *models.Like) (int64, error) { - return orm.NewOrm().Insert(like) -} -func (this *LikeService) DelLike(like *models.Like) (int64, error) { - return orm.NewOrm().QueryTable(models.Like{}).Filter("BlogId", like.BlogId).Filter("UserId", like.UserId).Delete() -} - -func (this *LikeService) IsLike(bid int64, uid int64) (bool, error) { - totalCount, err := orm.NewOrm().QueryTable(&models.Like{}).Filter("BlogId", bid).Filter("UserId", uid).Count() - if err == nil { - fmt.Println(totalCount, "like count") - if totalCount > 0 { - return true, nil - } else { - return false, nil - } - } else { - fmt.Println(err) - return false, err - } -} - -func (this *LikeService) MeLikes(num int, size int, uid int64) (*utils.Page, error) { - page, err := this.countLike(num, size, uid) - if err != nil { - return nil, err - } - var likes []*models.Like - o := orm.NewOrm() - qs := o.QueryTable(&models.Like{}) - qs = qs.Filter("UserId", uid) - qs = qs.Limit(size, (page.PageNo-1)*size) - if _, err = qs.All(&likes); err != nil { - return nil, err - } - if len(likes) > 0 { - for i := 0; i < len(likes); i++ { - blog := &models.Blog{Id: likes[i].BlogId} - if err := o.Read(blog); err == nil { - likes[i].Blog = blog - } - } - } - page.List = likes - return page, nil -} - -func (this *LikeService) countLike(num int, size int, uid int64) (*utils.Page, error) { - o := orm.NewOrm() - qs := o.QueryTable(&models.Like{}) - totalCount, err := qs.Filter("UserId", uid).Count() - if err != nil { - return nil, err - } - return utils.PageUtil(totalCount, num, size), nil -} -func (likeService LikeService) DelLikeByBlog(id int64) { - orm.NewOrm().QueryTable(models.Like{}).Filter("BlogId", id).Delete() -} diff --git a/service/NoteService.go b/service/NoteService.go deleted file mode 100644 index 41df422..0000000 --- a/service/NoteService.go +++ /dev/null @@ -1,105 +0,0 @@ -package service - -import ( - "beeblog/models" - "errors" - "github.com/beego/beego/v2/client/orm" -) - -type NoteService struct { -} - -func (this *NoteService) EditNote(note *models.Note) error { - o := orm.NewOrm() - id, err := o.Update(note) - if err == nil { - note.Id = id - } - return err -} - -func (this *NoteService) SaveNote(note *models.Note) error { - o := orm.NewOrm() - id, err := o.Insert(note) - if err == nil { - note.Id = id - } - return err -} - -func (this *NoteService) GetNote(note *models.Note) error { - o := orm.NewOrm() - return o.Read(note) -} - -func (this *NoteService) DelNote(note *models.Note) error { - o := orm.NewOrm() - _, err := o.Delete(note) - return err -} - -func (this *NoteService) GetNoteByPid(pid int64) ([]*models.Note, error) { - var notes []*models.Note - o := orm.NewOrm() - qs := o.QueryTable(models.Note{}) - _, err := qs.Filter("Pid", pid).All(¬es) - return notes, err -} - -func (this *NoteService) CountNote(pid int64) (int64, error) { - o := orm.NewOrm() - totalCount, err := o.QueryTable(&models.Note{}).Filter("Pid", pid).Count() - if err != nil { - return 0, err - } - return totalCount, nil -} - -func (this *NoteService) SaveNoteColl(note *models.NoteColl) error { - o := orm.NewOrm() - id, err := o.Insert(note) - if err == nil { - note.Id = id - } - return err -} - -func (this *NoteService) EditNoteColl(title string, id int64, uid int64) error { - o := orm.NewOrm() - noteColl := &models.NoteColl{Id: id} - - if err := o.Read(noteColl); err != nil { - return err - } - if noteColl.UserId != uid { - return errors.New("403") - } - noteColl.Title = title - _, err := o.Update(noteColl, "Title") - return err -} - -func (this *NoteService) GetNoteColl(uid int64) ([]*models.NoteColl, error) { - var notes []*models.NoteColl - o := orm.NewOrm() - qs := o.QueryTable(models.NoteColl{}) - _, err := qs.Filter("UserId", uid).All(¬es) - return notes, err -} - -func (this *NoteService) DelNoteColl(id int64, uid int64) error { - o := orm.NewOrm() - noteColl := &models.NoteColl{Id: id} - - if err := o.Read(noteColl); err != nil { - return err - } - if uid != noteColl.UserId { - return errors.New("403") - } - _, err := o.QueryTable(models.Note{}).Filter("Pid", id).Delete() - if err == nil { - _, err = o.Delete(noteColl) - } - return err -} diff --git a/utils/EsUtil.go b/utils/EsUtil.go index ef9a90f..f4b4259 100644 --- a/utils/EsUtil.go +++ b/utils/EsUtil.go @@ -4,13 +4,9 @@ import ( "beeblog/models" "context" "fmt" - beego "github.com/beego/beego/v2/server/web" "github.com/olivere/elastic" - "log" - "os" "reflect" "strconv" - "time" ) var client *elastic.Client @@ -48,21 +44,21 @@ const mapping = ` } }` -func init() { - host, _ := beego.AppConfig.String("eshost") - var err error - client, err = elastic.NewClient( - elastic.SetURL(host), - elastic.SetSniff(false), - elastic.SetHealthcheckInterval(10*time.Second), - elastic.SetGzip(true), - elastic.SetErrorLog(log.New(os.Stderr, "ELASTIC ", log.LstdFlags)), - elastic.SetInfoLog(log.New(os.Stdout, "", log.LstdFlags))) - - if err != nil { - panic(err) - } -} +//func init() { +// host, _ := beego.AppConfig.String("eshost") +// var err error +// client, err = elastic.NewClient( +// elastic.SetURL(host), +// elastic.SetSniff(false), +// elastic.SetHealthcheckInterval(10*time.Second), +// elastic.SetGzip(true), +// elastic.SetErrorLog(log.New(os.Stderr, "ELASTIC ", log.LstdFlags)), +// elastic.SetInfoLog(log.New(os.Stdout, "", log.LstdFlags))) +// +// if err != nil { +// panic(err) +// } +//} func Index() { ctx := context.Background() diff --git a/views/T.me.tpl b/views/T.me.tpl index b65a485..0acd786 100644 --- a/views/T.me.tpl +++ b/views/T.me.tpl @@ -15,16 +15,6 @@ {{.User.BlogBrowes}} -
-
- 评论: - {{.User.BlogComment}} -
-
- 喜欢: - {{.User.BlogLike}} -
-

我的博客

我的资料

diff --git a/views/blog.html b/views/blog.html index fd02962..e46fdda 100644 --- a/views/blog.html +++ b/views/blog.html @@ -19,7 +19,7 @@
{{.Blog.User.NickName}}
- {{.Blog.Ctime.Format "2006-01-02"}}阅读 {{.Blog.Browses}} + {{.Blog.Ctime.Format "2006-01-02"}} {{.Blog.CateName}} 阅读量 {{.Blog.Browses}}
{{range .Blog.Lables}} diff --git a/views/index.html b/views/index.html index 86ff467..3f92828 100644 --- a/views/index.html +++ b/views/index.html @@ -25,22 +25,6 @@

查看更多...

-
-
-
收藏排行
- {{range .LikeBlog}} -

{{.Title}}

- {{end}} -

查看更多...

-
-
-
人气最旺
- {{range .CommBlog}} -

{{.Title}}

- {{end}} -

查看更多...

-
-
{{template "footer"}} diff --git a/views/note.html b/views/note.html deleted file mode 100644 index ac6b132..0000000 --- a/views/note.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - - - 我的笔记 - 码农随笔 - - - - - - - - - - -
-
- -
- - - - - ${ item.title } - - - - - - - - - - - - - - - - - 新建文件夹 - 新建笔记 - - - - ${note.Title} - - - - - -
- - - - \ No newline at end of file