xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beta2 ok

Browse Source
This commit is contained in:
life
2014-11-12 17:32:03 +08:00
parent d979a0c3e2
commit 1f45666ec4
119 changed files with 2463 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

409
app/controllers/BlogController.go
View File

@ -4,11 +4,11 @@ import (
"github.com/revel/revel"
"strings"
// "encoding/json"
"fmt"
"github.com/leanote/leanote/app/info"
. "github.com/leanote/leanote/app/lea"
"github.com/leanote/leanote/app/lea/blog"
"gopkg.in/mgo.v2/bson"
"fmt"
// "github.com/leanote/leanote/app/types"
// "io/ioutil"
// "math"
@ -47,26 +47,25 @@ $.bootstrapCssUrl
$.bootstrapJsUrl
*/
func (c Blog) render(templateName string, themePath string) revel.Result {
isPreview := false
if c.RenderArgs["isPreview"] != nil {
if c.RenderArgs["isPreview"] != nil {
themePath2 := c.RenderArgs["themePath"]
if themePath2 == nil {
return c.E404();
return c.E404()
}
isPreview = true
themePath = themePath2.(string)
c.setPreviewUrl()
}
return blog.RenderTemplate(templateName, c.RenderArgs, revel.BasePath + "/" + themePath, isPreview)
return blog.RenderTemplate(templateName, c.RenderArgs, revel.BasePath+"/"+themePath, isPreview)
}
// 404
func (c Blog) e404(themePath string) revel.Result {
// 不知道是谁的404, 则用系统的404
if themePath == "" {
return c.E404();
return c.E404()
}
return c.render("404.html", themePath)
}
@ -101,24 +100,24 @@ func (c Blog) domain() (ok bool, userBlog info.UserBlog) {
// 渲染模板之
func (c Blog) setPreviewUrl() {
var indexUrl, postUrl, searchUrl, cateUrl, singleUrl, tagsUrl, archiveUrl string
userId := c.GetUserId()
themeId := c.Session["themeId"]
theme := themeService.GetTheme(userId, themeId)
siteUrl := configService.GetSiteUrl()
blogUrl := siteUrl + "/preview" // blog.leanote.com
userIdOrEmail := userId
indexUrl = blogUrl + "/" + userIdOrEmail
cateUrl = blogUrl + "/cate" // /notebookId
postUrl = blogUrl + "/post" // /xxxxx
searchUrl = blogUrl + "/search/" + userIdOrEmail // blog.leanote.com/search/userId
singleUrl = blogUrl + "/single" // blog.leanote.com/single/singleId
cateUrl = blogUrl + "/cate" // /notebookId
postUrl = blogUrl + "/post" // /xxxxx
searchUrl = blogUrl + "/search/" + userIdOrEmail // blog.leanote.com/search/userId
singleUrl = blogUrl + "/single" // blog.leanote.com/single/singleId
archiveUrl = blogUrl + "/archives/" + userIdOrEmail // blog.leanote.com/archive/userId
tagsUrl = blogUrl + "/tags/" + userIdOrEmail // blog.leanote.com/archive/userId
tagsUrl = blogUrl + "/tags/" + userIdOrEmail // blog.leanote.com/archive/userId
c.RenderArgs["indexUrl"] = indexUrl
c.RenderArgs["cateUrl"] = cateUrl
c.RenderArgs["postUrl"] = postUrl
@ -127,7 +126,7 @@ func (c Blog) setPreviewUrl() {
c.RenderArgs["archiveUrl"] = archiveUrl
c.RenderArgs["archivesUrl"] = archiveUrl // 别名
c.RenderArgs["tagsUrl"] = tagsUrl
c.RenderArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail
c.RenderArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail
c.RenderArgs["tagUrl"] = c.RenderArgs["tagPostsUrl"]
// themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的
@ -137,89 +136,55 @@ func (c Blog) setPreviewUrl() {
// 各种地址设置
func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) {
// 主页 http://leanote.com/blog/life or http://blog.leanote.com/life or http:// xxxx.leanote.com or aa.com
var indexUrl, postUrl, searchUrl, cateUrl, singleUrl, tagsUrl, archiveUrl, tagPostsUrl, staticUrl string
host := c.Request.Request.Host
staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
var staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
// staticUrl == host, 为保证同源!!! 只有host, http://leanote.com, http://blog/leanote.com
// life.leanote.com, lealife.com
siteUrl := configService.GetSiteUrl()
if userBlog.Domain != "" && configService.AllowCustomDomain() {
// ok
indexUrl = configService.GetUserUrl(userBlog.Domain)
cateUrl = indexUrl + "/cate" // /xxxxx
postUrl = indexUrl + "/post" // /xxxxx
searchUrl = indexUrl + "/search" // /xxxxx
singleUrl = indexUrl + "/single"
archiveUrl = indexUrl + "/archives"
tagsUrl = indexUrl + "/tags"
tagPostsUrl = indexUrl + "/tag"
} else if userBlog.SubDomain != "" {
indexUrl = configService.GetUserSubUrl(userBlog.SubDomain)
cateUrl = indexUrl + "/cate" // /xxxxx
postUrl = indexUrl + "/post" // /xxxxx
searchUrl = indexUrl + "/search" // /xxxxx
singleUrl = indexUrl + "/single"
archiveUrl = indexUrl + "/archives"
tagsUrl = indexUrl + "/tags"
tagPostsUrl = indexUrl + "/tag"
} else {
// ok
blogUrl := configService.GetBlogUrl() // blog.leanote.com
userIdOrEmail := ""
if userInfo.Username != "" {
userIdOrEmail = userInfo.Username
} else if userInfo.Email != "" {
userIdOrEmail = userInfo.Email
} else {
userIdOrEmail = userInfo.UserId.Hex()
}
indexUrl = blogUrl + "/" + userIdOrEmail
cateUrl = blogUrl + "/cate" // /notebookId
postUrl = blogUrl + "/post" // /xxxxx
searchUrl = blogUrl + "/search/" + userIdOrEmail // blog.leanote.com/search/userId
singleUrl = blogUrl + "/single" // blog.leanote.com/single/singleId
archiveUrl = blogUrl + "/archives/" + userIdOrEmail // blog.leanote.com/archive/userId
tagsUrl = blogUrl + "/tags/" + userIdOrEmail
tagPostsUrl = blogUrl + "/tag/" + userIdOrEmail // blog.leanote.com/archive/userId
}
blogUrls := blogService.GetBlogUrls(&userBlog, &userInfo)
// 分类
// 搜索
// 查看
c.RenderArgs["siteUrl"] = siteUrl
c.RenderArgs["indexUrl"] = indexUrl
c.RenderArgs["cateUrl"] = cateUrl
c.RenderArgs["postUrl"] = postUrl
c.RenderArgs["searchUrl"] = searchUrl
c.RenderArgs["singleUrl"] = singleUrl // 单页
c.RenderArgs["archiveUrl"] = archiveUrl
c.RenderArgs["archivesUrl"] = archiveUrl // 别名
c.RenderArgs["tagsUrl"] = tagsUrl
c.RenderArgs["tagPostsUrl"] = tagPostsUrl
c.RenderArgs["tagUrl"] = c.RenderArgs["tagPostsUrl"] // 别名
c.RenderArgs["indexUrl"] = blogUrls.IndexUrl
c.RenderArgs["cateUrl"] = blogUrls.CateUrl
c.RenderArgs["postUrl"] = blogUrls.PostUrl
c.RenderArgs["searchUrl"] = blogUrls.SearchUrl
c.RenderArgs["singleUrl"] = blogUrls.SingleUrl // 单页
c.RenderArgs["archiveUrl"] = blogUrls.ArchiveUrl
c.RenderArgs["archivesUrl"] = blogUrls.ArchiveUrl // 别名
c.RenderArgs["tagsUrl"] = blogUrls.TagsUrl
c.RenderArgs["tagPostsUrl"] = blogUrls.TagPostsUrl
c.RenderArgs["tagUrl"] = blogUrls.TagPostsUrl // 别名
// themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的
c.RenderArgs["themeBaseUrl"] = "/" + userBlog.ThemePath
// 其它static js
c.RenderArgs["jQueryUrl"] = siteUrl + "/js/jquery-1.9.0.min.js"
c.RenderArgs["prettifyJsUrl"] = siteUrl + "/js/google-code-prettify/prettify.js"
c.RenderArgs["prettifyCssUrl"] = siteUrl + "/js/google-code-prettify/prettify.css"
c.RenderArgs["blogCommonJsUrl"] = siteUrl + "/public/blog/js/common.js"
c.RenderArgs["shareCommentCssUrl"] = siteUrl + "/public/blog/css/share_comment.css"
c.RenderArgs["shareCommentJsUrl"] = siteUrl + "/public/blog/js/share_comment.js"
c.RenderArgs["fontAwesomeUrl"] = staticUrl + "/css/font-awesome-4.2.0/css/font-awesome.css"
c.RenderArgs["bootstrapCssUrl"] = siteUrl + "/css/bootstrap.css"
c.RenderArgs["bootstrapJsUrl"] = siteUrl + "/js/bootstrap-min.js"
}
// 笔记本分类
// cates = [{title:"xxx", cateId: "xxxx"}, {}]
func (c Blog) getCateUrlTitle(n *info.Notebook) string {
if n.UrlTitle != "" {
return n.UrlTitle
}
return n.NotebookId.Hex()
}
func (c Blog) getCates(userBlog info.UserBlog) {
notebooks := blogService.ListBlogNotebooks(userBlog.UserId.Hex())
notebooksMap := map[string]info.Notebook{}
@ -236,7 +201,7 @@ func (c Blog) getCates(userBlog info.UserBlog) {
if cateIds != nil && len(cateIds) > 0 {
for _, cateId := range cateIds {
if n, ok := notebooksMap[cateId]; ok {
cates[i] = map[string]string{"Title": n.Title, "CateId": n.NotebookId.Hex()}
cates[i] = map[string]string{"Title": n.Title, "UrlTitle": c.getCateUrlTitle(&n), "CateId": n.NotebookId.Hex()}
i++
has[cateId] = true
}
@ -246,7 +211,7 @@ func (c Blog) getCates(userBlog info.UserBlog) {
for _, n := range notebooks {
id := n.NotebookId.Hex()
if !has[id] {
cates[i] = map[string]string{"Title": n.Title, "CateId": id}
cates[i] = map[string]string{"Title": n.Title, "UrlTitle": c.getCateUrlTitle(&n), "CateId": id}
i++
}
}
@ -279,39 +244,15 @@ func (c Blog) setBlog(userBlog info.UserBlog, userInfo info.User) {
"Logo": userBlog.Logo,
"OpenComment": userBlog.CanComment,
"CommentType": userBlog.CommentType, // leanote, or disqus
"DisqusId": userBlog.DisqusId,
"DisqusId": userBlog.DisqusId,
"ThemeId": userBlog.ThemeId,
"SubDomain": userBlog.SubDomain,
"Domain": userBlog.Domain,
}
c.RenderArgs["blogInfo"] = blogInfo
/*
blogInfo := info.BlogInfoCustom{
UserId: userBlog.UserId.Hex(),
Username: userInfo.Username,
UserLogo: userInfo.Logo,
Title: userBlog.Title,
SubTitle: userBlog.SubTitle,
Logo: userBlog.Logo,
OpenComment: userBlog.CanComment,
CommentType: userBlog.CommentType, // leanote, or disqus
ThemeId: userBlog.ThemeId,
SubDomain: userBlog.SubDomain,
Domain: userBlog.Domain,
}
*/
}
func (c Blog) setPaging(pageInfo info.Page) {
/*
// 这些分类信息用一个变量
paging := map[string]interface{}{ // 分页信息
"CurPage": pageInfo.CurPage, // 当前页
"TotalPage": pageInfo.TotalPage, // 总页数
"PerPageSize": pageInfo.PerPageSize, // 每一页的记录数
"Count": pageInfo.Count, // 总记录数
}
*/
c.RenderArgs["paging"] = pageInfo
}
@ -323,13 +264,13 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
return false, userBlog
}
}
// c.RenderArgs["userInfo"] = userInfo
// c.RenderArgs["userInfo"] = userInfo
// 最新笔记
_, recentBlogs := blogService.ListBlogs(userId, "", 1, 5, userBlog.SortField, userBlog.IsAsc)
c.RenderArgs["recentPosts"] = c.fixBlogs(recentBlogs)
c.RenderArgs["latestPosts"] = c.RenderArgs["recentPosts"]
c.RenderArgs["tags"] = blogService.GetBlogTags(userId)
c.RenderArgs["recentPosts"] = blogService.FixBlogs(recentBlogs)
c.RenderArgs["latestPosts"] = c.RenderArgs["recentPosts"]
c.RenderArgs["tags"] = blogService.GetBlogTags(userId)
// 语言, url地址
c.SetLocale()
@ -339,7 +280,7 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
userBlog = blogService.GetUserBlog(userId)
}
c.setBlog(userBlog, userInfo)
// c.RenderArgs["userBlog"] = userBlog
// c.RenderArgs["userBlog"] = userBlog
// 分类导航
c.getCates(userBlog)
@ -352,42 +293,14 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
// 当前分类Id, 全设为""
c.RenderArgs["curCateId"] = ""
c.RenderArgs["curSingleId"] = ""
// 得到主题信息
themeInfo := themeService.GetThemeInfo(userBlog.ThemeId.Hex(), userBlog.Style)
LogJ(themeInfo)
c.RenderArgs["themeInfo"] = themeInfo
return true, userBlog
}
// 修复博客, index, cate用到
func (c Blog) fixBlog(blog info.BlogItem) info.Post {
blog2 := info.Post{
NoteId: blog.NoteId.Hex(),
Title: blog.Title,
CreatedTime: blog.CreatedTime,
UpdatedTime: blog.UpdatedTime,
PublicTime: blog.PublicTime,
Desc: blog.Desc,
Abstract: blog.Abstract,
Content: blog.Content,
Tags: blog.Tags,
CommentNum: blog.CommentNum,
ReadNum: blog.ReadNum,
LikeNum: blog.LikeNum,
IsMarkdown: blog.IsMarkdown,
}
return blog2
}
func (c Blog) fixBlogs(blogs []info.BlogItem) []info.Post {
blogs2 := make([]info.Post, len(blogs))
for i, blog := range blogs {
blogs2[i] = c.fixBlog(blog)
}
return blogs2
}
// 404
func (c Blog) E(userIdOrEmail, tag string) revel.Result {
ok, userBlog := c.domain()
@ -403,8 +316,8 @@ func (c Blog) E(userIdOrEmail, tag string) revel.Result {
userInfo = userService.GetUserInfoByAny(userIdOrEmail)
}
userId = userInfo.UserId.Hex()
_, userBlog = c.blogCommon(userId, userBlog, userInfo);
_, userBlog = c.blogCommon(userId, userBlog, userInfo)
return c.e404(userBlog.ThemePath)
}
@ -413,10 +326,10 @@ func (c Blog) Tags(userIdOrEmail string) (re revel.Result) {
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
@ -448,10 +361,10 @@ func (c Blog) Tag(userIdOrEmail, tag string) (re revel.Result) {
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
@ -465,23 +378,23 @@ func (c Blog) Tag(userIdOrEmail, tag string) (re revel.Result) {
userInfo = userService.GetUserInfoByAny(userIdOrEmail)
}
userId = userInfo.UserId.Hex()
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
}
if hasDomain && tag == "" {
tag = userIdOrEmail
}
c.RenderArgs["curIsTagPosts"] = true
c.RenderArgs["curTag"] = tag
page := c.GetPage()
pageInfo, blogs := blogService.SearchBlogByTags([]string{tag}, userId, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
c.setPaging(pageInfo)
c.RenderArgs["posts"] = c.fixBlogs(blogs)
c.RenderArgs["posts"] = blogService.FixBlogs(blogs)
tagPostsUrl := c.RenderArgs["tagPostsUrl"].(string)
c.RenderArgs["pagingBaseUrl"] = tagPostsUrl + "/" + tag
@ -496,7 +409,7 @@ func (c Blog) Archives(userIdOrEmail string, cateId string, year, month int) (re
defer func() {
if err := recover(); err != nil {
fmt.Println(err)
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
@ -532,59 +445,52 @@ func (c Blog) Archives(userIdOrEmail string, cateId string, year, month int) (re
}
c.RenderArgs["curYear"] = year
c.RenderArgs["curMonth"] = month
return c.render("archive.html", userBlog.ThemePath)
}
// 进入某个用户的博客
// TODO 可以配置, 排序和数目
var blogPageSize = 5
var searchBlogPageSize = 30
// 分类 /cate/xxxxxxxx?notebookId=1212
func (c Blog) Cate(notebookId string) (re revel.Result) {
func (c Blog) Cate(userIdOrEmail string, notebookId string) (re revel.Result) {
// 自定义域名
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
fmt.Println(err)
re = c.e404(userBlog.ThemePath)
}
}()
if notebookId == "" {
return c.e404(userBlog.ThemePath);
}
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
}
userId, userInfo := c.userIdOrEmail(hasDomain, userBlog, userIdOrEmail)
notebookId2 := notebookId
var notebook info.Notebook
notebook = notebookService.GetNotebookById(notebookId)
if userId == "" { // 证明没有userIdOrEmail, 只有singleId, 那么直接查
notebook = notebookService.GetNotebookById(notebookId)
userId = notebook.UserId.Hex()
} else {
notebook = notebookService.GetNotebookByUserIdAndUrlTitle(userId, notebookId)
notebookId2 = notebook.NotebookId.Hex()
}
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
}
if !notebook.IsBlog {
return c.e404("")
}
if userId != "" && userId != notebook.UserId.Hex() {
return c.e404("")
}
userId = notebook.UserId.Hex()
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, info.User{}); !ok {
return c.e404(userBlog.ThemePath)
}
// 分页的话, 需要分页信息, totalPage, curPage
page := c.GetPage()
pageInfo, blogs := blogService.ListBlogs(userId, notebookId, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
blogs2 := c.fixBlogs(blogs)
pageInfo, blogs := blogService.ListBlogs(userId, notebookId2, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
blogs2 := blogService.FixBlogs(blogs)
c.RenderArgs["posts"] = blogs2
c.setPaging(pageInfo)
c.RenderArgs["curCateTitle"] = notebook.Title
c.RenderArgs["curCateId"] = notebookId
c.RenderArgs["curCateId"] = notebookId2
cateUrl := c.RenderArgs["cateUrl"].(string)
c.RenderArgs["pagingBaseUrl"] = cateUrl + "/" + notebookId
c.RenderArgs["curIsCate"] = true
@ -592,31 +498,37 @@ func (c Blog) Cate(notebookId string) (re revel.Result) {
return c.render("cate.html", userBlog.ThemePath)
}
func (c Blog) userIdOrEmail(hasDomain bool, userBlog info.UserBlog, userIdOrEmail string) (userId string, userInfo info.User) {
userId = ""
if hasDomain {
userId = userBlog.UserId.Hex()
}
if userId != "" {
userInfo = userService.GetUserInfoByAny(userId)
} else {
if userIdOrEmail != "" {
userInfo = userService.GetUserInfoByAny(userIdOrEmail)
} else {
return
}
}
userId = userInfo.UserId.Hex()
return
}
func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
// 自定义域名
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
}
// 用户id为空, 转至博客平台
// 用户id为空, 则是admin用户的博客
if userIdOrEmail == "" {
userIdOrEmail = configService.GetAdminUsername()
}
var userInfo info.User
if userId != "" {
userInfo = userService.GetUserInfoByAny(userId)
} else {
userInfo = userService.GetUserInfoByAny(userIdOrEmail)
}
userId = userInfo.UserId.Hex()
userId, userInfo := c.userIdOrEmail(hasDomain, userBlog, userIdOrEmail)
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
@ -625,7 +537,7 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
// 分页的话, 需要分页信息, totalPage, curPage
page := c.GetPage()
pageInfo, blogs := blogService.ListBlogs(userId, "", page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
blogs2 := c.fixBlogs(blogs)
blogs2 := blogService.FixBlogs(blogs)
c.RenderArgs["posts"] = blogs2
c.setPaging(pageInfo)
@ -636,66 +548,36 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
return c.render("index.html", userBlog.ThemePath)
}
// 详情
// 为了上一篇, 下一篇
func (c Blog) fixNote(note info.Note) map[string]interface{} {
if note.NoteId == "" {
return nil
}
return map[string]interface{}{
"NoteId": note.NoteId.Hex(),
"Title": note.Title,
"CreatedTime": note.CreatedTime,
"UpdatedTime": note.UpdatedTime,
"PublicTime": note.PublicTime,
"Desc": note.Desc,
"Tags": note.Tags,
"CommentNum": note.CommentNum,
"ReadNum": note.ReadNum,
"LikeNum": note.LikeNum,
"IsMarkdown": note.IsMarkdown,
}
}
func (c Blog) Post(noteId string) (re revel.Result) {
func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) {
// 自定义域名
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
Log(err)
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
userId, userInfo := c.userIdOrEmail(hasDomain, userBlog, userIdOrEmail)
var blogInfo info.BlogItem
if userId == "" { // 证明没有userIdOrEmail, 只有singleId, 那么直接查
blogInfo = blogService.GetBlog(noteId)
userId = blogInfo.UserId.Hex()
} else {
blogInfo = blogService.GetBlogByIdAndUrlTitle(userId, noteId)
}
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
}
if blogInfo.NoteId == "" {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
}
blogInfo := blogService.GetBlog(noteId)
userInfo := userService.GetUserInfo(blogInfo.UserId.Hex())
if userId != "" && userInfo.UserId.Hex() != userId {
panic("error")
}
userId = userInfo.UserId.Hex()
_, userBlog = c.blogCommon(userId, userBlog, info.User{})
c.RenderArgs["post"] = c.fixBlog(blogInfo)
c.RenderArgs["post"] = blogService.FixBlog(blogInfo)
// c.RenderArgs["userInfo"] = userInfo
c.RenderArgs["curIsPost"] = true
// 得到访问者id
/*
visitUserId := c.GetUserId()
if visitUserId != "" {
visitUserInfo := userService.GetUserInfo(visitUserId)
c.RenderArgs["visitUserInfoJson"] = c.Json(visitUserInfo)
c.RenderArgs["visitUserInfo"] = visitUserInfo
} else {
c.RenderArgs["visitUserInfoJson"] = "{}"
}
*/
// 上一篇, 下一篇
var baseTime interface{}
if userBlog.SortField == "PublicTime" {
@ -708,44 +590,46 @@ func (c Blog) Post(noteId string) (re revel.Result) {
baseTime = blogInfo.Title
}
preNote, nextNote := blogService.PreNextBlog(userId, userBlog.SortField, userBlog.IsAsc, baseTime)
c.RenderArgs["prePost"] = c.fixNote(preNote)
c.RenderArgs["nextPost"] = c.fixNote(nextNote)
Log("---------")
prePost, nextPost := blogService.PreNextBlog(userId, userBlog.SortField, userBlog.IsAsc, baseTime)
c.RenderArgs["prePost"] = prePost
c.RenderArgs["nextPost"] = nextPost
return c.render("post.html", userBlog.ThemePath)
}
func (c Blog) Single(singleId string) (re revel.Result) {
func (c Blog) Single(userIdOrEmail, singleId string) (re revel.Result) {
// 自定义域名
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
if hasDomain {
userId = userBlog.UserId.Hex()
}
single := blogService.GetSingle(singleId)
userInfo := userService.GetUserInfo(single.UserId.Hex())
if userId != "" && userInfo.UserId.Hex() != userId {
return c.e404(userBlog.ThemePath)
userId, userInfo := c.userIdOrEmail(hasDomain, userBlog, userIdOrEmail)
var single info.BlogSingle
if userId == "" { // 证明没有userIdOrEmail, 只有singleId, 那么直接查
single = blogService.GetSingle(singleId)
userId = single.UserId.Hex()
} else {
single = blogService.GetSingleByUserIdAndUrlTitle(userId, singleId)
}
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
}
if single.SingleId == "" {
panic("")
}
userId = userInfo.UserId.Hex()
_, userBlog = c.blogCommon(userId, userBlog, info.User{})
c.RenderArgs["single"] = map[string]interface{}{
"SingleId": single.SingleId.Hex(),
"Title": single.Title,
"UrlTitle": single.UrlTitle,
"Content": single.Content,
"CreatedTime": single.CreatedTime,
"UpdatedTime": single.UpdatedTime,
}
c.RenderArgs["curSingleId"] = singleId
c.RenderArgs["curSingleId"] = single.SingleId.Hex()
c.RenderArgs["curIsSingle"] = true
return c.render("single.html", userBlog.ThemePath)
@ -757,7 +641,7 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) {
hasDomain, userBlog := c.domain()
defer func() {
if err := recover(); err != nil {
re = c.e404(userBlog.ThemePath);
re = c.e404(userBlog.ThemePath)
}
}()
userId := ""
@ -771,7 +655,7 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) {
} else {
userInfo = userService.GetUserInfoByAny(userIdOrEmail)
}
// c.RenderArgs["userInfo"] = userInfo
// c.RenderArgs["userInfo"] = userInfo
userId = userInfo.UserId.Hex()
var ok = false
if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
@ -782,7 +666,7 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) {
pageInfo, blogs := blogService.SearchBlog(keywords, userId, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
c.setPaging(pageInfo)
c.RenderArgs["posts"] = c.fixBlogs(blogs)
c.RenderArgs["posts"] = blogService.FixBlogs(blogs)
c.RenderArgs["keywords"] = keywords
searchUrl, _ := c.RenderArgs["searchUrl"].(string)
c.RenderArgs["pagingBaseUrl"] = searchUrl + "?keywords=" + keywords
@ -808,7 +692,7 @@ func (c Blog) GetPostStat(noteId string) revel.Result {
re.Ok = true
statInfo := blogService.GetBlogStat(noteId)
re.Item = statInfo
return c.RenderJson(re);
return c.RenderJson(re)
}
// jsonP
@ -819,7 +703,7 @@ func (c Blog) GetLikes(noteId string, callback string) revel.Result {
userId := c.GetUserId()
result := map[string]interface{}{}
isILikeIt := false
if userId != "" {
if userId != "" {
isILikeIt = blogService.IsILikeIt(noteId, userId)
result["visitUserInfo"] = userService.GetUserAndBlog(userId)
}
@ -841,11 +725,11 @@ func (c Blog) GetLikesAndComments(noteId, callback string) revel.Result {
// 我也点过?
isILikeIt := false
if userId != "" {
if userId != "" {
isILikeIt = blogService.IsILikeIt(noteId, userId)
result["visitUserInfo"] = userService.GetUserAndBlog(userId)
}
// 点赞用户列表
likedUsers, hasMoreLikedUser := blogService.ListLikedUsers(noteId, false)
// 评论
@ -892,18 +776,21 @@ func (c Blog) GetComments(noteId string) revel.Result {
return c.RenderJson(re)
}
// jsonp
func (c Blog) DeleteComment(noteId, commentId string, callback string) revel.Result {
re := info.NewRe()
re.Ok = blogService.DeleteComment(noteId, commentId, c.GetUserId())
return c.RenderJsonP(callback, re)
}
// jsonp
func (c Blog) CommentPost(noteId, content, toCommentId string, callback string) revel.Result {
re := info.NewRe()
re.Ok, re.Item = blogService.Comment(noteId, toCommentId, c.GetUserId(), content)
return c.RenderJsonP(callback, re)
}
// jsonp
func (c Blog) LikeComment(commentId string, callback string) revel.Result {
re := info.NewRe()

4
app/controllers/IndexController.go
View File

@ -14,6 +14,10 @@ type Index struct {
// leanote展示页, 没有登录的, 或已登录明确要进该页的
func (c Index) Index() revel.Result {
if configService.HomePageIsAdminsBlog(){
blog := Blog{c.BaseController}
return blog.Index(configService.GetAdminUsername());
}
c.SetUserInfo()
c.RenderArgs["title"] = "leanote"
c.RenderArgs["openRegister"] = configService.GlobalStringConfigs["openRegister"]

12
app/controllers/PreviewController.go
View File

@ -71,25 +71,25 @@ func (c Preview) Archives(userIdOrEmail string, notebookId string, year, month i
return c.Blog.Archives(c.GetUserId(), notebookId, year, month)
// return blog.RenderTemplate("archive.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
}
func (c Preview) Cate(notebookId string) revel.Result {
func (c Preview) Cate(userIdOrEmail, notebookId string) revel.Result {
if !c.getPreviewThemeAbsolutePath("") {
return c.E404()
}
return c.Blog.Cate(notebookId)
return c.Blog.Cate(userIdOrEmail, notebookId)
// return blog.RenderTemplate("cate.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
}
func (c Preview) Post(noteId string) revel.Result {
func (c Preview) Post(userIdOrEmail, noteId string) revel.Result {
if !c.getPreviewThemeAbsolutePath("") {
return c.E404()
}
return c.Blog.Post(noteId)
return c.Blog.Post(userIdOrEmail, noteId)
// return blog.RenderTemplate("view.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
}
func (c Preview) Single(singleId string) revel.Result {
func (c Preview) Single(userIdOrEmail, singleId string) revel.Result {
if !c.getPreviewThemeAbsolutePath("") {
return c.E404()
}
return c.Blog.Single(singleId)
return c.Blog.Single(userIdOrEmail, singleId)
// return blog.RenderTemplate("single.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
}
func (c Preview) Search(userIdOrEmail, keywords string) revel.Result {

48
app/controllers/ShareController.go
View File

@ -4,7 +4,7 @@ import (
"github.com/revel/revel"
// "encoding/json"
// "gopkg.in/mgo.v2/bson"
// . "github.com/leanote/leanote/app/lea"
. "github.com/leanote/leanote/app/lea"
"github.com/leanote/leanote/app/info"
// "github.com/leanote/leanote/app/types"
// "io/ioutil"
@ -87,6 +87,8 @@ func (c Share) ListNoteShareUserInfo(noteId string) revel.Result {
noteShareUserInfos := shareService.ListNoteShareUserInfo(noteId, c.GetUserId())
c.RenderArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos
c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId())
c.RenderArgs["isNote"] = true
c.RenderArgs["noteOrNotebookId"] = note.NoteId.Hex();
c.RenderArgs["title"] = note.Title
@ -99,6 +101,9 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result {
notebookShareUserInfos := shareService.ListNotebookShareUserInfo(notebookId, c.GetUserId())
c.RenderArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos
c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId())
LogJ(c.RenderArgs["noteOrNotebookShareGroupInfos"])
c.RenderArgs["isNote"] = false
c.RenderArgs["noteOrNotebookId"] = notebook.NotebookId.Hex();
c.RenderArgs["title"] = notebook.Title
@ -139,4 +144,45 @@ func (c Share) DeleteShareNotebookBySharedUser(notebookId string, fromUserId str
// 删除fromUserId分享给我的所有note, notebook
func (c Share) DeleteUserShareNoteAndNotebook(fromUserId string) revel.Result {
return c.RenderJson(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId()));
}
//-------------
// 用户组
// 将笔记分享给分组
func (c Share) AddShareNoteGroup(noteId, groupId string, perm int) revel.Result {
re := info.NewRe()
re.Ok = shareService.AddShareNoteGroup(c.GetUserId(), noteId, groupId, perm);
return c.RenderJson(re);
}
// 删除
func (c Share) DeleteShareNoteGroup(noteId, groupId string) revel.Result {
re := info.NewRe()
re.Ok = shareService.DeleteShareNoteGroup(c.GetUserId(), noteId, groupId);
return c.RenderJson(re);
}
// 更新, 也是一样, 先删后加
func (c Share) UpdateShareNoteGroupPerm(noteId, groupId string, perm int) revel.Result {
return c.AddShareNoteGroup(noteId, groupId, perm)
}
//------
// 将笔记分享给分组
func (c Share) AddShareNotebookGroup(notebookId, groupId string, perm int) revel.Result {
re := info.NewRe()
re.Ok = shareService.AddShareNotebookGroup(c.GetUserId(), notebookId, groupId, perm);
return c.RenderJson(re);
}
// 删除
func (c Share) DeleteShareNotebookGroup(notebookId, groupId string) revel.Result {
re := info.NewRe()
re.Ok = shareService.DeleteShareNotebookGroup(c.GetUserId(), notebookId, groupId);
return c.RenderJson(re);
}
// 更新, 也是一样, 先删后加
func (c Share) UpdateShareNotebookGroupPerm(notebookId, groupId string, perm int) revel.Result {
return c.AddShareNotebookGroup(notebookId, groupId, perm)
}

4
app/controllers/admin/AdminBlogController.go
View File

@ -16,7 +16,7 @@ type AdminBlog struct {
func (c AdminBlog) Index(sorter, keywords string) revel.Result {
pageNumber := c.GetPage()
sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"title", "userId", "isRecommed", "createdTime"});
pageInfo, blogs := blogService.ListAllBlogs("", keywords, false, pageNumber, userPageSize, sorterField, isAsc);
pageInfo, blogs := blogService.ListAllBlogs("", "", keywords, false, pageNumber, userPageSize, sorterField, isAsc);
c.RenderArgs["pageInfo"] = pageInfo
c.RenderArgs["blogs"] = blogs
c.RenderArgs["keywords"] = keywords
@ -27,4 +27,4 @@ func (c AdminBlog) SetRecommend(noteId string, recommend bool) revel.Result {
re := info.NewRe()
re.Ok = blogService.SetRecommend(noteId, recommend);
return c.RenderJson(re)
}
}

1
app/controllers/admin/AdminController.go
View File

@ -30,6 +30,7 @@ func (c Admin) T(t string) revel.Result {
c.RenderArgs["arr"] = configService.GlobalArrayConfigs
c.RenderArgs["map"] = configService.GlobalMapConfigs
c.RenderArgs["arrMap"] = configService.GlobalArrMapConfigs
c.RenderArgs["version"] = configService.GetVersion()
return c.RenderTemplate("admin/" + t + ".html")
}

9
app/controllers/admin/AdminSettingController.go
View File

@ -111,6 +111,15 @@ func (c AdminSetting) OpenRegister(openRegister string) revel.Result {
return c.RenderJson(re)
}
func (c AdminSetting) HomePage(homePage string) revel.Result {
re := info.NewRe()
if homePage == "0" {
homePage = ""
}
re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "homePage", homePage)
return c.RenderJson(re)
}
func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Result {
re := info.NewRe()
re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongodumpPath", mongodumpPath)

6
app/controllers/admin/AdminUpgradeController.go
View File

@ -17,8 +17,8 @@ func (c AdminUpgrade) UpgradeBlog() revel.Result {
return nil;
}
func (c AdminUpgrade) UpgradeBetaToSelfBlog() revel.Result {
func (c AdminUpgrade) UpgradeBetaToBeta2() revel.Result {
re := info.NewRe()
re.Ok, re.Msg = upgradeService.UpgradeBetaToSelfBlog(c.GetUserId())
re.Ok, re.Msg = upgradeService.UpgradeBetaToBeta2(c.GetUserId())
return c.RenderJson(re)
}
}

95
app/controllers/member/MemberBlogController.go
View File

@ -8,10 +8,11 @@ import (
"io/ioutil"
"time"
"fmt"
"strings"
// "github.com/leanote/leanote/app/lea/blog"
)
// admin 首页
// 博客管理
type MemberBlog struct {
MemberBaseController
@ -33,6 +34,82 @@ func (c MemberBlog) common() info.UserBlog {
return userBlog
}
// 得到sorterField 和 isAsc
// okSorter = ['email', 'username']
func (c MemberBlog) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool){
sorter := ""
c.Params.Bind(&sorter, "sorter")
if sorter == "" {
return sorterField, isAsc;
}
// sorter形式 email-up, email-down
s2 := strings.Split(sorter, "-")
if len(s2) != 2 {
return sorterField, isAsc;
}
// 必须是可用的sorter
if okSorter != nil && len(okSorter) > 0 {
if !InArray(okSorter, s2[0]) {
return sorterField, isAsc;
}
}
sorterField = strings.Title(s2[0])
if s2[1] == "up" {
isAsc = true
} else {
isAsc = false
}
c.RenderArgs["sorter"] = sorter
return sorterField, isAsc;
}
// 博客列表
var userPageSize = 15
func (c MemberBlog) Index(sorter, keywords string) revel.Result {
c.RenderArgs["title"] = "Posts"
pageNumber := c.GetPage()
sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"title", "urlTitle", "updatedTime", "publicTime", "createdTime"});
pageInfo, blogs := blogService.ListAllBlogs(c.GetUserId(), "", keywords, false, pageNumber, userPageSize, sorterField, isAsc);
c.RenderArgs["pageInfo"] = pageInfo
c.RenderArgs["blogs"] = blogs
c.RenderArgs["keywords"] = keywords
userAndBlog := userService.GetUserAndBlog(c.GetUserId())
c.RenderArgs["userAndBlog"] = userAndBlog
return c.RenderTemplate("member/blog/list.html");
}
// 修改笔记的urlTitle
func (c MemberBlog) UpdateBlogUrlTitle(noteId, urlTitle string) revel.Result {
re := info.NewRe()
re.Ok, re.Item = blogService.UpateBlogUrlTitle(c.GetUserId(), noteId, urlTitle)
return c.RenderJson(re)
}
// 修改笔记的urlTitle
func (c MemberBlog) UpdateBlogAbstract(noteId string) revel.Result {
c.RenderArgs["title"] = "Update Post Abstract"
note := noteService.GetNoteAndContent(noteId, c.GetUserId());
if !note.Note.IsBlog {
return c.E404();
}
c.RenderArgs["note"] = note
c.RenderArgs["noteId"] = noteId
return c.RenderTemplate("member/blog/update_abstract.html");
}
func (c MemberBlog) DoUpdateBlogAbstract(noteId, imgSrc, desc, abstract string) revel.Result {
re := info.NewRe()
re.Ok = blogService.UpateBlogAbstract(c.GetUserId(), noteId, imgSrc, desc, abstract)
return c.RenderJson(re)
}
// 基本信息设置
func (c MemberBlog) Base() revel.Result {
c.common()
@ -101,6 +178,12 @@ func (c MemberBlog) UpateCateIds(cateIds []string) revel.Result {
return c.RenderJson(re)
}
func (c MemberBlog) UpdateCateUrlTitle(cateId, urlTitle string) revel.Result {
re := info.NewRe()
re.Ok, re.Item = blogService.UpateCateUrlTitle(c.GetUserId(), cateId, urlTitle)
return c.RenderJson(re)
}
// 保存之, 包含增加与保存
func (c MemberBlog) DoAddOrUpdateSingle(singleId, title, content string) revel.Result {
re := info.NewRe()
@ -127,6 +210,14 @@ func (c MemberBlog) DeleteSingle(singleId string) revel.Result {
re.Ok = blogService.DeleteSingle(c.GetUserId(), singleId)
return c.RenderJson(re)
}
// 修改页面标题
func (c MemberBlog) UpdateSingleUrlTitle(singleId, urlTitle string) revel.Result {
re := info.NewRe()
re.Ok, re.Item = blogService.UpdateSingleUrlTitle(c.GetUserId(), singleId, urlTitle)
return c.RenderJson(re)
}
func (c MemberBlog) Single() revel.Result {
c.common()
c.RenderArgs["title"] = "Cate"
@ -425,4 +516,4 @@ func (c MemberBlog) SetUserBlogPaging(perPageSize int, sortField string, isAsc b
re := info.NewRe()
re.Ok, re.Msg = blogService.UpdateUserBlogPaging(c.GetUserId(), perPageSize, sortField, isAsc)
return c.RenderRe(re)
}
}

58
app/controllers/member/MemberGroupController.go Normal file
View File

@ -0,0 +1,58 @@
package member
import (
"github.com/revel/revel"
"github.com/leanote/leanote/app/info"
)
// 分组管理
type MemberGroup struct {
MemberBaseController
}
// 首页, 显示所有分组和用户
func (c MemberGroup) Index() revel.Result {
c.SetUserInfo()
c.SetLocale()
c.RenderArgs["title"] = "My Group"
c.RenderArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId())
return c.RenderTemplate("member/group/index.html");
}
// 添加分组
func (c MemberGroup) AddGroup(title string) revel.Result {
re := info.NewRe()
re.Ok, re.Item = groupService.AddGroup(c.GetUserId(), title)
return c.RenderJson(re)
}
func (c MemberGroup) UpdateGroupTitle(groupId, title string) revel.Result {
re := info.NewRe()
re.Ok = groupService.UpdateGroupTitle(c.GetUserId(), groupId, title)
return c.RenderJson(re)
}
func (c MemberGroup) DeleteGroup(groupId string) revel.Result {
re := info.NewRe()
re.Ok, re.Msg = groupService.DeleteGroup(c.GetUserId(), groupId)
return c.RenderJson(re)
}
// 添加用户
func (c MemberGroup) AddUser(groupId, email string) revel.Result {
re := info.NewRe()
userInfo := userService.GetUserInfoByAny(email)
if userInfo.UserId == "" {
re.Msg = "userNotExists"
} else {
re.Ok, re.Msg = groupService.AddUser(c.GetUserId(), groupId, userInfo.UserId.Hex())
re.Item = userInfo
}
return c.RenderRe(re)
}
func (c MemberGroup) DeleteUser(groupId, userId string) revel.Result {
re := info.NewRe()
re.Ok, re.Msg = groupService.DeleteUser(c.GetUserId(), groupId, userId)
return c.RenderRe(re)
}

2
app/controllers/member/init.go
View File

@ -9,6 +9,7 @@ import (
)
var userService *service.UserService
var groupService *service.GroupService
var noteService *service.NoteService
var trashService *service.TrashService
var notebookService *service.NotebookService
@ -106,6 +107,7 @@ func InitService() {
trashService = service.TrashS
shareService = service.ShareS
userService = service.UserS
groupService = service.GroupS
tagService = service.TagS
blogService = service.BlogS
tokenService = service.TokenS