From 6af19670daccc31403a64da2b63bcc010a6a4130 Mon Sep 17 00:00:00 2001 From: lealife Date: Sat, 8 Apr 2017 18:55:42 +0800 Subject: [PATCH] Upgrade revel from 0.13 to 0.14 https://github.com/revel/revel/releases/tag/v0.14.0 --- app/controllers/AlbumController.go | 10 +- app/controllers/AttachController.go | 6 +- app/controllers/AuthController.go | 58 +++--- app/controllers/BaseController.go | 22 +- app/controllers/BlogController.go | 194 +++++++++--------- app/controllers/FileController.go | 32 +-- app/controllers/IndexController.go | 6 +- .../NoteContentHistoryController.go | 2 +- app/controllers/NoteController.go | 74 +++---- app/controllers/NotebookController.go | 18 +- app/controllers/PreviewController.go | 24 +-- app/controllers/ShareController.go | 54 ++--- app/controllers/TagController.go | 4 +- app/controllers/UserController.go | 32 +-- app/controllers/admin/AdminBaseController.go | 2 +- app/controllers/admin/AdminBlogController.go | 8 +- app/controllers/admin/AdminController.go | 18 +- app/controllers/admin/AdminData.go | 10 +- app/controllers/admin/AdminEmailController.go | 56 ++--- .../admin/AdminSettingController.go | 42 ++-- .../admin/AdminUpgradeController.go | 4 +- app/controllers/admin/AdminUserController.go | 8 +- app/controllers/admin/init.go | 2 +- app/controllers/api/ApiAuthController.go | 14 +- app/controllers/api/ApiFileController.go | 8 +- app/controllers/api/ApiNoteController.go | 66 +++--- app/controllers/api/ApiNotebookController.go | 14 +- app/controllers/api/ApiTagController.go | 6 +- app/controllers/api/ApiUserController.go | 24 +-- app/controllers/api/init.go | 4 +- app/controllers/init.go | 2 +- .../member/MemberBaseController.go | 2 +- .../member/MemberBlogController.go | 122 +++++------ .../member/MemberGroupController.go | 8 +- .../member/MemberIndexController.go | 14 +- .../member/MemberUserController.go | 10 +- app/controllers/member/init.go | 2 +- app/lea/blog/Template.go | 22 +- app/lea/i18n/i18n.go | 2 +- 39 files changed, 503 insertions(+), 503 deletions(-) diff --git a/app/controllers/AlbumController.go b/app/controllers/AlbumController.go index dcd097c..7215c6d 100644 --- a/app/controllers/AlbumController.go +++ b/app/controllers/AlbumController.go @@ -23,11 +23,11 @@ func (c Album) Index() revel.Result { // all albums by userId func (c Album) GetAlbums() revel.Result { re := albumService.GetAlbums(c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c Album) DeleteAlbum(albumId string) revel.Result { re, msg := albumService.DeleteAlbum(c.GetUserId(), albumId) - return c.RenderJson(info.Re{Ok: re, Msg: msg}) + return c.RenderJSON(info.Re{Ok: re, Msg: msg}) } // add album @@ -40,13 +40,13 @@ func (c Album) AddAlbum(name string) revel.Result { re := albumService.AddAlbum(album) if re { - return c.RenderJson(album) + return c.RenderJSON(album) } else { - return c.RenderJson(false) + return c.RenderJSON(false) } } // update alnum name func (c Album) UpdateAlbum(albumId, name string) revel.Result { - return c.RenderJson(albumService.UpdateAlbum(albumId, c.GetUserId(), name)) + return c.RenderJSON(albumService.UpdateAlbum(albumId, c.GetUserId(), name)) } diff --git a/app/controllers/AttachController.go b/app/controllers/AttachController.go index e82d142..d17416c 100644 --- a/app/controllers/AttachController.go +++ b/app/controllers/AttachController.go @@ -24,7 +24,7 @@ type Attach struct { // 上传附件 func (c Attach) UploadAttach(noteId string) revel.Result { re := c.uploadAttach(noteId) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c Attach) uploadAttach(noteId string) (re info.Re) { var fileId = "" @@ -118,7 +118,7 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) { func (c Attach) DeleteAttach(attachId string) revel.Result { re := info.NewRe() re.Ok, re.Msg = attachService.DeleteAttach(attachId, c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } // get all attachs by noteId @@ -126,7 +126,7 @@ func (c Attach) GetAttachs(noteId string) revel.Result { re := info.NewRe() re.Ok = true re.List = attachService.ListAttachs(noteId, c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } // 下载附件 diff --git a/app/controllers/AuthController.go b/app/controllers/AuthController.go index 7463217..1e60746 100644 --- a/app/controllers/AuthController.go +++ b/app/controllers/AuthController.go @@ -17,29 +17,29 @@ type Auth struct { //-------- // 登录 func (c Auth) Login(email, from string) revel.Result { - c.RenderArgs["title"] = c.Message("login") - c.RenderArgs["subTitle"] = c.Message("login") - c.RenderArgs["email"] = email - c.RenderArgs["from"] = from - c.RenderArgs["openRegister"] = configService.IsOpenRegister() + c.ViewArgs["title"] = c.Message("login") + c.ViewArgs["subTitle"] = c.Message("login") + c.ViewArgs["email"] = email + c.ViewArgs["from"] = from + c.ViewArgs["openRegister"] = configService.IsOpenRegister() - sessionId := c.Session.Id() + sessionId := c.Session.ID() if sessionService.LoginTimesIsOver(sessionId) { - c.RenderArgs["needCaptcha"] = true + c.ViewArgs["needCaptcha"] = true } c.SetLocale() if c.Has("demo") { - c.RenderArgs["demo"] = true - c.RenderArgs["email"] = "demo@leanote.com" + c.ViewArgs["demo"] = true + c.ViewArgs["email"] = "demo@leanote.com" } return c.RenderTemplate("home/login.html") } // 为了demo和register func (c Auth) doLogin(email, pwd string) revel.Result { - sessionId := c.Session.Id() + sessionId := c.Session.ID() var msg = "" userInfo, err := authService.Login(email, pwd) @@ -49,13 +49,13 @@ func (c Auth) doLogin(email, pwd string) revel.Result { } else { c.SetSession(userInfo) sessionService.ClearLoginTimes(sessionId) - return c.RenderJson(info.Re{Ok: true}) + return c.RenderJSON(info.Re{Ok: true}) } - return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId), Msg: c.Message(msg)}) + return c.RenderJSON(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId), Msg: c.Message(msg)}) } func (c Auth) DoLogin(email, pwd string, captcha string) revel.Result { - sessionId := c.Session.Id() + sessionId := c.Session.ID() var msg = "" // > 5次需要验证码, 直到登录成功 @@ -70,16 +70,16 @@ func (c Auth) DoLogin(email, pwd string, captcha string) revel.Result { } else { c.SetSession(userInfo) sessionService.ClearLoginTimes(sessionId) - return c.RenderJson(info.Re{Ok: true}) + return c.RenderJSON(info.Re{Ok: true}) } } - return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId), Msg: c.Message(msg)}) + return c.RenderJSON(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId), Msg: c.Message(msg)}) } // 注销 func (c Auth) Logout() revel.Result { - sessionId := c.Session.Id() + sessionId := c.Session.ID() sessionService.Clear(sessionId) c.ClearSession() return c.Redirect("/login") @@ -92,7 +92,7 @@ func (c Auth) Demo() revel.Result { userInfo, err := authService.Login(email, pwd) if err != nil { - return c.RenderJson(info.Re{Ok: false}) + return c.RenderJSON(info.Re{Ok: false}) } else { c.SetSession(userInfo) return c.Redirect("/note") @@ -107,11 +107,11 @@ func (c Auth) Register(from, iu string) revel.Result { return c.Redirect("/index") } c.SetLocale() - c.RenderArgs["from"] = from - c.RenderArgs["iu"] = iu + c.ViewArgs["from"] = from + c.ViewArgs["iu"] = iu - c.RenderArgs["title"] = c.Message("register") - c.RenderArgs["subTitle"] = c.Message("register") + c.ViewArgs["title"] = c.Message("register") + c.ViewArgs["subTitle"] = c.Message("register") return c.RenderTemplate("home/register.html") } func (c Auth) DoRegister(email, pwd, iu string) revel.Result { @@ -145,22 +145,22 @@ func (c Auth) DoRegister(email, pwd, iu string) revel.Result { // 找回密码 func (c Auth) FindPassword() revel.Result { c.SetLocale() - c.RenderArgs["title"] = c.Message("findPassword") - c.RenderArgs["subTitle"] = c.Message("findPassword") + c.ViewArgs["title"] = c.Message("findPassword") + c.ViewArgs["subTitle"] = c.Message("findPassword") return c.RenderTemplate("home/find_password.html") } func (c Auth) DoFindPassword(email string) revel.Result { pwdService.FindPwd(email) re := info.NewRe() re.Ok = true - return c.RenderJson(re) + return c.RenderJSON(re) } // 点击链接后, 先验证之 func (c Auth) FindPassword2(token string) revel.Result { c.SetLocale() - c.RenderArgs["title"] = c.Message("findPassword") - c.RenderArgs["subTitle"] = c.Message("findPassword") + c.ViewArgs["title"] = c.Message("findPassword") + c.ViewArgs["subTitle"] = c.Message("findPassword") if token == "" { return c.RenderTemplate("find_password2_timeout.html") } @@ -168,10 +168,10 @@ func (c Auth) FindPassword2(token string) revel.Result { if !ok { return c.RenderTemplate("home/find_password2_timeout.html") } - c.RenderArgs["findPwd"] = findPwd + c.ViewArgs["findPwd"] = findPwd - c.RenderArgs["title"] = c.Message("updatePassword") - c.RenderArgs["subTitle"] = c.Message("updatePassword") + c.ViewArgs["title"] = c.Message("updatePassword") + c.ViewArgs["subTitle"] = c.Message("updatePassword") return c.RenderTemplate("home/find_password2.html") } diff --git a/app/controllers/BaseController.go b/app/controllers/BaseController.go index 235f3d2..b7c8e59 100644 --- a/app/controllers/BaseController.go +++ b/app/controllers/BaseController.go @@ -180,7 +180,7 @@ func (c BaseController) GetTotalPage(page, count int) int { //------------- func (c BaseController) E404() revel.Result { - c.RenderArgs["title"] = "404" + c.ViewArgs["title"] = "404" return c.NotFound("", nil) } @@ -199,12 +199,12 @@ func (c BaseController) SetLocale() string { if !i18n.HasLang(locale) { lang = i18n.GetDefaultLang() } - c.RenderArgs["locale"] = lang - c.RenderArgs["siteUrl"] = configService.GetSiteUrl() + c.ViewArgs["locale"] = lang + c.ViewArgs["siteUrl"] = configService.GetSiteUrl() - c.RenderArgs["blogUrl"] = configService.GetBlogUrl() - c.RenderArgs["leaUrl"] = configService.GetLeaUrl() - c.RenderArgs["noteUrl"] = configService.GetNoteUrl() + c.ViewArgs["blogUrl"] = configService.GetBlogUrl() + c.ViewArgs["leaUrl"] = configService.GetLeaUrl() + c.ViewArgs["noteUrl"] = configService.GetNoteUrl() return lang } @@ -212,9 +212,9 @@ func (c BaseController) SetLocale() string { // 设置userInfo func (c BaseController) SetUserInfo() info.User { userInfo := c.GetUserInfo() - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["userInfo"] = userInfo if userInfo.Username == configService.GetAdminUsername() { - c.RenderArgs["isAdmin"] = true + c.ViewArgs["isAdmin"] = true } return userInfo } @@ -230,11 +230,11 @@ func (c BaseController) RenderTemplateStr(templatePath string) string { tpl := &revel.RenderTemplateResult{ Template: template, - RenderArgs: c.RenderArgs, // 把args给它 + ViewArgs: c.ViewArgs, // 把args给它 } var buffer bytes.Buffer - tpl.Template.Render(&buffer, c.RenderArgs) + tpl.Template.Render(&buffer, c.ViewArgs) return buffer.String() } @@ -263,5 +263,5 @@ func (c BaseController) RenderRe(re info.Re) revel.Result { if strings.HasPrefix(re.Msg, "???") { re.Msg = oldMsg } - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/BlogController.go b/app/controllers/BlogController.go index bdf19c6..3b1b567 100644 --- a/app/controllers/BlogController.go +++ b/app/controllers/BlogController.go @@ -49,8 +49,8 @@ $.bootstrapJsUrl func (c Blog) render(templateName string, themePath string) revel.Result { isPreview := false - if c.RenderArgs["isPreview"] != nil { - themePath2 := c.RenderArgs["themePath"] + if c.ViewArgs["isPreview"] != nil { + themePath2 := c.ViewArgs["themePath"] if themePath2 == nil { return c.E404() } @@ -59,9 +59,9 @@ func (c Blog) render(templateName string, themePath string) revel.Result { c.setPreviewUrl() // 因为common的themeInfo是从UserBlog.ThemeId来取的, 所以这里要fugai下 - c.RenderArgs["themeInfo"] = c.RenderArgs["themeInfoPreview"] + c.ViewArgs["themeInfo"] = c.ViewArgs["themeInfoPreview"] } - return blog.RenderTemplate(templateName, c.RenderArgs, revel.BasePath+"/"+themePath, isPreview) + return blog.RenderTemplate(templateName, c.ViewArgs, revel.BasePath+"/"+themePath, isPreview) } // 404 @@ -125,19 +125,19 @@ func (c Blog) setPreviewUrl() { archiveUrl = blogUrl + "/archives/" + 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 - c.RenderArgs["searchUrl"] = searchUrl - c.RenderArgs["singleUrl"] = singleUrl // 单页 - c.RenderArgs["archiveUrl"] = archiveUrl - c.RenderArgs["archivesUrl"] = archiveUrl // 别名 - c.RenderArgs["tagsUrl"] = tagsUrl - c.RenderArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail - c.RenderArgs["tagUrl"] = c.RenderArgs["tagPostsUrl"] + c.ViewArgs["indexUrl"] = indexUrl + c.ViewArgs["cateUrl"] = cateUrl + c.ViewArgs["postUrl"] = postUrl + c.ViewArgs["searchUrl"] = searchUrl + c.ViewArgs["singleUrl"] = singleUrl // 单页 + c.ViewArgs["archiveUrl"] = archiveUrl + c.ViewArgs["archivesUrl"] = archiveUrl // 别名 + c.ViewArgs["tagsUrl"] = tagsUrl + c.ViewArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail + c.ViewArgs["tagUrl"] = c.ViewArgs["tagPostsUrl"] // themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的 - c.RenderArgs["themeBaseUrl"] = "/" + theme.Path + c.ViewArgs["themeBaseUrl"] = "/" + theme.Path } // 各种地址设置 @@ -152,36 +152,36 @@ func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) { // 分类 // 搜索 // 查看 - c.RenderArgs["siteUrl"] = siteUrl - 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 // 别名 + c.ViewArgs["siteUrl"] = siteUrl + c.ViewArgs["indexUrl"] = blogUrls.IndexUrl + c.ViewArgs["cateUrl"] = blogUrls.CateUrl + c.ViewArgs["postUrl"] = blogUrls.PostUrl + c.ViewArgs["searchUrl"] = blogUrls.SearchUrl + c.ViewArgs["singleUrl"] = blogUrls.SingleUrl // 单页 + c.ViewArgs["archiveUrl"] = blogUrls.ArchiveUrl + c.ViewArgs["archivesUrl"] = blogUrls.ArchiveUrl // 别名 + c.ViewArgs["tagsUrl"] = blogUrls.TagsUrl + c.ViewArgs["tagPostsUrl"] = blogUrls.TagPostsUrl + c.ViewArgs["tagUrl"] = blogUrls.TagPostsUrl // 别名 // themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的 - c.RenderArgs["themeBaseUrl"] = "/" + userBlog.ThemePath + c.ViewArgs["themeBaseUrl"] = "/" + userBlog.ThemePath // 其它static js - c.RenderArgs["jQueryUrl"] = "/js/jquery-1.9.0.min.js" + c.ViewArgs["jQueryUrl"] = "/js/jquery-1.9.0.min.js" - c.RenderArgs["prettifyJsUrl"] = "/js/google-code-prettify/prettify.js" - c.RenderArgs["prettifyCssUrl"] = "/js/google-code-prettify/prettify.css" + c.ViewArgs["prettifyJsUrl"] = "/js/google-code-prettify/prettify.js" + c.ViewArgs["prettifyCssUrl"] = "/js/google-code-prettify/prettify.css" - c.RenderArgs["blogCommonJsUrl"] = "/public/blog/js/common.js" + c.ViewArgs["blogCommonJsUrl"] = "/public/blog/js/common.js" - c.RenderArgs["shareCommentCssUrl"] = "/public/blog/css/share_comment.css" - c.RenderArgs["shareCommentJsUrl"] = "/public/blog/js/share_comment.js" + c.ViewArgs["shareCommentCssUrl"] = "/public/blog/css/share_comment.css" + c.ViewArgs["shareCommentJsUrl"] = "/public/blog/js/share_comment.js" - c.RenderArgs["fontAwesomeUrl"] = "/css/font-awesome-4.2.0/css/font-awesome.css" + c.ViewArgs["fontAwesomeUrl"] = "/css/font-awesome-4.2.0/css/font-awesome.css" - c.RenderArgs["bootstrapCssUrl"] = "/css/bootstrap.css" - c.RenderArgs["bootstrapJsUrl"] = "/js/bootstrap-min.js" + c.ViewArgs["bootstrapCssUrl"] = "/css/bootstrap.css" + c.ViewArgs["bootstrapJsUrl"] = "/js/bootstrap-min.js" } // 笔记本分类 @@ -265,8 +265,8 @@ func (c Blog) getCates(userBlog info.UserBlog) { } } - c.RenderArgs["cates"] = cates - c.RenderArgs["catesTree"] = catesTree + c.ViewArgs["cates"] = cates + c.ViewArgs["catesTree"] = catesTree } // 单页 @@ -281,7 +281,7 @@ func (c Blog) getSingles(userId string) { singles2[i] = map[string]string{"title": page["Title"], "singleId": page["SingleId"]} } */ - c.RenderArgs["singles"] = singles + c.ViewArgs["singles"] = singles } // $.blog = {userId, title, subTitle, desc, openComment, } @@ -300,11 +300,11 @@ func (c Blog) setBlog(userBlog info.UserBlog, userInfo info.User) { "SubDomain": userBlog.SubDomain, "Domain": userBlog.Domain, } - c.RenderArgs["blogInfo"] = blogInfo + c.ViewArgs["blogInfo"] = blogInfo } func (c Blog) setPaging(pageInfo info.Page) { - c.RenderArgs["paging"] = pageInfo + c.ViewArgs["paging"] = pageInfo } // 公共 @@ -315,13 +315,13 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us return false, userBlog } } - // c.RenderArgs["userInfo"] = userInfo + // c.ViewArgs["userInfo"] = userInfo // 最新笔记 _, recentBlogs := blogService.ListBlogs(userId, "", 1, 5, userBlog.SortField, userBlog.IsAsc) - c.RenderArgs["recentPosts"] = blogService.FixBlogs(recentBlogs) - c.RenderArgs["latestPosts"] = c.RenderArgs["recentPosts"] - c.RenderArgs["tags"] = blogService.GetBlogTags(userId) + c.ViewArgs["recentPosts"] = blogService.FixBlogs(recentBlogs) + c.ViewArgs["latestPosts"] = c.ViewArgs["recentPosts"] + c.ViewArgs["tags"] = blogService.GetBlogTags(userId) // 语言, url地址 c.SetLocale() @@ -331,7 +331,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.ViewArgs["userBlog"] = userBlog // 分类导航 c.getCates(userBlog) @@ -342,12 +342,12 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us c.setUrl(userBlog, userInfo) // 当前分类Id, 全设为"" - c.RenderArgs["curCateId"] = "" - c.RenderArgs["curSingleId"] = "" + c.ViewArgs["curCateId"] = "" + c.ViewArgs["curSingleId"] = "" // 得到主题信息 themeInfo := themeService.GetThemeInfo(userBlog.ThemeId.Hex(), userBlog.Style) - c.RenderArgs["themeInfo"] = themeInfo + c.ViewArgs["themeInfo"] = themeInfo // Log(">>") // Log(userBlog.Style) @@ -404,9 +404,9 @@ func (c Blog) Tags(userIdOrEmail string) (re revel.Result) { return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404 } - c.RenderArgs["curIsTags"] = true + c.ViewArgs["curIsTags"] = true tags := blogService.GetBlogTags(userId) - c.RenderArgs["tags"] = tags + c.ViewArgs["tags"] = tags return c.render("tags.html", userBlog.ThemePath) } @@ -443,15 +443,15 @@ func (c Blog) Tag(userIdOrEmail, tag string) (re revel.Result) { tag = userIdOrEmail } - c.RenderArgs["curIsTagPosts"] = true - c.RenderArgs["curTag"] = tag + c.ViewArgs["curIsTagPosts"] = true + c.ViewArgs["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"] = blogService.FixBlogs(blogs) - tagPostsUrl := c.RenderArgs["tagPostsUrl"].(string) - c.RenderArgs["pagingBaseUrl"] = tagPostsUrl + "/" + tag + c.ViewArgs["posts"] = blogService.FixBlogs(blogs) + tagPostsUrl := c.ViewArgs["tagPostsUrl"].(string) + c.ViewArgs["pagingBaseUrl"] = tagPostsUrl + "/" + tag return c.render("tag_posts.html", userBlog.ThemePath) } @@ -490,16 +490,16 @@ func (c Blog) Archives(userIdOrEmail string, cateId string, year, month int) (re } arcs := blogService.ListBlogsArchive(userId, notebookId, year, month, "PublicTime", false) - c.RenderArgs["archives"] = arcs + c.ViewArgs["archives"] = arcs - c.RenderArgs["curIsArchive"] = true + c.ViewArgs["curIsArchive"] = true if notebookId != "" { notebook := notebookService.GetNotebookById(notebookId) - c.RenderArgs["curCateTitle"] = notebook.Title - c.RenderArgs["curCateId"] = notebookId + c.ViewArgs["curCateTitle"] = notebook.Title + c.ViewArgs["curCateId"] = notebookId } - c.RenderArgs["curYear"] = year - c.RenderArgs["curMonth"] = month + c.ViewArgs["curYear"] = year + c.ViewArgs["curMonth"] = month return c.render("archive.html", userBlog.ThemePath) } @@ -541,15 +541,15 @@ func (c Blog) Cate(userIdOrEmail string, notebookId string) (re revel.Result) { page := c.GetPage() pageInfo, blogs := blogService.ListBlogs(userId, notebookId2, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc) blogs2 := blogService.FixBlogs(blogs) - c.RenderArgs["posts"] = blogs2 + c.ViewArgs["posts"] = blogs2 c.setPaging(pageInfo) - c.RenderArgs["curCateTitle"] = notebook.Title - c.RenderArgs["curCateId"] = notebookId2 - cateUrl := c.RenderArgs["cateUrl"].(string) - c.RenderArgs["pagingBaseUrl"] = cateUrl + "/" + notebookId - c.RenderArgs["curIsCate"] = true + c.ViewArgs["curCateTitle"] = notebook.Title + c.ViewArgs["curCateId"] = notebookId2 + cateUrl := c.ViewArgs["cateUrl"].(string) + c.ViewArgs["pagingBaseUrl"] = cateUrl + "/" + notebookId + c.ViewArgs["curIsCate"] = true return c.render("cate.html", userBlog.ThemePath) } @@ -594,12 +594,12 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) { page := c.GetPage() pageInfo, blogs := blogService.ListBlogs(userId, "", page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc) blogs2 := blogService.FixBlogs(blogs) - c.RenderArgs["posts"] = blogs2 + c.ViewArgs["posts"] = blogs2 c.setPaging(pageInfo) - c.RenderArgs["pagingBaseUrl"] = c.RenderArgs["indexUrl"] + c.ViewArgs["pagingBaseUrl"] = c.ViewArgs["indexUrl"] - c.RenderArgs["curIsIndex"] = true + c.ViewArgs["curIsIndex"] = true return c.render("index.html", userBlog.ThemePath) } @@ -631,9 +631,9 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) { } post := blogService.FixBlog(blogInfo) - c.RenderArgs["post"] = post - // c.RenderArgs["userInfo"] = userInfo - c.RenderArgs["curIsPost"] = true + c.ViewArgs["post"] = post + // c.ViewArgs["userInfo"] = userInfo + c.ViewArgs["curIsPost"] = true // 上一篇, 下一篇 var baseTime interface{} @@ -649,10 +649,10 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) { prePost, nextPost := blogService.PreNextBlog(userId, userBlog.SortField, userBlog.IsAsc, post.NoteId, baseTime) if prePost.NoteId != "" { - c.RenderArgs["prePost"] = prePost + c.ViewArgs["prePost"] = prePost } if nextPost.NoteId != "" { - c.RenderArgs["nextPost"] = nextPost + c.ViewArgs["nextPost"] = nextPost } return c.render("post.html", userBlog.ThemePath) } @@ -682,7 +682,7 @@ func (c Blog) Single(userIdOrEmail, singleId string) (re revel.Result) { panic("") } - c.RenderArgs["single"] = map[string]interface{}{ + c.ViewArgs["single"] = map[string]interface{}{ "SingleId": single.SingleId.Hex(), "Title": single.Title, "UrlTitle": single.UrlTitle, @@ -690,8 +690,8 @@ func (c Blog) Single(userIdOrEmail, singleId string) (re revel.Result) { "CreatedTime": single.CreatedTime, "UpdatedTime": single.UpdatedTime, } - c.RenderArgs["curSingleId"] = single.SingleId.Hex() - c.RenderArgs["curIsSingle"] = true + c.ViewArgs["curSingleId"] = single.SingleId.Hex() + c.ViewArgs["curIsSingle"] = true return c.render("single.html", userBlog.ThemePath) } @@ -716,7 +716,7 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) { } else { userInfo = userService.GetUserInfoByAny(userIdOrEmail) } - // c.RenderArgs["userInfo"] = userInfo + // c.ViewArgs["userInfo"] = userInfo userId = userInfo.UserId.Hex() var ok = false if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok { @@ -727,11 +727,11 @@ 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"] = blogService.FixBlogs(blogs) - c.RenderArgs["keywords"] = keywords - searchUrl, _ := c.RenderArgs["searchUrl"].(string) - c.RenderArgs["pagingBaseUrl"] = searchUrl + "?keywords=" + keywords - c.RenderArgs["curIsSearch"] = true + c.ViewArgs["posts"] = blogService.FixBlogs(blogs) + c.ViewArgs["keywords"] = keywords + searchUrl, _ := c.ViewArgs["searchUrl"].(string) + c.ViewArgs["pagingBaseUrl"] = searchUrl + "?keywords=" + keywords + c.ViewArgs["curIsSearch"] = true return c.render("search.html", userBlog.ThemePath) } @@ -741,7 +741,7 @@ func (c Blog) setRenderUserInfo(userInfo info.User) { if userInfo.Username == "" { userInfo.Username = userInfo.Email } - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["userInfo"] = userInfo } //---------------- @@ -753,7 +753,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 @@ -778,7 +778,7 @@ func (c Blog) GetLikes(noteId string, callback string) revel.Result { result["hasMoreLikedUser"] = hasMoreLikedUser re.Item = result - return c.RenderJsonP(callback, re) + return c.RenderJSONP(callback, re) } func (c Blog) GetLikesAndComments(noteId, callback string) revel.Result { userId := c.GetUserId() @@ -806,13 +806,13 @@ func (c Blog) GetLikesAndComments(noteId, callback string) revel.Result { result["comments"] = comments result["commentUserInfo"] = commentUserInfo re.Item = result - return c.RenderJsonP(callback, re) + return c.RenderJSONP(callback, re) } func (c Blog) IncReadNum(noteId string) revel.Result { re := info.NewRe() re.Ok = blogService.IncReadNum(noteId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 点赞, 要用jsonp @@ -820,7 +820,7 @@ func (c Blog) LikePost(noteId string, callback string) revel.Result { re := info.NewRe() userId := c.GetUserId() re.Ok, re.Item = blogService.LikeBlog(noteId, userId) - return c.RenderJsonP(callback, re) + return c.RenderJSONP(callback, re) } func (c Blog) GetComments(noteId string, callback string) revel.Result { // 评论 @@ -836,24 +836,24 @@ func (c Blog) GetComments(noteId string, callback string) revel.Result { re.Item = result if callback != "" { - return c.RenderJsonP(callback, result) + return c.RenderJSONP(callback, result) } - return c.RenderJson(re) + 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) + 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) + return c.RenderJSONP(callback, re) } // jsonp @@ -862,7 +862,7 @@ func (c Blog) LikeComment(commentId string, callback string) revel.Result { ok, isILikeIt, num := blogService.LikeComment(commentId, c.GetUserId()) re.Ok = ok re.Item = bson.M{"IsILikeIt": isILikeIt, "Num": num} - return c.RenderJsonP(callback, re) + return c.RenderJSONP(callback, re) } // 显示分类的最近博客, jsonp @@ -898,5 +898,5 @@ func (c Blog) ListCateLatest(notebookId, callback string) revel.Result { re := info.NewRe() re.Ok = true re.List = blogs - return c.RenderJsonP(callback, re) + return c.RenderJSONP(callback, re) } diff --git a/app/controllers/FileController.go b/app/controllers/FileController.go index 2d3da1d..e8fe799 100644 --- a/app/controllers/FileController.go +++ b/app/controllers/FileController.go @@ -24,9 +24,9 @@ type File struct { func (c File) UploadBlogLogo() revel.Result { re := c.uploadImage("blogLogo", "") - c.RenderArgs["fileUrlPath"] = re.Id - c.RenderArgs["resultCode"] = re.Code - c.RenderArgs["resultMsg"] = re.Msg + c.ViewArgs["fileUrlPath"] = re.Id + c.ViewArgs["resultCode"] = re.Code + c.ViewArgs["resultMsg"] = re.Msg return c.RenderTemplate("file/blog_logo.html") } @@ -54,16 +54,16 @@ func (c File) PasteImage(noteId string) revel.Result { } } - return c.RenderJson(re) + return c.RenderJSON(re) } // 头像设置 func (c File) UploadAvatar() revel.Result { re := c.uploadImage("logo", "") - c.RenderArgs["fileUrlPath"] = re.Id - c.RenderArgs["resultCode"] = re.Code - c.RenderArgs["resultMsg"] = re.Msg + c.ViewArgs["fileUrlPath"] = re.Id + c.ViewArgs["resultCode"] = re.Code + c.ViewArgs["resultMsg"] = re.Msg if re.Ok { re.Ok = userService.UpdateAvatar(c.GetUserId(), re.Id) @@ -72,13 +72,13 @@ func (c File) UploadAvatar() revel.Result { } } - return c.RenderJson(re) + return c.RenderJSON(re) } // leaui image plugin upload image func (c File) UploadImageLeaui(albumId string) revel.Result { re := c.uploadImage("", albumId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 上传图片, 公用方法 @@ -201,19 +201,19 @@ func (c File) uploadImage(from, albumId string) (re info.Re) { // get all images by userId with page func (c File) GetImages(albumId, key string, page int) revel.Result { re := fileService.ListImagesWithPage(c.GetUserId(), albumId, key, page, 12) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c File) UpdateImageTitle(fileId, title string) revel.Result { re := info.NewRe() re.Ok = fileService.UpdateImageTitle(c.GetUserId(), fileId, title) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c File) DeleteImage(fileId string) revel.Result { re := info.NewRe() re.Ok, re.Msg = fileService.DeleteImage(c.GetUserId(), fileId) - return c.RenderJson(re) + return c.RenderJSON(re) } //----------- @@ -235,7 +235,7 @@ func (c File) OutputImage(noteId, fileId string) revel.Result { func (c File) CopyImage(userId, fileId, toUserId string) revel.Result { re := info.NewRe() re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 复制外网的图片 @@ -251,13 +251,13 @@ func (c File) CopyHttpImage(src string) revel.Result { dir := revel.BasePath + "/" + fileUrlPath err := os.MkdirAll(dir, 0755) if err != nil { - return c.RenderJson(re) + return c.RenderJSON(re) } filesize, filename, _, ok := netutil.WriteUrl(src, dir) if !ok { re.Msg = "copy error" - return c.RenderJson(re) + return c.RenderJSON(re) } // File @@ -273,5 +273,5 @@ func (c File) CopyHttpImage(src string) revel.Result { // re.Item = fileInfo.Path re.Ok, re.Msg = fileService.AddImage(fileInfo, "", c.GetUserId(), true) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/IndexController.go b/app/controllers/IndexController.go index 75c780b..7757006 100644 --- a/app/controllers/IndexController.go +++ b/app/controllers/IndexController.go @@ -23,8 +23,8 @@ func (c Index) Default() revel.Result { // leanote展示页, 没有登录的, 或已登录明确要进该页的 func (c Index) Index() revel.Result { c.SetUserInfo() - c.RenderArgs["title"] = "leanote" - c.RenderArgs["openRegister"] = configService.GlobalStringConfigs["openRegister"] + c.ViewArgs["title"] = "leanote" + c.ViewArgs["openRegister"] = configService.GlobalStringConfigs["openRegister"] c.SetLocale() return c.RenderTemplate("home/index.html") @@ -40,5 +40,5 @@ func (c Index) Suggestion(addr, suggestion string) revel.Result { emailService.SendEmail("leanote@leanote.com", "建议", "UserId: "+c.GetUserId()+"
Suggestions: "+suggestion) }() - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/NoteContentHistoryController.go b/app/controllers/NoteContentHistoryController.go index 5ff1555..e975ac6 100644 --- a/app/controllers/NoteContentHistoryController.go +++ b/app/controllers/NoteContentHistoryController.go @@ -12,5 +12,5 @@ type NoteContentHistory struct { func (c NoteContentHistory) ListHistories(noteId string) revel.Result { histories := noteContentHistoryService.ListHistories(noteId, c.GetUserId()) - return c.RenderJson(histories) + return c.RenderJSON(histories) } diff --git a/app/controllers/NoteController.go b/app/controllers/NoteController.go index fe6ab1e..75de922 100644 --- a/app/controllers/NoteController.go +++ b/app/controllers/NoteController.go @@ -36,7 +36,7 @@ func (c Note) Index(noteId, online string) revel.Result { return c.Redirect("/login") } - c.RenderArgs["openRegister"] = configService.IsOpenRegister() + c.ViewArgs["openRegister"] = configService.IsOpenRegister() // 已登录了, 那么得到所有信息 notebooks := notebookService.GetNotebooks(userId) @@ -58,16 +58,16 @@ func (c Note) Index(noteId, online string) revel.Result { noteContent = noteService.GetNoteContent(noteId, noteOwner) hasRightNoteId = true - c.RenderArgs["curNoteId"] = noteId - c.RenderArgs["curNotebookId"] = note.NotebookId.Hex() + c.ViewArgs["curNoteId"] = noteId + c.ViewArgs["curNotebookId"] = note.NotebookId.Hex() // 打开的是共享的笔记, 那么判断是否是共享给我的默认笔记 if noteOwner != c.GetUserId() { if shareService.HasReadPerm(noteOwner, c.GetUserId(), noteId) { // 不要获取notebook下的笔记 // 在前端下发请求 - c.RenderArgs["curSharedNoteNotebookId"] = note.NotebookId.Hex() - c.RenderArgs["curSharedUserId"] = noteOwner + c.ViewArgs["curSharedNoteNotebookId"] = note.NotebookId.Hex() + c.ViewArgs["curSharedUserId"] = noteOwner // 没有读写权限 } else { hasRightNoteId = false @@ -97,7 +97,7 @@ func (c Note) Index(noteId, online string) revel.Result { // 得到最近的笔记 _, latestNotes := noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false) - c.RenderArgs["latestNotes"] = latestNotes + c.ViewArgs["latestNotes"] = latestNotes } // 没有传入笔记 @@ -106,27 +106,27 @@ func (c Note) Index(noteId, online string) revel.Result { _, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false) if len(notes) > 0 { noteContent = noteService.GetNoteContent(notes[0].NoteId.Hex(), userId) - c.RenderArgs["curNoteId"] = notes[0].NoteId.Hex() + c.ViewArgs["curNoteId"] = notes[0].NoteId.Hex() } } } // 当然, 还需要得到第一个notes的content //... - c.RenderArgs["isAdmin"] = configService.GetAdminUsername() == userInfo.Username + c.ViewArgs["isAdmin"] = configService.GetAdminUsername() == userInfo.Username - c.RenderArgs["userInfo"] = userInfo - c.RenderArgs["notebooks"] = notebooks - c.RenderArgs["shareNotebooks"] = shareNotebooks // note信息在notes列表中 - c.RenderArgs["sharedUserInfos"] = sharedUserInfos + c.ViewArgs["userInfo"] = userInfo + c.ViewArgs["notebooks"] = notebooks + c.ViewArgs["shareNotebooks"] = shareNotebooks // note信息在notes列表中 + c.ViewArgs["sharedUserInfos"] = sharedUserInfos - c.RenderArgs["notes"] = notes - c.RenderArgs["noteContentJson"] = noteContent - c.RenderArgs["noteContent"] = noteContent.Content + c.ViewArgs["notes"] = notes + c.ViewArgs["noteContentJson"] = noteContent + c.ViewArgs["noteContent"] = noteContent.Content - c.RenderArgs["tags"] = tagService.GetTags(c.GetUserId()) + c.ViewArgs["tags"] = tagService.GetTags(c.GetUserId()) - c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser() + c.ViewArgs["globalConfigs"] = configService.GetGlobalConfigForUser() // return c.RenderTemplate("note/note.html") @@ -142,18 +142,18 @@ func (c Note) Index(noteId, online string) revel.Result { // 否则, 转向登录页面 func (c Note) ListNotes(notebookId string) revel.Result { _, notes := noteService.ListNotes(c.GetUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false) - return c.RenderJson(notes) + return c.RenderJSON(notes) } // 得到trash func (c Note) ListTrashNotes() revel.Result { _, notes := noteService.ListNotes(c.GetUserId(), "", true, c.GetPage(), pageSize, defaultSortField, false, false) - return c.RenderJson(notes) + return c.RenderJSON(notes) } // 得到note和内容 func (c Note) GetNoteAndContent(noteId string) revel.Result { - return c.RenderJson(noteService.GetNoteAndContent(noteId, c.GetUserId())) + return c.RenderJSON(noteService.GetNoteAndContent(noteId, c.GetUserId())) } func (c Note) GetNoteAndContentBySrc(src string) revel.Result { @@ -163,13 +163,13 @@ func (c Note) GetNoteAndContentBySrc(src string) revel.Result { ret.Ok = true ret.Item = noteAndContent } - return c.RenderJson(ret) + return c.RenderJSON(ret) } // 得到内容 func (c Note) GetNoteContent(noteId string) revel.Result { noteContent := noteService.GetNoteContent(noteId, c.GetUserId()) - return c.RenderJson(noteContent) + return c.RenderJSON(noteContent) } // 这里不能用json, 要用post @@ -201,7 +201,7 @@ func (c Note) UpdateNoteOrContent(noteOrContent info.NoteOrContent) revel.Result Abstract: noteOrContent.Abstract} note = noteService.AddNoteAndContentForController(note, noteContent, c.GetUserId()) - return c.RenderJson(note) + return c.RenderJSON(note) } noteUpdate := bson.M{} @@ -248,7 +248,7 @@ func (c Note) UpdateNoteOrContent(noteOrContent info.NoteOrContent) revel.Result Log(contentOk) Log(contentMsg) - return c.RenderJson(true) + return c.RenderJSON(true) } // 删除note/ 删除别人共享给我的笔记 @@ -258,19 +258,19 @@ func (c Note) DeleteNote(noteIds []string, isShared bool) revel.Result { for _, noteId := range noteIds { trashService.DeleteNote(noteId, c.GetUserId()) } - return c.RenderJson(true) + return c.RenderJSON(true) } for _, noteId := range noteIds { trashService.DeleteSharedNote(noteId, c.GetUserId()) } - return c.RenderJson(true) + return c.RenderJSON(true) } // 删除trash, 已弃用, 用DeleteNote func (c Note) DeleteTrash(noteId string) revel.Result { - return c.RenderJson(trashService.DeleteTrash(noteId, c.GetUserId())) + return c.RenderJSON(trashService.DeleteTrash(noteId, c.GetUserId())) } // 移动note @@ -279,7 +279,7 @@ func (c Note) MoveNote(noteIds []string, notebookId string) revel.Result { for _, noteId := range noteIds { noteService.MoveNote(noteId, notebookId, userId) } - return c.RenderJson(true) + return c.RenderJSON(true) } // 复制note @@ -292,7 +292,7 @@ func (c Note) CopyNote(noteIds []string, notebookId string) revel.Result { re := info.NewRe() re.Ok = true re.Item = copyNotes - return c.RenderJson(re) + return c.RenderJSON(re) } // 复制别人共享的笔记给我 @@ -305,7 +305,7 @@ func (c Note) CopySharedNote(noteIds []string, notebookId, fromUserId string) re re := info.NewRe() re.Ok = true re.Item = copyNotes - return c.RenderJson(re) + return c.RenderJSON(re) } //------------ @@ -313,13 +313,13 @@ func (c Note) CopySharedNote(noteIds []string, notebookId, fromUserId string) re // 通过title搜索 func (c Note) SearchNote(key string) revel.Result { _, blogs := noteService.SearchNote(key, c.GetUserId(), c.GetPage(), pageSize, "UpdatedTime", false, false) - return c.RenderJson(blogs) + return c.RenderJSON(blogs) } // 通过tags搜索 func (c Note) SearchNoteByTags(tags []string) revel.Result { _, blogs := noteService.SearchNoteByTags(tags, c.GetUserId(), c.GetPage(), pageSize, "UpdatedTime", false) - return c.RenderJson(blogs) + return c.RenderJSON(blogs) } // 生成PDF @@ -397,11 +397,11 @@ func (c Note) ToPdf(noteId, appKey string) revel.Result { } else { note.Tags = nil } - c.RenderArgs["blog"] = note - c.RenderArgs["content"] = contentStr - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["blog"] = note + c.ViewArgs["content"] = contentStr + c.ViewArgs["userInfo"] = userInfo userBlog := blogService.GetUserBlog(noteUserId) - c.RenderArgs["userBlog"] = userBlog + c.ViewArgs["userBlog"] = userBlog return c.RenderTemplate("file/pdf.html") } @@ -488,5 +488,5 @@ func (c Note) SetNote2Blog(noteIds []string, isBlog, isTop bool) revel.Result { for _, noteId := range noteIds { noteService.ToBlog(c.GetUserId(), noteId, isBlog, isTop) } - return c.RenderJson(true) + return c.RenderJSON(true) } diff --git a/app/controllers/NotebookController.go b/app/controllers/NotebookController.go index 93bf66b..6b56efc 100644 --- a/app/controllers/NotebookController.go +++ b/app/controllers/NotebookController.go @@ -14,18 +14,18 @@ type Notebook struct { } func (c Notebook) Index(notebook info.Notebook, i int, name string) revel.Result { - return c.RenderJson(notebook) + return c.RenderJSON(notebook) } // 得到用户的所有笔记本 func (c Notebook) GetNotebooks() revel.Result { re := notebookService.GetNotebooks(c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c Notebook) DeleteNotebook(notebookId string) revel.Result { re, msg := notebookService.DeleteNotebook(c.GetUserId(), notebookId) - return c.RenderJson(info.Re{Ok: re, Msg: msg}) + return c.RenderJSON(info.Re{Ok: re, Msg: msg}) } // 添加notebook @@ -41,21 +41,21 @@ func (c Notebook) AddNotebook(notebookId, title, parentNotebookId string) revel. re, notebook := notebookService.AddNotebook(notebook) if re { - return c.RenderJson(notebook) + return c.RenderJSON(notebook) } else { - return c.RenderJson(false) + return c.RenderJSON(false) } } // 修改标题 func (c Notebook) UpdateNotebookTitle(notebookId, title string) revel.Result { - return c.RenderJson(notebookService.UpdateNotebookTitle(notebookId, c.GetUserId(), title)) + return c.RenderJSON(notebookService.UpdateNotebookTitle(notebookId, c.GetUserId(), title)) } // 排序 // 无用 // func (c Notebook) SortNotebooks(notebookId2Seqs map[string]int) revel.Result { -// return c.RenderJson(notebookService.SortNotebooks(c.GetUserId(), notebookId2Seqs)) +// return c.RenderJSON(notebookService.SortNotebooks(c.GetUserId(), notebookId2Seqs)) // } // 调整notebooks, 可能是排序, 可能是移动到其它笔记本下 @@ -70,11 +70,11 @@ func (c Notebook) DragNotebooks(data string) revel.Result { info := DragNotebooksInfo{} json.Unmarshal([]byte(data), &info) - return c.RenderJson(notebookService.DragNotebooks(c.GetUserId(), info.CurNotebookId, info.ParentNotebookId, info.Siblings)) + return c.RenderJSON(notebookService.DragNotebooks(c.GetUserId(), info.CurNotebookId, info.ParentNotebookId, info.Siblings)) } // 设置notebook <-> blog func (c Notebook) SetNotebook2Blog(notebookId string, isBlog bool) revel.Result { re := notebookService.ToBlog(c.GetUserId(), notebookId, isBlog) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/PreviewController.go b/app/controllers/PreviewController.go index 0ef55d6..70a9ac0 100644 --- a/app/controllers/PreviewController.go +++ b/app/controllers/PreviewController.go @@ -32,10 +32,10 @@ func (c Preview) getPreviewThemeAbsolutePath(themeId string) bool { } theme := themeService.GetTheme(c.GetUserId(), themeId) - c.RenderArgs["isPreview"] = true - c.RenderArgs["themeId"] = themeId - c.RenderArgs["themeInfoPreview"] = theme.Info - c.RenderArgs["themePath"] = theme.Path + c.ViewArgs["isPreview"] = true + c.ViewArgs["themeId"] = themeId + c.ViewArgs["themeInfoPreview"] = theme.Info + c.ViewArgs["themePath"] = theme.Path if theme.Path == "" { return false } @@ -47,7 +47,7 @@ func (c Preview) Index(userIdOrEmail string, themeId string) revel.Result { return c.E404() } return c.Blog.Index(c.GetUserId()) - // return blog.RenderTemplate("index.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(themeId)) + // return blog.RenderTemplate("index.html", c.ViewArgs, c.getPreviewThemeAbsolutePath(themeId)) } func (c Preview) Tag(userIdOrEmail, tag string) revel.Result { @@ -62,42 +62,42 @@ func (c Preview) Tags(userIdOrEmail string) revel.Result { } return c.Blog.Tags(c.GetUserId()) // if tag == "" { - // return blog.RenderTemplate("tags.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("tags.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) // } - // return blog.RenderTemplate("tag_posts.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("tag_posts.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } func (c Preview) Archives(userIdOrEmail string, notebookId string, year, month int) revel.Result { if !c.getPreviewThemeAbsolutePath("") { return c.E404() } return c.Blog.Archives(c.GetUserId(), notebookId, year, month) - // return blog.RenderTemplate("archive.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("archive.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } func (c Preview) Cate(userIdOrEmail, notebookId string) revel.Result { if !c.getPreviewThemeAbsolutePath("") { return c.E404() } return c.Blog.Cate(userIdOrEmail, notebookId) - // return blog.RenderTemplate("cate.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("cate.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } func (c Preview) Post(userIdOrEmail, noteId string) revel.Result { if !c.getPreviewThemeAbsolutePath("") { return c.E404() } return c.Blog.Post(userIdOrEmail, noteId) - // return blog.RenderTemplate("view.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("view.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } func (c Preview) Single(userIdOrEmail, singleId string) revel.Result { if !c.getPreviewThemeAbsolutePath("") { return c.E404() } return c.Blog.Single(userIdOrEmail, singleId) - // return blog.RenderTemplate("single.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("single.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } func (c Preview) Search(userIdOrEmail, keywords string) revel.Result { if !c.getPreviewThemeAbsolutePath("") { return c.E404() } return c.Blog.Search(c.GetUserId(), keywords) - // return blog.RenderTemplate("search.html", c.RenderArgs, c.getPreviewThemeAbsolutePath("")) + // return blog.RenderTemplate("search.html", c.ViewArgs, c.getPreviewThemeAbsolutePath("")) } diff --git a/app/controllers/ShareController.go b/app/controllers/ShareController.go index 4f44a18..0fe1e5f 100644 --- a/app/controllers/ShareController.go +++ b/app/controllers/ShareController.go @@ -33,7 +33,7 @@ func (c Share) AddShareNote(noteId string, emails []string, perm int) revel.Resu } } - return c.RenderJson(status) + return c.RenderJSON(status) } // 添加共享notebook @@ -53,7 +53,7 @@ func (c Share) AddShareNotebook(notebookId string, emails []string, perm int) re } } - return c.RenderJson(status) + return c.RenderJSON(status) } // 得到notes @@ -63,10 +63,10 @@ func (c Share) ListShareNotes(notebookId, userId string) revel.Result { var notes []info.ShareNoteWithPerm if notebookId == "" { notes = shareService.ListShareNotes(c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false) - return c.RenderJson(notes) + return c.RenderJSON(notes) } else { // 有notebookId的 - return c.RenderJson(shareService.ListShareNotesByNotebookId(notebookId, c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false)) + return c.RenderJSON(shareService.ListShareNotesByNotebookId(notebookId, c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false)) } } @@ -74,7 +74,7 @@ func (c Share) ListShareNotes(notebookId, userId string) revel.Result { // sharedUserId 是谁的笔记 func (c Share) GetShareNoteContent(noteId, sharedUserId string) revel.Result { noteContent := shareService.GetShareNoteContent(noteId, c.GetUserId(), sharedUserId) - return c.RenderJson(noteContent) + return c.RenderJSON(noteContent) } // 查看note的分享信息 @@ -85,13 +85,13 @@ func (c Share) ListNoteShareUserInfo(noteId string) revel.Result { note := noteService.GetNote(noteId, c.GetUserId()) noteShareUserInfos := shareService.ListNoteShareUserInfo(noteId, c.GetUserId()) - c.RenderArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos + c.ViewArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos - c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId()) + c.ViewArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId()) - c.RenderArgs["isNote"] = true - c.RenderArgs["noteOrNotebookId"] = note.NoteId.Hex() - c.RenderArgs["title"] = note.Title + c.ViewArgs["isNote"] = true + c.ViewArgs["noteOrNotebookId"] = note.NoteId.Hex() + c.ViewArgs["title"] = note.Title return c.RenderTemplate("share/note_notebook_share_user_infos.html") } @@ -99,14 +99,14 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result { notebook := notebookService.GetNotebook(notebookId, c.GetUserId()) notebookShareUserInfos := shareService.ListNotebookShareUserInfo(notebookId, c.GetUserId()) - c.RenderArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos + c.ViewArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos - c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId()) - LogJ(c.RenderArgs["noteOrNotebookShareGroupInfos"]) + c.ViewArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId()) + LogJ(c.ViewArgs["noteOrNotebookShareGroupInfos"]) - c.RenderArgs["isNote"] = false - c.RenderArgs["noteOrNotebookId"] = notebook.NotebookId.Hex() - c.RenderArgs["title"] = notebook.Title + c.ViewArgs["isNote"] = false + c.ViewArgs["noteOrNotebookId"] = notebook.NotebookId.Hex() + c.ViewArgs["title"] = notebook.Title return c.RenderTemplate("share/note_notebook_share_user_infos.html") } @@ -114,38 +114,38 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result { //------------ // 改变share note 权限 func (c Share) UpdateShareNotePerm(noteId string, perm int, toUserId string) revel.Result { - return c.RenderJson(shareService.UpdateShareNotePerm(noteId, perm, c.GetUserId(), toUserId)) + return c.RenderJSON(shareService.UpdateShareNotePerm(noteId, perm, c.GetUserId(), toUserId)) } // 改变share notebook 权限 func (c Share) UpdateShareNotebookPerm(notebookId string, perm int, toUserId string) revel.Result { - return c.RenderJson(shareService.UpdateShareNotebookPerm(notebookId, perm, c.GetUserId(), toUserId)) + return c.RenderJSON(shareService.UpdateShareNotebookPerm(notebookId, perm, c.GetUserId(), toUserId)) } //--------------- // 删除share note func (c Share) DeleteShareNote(noteId string, toUserId string) revel.Result { - return c.RenderJson(shareService.DeleteShareNote(noteId, c.GetUserId(), toUserId)) + return c.RenderJSON(shareService.DeleteShareNote(noteId, c.GetUserId(), toUserId)) } // 删除share notebook func (c Share) DeleteShareNotebook(notebookId string, toUserId string) revel.Result { - return c.RenderJson(shareService.DeleteShareNotebook(notebookId, c.GetUserId(), toUserId)) + return c.RenderJSON(shareService.DeleteShareNotebook(notebookId, c.GetUserId(), toUserId)) } // 删除share note, 被共享方删除 func (c Share) DeleteShareNoteBySharedUser(noteId string, fromUserId string) revel.Result { - return c.RenderJson(shareService.DeleteShareNote(noteId, fromUserId, c.GetUserId())) + return c.RenderJSON(shareService.DeleteShareNote(noteId, fromUserId, c.GetUserId())) } // 删除share notebook, 被共享方删除 func (c Share) DeleteShareNotebookBySharedUser(notebookId string, fromUserId string) revel.Result { - return c.RenderJson(shareService.DeleteShareNotebook(notebookId, fromUserId, c.GetUserId())) + return c.RenderJSON(shareService.DeleteShareNotebook(notebookId, fromUserId, c.GetUserId())) } // 删除fromUserId分享给我的所有note, notebook func (c Share) DeleteUserShareNoteAndNotebook(fromUserId string) revel.Result { - return c.RenderJson(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId())) + return c.RenderJSON(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId())) } //------------- @@ -155,14 +155,14 @@ func (c Share) DeleteUserShareNoteAndNotebook(fromUserId string) revel.Result { 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) + 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) + return c.RenderJSON(re) } // 更新, 也是一样, 先删后加 @@ -176,14 +176,14 @@ func (c Share) UpdateShareNoteGroupPerm(noteId, groupId string, perm int) revel. 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) + 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) + return c.RenderJSON(re) } // 更新, 也是一样, 先删后加 diff --git a/app/controllers/TagController.go b/app/controllers/TagController.go index 6653b8a..5fa59ae 100644 --- a/app/controllers/TagController.go +++ b/app/controllers/TagController.go @@ -18,7 +18,7 @@ func (c Tag) UpdateTag(tag string) revel.Result { ret := info.NewRe() ret.Ok = true ret.Item = tagService.AddOrUpdateTag(c.GetUserId(), tag) - return c.RenderJson(ret) + return c.RenderJSON(ret) } // 删除标签 @@ -26,5 +26,5 @@ func (c Tag) DeleteTag(tag string) revel.Result { ret := info.Re{} ret.Ok = true ret.Item = tagService.DeleteTag(c.GetUserId(), tag) - return c.RenderJson(ret) + return c.RenderJSON(ret) } diff --git a/app/controllers/UserController.go b/app/controllers/UserController.go index 44d5f8a..43c5cbd 100644 --- a/app/controllers/UserController.go +++ b/app/controllers/UserController.go @@ -21,8 +21,8 @@ type User struct { func (c User) Account(tab int) revel.Result { userInfo := c.GetUserInfo() - c.RenderArgs["userInfo"] = userInfo - c.RenderArgs["tab"] = tab + c.ViewArgs["userInfo"] = userInfo + c.ViewArgs["tab"] = tab c.SetLocale() return c.RenderTemplate("user/account.html") } @@ -70,18 +70,18 @@ func (c User) UpdateTheme(theme string) revel.Result { if re.Ok { c.UpdateSession("Theme", theme) } - return c.RenderJson(re) + return c.RenderJSON(re) } // 发送邀请链接 func (c User) SendRegisterEmail(content, toEmail string) revel.Result { re := info.NewRe() if content == "" || !IsEmail(toEmail) { - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok = emailService.SendInviteEmail(c.GetUserInfo(), toEmail, content) - return c.RenderJson(re) + return c.RenderJSON(re) } //--------------------------- @@ -90,7 +90,7 @@ func (c User) SendRegisterEmail(content, toEmail string) revel.Result { func (c User) ReSendActiveEmail() revel.Result { re := info.NewRe() re.Ok = emailService.RegisterSendActiveEmail(c.GetUserInfo(), c.GetEmail()) - return c.RenderJson(re) + return c.RenderJSON(re) } // 通过点击链接 @@ -100,10 +100,10 @@ func (c User) UpdateEmail(token string) revel.Result { ok, msg, email := userService.UpdateEmail(token) - c.RenderArgs["title"] = "验证邮箱" - c.RenderArgs["ok"] = ok - c.RenderArgs["msg"] = msg - c.RenderArgs["email"] = email + c.ViewArgs["title"] = "验证邮箱" + c.ViewArgs["ok"] = ok + c.ViewArgs["msg"] = msg + c.ViewArgs["email"] = email // 修改session if ok { @@ -124,10 +124,10 @@ func (c User) ActiveEmail(token string) revel.Result { c.UpdateSession("Verified", "1") } - c.RenderArgs["title"] = "验证邮箱" - c.RenderArgs["ok"] = ok - c.RenderArgs["msg"] = msg - c.RenderArgs["email"] = email + c.ViewArgs["title"] = "验证邮箱" + c.ViewArgs["ok"] = ok + c.ViewArgs["msg"] = msg + c.ViewArgs["email"] = email return c.RenderTemplate("user/active_email.html") } @@ -144,7 +144,7 @@ func (c User) UpdateColumnWidth(notebookWidth, noteListWidth, mdEditorWidth int) LogJ(c.Session) } - return c.RenderJson(re) + return c.RenderJSON(re) } func (c User) UpdateLeftIsMin(leftIsMin bool) revel.Result { re := info.NewRe() @@ -156,5 +156,5 @@ func (c User) UpdateLeftIsMin(leftIsMin bool) revel.Result { c.UpdateSession("LeftIsMin", "0") } } - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/admin/AdminBaseController.go b/app/controllers/admin/AdminBaseController.go index e68f102..74eb6fe 100644 --- a/app/controllers/admin/AdminBaseController.go +++ b/app/controllers/admin/AdminBaseController.go @@ -46,7 +46,7 @@ func (c AdminBaseController) getSorter(sorterField string, isAsc bool, okSorter } else { isAsc = false } - c.RenderArgs["sorter"] = sorter + c.ViewArgs["sorter"] = sorter return sorterField, isAsc } diff --git a/app/controllers/admin/AdminBlogController.go b/app/controllers/admin/AdminBlogController.go index e977f37..6c4b9fe 100644 --- a/app/controllers/admin/AdminBlogController.go +++ b/app/controllers/admin/AdminBlogController.go @@ -17,14 +17,14 @@ 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) - c.RenderArgs["pageInfo"] = pageInfo - c.RenderArgs["blogs"] = blogs - c.RenderArgs["keywords"] = keywords + c.ViewArgs["pageInfo"] = pageInfo + c.ViewArgs["blogs"] = blogs + c.ViewArgs["keywords"] = keywords return c.RenderTemplate("admin/blog/list.html") } func (c AdminBlog) SetRecommend(noteId string, recommend bool) revel.Result { re := info.NewRe() re.Ok = blogService.SetRecommend(noteId, recommend) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/admin/AdminController.go b/app/controllers/admin/AdminController.go index c4360c8..77b4407 100644 --- a/app/controllers/admin/AdminController.go +++ b/app/controllers/admin/AdminController.go @@ -14,23 +14,23 @@ type Admin struct { func (c Admin) Index() revel.Result { c.SetUserInfo() - c.RenderArgs["title"] = "leanote" + c.ViewArgs["title"] = "leanote" c.SetLocale() - c.RenderArgs["countUser"] = userService.CountUser() - c.RenderArgs["countNote"] = noteService.CountNote("") - c.RenderArgs["countBlog"] = noteService.CountBlog("") + c.ViewArgs["countUser"] = userService.CountUser() + c.ViewArgs["countNote"] = noteService.CountNote("") + c.ViewArgs["countBlog"] = noteService.CountBlog("") return c.RenderTemplate("admin/index.html") } // 模板 func (c Admin) T(t string) revel.Result { - c.RenderArgs["str"] = configService.GlobalStringConfigs - c.RenderArgs["arr"] = configService.GlobalArrayConfigs - c.RenderArgs["map"] = configService.GlobalMapConfigs - c.RenderArgs["arrMap"] = configService.GlobalArrMapConfigs - c.RenderArgs["version"] = configService.GetVersion() + c.ViewArgs["str"] = configService.GlobalStringConfigs + c.ViewArgs["arr"] = configService.GlobalArrayConfigs + c.ViewArgs["map"] = configService.GlobalMapConfigs + c.ViewArgs["arrMap"] = configService.GlobalArrMapConfigs + c.ViewArgs["version"] = configService.GetVersion() return c.RenderTemplate("admin/" + t + ".html") } diff --git a/app/controllers/admin/AdminData.go b/app/controllers/admin/AdminData.go index 1ea9dfb..8e27411 100644 --- a/app/controllers/admin/AdminData.go +++ b/app/controllers/admin/AdminData.go @@ -26,33 +26,33 @@ func (c AdminData) Index() revel.Result { backups2[j] = backups[i] j++ } - c.RenderArgs["backups"] = backups2 + c.ViewArgs["backups"] = backups2 return c.RenderTemplate("admin/data/index.html") } func (c AdminData) Backup() revel.Result { re := info.NewRe() re.Ok, re.Msg = configService.Backup("") - return c.RenderJson(re) + return c.RenderJSON(re) } // 还原 func (c AdminData) Restore(createdTime string) revel.Result { re := info.Re{} re.Ok, re.Msg = configService.Restore(createdTime) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminData) Delete(createdTime string) revel.Result { re := info.Re{} re.Ok, re.Msg = configService.DeleteBackup(createdTime) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminData) UpdateRemark(createdTime, remark string) revel.Result { re := info.Re{} re.Ok, re.Msg = configService.UpdateBackupRemark(createdTime, remark) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminData) Download(createdTime string) revel.Result { backup, ok := configService.GetBackup(createdTime) diff --git a/app/controllers/admin/AdminEmailController.go b/app/controllers/admin/AdminEmailController.go index 08d4427..bba30dc 100644 --- a/app/controllers/admin/AdminEmailController.go +++ b/app/controllers/admin/AdminEmailController.go @@ -23,8 +23,8 @@ func (c AdminEmail) Email() revel.Result { func (c AdminEmail) Blog() revel.Result { recommendTags := configService.GetGlobalArrayConfig("recommendTags") newTags := configService.GetGlobalArrayConfig("newTags") - c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",") - c.RenderArgs["newTags"] = strings.Join(newTags, ",") + c.ViewArgs["recommendTags"] = strings.Join(recommendTags, ",") + c.ViewArgs["newTags"] = strings.Join(newTags, ",") return c.RenderTemplate("admin/setting/blog.html") } func (c AdminEmail) DoBlogTag(recommendTags, newTags string) revel.Result { @@ -33,14 +33,14 @@ func (c AdminEmail) DoBlogTag(recommendTags, newTags string) revel.Result { re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ",")) re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ",")) - return c.RenderJson(re) + return c.RenderJSON(re) } // demo // blog标签设置 func (c AdminEmail) Demo() revel.Result { - c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername") - c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword") + c.ViewArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername") + c.ViewArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword") return c.RenderTemplate("admin/setting/demo.html") } func (c AdminEmail) DoDemo(demoUsername, demoPassword string) revel.Result { @@ -48,30 +48,30 @@ func (c AdminEmail) DoDemo(demoUsername, demoPassword string) revel.Result { userInfo, err := authService.Login(demoUsername, demoPassword) if err != nil { - return c.RenderJson(info.Re{Ok: false}) + return c.RenderJSON(info.Re{Ok: false}) } if userInfo.UserId == "" { re.Msg = "The User is Not Exists" - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex()) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword) - return c.RenderJson(re) + return c.RenderJSON(re) } // ToImage // 长微博的bin路径phantomJs func (c AdminEmail) ToImage() revel.Result { - c.RenderArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath") + c.ViewArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath") return c.RenderTemplate("admin/setting/toImage.html") } func (c AdminEmail) DoToImage(toImageBinPath string) revel.Result { re := info.NewRe() re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "toImageBinPath", toImageBinPath) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminEmail) Set(emailHost, emailPort, emailUsername, emailPassword, emailSSL string) revel.Result { @@ -82,7 +82,7 @@ func (c AdminEmail) Set(emailHost, emailPort, emailUsername, emailPassword, emai re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailPassword", emailPassword) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailSSL", emailSSL) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminEmail) Template() revel.Result { re := info.NewRe() @@ -108,7 +108,7 @@ func (c AdminEmail) Template() revel.Result { if !ok { re.Ok = false re.Msg = "Error key: " + key + "
" + msg - return c.RenderJson(re) + return c.RenderJSON(re) } else { configService.UpdateGlobalStringConfig(userId, key, v) } @@ -116,7 +116,7 @@ func (c AdminEmail) Template() revel.Result { } re.Ok = true - return c.RenderJson(re) + return c.RenderJSON(re) } // 发送Email @@ -127,7 +127,7 @@ func (c AdminEmail) SendEmailToEmails(sendEmails, latestEmailSubject, latestEmai if latestEmailSubject == "" || latestEmailBody == "" { re.Msg = "subject or body is blank" - return c.RenderJson(re) + return c.RenderJSON(re) } if saveAsOldEmail { @@ -140,7 +140,7 @@ func (c AdminEmail) SendEmailToEmails(sendEmails, latestEmailSubject, latestEmai emails := strings.Split(sendEmails, "\n") re.Ok, re.Msg = emailService.SendEmailToEmails(emails, latestEmailSubject, latestEmailBody) - return c.RenderJson(re) + return c.RenderJSON(re) } // 发送Email @@ -151,7 +151,7 @@ func (c AdminEmail) SendToUsers2(emails, latestEmailSubject, latestEmailBody str if latestEmailSubject == "" || latestEmailBody == "" { re.Msg = "subject or body is blank" - return c.RenderJson(re) + return c.RenderJSON(re) } if saveAsOldEmail { @@ -168,7 +168,7 @@ func (c AdminEmail) SendToUsers2(emails, latestEmailSubject, latestEmailBody str re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody) - return c.RenderJson(re) + return c.RenderJSON(re) } // send Email dialog @@ -176,9 +176,9 @@ func (c AdminEmail) SendEmailDialog(emails string) revel.Result { emailsArr := strings.Split(emails, ",") emailsNl := strings.Join(emailsArr, "\n") - c.RenderArgs["emailsNl"] = emailsNl - c.RenderArgs["str"] = configService.GlobalStringConfigs - c.RenderArgs["map"] = configService.GlobalMapConfigs + c.ViewArgs["emailsNl"] = emailsNl + c.ViewArgs["str"] = configService.GlobalStringConfigs + c.ViewArgs["map"] = configService.GlobalMapConfigs return c.RenderTemplate("admin/email/emailDialog.html") } @@ -190,7 +190,7 @@ func (c AdminEmail) SendToUsers(userFilterEmail, userFilterWhiteList, userFilter if latestEmailSubject == "" || latestEmailBody == "" { re.Msg = "subject or body is blank" - return c.RenderJson(re) + return c.RenderJSON(re) } if saveAsOldEmail { @@ -204,33 +204,33 @@ func (c AdminEmail) SendToUsers(userFilterEmail, userFilterWhiteList, userFilter if users == nil || len(users) == 0 { re.Ok = false re.Msg = "no users" - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody) if !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok = true re.Msg = "users:" + strconv.Itoa(len(users)) - return c.RenderJson(re) + return c.RenderJSON(re) } // 删除emails func (c AdminEmail) DeleteEmails(ids string) revel.Result { re := info.NewRe() re.Ok = emailService.DeleteEmails(strings.Split(ids, ",")) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminEmail) List(sorter, keywords string) revel.Result { pageNumber := c.GetPage() sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "ok", "subject", "createdTime"}) pageInfo, emails := emailService.ListEmailLogs(pageNumber, userPageSize, sorterField, isAsc, keywords) - c.RenderArgs["pageInfo"] = pageInfo - c.RenderArgs["emails"] = emails - c.RenderArgs["keywords"] = keywords + c.ViewArgs["pageInfo"] = pageInfo + c.ViewArgs["emails"] = emails + c.ViewArgs["keywords"] = keywords return c.RenderTemplate("admin/email/list.html") } diff --git a/app/controllers/admin/AdminSettingController.go b/app/controllers/admin/AdminSettingController.go index 72fb33e..3044777 100644 --- a/app/controllers/admin/AdminSettingController.go +++ b/app/controllers/admin/AdminSettingController.go @@ -23,8 +23,8 @@ func (c AdminSetting) Email() revel.Result { func (c AdminSetting) Blog() revel.Result { recommendTags := configService.GetGlobalArrayConfig("recommendTags") newTags := configService.GetGlobalArrayConfig("newTags") - c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",") - c.RenderArgs["newTags"] = strings.Join(newTags, ",") + c.ViewArgs["recommendTags"] = strings.Join(recommendTags, ",") + c.ViewArgs["newTags"] = strings.Join(newTags, ",") return c.RenderTemplate("admin/setting/blog.html") } func (c AdminSetting) DoBlogTag(recommendTags, newTags string) revel.Result { @@ -33,7 +33,7 @@ func (c AdminSetting) DoBlogTag(recommendTags, newTags string) revel.Result { re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ",")) re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ",")) - return c.RenderJson(re) + return c.RenderJSON(re) } // 共享设置 @@ -43,14 +43,14 @@ func (c AdminSetting) ShareNote(registerSharedUserId string, re := info.NewRe() re.Ok, re.Msg = configService.UpdateShareNoteConfig(registerSharedUserId, registerSharedNotebookPerms, registerSharedNotePerms, registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds) - return c.RenderJson(re) + return c.RenderJSON(re) } // demo // blog标签设置 func (c AdminSetting) Demo() revel.Result { - c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername") - c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword") + c.ViewArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername") + c.ViewArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword") return c.RenderTemplate("admin/setting/demo.html") } func (c AdminSetting) DoDemo(demoUsername, demoPassword string) revel.Result { @@ -59,40 +59,40 @@ func (c AdminSetting) DoDemo(demoUsername, demoPassword string) revel.Result { userInfo, err := authService.Login(demoUsername, demoPassword) if err != nil { fmt.Println(err) - return c.RenderJson(info.Re{Ok: false}) + return c.RenderJSON(info.Re{Ok: false}) } if userInfo.UserId == "" { re.Msg = "The User is Not Exists" - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex()) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) ExportPdf(path string) revel.Result { re := info.NewRe() re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "exportPdfBinPath", path) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) DoSiteUrl(siteUrl string) revel.Result { re := info.NewRe() re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "siteUrl", siteUrl) - return c.RenderJson(re) + return c.RenderJSON(re) } // SubDomain func (c AdminSetting) SubDomain() revel.Result { - c.RenderArgs["str"] = configService.GlobalStringConfigs - c.RenderArgs["arr"] = configService.GlobalArrayConfigs + c.ViewArgs["str"] = configService.GlobalStringConfigs + c.ViewArgs["arr"] = configService.GlobalArrayConfigs - c.RenderArgs["noteSubDomain"] = configService.GetGlobalStringConfig("noteSubDomain") - c.RenderArgs["blogSubDomain"] = configService.GetGlobalStringConfig("blogSubDomain") - c.RenderArgs["leaSubDomain"] = configService.GetGlobalStringConfig("leaSubDomain") + c.ViewArgs["noteSubDomain"] = configService.GetGlobalStringConfig("noteSubDomain") + c.ViewArgs["blogSubDomain"] = configService.GetGlobalStringConfig("blogSubDomain") + c.ViewArgs["leaSubDomain"] = configService.GetGlobalStringConfig("leaSubDomain") return c.RenderTemplate("admin/setting/subDomain.html") } @@ -106,13 +106,13 @@ func (c AdminSetting) DoSubDomain(noteSubDomain, blogSubDomain, leaSubDomain, bl re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackSubDomains", strings.Split(blackSubDomains, ",")) re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackCustomDomains", strings.Split(blackCustomDomains, ",")) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) OpenRegister(openRegister string) revel.Result { re := info.NewRe() re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "openRegister", openRegister) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) HomePage(homePage string) revel.Result { @@ -121,7 +121,7 @@ func (c AdminSetting) HomePage(homePage string) revel.Result { homePage = "" } re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "homePage", homePage) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Result { @@ -129,7 +129,7 @@ func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Resu re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongodumpPath", mongodumpPath) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongorestorePath", mongorestorePath) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminSetting) UploadSize(uploadImageSize, uploadAvatarSize, uploadBlogLogoSize, uploadAttachSize float64) revel.Result { @@ -138,5 +138,5 @@ func (c AdminSetting) UploadSize(uploadImageSize, uploadAvatarSize, uploadBlogLo re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAvatarSize", fmt.Sprintf("%v", uploadAvatarSize)) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadBlogLogoSize", fmt.Sprintf("%v", uploadBlogLogoSize)) re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAttachSize", fmt.Sprintf("%v", uploadAttachSize)) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/admin/AdminUpgradeController.go b/app/controllers/admin/AdminUpgradeController.go index 0ca28fb..dc818b9 100644 --- a/app/controllers/admin/AdminUpgradeController.go +++ b/app/controllers/admin/AdminUpgradeController.go @@ -20,11 +20,11 @@ func (c AdminUpgrade) UpgradeBlog() revel.Result { func (c AdminUpgrade) UpgradeBetaToBeta2() revel.Result { re := info.NewRe() re.Ok, re.Msg = upgradeService.UpgradeBetaToBeta2(c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c AdminUpgrade) UpgradeBeta3ToBeta4() revel.Result { re := info.NewRe() re.Ok, re.Msg = upgradeService.Api(c.GetUserId()) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/admin/AdminUserController.go b/app/controllers/admin/AdminUserController.go index 73bc1b9..6926a79 100644 --- a/app/controllers/admin/AdminUserController.go +++ b/app/controllers/admin/AdminUserController.go @@ -23,9 +23,9 @@ func (c AdminUser) Index(sorter, keywords string, pageSize int) revel.Result { } sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "username", "verified", "createdTime", "accountType"}) pageInfo, users := userService.ListUsers(pageNumber, pageSize, sorterField, isAsc, keywords) - c.RenderArgs["pageInfo"] = pageInfo - c.RenderArgs["users"] = users - c.RenderArgs["keywords"] = keywords + c.ViewArgs["pageInfo"] = pageInfo + c.ViewArgs["users"] = users + c.ViewArgs["keywords"] = keywords return c.RenderTemplate("admin/user/list.html") } @@ -53,7 +53,7 @@ func (c AdminUser) Register(email, pwd string) revel.Result { // 修改帐户 func (c AdminUser) ResetPwd(userId string) revel.Result { userInfo := userService.GetUserInfo(userId) - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["userInfo"] = userInfo return c.RenderTemplate("admin/user/reset_pwd.html") } diff --git a/app/controllers/admin/init.go b/app/controllers/admin/init.go index bd97b48..3a7a6e3 100644 --- a/app/controllers/admin/init.go +++ b/app/controllers/admin/init.go @@ -91,7 +91,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result { if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" { re := info.NewRe() re.Msg = "NOTLOGIN" - return c.RenderJson(re) + return c.RenderJSON(re) } return c.Redirect("/login") diff --git a/app/controllers/api/ApiAuthController.go b/app/controllers/api/ApiAuthController.go index c651fd1..673c030 100644 --- a/app/controllers/api/ApiAuthController.go +++ b/app/controllers/api/ApiAuthController.go @@ -28,12 +28,12 @@ func (c ApiAuth) Login(email, pwd string) revel.Result { if err == nil { token := bson.NewObjectId().Hex() sessionService.SetUserId(token, userInfo.UserId.Hex()) - return c.RenderJson(info.AuthOk{Ok: true, Token: token, UserId: userInfo.UserId, Email: userInfo.Email, Username: userInfo.Username}) + return c.RenderJSON(info.AuthOk{Ok: true, Token: token, UserId: userInfo.UserId, Email: userInfo.Email, Username: userInfo.Username}) } else { // 登录错误, 则错误次数++ msg = "wrongUsernameOrPassword" } - return c.RenderJson(info.ApiRe{Ok: false, Msg: c.Message(msg)}) + return c.RenderJSON(info.ApiRe{Ok: false, Msg: c.Message(msg)}) } // 注销 @@ -43,7 +43,7 @@ func (c ApiAuth) Logout() revel.Result { sessionService.Clear(token) re := info.NewApiRe() re.Ok = true - return c.RenderJson(re) + return c.RenderJSON(re) } // 注册 @@ -53,17 +53,17 @@ func (c ApiAuth) Register(email, pwd string) revel.Result { re := info.NewApiRe() if !configService.IsOpenRegister() { re.Msg = "notOpenRegister" // 未开放注册 - return c.RenderJson(re) + return c.RenderJSON(re) } if re.Ok, re.Msg = Vd("email", email); !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } if re.Ok, re.Msg = Vd("password", pwd); !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } // 注册 re.Ok, re.Msg = authService.Register(email, pwd, "") - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/api/ApiFileController.go b/app/controllers/api/ApiFileController.go index 4432501..6536947 100644 --- a/app/controllers/api/ApiFileController.go +++ b/app/controllers/api/ApiFileController.go @@ -30,7 +30,7 @@ func (c ApiFile) CopyImage(userId, fileId, toUserId string) revel.Result { re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId) - return c.RenderJson(re) + return c.RenderJSON(re) } // get all images by userId with page @@ -39,19 +39,19 @@ func (c ApiFile) GetImages(albumId, key string, page int) revel.Result { re := info.NewRe() re.Ok = true re.Item = imagesPage - return c.RenderJson(re) + return c.RenderJSON(re) } func (c ApiFile) UpdateImageTitle(fileId, title string) revel.Result { re := info.NewRe() re.Ok = fileService.UpdateImageTitle(c.getUserId(), fileId, title) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c ApiFile) DeleteImage(fileId string) revel.Result { re := info.NewRe() re.Ok, re.Msg = fileService.DeleteImage(c.getUserId(), fileId) - return c.RenderJson(re) + return c.RenderJSON(re) } */ diff --git a/app/controllers/api/ApiNoteController.go b/app/controllers/api/ApiNoteController.go index 1c5ae85..4ee73c6 100644 --- a/app/controllers/api/ApiNoteController.go +++ b/app/controllers/api/ApiNoteController.go @@ -52,7 +52,7 @@ func (c ApiNote) GetSyncNotes(afterUsn, maxEntry int) revel.Result { maxEntry = 100 } notes := noteService.GetSyncNotes(c.getUserId(), afterUsn, maxEntry) - return c.RenderJson(notes) + return c.RenderJSON(notes) } // 得到笔记本下的笔记 @@ -61,17 +61,17 @@ func (c ApiNote) GetNotes(notebookId string) revel.Result { if notebookId != "" && !bson.IsObjectIdHex(notebookId) { re := info.NewApiRe() re.Msg = "notebookIdInvalid" - return c.RenderJson(re) + return c.RenderJSON(re) } _, notes := noteService.ListNotes(c.getUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false) - return c.RenderJson(noteService.ToApiNotes(notes)) + return c.RenderJSON(noteService.ToApiNotes(notes)) } // 得到trash // [OK] func (c ApiNote) GetTrashNotes() revel.Result { _, notes := noteService.ListNotes(c.getUserId(), "", true, c.GetPage(), pageSize, defaultSortField, false, false) - return c.RenderJson(noteService.ToApiNotes(notes)) + return c.RenderJSON(noteService.ToApiNotes(notes)) } @@ -127,17 +127,17 @@ func (c ApiNote) GetNote(noteId string) revel.Result { if !bson.IsObjectIdHex(noteId) { re := info.NewApiRe() re.Msg = "noteIdInvalid" - return c.RenderJson(re) + return c.RenderJSON(re) } note := noteService.GetNote(noteId, c.getUserId()) if note.NoteId == "" { re := info.NewApiRe() re.Msg = "notExists" - return c.RenderJson(re) + return c.RenderJSON(re) } apiNotes := noteService.ToApiNotes([]info.Note{note}) - return c.RenderJson(apiNotes[0]) + return c.RenderJSON(apiNotes[0]) } // 得到note和内容 @@ -148,7 +148,7 @@ func (c ApiNote) GetNoteAndContent(noteId string) revel.Result { apiNotes := noteService.ToApiNotes([]info.Note{noteAndContent.Note}) apiNote := apiNotes[0] apiNote.Content = noteService.FixContent(noteAndContent.Content, noteAndContent.IsMarkdown) - return c.RenderJson(apiNote) + return c.RenderJSON(apiNote) } // content里的image, attach链接是 @@ -207,7 +207,7 @@ func (c ApiNote) GetNoteContent(noteId string) revel.Result { Content: noteContent.Content, } - return c.RenderJson(apiNoteContent) + return c.RenderJSON(apiNoteContent) } // 添加笔记 @@ -233,10 +233,10 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { LogJ(file) } */ - // return c.RenderJson(re) + // return c.RenderJSON(re) if noteOrContent.NotebookId == "" || !bson.IsObjectIdHex(noteOrContent.NotebookId) { re.Msg = "notebookIdNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } noteId := bson.NewObjectId() @@ -259,7 +259,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { } // 报不是图片的错误没关系, 证明客户端传来非图片的数据 if msg != "notImage" { - return c.RenderJson(re) + return c.RenderJSON(re) } } else { // 建立映射 @@ -271,7 +271,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { } } } else { - return c.RenderJson(re) + return c.RenderJSON(re) } } } @@ -282,7 +282,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { // Log("Add") // LogJ(noteOrContent) - // return c.RenderJson(re) + // return c.RenderJSON(re) note := info.Note{UserId: userId, NoteId: noteId, @@ -318,7 +318,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { if note.NoteId == "" { re.Ok = false - return c.RenderJson(re) + return c.RenderJSON(re) } // 添加需要返回的 @@ -332,7 +332,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result { noteOrContent.Content = "" noteOrContent.Abstract = "" // apiNote := info.NoteToApiNote(note, noteOrContent.Files) - return c.RenderJson(noteOrContent) + return c.RenderJSON(noteOrContent) } // 更新笔记 @@ -347,12 +347,12 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { if noteOrContent.NoteId == "" { re.Msg = "noteIdNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } if noteOrContent.Usn <= 0 { re.Msg = "usnNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } // Log("_____________") @@ -368,12 +368,12 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { note := noteService.GetNote(noteId, userId) if note.NoteId == "" { re.Msg = "notExists" - return c.RenderJson(re) + return c.RenderJSON(re) } if note.Usn != noteOrContent.Usn { re.Msg = "conflict" Log("conflict") - return c.RenderJson(re) + return c.RenderJSON(re) } Log("没有冲突") @@ -402,14 +402,14 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { } else { re.Msg = msg } - return c.RenderJson(re) + return c.RenderJSON(re) } else { // 建立映射 file.FileId = fileId noteOrContent.Files[i] = file } } else { - return c.RenderJson(re) + return c.RenderJSON(re) } } } @@ -490,7 +490,7 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { if !noteOk { re.Ok = false re.Msg = noteMsg - return c.RenderJson(re) + return c.RenderJSON(re) } } @@ -528,7 +528,7 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { } if !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } noteOrContent.Content = "" @@ -539,14 +539,14 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result { // LogJ(noteOrContent.Files) noteOrContent.UserId = c.getUserId() - return c.RenderJson(noteOrContent) + return c.RenderJSON(noteOrContent) } // 删除trash func (c ApiNote) DeleteTrash(noteId string, usn int) revel.Result { re := info.NewReUpdate() re.Ok, re.Msg, re.Usn = trashService.DeleteTrashApi(noteId, c.getUserId(), usn) - return c.RenderJson(re) + return c.RenderJSON(re) } // 得到历史列表 @@ -558,7 +558,7 @@ func (c ApiNote) GetHistories(noteId string) revel.Result { re.Ok = true re.Item = histories } - return c.RenderJson(re) + return c.RenderJSON(re) } */ @@ -569,13 +569,13 @@ func (c ApiNote) ExportPdf(noteId string) revel.Result { userId := c.getUserId() if noteId == "" { re.Msg = "noteNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } note := noteService.GetNoteById(noteId) if note.NoteId == "" { re.Msg = "noteNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } noteUserId := note.UserId.Hex() @@ -584,7 +584,7 @@ func (c ApiNote) ExportPdf(noteId string) revel.Result { // 是否是有权限协作的 if !note.IsBlog && !shareService.HasReadPerm(noteUserId, userId, noteId) { re.Msg = "noteNotExists" - return c.RenderJson(re) + return c.RenderJSON(re) } } @@ -594,7 +594,7 @@ func (c ApiNote) ExportPdf(noteId string) revel.Result { dir := revel.BasePath + "/" + fileUrlPath if !MkdirAll(dir) { re.Msg = "noDir" - return c.RenderJson(re) + return c.RenderJSON(re) } filename := guid + ".pdf" path := dir + "/" + filename @@ -623,12 +623,12 @@ func (c ApiNote) ExportPdf(noteId string) revel.Result { _, err := cmd.Output() if err != nil { re.Msg = "sysError" - return c.RenderJson(re) + return c.RenderJSON(re) } file, err := os.Open(path) if err != nil { re.Msg = "sysError" - return c.RenderJson(re) + return c.RenderJSON(re) } filenameReturn := note.Title diff --git a/app/controllers/api/ApiNotebookController.go b/app/controllers/api/ApiNotebookController.go index 520a998..ef6cee4 100644 --- a/app/controllers/api/ApiNotebookController.go +++ b/app/controllers/api/ApiNotebookController.go @@ -53,7 +53,7 @@ func (c ApiNotebook) GetSyncNotebooks(afterUsn, maxEntry int) revel.Result { maxEntry = 100 } notebooks := notebookService.GeSyncNotebooks(c.getUserId(), afterUsn, maxEntry) - return c.RenderJson(c.fixNotebooks(notebooks)) + return c.RenderJSON(c.fixNotebooks(notebooks)) } // 得到用户的所有笔记本 @@ -61,7 +61,7 @@ func (c ApiNotebook) GetSyncNotebooks(afterUsn, maxEntry int) revel.Result { // info.SubNotebooks func (c ApiNotebook) GetNotebooks() revel.Result { notebooks := notebookService.GeSyncNotebooks(c.getUserId(), 0, 99999) - return c.RenderJson(c.fixNotebooks(notebooks)) + return c.RenderJSON(c.fixNotebooks(notebooks)) } // 添加notebook @@ -77,9 +77,9 @@ func (c ApiNotebook) AddNotebook(title, parentNotebookId string, seq int) revel. re := info.NewRe() re.Ok, notebook = notebookService.AddNotebook(notebook) if !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } - return c.RenderJson(c.fixNotebook(¬ebook)) + return c.RenderJSON(c.fixNotebook(¬ebook)) } // 修改笔记 @@ -91,10 +91,10 @@ func (c ApiNotebook) UpdateNotebook(notebookId, title, parentNotebookId string, if !ok { re.Ok = false re.Msg = msg - return c.RenderJson(re) + return c.RenderJSON(re) } LogJ(notebook) - return c.RenderJson(c.fixNotebook(¬ebook)) + return c.RenderJSON(c.fixNotebook(¬ebook)) } // 删除笔记本 @@ -102,5 +102,5 @@ func (c ApiNotebook) UpdateNotebook(notebookId, title, parentNotebookId string, func (c ApiNotebook) DeleteNotebook(notebookId string, usn int) revel.Result { re := info.NewApiRe() re.Ok, re.Msg = notebookService.DeleteNotebookForce(c.getUserId(), notebookId, usn) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/api/ApiTagController.go b/app/controllers/api/ApiTagController.go index 14dbcea..7c4b9cf 100644 --- a/app/controllers/api/ApiTagController.go +++ b/app/controllers/api/ApiTagController.go @@ -23,7 +23,7 @@ func (c ApiTag) GetSyncTags(afterUsn, maxEntry int) revel.Result { maxEntry = 100 } tags := tagService.GeSyncTags(c.getUserId(), afterUsn, maxEntry) - return c.RenderJson(tags) + return c.RenderJSON(tags) } // 添加Tag @@ -44,7 +44,7 @@ func (c ApiTag) GetSyncTags(afterUsn, maxEntry int) revel.Result { */ func (c ApiTag) AddTag(tag string) revel.Result { ret := tagService.AddOrUpdateTag(c.getUserId(), tag) - return c.RenderJson(ret) + return c.RenderJSON(ret) } // 删除标签 @@ -52,5 +52,5 @@ func (c ApiTag) AddTag(tag string) revel.Result { func (c ApiTag) DeleteTag(tag string, usn int) revel.Result { re := info.NewReUpdate() re.Ok, re.Msg, re.Usn = tagService.DeleteTagApi(c.getUserId(), tag, usn) - return c.RenderJson(re) + return c.RenderJSON(re) } diff --git a/app/controllers/api/ApiUserController.go b/app/controllers/api/ApiUserController.go index a0c5426..4ac0cfc 100644 --- a/app/controllers/api/ApiUserController.go +++ b/app/controllers/api/ApiUserController.go @@ -28,7 +28,7 @@ func (c ApiUser) Info() revel.Result { userInfo := c.getUserInfo() if userInfo.UserId == "" { - return c.RenderJson(re) + return c.RenderJSON(re) } apiUser := info.ApiUser{ UserId: userInfo.UserId.Hex(), @@ -37,7 +37,7 @@ func (c ApiUser) Info() revel.Result { Logo: userInfo.Logo, Verified: userInfo.Verified, } - return c.RenderJson(apiUser) + return c.RenderJSON(apiUser) } // 修改用户名 @@ -46,15 +46,15 @@ func (c ApiUser) UpdateUsername(username string) revel.Result { re := info.NewApiRe() if c.GetUsername() == "demo" { re.Msg = "cannotUpdateDemo" - return c.RenderJson(re) + return c.RenderJSON(re) } if re.Ok, re.Msg = Vd("username", username); !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok, re.Msg = userService.UpdateUsername(c.getUserId(), username) - return c.RenderJson(re) + return c.RenderJSON(re) } // 修改密码 @@ -63,23 +63,23 @@ func (c ApiUser) UpdatePwd(oldPwd, pwd string) revel.Result { re := info.NewApiRe() if c.GetUsername() == "demo" { re.Msg = "cannotUpdateDemo" - return c.RenderJson(re) + return c.RenderJSON(re) } if re.Ok, re.Msg = Vd("password", oldPwd); !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } if re.Ok, re.Msg = Vd("password", pwd); !re.Ok { - return c.RenderJson(re) + return c.RenderJSON(re) } re.Ok, re.Msg = userService.UpdatePwd(c.getUserId(), oldPwd, pwd) - return c.RenderJson(re) + return c.RenderJSON(re) } // 获得同步状态 // [OK] func (c ApiUser) GetSyncState() revel.Result { ret := bson.M{"LastSyncUsn": userService.GetUsn(c.getUserId()), "LastSyncTime": time.Now().Unix()} - return c.RenderJson(ret) + return c.RenderJSON(ret) } // 头像设置 @@ -91,11 +91,11 @@ func (c ApiUser) UpdateLogo() revel.Result { if ok { ok = userService.UpdateAvatar(c.getUserId(), url) - return c.RenderJson(map[string]string{"Logo": url}) + return c.RenderJSON(map[string]string{"Logo": url}) } else { re := info.NewApiRe() re.Msg = msg - return c.RenderJson(re) + return c.RenderJSON(re) } } diff --git a/app/controllers/api/init.go b/app/controllers/api/init.go index 37f9c1c..71659c6 100644 --- a/app/controllers/api/init.go +++ b/app/controllers/api/init.go @@ -75,7 +75,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result { noToken := false if token == "" { // 若无, 则取sessionId - token = c.Session.Id() + token = c.Session.ID() noToken = true } c.Session["_token"] = token @@ -106,7 +106,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result { // 没有登录, 返回错误的信息, 需要登录 re := info.NewApiRe() re.Msg = "NOTLOGIN" - return c.RenderJson(re) + return c.RenderJSON(re) } func init() { diff --git a/app/controllers/init.go b/app/controllers/init.go index 790b453..37d5b74 100644 --- a/app/controllers/init.go +++ b/app/controllers/init.go @@ -103,7 +103,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result { if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" { re := info.NewRe() re.Msg = "NOTLOGIN" - return c.RenderJson(re) + return c.RenderJSON(re) } return c.Redirect("/login") diff --git a/app/controllers/member/MemberBaseController.go b/app/controllers/member/MemberBaseController.go index 4db0bb7..7cea3aa 100644 --- a/app/controllers/member/MemberBaseController.go +++ b/app/controllers/member/MemberBaseController.go @@ -46,7 +46,7 @@ func (c MemberBaseController) getSorter(sorterField string, isAsc bool, okSorter } else { isAsc = false } - c.RenderArgs["sorter"] = sorter + c.ViewArgs["sorter"] = sorter return sorterField, isAsc } diff --git a/app/controllers/member/MemberBlogController.go b/app/controllers/member/MemberBlogController.go index 304a343..4dac19a 100644 --- a/app/controllers/member/MemberBlogController.go +++ b/app/controllers/member/MemberBlogController.go @@ -21,13 +21,13 @@ type MemberBlog struct { func (c MemberBlog) common() info.UserBlog { userId := c.GetUserId() userInfo := userService.GetUserInfo(userId) - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["userInfo"] = userInfo // 得到博客设置信息 - c.RenderArgs["allowCustomDomain"] = configService.GetGlobalStringConfig("allowCustomDomain") + c.ViewArgs["allowCustomDomain"] = configService.GetGlobalStringConfig("allowCustomDomain") userBlog := blogService.GetUserBlog(userId) - c.RenderArgs["userBlog"] = userBlog + c.ViewArgs["userBlog"] = userBlog c.SetUserInfo() c.SetLocale() @@ -62,7 +62,7 @@ func (c MemberBlog) getSorter(sorterField string, isAsc bool, okSorter []string) } else { isAsc = false } - c.RenderArgs["sorter"] = sorter + c.ViewArgs["sorter"] = sorter return sorterField, isAsc } @@ -72,18 +72,18 @@ var userPageSize = 15 func (c MemberBlog) Index(sorter, keywords string) revel.Result { userId := c.GetUserId() userInfo := userService.GetUserInfo(userId) - c.RenderArgs["userInfo"] = userInfo + c.ViewArgs["userInfo"] = userInfo - c.RenderArgs["title"] = c.Message("Posts") + c.ViewArgs["title"] = c.Message("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 + c.ViewArgs["pageInfo"] = pageInfo + c.ViewArgs["blogs"] = blogs + c.ViewArgs["keywords"] = keywords userAndBlog := userService.GetUserAndBlog(c.GetUserId()) - c.RenderArgs["userAndBlog"] = userAndBlog + c.ViewArgs["userAndBlog"] = userAndBlog c.common() @@ -94,48 +94,48 @@ func (c MemberBlog) Index(sorter, keywords string) revel.Result { 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) + return c.RenderJSON(re) } // 修改笔记的urlTitle func (c MemberBlog) UpdateBlogAbstract(noteId string) revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Update Post Abstract") + c.ViewArgs["title"] = c.Message("Update Post Abstract") note := noteService.GetNoteAndContent(noteId, c.GetUserId()) if !note.Note.IsBlog { return c.E404() } - c.RenderArgs["note"] = note - c.RenderArgs["noteId"] = noteId + c.ViewArgs["note"] = note + c.ViewArgs["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) + return c.RenderJSON(re) } // 基本信息设置 func (c MemberBlog) Base() revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Blog Base Info") + c.ViewArgs["title"] = c.Message("Blog Base Info") return c.RenderTemplate("member/blog/base.html") } func (c MemberBlog) Comment() revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Comment") + c.ViewArgs["title"] = c.Message("Comment") return c.RenderTemplate("member/blog/comment.html") } func (c MemberBlog) Paging() revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Paging") + c.ViewArgs["title"] = c.Message("Paging") return c.RenderTemplate("member/blog/paging.html") } func (c MemberBlog) Cate() revel.Result { userBlog := c.common() - c.RenderArgs["title"] = c.Message("Category") + c.ViewArgs["title"] = c.Message("Category") notebooks := blogService.ListBlogNotebooks(c.GetUserId()) notebooksMap := map[string]info.Notebook{} @@ -166,7 +166,7 @@ func (c MemberBlog) Cate() revel.Result { i++ } } - c.RenderArgs["notebooks"] = notebooks2 + c.ViewArgs["notebooks"] = notebooks2 return c.RenderTemplate("member/blog/cate.html") } @@ -175,54 +175,54 @@ func (c MemberBlog) Cate() revel.Result { func (c MemberBlog) UpateCateIds(cateIds []string) revel.Result { re := info.NewRe() re.Ok = blogService.UpateCateIds(c.GetUserId(), cateIds) - return c.RenderJson(re) + 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) + return c.RenderJSON(re) } // 保存之, 包含增加与保存 func (c MemberBlog) DoAddOrUpdateSingle(singleId, title, content string) revel.Result { re := info.NewRe() re.Ok = blogService.AddOrUpdateSingle(c.GetUserId(), singleId, title, content) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) AddOrUpdateSingle(singleId string) revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Add Single") - c.RenderArgs["singleId"] = singleId + c.ViewArgs["title"] = c.Message("Add Single") + c.ViewArgs["singleId"] = singleId if singleId != "" { - c.RenderArgs["title"] = c.Message("Update Single") - c.RenderArgs["single"] = blogService.GetSingle(singleId) + c.ViewArgs["title"] = c.Message("Update Single") + c.ViewArgs["single"] = blogService.GetSingle(singleId) } return c.RenderTemplate("member/blog/add_single.html") } func (c MemberBlog) SortSingles(singleIds []string) revel.Result { re := info.NewRe() re.Ok = blogService.SortSingles(c.GetUserId(), singleIds) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) DeleteSingle(singleId string) revel.Result { re := info.NewRe() re.Ok = blogService.DeleteSingle(c.GetUserId(), singleId) - return c.RenderJson(re) + 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) + return c.RenderJSON(re) } func (c MemberBlog) Single() revel.Result { c.common() - c.RenderArgs["title"] = c.Message("Single") - c.RenderArgs["singles"] = blogService.GetSingles(c.GetUserId()) + c.ViewArgs["title"] = c.Message("Single") + c.ViewArgs["singles"] = blogService.GetSingles(c.GetUserId()) return c.RenderTemplate("member/blog/single.html") } @@ -231,12 +231,12 @@ func (c MemberBlog) Single() revel.Result { func (c MemberBlog) Theme() revel.Result { c.common() activeTheme, otherThemes := themeService.GetUserThemes(c.GetUserId()) - c.RenderArgs["activeTheme"] = activeTheme - c.RenderArgs["otherThemes"] = otherThemes + c.ViewArgs["activeTheme"] = activeTheme + c.ViewArgs["otherThemes"] = otherThemes - c.RenderArgs["optionThemes"] = themeService.GetDefaultThemes() + c.ViewArgs["optionThemes"] = themeService.GetDefaultThemes() - c.RenderArgs["title"] = c.Message("Theme") + c.ViewArgs["title"] = c.Message("Theme") return c.RenderTemplate("member/blog/theme.html") } @@ -253,11 +253,11 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result { } c.common() - c.RenderArgs["title"] = c.Message("Update Theme") - c.RenderArgs["isNew"] = isNew + c.ViewArgs["title"] = c.Message("Update Theme") + c.ViewArgs["isNew"] = isNew // 先复制之 - c.RenderArgs["themeId"] = themeId + c.ViewArgs["themeId"] = themeId // 得到脚本目录 userId := c.GetUserId() @@ -266,7 +266,7 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result { if theme.ThemeId == "" { return c.E404() } - c.RenderArgs["theme"] = theme + c.ViewArgs["theme"] = theme path := revel.BasePath + "/" + theme.Path @@ -287,7 +287,7 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result { } } - c.RenderArgs["myTpls"] = myTpls + c.ViewArgs["myTpls"] = myTpls return c.RenderTemplate("member/blog/update_theme.html") } @@ -298,7 +298,7 @@ func (c MemberBlog) GetTplContent(themeId string, filename string) revel.Result re.Ok = true re.Item = themeService.GetTplContent(c.GetUserId(), themeId, filename) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) UpdateTplContent(themeId, filename, content string) revel.Result { re := info.NewRe() @@ -309,7 +309,7 @@ func (c MemberBlog) UpdateTplContent(themeId, filename, content string) revel.Re func (c MemberBlog) DeleteTpl(themeId, filename string) revel.Result { re := info.NewRe() re.Ok = themeService.DeleteTpl(c.GetUserId(), themeId, filename) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) ListThemeImages(themeId string) revel.Result { @@ -320,22 +320,22 @@ func (c MemberBlog) ListThemeImages(themeId string) revel.Result { images := ListDir(path) re.List = images re.Ok = true - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) DeleteThemeImage(themeId, filename string) revel.Result { re := info.NewRe() path := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images/" + filename re.Ok = DeleteFile(path) - return c.RenderJson(re) + return c.RenderJSON(re) } // 上传主题图片 func (c MemberBlog) UploadThemeImage(themeId string) revel.Result { re := c.uploadImage(themeId) - c.RenderArgs["fileUrlPath"] = re.Id - c.RenderArgs["resultCode"] = re.Code - c.RenderArgs["resultMsg"] = re.Msg + c.ViewArgs["fileUrlPath"] = re.Id + c.ViewArgs["resultCode"] = re.Code + c.ViewArgs["resultMsg"] = re.Msg return c.RenderTemplate("file/blog_logo.html") } func (c MemberBlog) uploadImage(themeId string) (re info.Re) { @@ -405,21 +405,21 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) { func (c MemberBlog) ActiveTheme(themeId string) revel.Result { re := info.NewRe() re.Ok = themeService.ActiveTheme(c.GetUserId(), themeId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 删除主题 func (c MemberBlog) DeleteTheme(themeId string) revel.Result { re := info.NewRe() re.Ok = themeService.DeleteTheme(c.GetUserId(), themeId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 管理员公开主题 func (c MemberBlog) PublicTheme(themeId string) revel.Result { re := info.NewRe() re.Ok = themeService.PublicTheme(c.GetUserId(), themeId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 导出 @@ -444,7 +444,7 @@ func (c MemberBlog) ImportTheme() revel.Result { file, handel, err := c.Request.FormFile("file") if err != nil { re.Msg = fmt.Sprintf("%v", err) - return c.RenderJson(re) + return c.RenderJSON(re) } defer file.Close() @@ -454,7 +454,7 @@ func (c MemberBlog) ImportTheme() revel.Result { err = os.MkdirAll(dir, 0755) if err != nil { re.Msg = fmt.Sprintf("%v", err) - return c.RenderJson(re) + return c.RenderJSON(re) } // 生成新的文件名 filename := handel.Filename @@ -463,26 +463,26 @@ func (c MemberBlog) ImportTheme() revel.Result { _, ext = SplitFilename(filename) if ext != ".zip" { re.Msg = "Please upload zip file" - return c.RenderJson(re) + return c.RenderJSON(re) } filename = filename data, err := ioutil.ReadAll(file) if err != nil { - return c.RenderJson(re) + return c.RenderJSON(re) } // > 10M? if len(data) > 10*1024*1024 { re.Msg = "File is big than 10M" - return c.RenderJson(re) + return c.RenderJSON(re) } toPath := dir + "/" + filename err = ioutil.WriteFile(toPath, data, 0777) if err != nil { re.Msg = fmt.Sprintf("%v", err) - return c.RenderJson(re) + return c.RenderJSON(re) } // 上传好后, 增加之 @@ -494,7 +494,7 @@ func (c MemberBlog) ImportTheme() revel.Result { func (c MemberBlog) InstallTheme(themeId string) revel.Result { re := info.NewRe() re.Ok = themeService.InstallTheme(c.GetUserId(), themeId) - return c.RenderJson(re) + return c.RenderJSON(re) } // 新建主题 @@ -508,17 +508,17 @@ func (c MemberBlog) NewTheme() revel.Result { func (c MemberBlog) SetUserBlogBase(userBlog info.UserBlogBase) revel.Result { re := info.NewRe() re.Ok = blogService.UpdateUserBlogBase(c.GetUserId(), userBlog) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) SetUserBlogComment(userBlog info.UserBlogComment) revel.Result { re := info.NewRe() re.Ok = blogService.UpdateUserBlogComment(c.GetUserId(), userBlog) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) SetUserBlogStyle(userBlog info.UserBlogStyle) revel.Result { re := info.NewRe() re.Ok = blogService.UpdateUserBlogStyle(c.GetUserId(), userBlog) - return c.RenderJson(re) + return c.RenderJSON(re) } func (c MemberBlog) SetUserBlogPaging(perPageSize int, sortField string, isAsc bool) revel.Result { diff --git a/app/controllers/member/MemberGroupController.go b/app/controllers/member/MemberGroupController.go index f5fcf5a..6e50a76 100644 --- a/app/controllers/member/MemberGroupController.go +++ b/app/controllers/member/MemberGroupController.go @@ -14,8 +14,8 @@ type MemberGroup struct { func (c MemberGroup) Index() revel.Result { c.SetUserInfo() c.SetLocale() - c.RenderArgs["title"] = c.Message("My Group") - c.RenderArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId()) + c.ViewArgs["title"] = c.Message("My Group") + c.ViewArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId()) return c.RenderTemplate("member/group/index.html") } @@ -23,13 +23,13 @@ func (c MemberGroup) Index() revel.Result { func (c MemberGroup) AddGroup(title string) revel.Result { re := info.NewRe() re.Ok, re.Item = groupService.AddGroup(c.GetUserId(), title) - return c.RenderJson(re) + 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) + return c.RenderJSON(re) } func (c MemberGroup) DeleteGroup(groupId string) revel.Result { diff --git a/app/controllers/member/MemberIndexController.go b/app/controllers/member/MemberIndexController.go index 98b570b..f9e0bdb 100644 --- a/app/controllers/member/MemberIndexController.go +++ b/app/controllers/member/MemberIndexController.go @@ -13,10 +13,10 @@ type MemberIndex struct { // admin 主页 func (c MemberIndex) Index() revel.Result { c.SetUserInfo() - c.RenderArgs["title"] = c.Message("Leanote Member Center") + c.ViewArgs["title"] = c.Message("Leanote Member Center") - c.RenderArgs["countNote"] = noteService.CountNote(c.GetUserId()) - c.RenderArgs["countBlog"] = noteService.CountBlog(c.GetUserId()) + c.ViewArgs["countNote"] = noteService.CountNote(c.GetUserId()) + c.ViewArgs["countBlog"] = noteService.CountBlog(c.GetUserId()) c.SetLocale() @@ -25,10 +25,10 @@ func (c MemberIndex) Index() revel.Result { // 模板 func (c MemberIndex) T(t string) revel.Result { - c.RenderArgs["str"] = configService.GlobalStringConfigs - c.RenderArgs["arr"] = configService.GlobalArrayConfigs - c.RenderArgs["map"] = configService.GlobalMapConfigs - c.RenderArgs["arrMap"] = configService.GlobalArrMapConfigs + c.ViewArgs["str"] = configService.GlobalStringConfigs + c.ViewArgs["arr"] = configService.GlobalArrayConfigs + c.ViewArgs["map"] = configService.GlobalMapConfigs + c.ViewArgs["arrMap"] = configService.GlobalArrMapConfigs return c.RenderTemplate("admin/" + t + ".html") } diff --git a/app/controllers/member/MemberUserController.go b/app/controllers/member/MemberUserController.go index 4d22301..fba023a 100644 --- a/app/controllers/member/MemberUserController.go +++ b/app/controllers/member/MemberUserController.go @@ -13,28 +13,28 @@ type MemberUser struct { func (c MemberUser) Username() revel.Result { c.SetUserInfo() c.SetLocale() - c.RenderArgs["title"] = c.Message("Username") + c.ViewArgs["title"] = c.Message("Username") return c.RenderTemplate("member/user/username.html") } func (c MemberUser) Email() revel.Result { c.SetUserInfo() c.SetLocale() - c.RenderArgs["title"] = c.Message("Email") + c.ViewArgs["title"] = c.Message("Email") return c.RenderTemplate("member/user/email.html") } func (c MemberUser) Password() revel.Result { c.SetUserInfo() c.SetLocale() - c.RenderArgs["title"] = c.Message("Password") + c.ViewArgs["title"] = c.Message("Password") return c.RenderTemplate("member/user/password.html") } func (c MemberUser) Avatar() revel.Result { c.SetUserInfo() c.SetLocale() - c.RenderArgs["title"] = c.Message("Avatar") - c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser() + c.ViewArgs["title"] = c.Message("Avatar") + c.ViewArgs["globalConfigs"] = configService.GetGlobalConfigForUser() return c.RenderTemplate("member/user/avatar.html") } diff --git a/app/controllers/member/init.go b/app/controllers/member/init.go index eea26e6..a128fdd 100644 --- a/app/controllers/member/init.go +++ b/app/controllers/member/init.go @@ -93,7 +93,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result { if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" { re := info.NewRe() re.Msg = "NOTLOGIN" - return c.RenderJson(re) + return c.RenderJSON(re) } return c.Redirect("/login") diff --git a/app/lea/blog/Template.go b/app/lea/blog/Template.go index 908ec40..0d01e0f 100644 --- a/app/lea/blog/Template.go +++ b/app/lea/blog/Template.go @@ -39,7 +39,7 @@ var CloneTemplate *template.Template type RenderTemplateResult struct { Template *template.Template PathContent map[string]string - RenderArgs map[string]interface{} + ViewArgs map[string]interface{} IsPreview bool // 是否是预览 CurBlogTpl *BlogTpl @@ -62,7 +62,7 @@ func parseTemplateError(err error) (templateName string, line int, description s return templateName, line, description } func (r *RenderTemplateResult) render(req *revel.Request, resp *revel.Response, wr io.Writer) { - err := r.Template.Execute(wr, r.RenderArgs) + err := r.Template.Execute(wr, r.ViewArgs) if err == nil { return } @@ -91,7 +91,7 @@ func (r *RenderTemplateResult) render(req *revel.Request, resp *revel.Response, // 这里, 错误!! // 这里应该导向到本主题的错误页面 resp.Status = 500 - ErrorResult{r.RenderArgs, compileError, r.IsPreview, r.CurBlogTpl}.Apply(req, resp) + ErrorResult{r.ViewArgs, compileError, r.IsPreview, r.CurBlogTpl}.Apply(req, resp) } func (r *RenderTemplateResult) Apply(req *revel.Request, resp *revel.Response) { @@ -162,7 +162,7 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i r = &RenderTemplateResult{ Template: t, PathContent: BlogTplObject.PathContent, // 为了显示错误 - RenderArgs: args, // 把args给它 + ViewArgs: args, // 把args给它 } } else { // 复制一份 @@ -202,7 +202,7 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i r = &RenderTemplateResult{ Template: t, PathContent: newBlogTplObject.PathContent, // 为了显示错误 - RenderArgs: args, + ViewArgs: args, CurBlogTpl: newBlogTplObject, IsPreview: isPreview, } @@ -215,7 +215,7 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i // type ErrorResult struct { - RenderArgs map[string]interface{} + ViewArgs map[string]interface{} Error error IsPreview bool CurBlogTpl *BlogTpl @@ -280,18 +280,18 @@ func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) { panic("no error provided") } - if r.RenderArgs == nil { - r.RenderArgs = make(map[string]interface{}) + if r.ViewArgs == nil { + r.ViewArgs = make(map[string]interface{}) } - r.RenderArgs["Error"] = revelError - r.RenderArgs["Router"] = revel.MainRouter + r.ViewArgs["Error"] = revelError + r.ViewArgs["Router"] = revel.MainRouter // 不是preview就不要显示错误了 if r.IsPreview { var b bytes.Buffer out := io.Writer(resp.Out) // out = ioutil.Discard - err = tmpl.Execute(&b, r.RenderArgs) + err = tmpl.Execute(&b, r.ViewArgs) resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8") b.WriteTo(out) } diff --git a/app/lea/i18n/i18n.go b/app/lea/i18n/i18n.go index af5303a..689b917 100644 --- a/app/lea/i18n/i18n.go +++ b/app/lea/i18n/i18n.go @@ -193,7 +193,7 @@ func I18nFilter(c *revel.Controller, fc []revel.Filter) { // Set the current locale controller argument (CurrentLocaleControllerArg) with the given locale. func setCurrentLocaleControllerArguments(c *revel.Controller, locale string) { c.Request.Locale = locale - c.RenderArgs[CurrentLocaleRenderArg] = locale + c.ViewArgs[CurrentLocaleRenderArg] = locale } // Determine whether the given request has valid Accept-Language value.