diff --git a/README.md b/README.md index 64ee551..054a057 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ The repository contains leanote source and dependencies, just for developers. ## Current version -* leanote-v1.3 +* leanote-v1.3.1 * revel 0.12 * [mgo](http://blog.labix.org/2015/01/24/readying-mgo-for-mongodb-3-0) support for mongodb-3.0 -## leanote-v1.3 +## leanote-v1.3.1 * Note batch operation ## How to install leanote diff --git a/src/github.com/leanote/leanote/Gulpfile.js b/src/github.com/leanote/leanote/Gulpfile.js index be99a7c..118f7e3 100644 --- a/src/github.com/leanote/leanote/Gulpfile.js +++ b/src/github.com/leanote/leanote/Gulpfile.js @@ -306,8 +306,8 @@ gulp.task('minifycss', function() { }); // tinymce -// !! You must has tinymce_dev on public/ -var tinymceBase = base + '/tinymce_dev'; +// please set the right path on your own env +var tinymceBase = '/Users/life/leanote/leanote-tools/tinymce_4.1.9_leanote_public'; gulp.task('tinymce', function() { // 先清理 fs.unlink(tinymceBase + '/js/tinymce/tinymce.dev.js'); @@ -317,7 +317,7 @@ gulp.task('tinymce', function() { var cp = require('child_process'); - var bundleCmd = 'grunt bundle --themes leanote --plugins autolink,link,leaui_image,leaui_mind,lists,hr,paste,searchreplace,leanote_nav,leanote_code,tabfocus,table,directionality,textcolor'; + var bundleCmd = 'grunt bundle --themes leanote --plugins autolink,link,leaui_image,lists,hr,paste,searchreplace,leanote_nav,leanote_code,tabfocus,table,directionality,textcolor'; // build cp.exec('grunt minify', {cwd: tinymceBase}, function(err, stdout, stderr) { console.log('stdout: ' + stdout); diff --git a/src/github.com/leanote/leanote/app/routes/routes.go b/src/github.com/leanote/leanote/app/routes/routes.go index eb6bfff..8f2af70 100644 --- a/src/github.com/leanote/leanote/app/routes/routes.go +++ b/src/github.com/leanote/leanote/app/routes/routes.go @@ -54,156 +54,173 @@ func (_ tStatic) ServeModule( } -type tAttach struct {} -var Attach tAttach +type tIndex struct {} +var Index tIndex -func (_ tAttach) UploadAttach( - noteId string, +func (_ tIndex) Default( ) string { args := make(map[string]string) - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Attach.UploadAttach", args).Url + return revel.MainRouter.Reverse("Index.Default", args).Url } -func (_ tAttach) DeleteAttach( - attachId string, +func (_ tIndex) Index( ) string { args := make(map[string]string) - revel.Unbind(args, "attachId", attachId) - return revel.MainRouter.Reverse("Attach.DeleteAttach", args).Url + return revel.MainRouter.Reverse("Index.Index", args).Url } -func (_ tAttach) GetAttachs( - noteId string, +func (_ tIndex) Suggestion( + addr string, + suggestion string, ) string { args := make(map[string]string) - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Attach.GetAttachs", args).Url + revel.Unbind(args, "addr", addr) + revel.Unbind(args, "suggestion", suggestion) + return revel.MainRouter.Reverse("Index.Suggestion", args).Url } -func (_ tAttach) Download( - attachId string, + +type tCaptcha struct {} +var Captcha tCaptcha + + +func (_ tCaptcha) Get( ) string { args := make(map[string]string) - revel.Unbind(args, "attachId", attachId) - return revel.MainRouter.Reverse("Attach.Download", args).Url + return revel.MainRouter.Reverse("Captcha.Get", args).Url } -func (_ tAttach) DownloadAll( - noteId string, + +type tNotebook struct {} +var Notebook tNotebook + + +func (_ tNotebook) Index( + notebook interface{}, + i int, + name string, ) string { args := make(map[string]string) - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Attach.DownloadAll", args).Url + revel.Unbind(args, "notebook", notebook) + revel.Unbind(args, "i", i) + revel.Unbind(args, "name", name) + return revel.MainRouter.Reverse("Notebook.Index", args).Url } +func (_ tNotebook) GetNotebooks( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Notebook.GetNotebooks", args).Url +} -type tAuth struct {} -var Auth tAuth - - -func (_ tAuth) Login( - email string, - from string, +func (_ tNotebook) DeleteNotebook( + notebookId string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - revel.Unbind(args, "from", from) - return revel.MainRouter.Reverse("Auth.Login", args).Url + revel.Unbind(args, "notebookId", notebookId) + return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url } -func (_ tAuth) DoLogin( - email string, - pwd string, - captcha string, +func (_ tNotebook) AddNotebook( + notebookId string, + title string, + parentNotebookId string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - revel.Unbind(args, "pwd", pwd) - revel.Unbind(args, "captcha", captcha) - return revel.MainRouter.Reverse("Auth.DoLogin", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + revel.Unbind(args, "parentNotebookId", parentNotebookId) + return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url } -func (_ tAuth) Logout( +func (_ tNotebook) UpdateNotebookTitle( + notebookId string, + title string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Auth.Logout", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url } -func (_ tAuth) Demo( +func (_ tNotebook) DragNotebooks( + data string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Auth.Demo", args).Url + revel.Unbind(args, "data", data) + return revel.MainRouter.Reverse("Notebook.DragNotebooks", args).Url } -func (_ tAuth) Register( - from string, - iu string, +func (_ tNotebook) SetNotebook2Blog( + notebookId string, + isBlog bool, ) string { args := make(map[string]string) - revel.Unbind(args, "from", from) - revel.Unbind(args, "iu", iu) - return revel.MainRouter.Reverse("Auth.Register", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "isBlog", isBlog) + return revel.MainRouter.Reverse("Notebook.SetNotebook2Blog", args).Url } -func (_ tAuth) DoRegister( - email string, - pwd string, - iu string, + +type tAttach struct {} +var Attach tAttach + + +func (_ tAttach) UploadAttach( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - revel.Unbind(args, "pwd", pwd) - revel.Unbind(args, "iu", iu) - return revel.MainRouter.Reverse("Auth.DoRegister", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Attach.UploadAttach", args).Url } -func (_ tAuth) FindPassword( +func (_ tAttach) DeleteAttach( + attachId string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Auth.FindPassword", args).Url + revel.Unbind(args, "attachId", attachId) + return revel.MainRouter.Reverse("Attach.DeleteAttach", args).Url } -func (_ tAuth) DoFindPassword( - email string, +func (_ tAttach) GetAttachs( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - return revel.MainRouter.Reverse("Auth.DoFindPassword", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Attach.GetAttachs", args).Url } -func (_ tAuth) FindPassword2( - token string, +func (_ tAttach) Download( + attachId string, ) string { args := make(map[string]string) - revel.Unbind(args, "token", token) - return revel.MainRouter.Reverse("Auth.FindPassword2", args).Url + revel.Unbind(args, "attachId", attachId) + return revel.MainRouter.Reverse("Attach.Download", args).Url } -func (_ tAuth) FindPasswordUpdate( - token string, - pwd string, +func (_ tAttach) DownloadAll( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "token", token) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("Auth.FindPasswordUpdate", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Attach.DownloadAll", args).Url } @@ -423,328 +440,96 @@ func (_ tBlog) ListCateLatest( } -type tTag struct {} -var Tag tTag +type tNoteContentHistory struct {} +var NoteContentHistory tNoteContentHistory -func (_ tTag) UpdateTag( - tag string, +func (_ tNoteContentHistory) ListHistories( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "tag", tag) - return revel.MainRouter.Reverse("Tag.UpdateTag", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("NoteContentHistory.ListHistories", args).Url } -func (_ tTag) DeleteTag( - tag string, + +type tNote struct {} +var Note tNote + + +func (_ tNote) Index( + noteId string, + online string, ) string { args := make(map[string]string) - revel.Unbind(args, "tag", tag) - return revel.MainRouter.Reverse("Tag.DeleteTag", args).Url + revel.Unbind(args, "noteId", noteId) + revel.Unbind(args, "online", online) + return revel.MainRouter.Reverse("Note.Index", args).Url } - -type tCaptcha struct {} -var Captcha tCaptcha - - -func (_ tCaptcha) Get( +func (_ tNote) ListNotes( + notebookId string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Captcha.Get", args).Url + revel.Unbind(args, "notebookId", notebookId) + return revel.MainRouter.Reverse("Note.ListNotes", args).Url } - -type tFile struct {} -var File tFile - - -func (_ tFile) UploadBlogLogo( +func (_ tNote) ListTrashNotes( ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url + return revel.MainRouter.Reverse("Note.ListTrashNotes", args).Url } -func (_ tFile) PasteImage( +func (_ tNote) GetNoteAndContent( noteId string, ) string { args := make(map[string]string) revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("File.PasteImage", args).Url + return revel.MainRouter.Reverse("Note.GetNoteAndContent", args).Url } -func (_ tFile) UploadAvatar( +func (_ tNote) GetNoteContent( + noteId string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("File.UploadAvatar", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Note.GetNoteContent", args).Url } -func (_ tFile) UploadImageLeaui( - albumId string, +func (_ tNote) UpdateNoteOrContent( + noteOrContent controllers.NoteOrContent, ) string { args := make(map[string]string) - revel.Unbind(args, "albumId", albumId) - return revel.MainRouter.Reverse("File.UploadImageLeaui", args).Url + revel.Unbind(args, "noteOrContent", noteOrContent) + return revel.MainRouter.Reverse("Note.UpdateNoteOrContent", args).Url } -func (_ tFile) GetImages( - albumId string, - key string, - page int, +func (_ tNote) DeleteNote( + noteIds []string, + isShared bool, ) string { args := make(map[string]string) - revel.Unbind(args, "albumId", albumId) - revel.Unbind(args, "key", key) - revel.Unbind(args, "page", page) - return revel.MainRouter.Reverse("File.GetImages", args).Url + revel.Unbind(args, "noteIds", noteIds) + revel.Unbind(args, "isShared", isShared) + return revel.MainRouter.Reverse("Note.DeleteNote", args).Url } -func (_ tFile) UpdateImageTitle( - fileId string, - title string, +func (_ tNote) DeleteTrash( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "fileId", fileId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("File.UpdateImageTitle", args).Url -} - -func (_ tFile) DeleteImage( - fileId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "fileId", fileId) - return revel.MainRouter.Reverse("File.DeleteImage", args).Url -} - -func (_ tFile) OutputImage( - noteId string, - fileId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - revel.Unbind(args, "fileId", fileId) - return revel.MainRouter.Reverse("File.OutputImage", args).Url -} - -func (_ tFile) CopyImage( - userId string, - fileId string, - toUserId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "userId", userId) - revel.Unbind(args, "fileId", fileId) - revel.Unbind(args, "toUserId", toUserId) - return revel.MainRouter.Reverse("File.CopyImage", args).Url -} - -func (_ tFile) CopyHttpImage( - src string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "src", src) - return revel.MainRouter.Reverse("File.CopyHttpImage", args).Url -} - - -type tIndex struct {} -var Index tIndex - - -func (_ tIndex) Default( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Index.Default", args).Url -} - -func (_ tIndex) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Index.Index", args).Url -} - -func (_ tIndex) Suggestion( - addr string, - suggestion string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "addr", addr) - revel.Unbind(args, "suggestion", suggestion) - return revel.MainRouter.Reverse("Index.Suggestion", args).Url -} - - -type tNotebook struct {} -var Notebook tNotebook - - -func (_ tNotebook) Index( - notebook interface{}, - i int, - name string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebook", notebook) - revel.Unbind(args, "i", i) - revel.Unbind(args, "name", name) - return revel.MainRouter.Reverse("Notebook.Index", args).Url -} - -func (_ tNotebook) GetNotebooks( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Notebook.GetNotebooks", args).Url -} - -func (_ tNotebook) DeleteNotebook( - notebookId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url -} - -func (_ tNotebook) AddNotebook( - notebookId string, - title string, - parentNotebookId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - revel.Unbind(args, "parentNotebookId", parentNotebookId) - return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url -} - -func (_ tNotebook) UpdateNotebookTitle( - notebookId string, - title string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url -} - -func (_ tNotebook) DragNotebooks( - data string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "data", data) - return revel.MainRouter.Reverse("Notebook.DragNotebooks", args).Url -} - -func (_ tNotebook) SetNotebook2Blog( - notebookId string, - isBlog bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "isBlog", isBlog) - return revel.MainRouter.Reverse("Notebook.SetNotebook2Blog", args).Url -} - - -type tNote struct {} -var Note tNote - - -func (_ tNote) Index( - noteId string, - online string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - revel.Unbind(args, "online", online) - return revel.MainRouter.Reverse("Note.Index", args).Url -} - -func (_ tNote) ListNotes( - notebookId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - return revel.MainRouter.Reverse("Note.ListNotes", args).Url -} - -func (_ tNote) ListTrashNotes( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Note.ListTrashNotes", args).Url -} - -func (_ tNote) GetNoteAndContent( - noteId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Note.GetNoteAndContent", args).Url -} - -func (_ tNote) GetNoteContent( - noteId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Note.GetNoteContent", args).Url -} - -func (_ tNote) UpdateNoteOrContent( - noteOrContent controllers.NoteOrContent, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteOrContent", noteOrContent) - return revel.MainRouter.Reverse("Note.UpdateNoteOrContent", args).Url -} - -func (_ tNote) DeleteNote( - noteIds []string, - isShared bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteIds", noteIds) - revel.Unbind(args, "isShared", isShared) - return revel.MainRouter.Reverse("Note.DeleteNote", args).Url -} - -func (_ tNote) DeleteTrash( - noteId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Note.DeleteTrash", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Note.DeleteTrash", args).Url } func (_ tNote) MoveNote( @@ -812,87 +597,25 @@ func (_ tNote) ToPdf( } func (_ tNote) ExportPdf( - noteId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Note.ExportPdf", args).Url -} - -func (_ tNote) SetNote2Blog( - noteIds []string, - isBlog bool, - isTop bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteIds", noteIds) - revel.Unbind(args, "isBlog", isBlog) - revel.Unbind(args, "isTop", isTop) - return revel.MainRouter.Reverse("Note.SetNote2Blog", args).Url -} - - -type tAlbum struct {} -var Album tAlbum - - -func (_ tAlbum) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Album.Index", args).Url -} - -func (_ tAlbum) GetAlbums( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Album.GetAlbums", args).Url -} - -func (_ tAlbum) DeleteAlbum( - albumId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "albumId", albumId) - return revel.MainRouter.Reverse("Album.DeleteAlbum", args).Url -} - -func (_ tAlbum) AddAlbum( - name string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "name", name) - return revel.MainRouter.Reverse("Album.AddAlbum", args).Url -} - -func (_ tAlbum) UpdateAlbum( - albumId string, - name string, + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "albumId", albumId) - revel.Unbind(args, "name", name) - return revel.MainRouter.Reverse("Album.UpdateAlbum", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Note.ExportPdf", args).Url } - -type tNoteContentHistory struct {} -var NoteContentHistory tNoteContentHistory - - -func (_ tNoteContentHistory) ListHistories( - noteId string, +func (_ tNote) SetNote2Blog( + noteIds []string, + isBlog bool, + isTop bool, ) string { args := make(map[string]string) - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("NoteContentHistory.ListHistories", args).Url + revel.Unbind(args, "noteIds", noteIds) + revel.Unbind(args, "isBlog", isBlog) + revel.Unbind(args, "isTop", isTop) + return revel.MainRouter.Reverse("Note.SetNote2Blog", args).Url } @@ -1095,28 +818,257 @@ func (_ tShare) AddShareNotebookGroup( return revel.MainRouter.Reverse("Share.AddShareNotebookGroup", args).Url } -func (_ tShare) DeleteShareNotebookGroup( - notebookId string, - groupId string, +func (_ tShare) DeleteShareNotebookGroup( + notebookId string, + groupId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "groupId", groupId) + return revel.MainRouter.Reverse("Share.DeleteShareNotebookGroup", args).Url +} + +func (_ tShare) UpdateShareNotebookGroupPerm( + notebookId string, + groupId string, + perm int, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "groupId", groupId) + revel.Unbind(args, "perm", perm) + return revel.MainRouter.Reverse("Share.UpdateShareNotebookGroupPerm", args).Url +} + + +type tAuth struct {} +var Auth tAuth + + +func (_ tAuth) Login( + email string, + from string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + revel.Unbind(args, "from", from) + return revel.MainRouter.Reverse("Auth.Login", args).Url +} + +func (_ tAuth) DoLogin( + email string, + pwd string, + captcha string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + revel.Unbind(args, "pwd", pwd) + revel.Unbind(args, "captcha", captcha) + return revel.MainRouter.Reverse("Auth.DoLogin", args).Url +} + +func (_ tAuth) Logout( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Auth.Logout", args).Url +} + +func (_ tAuth) Demo( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Auth.Demo", args).Url +} + +func (_ tAuth) Register( + from string, + iu string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "from", from) + revel.Unbind(args, "iu", iu) + return revel.MainRouter.Reverse("Auth.Register", args).Url +} + +func (_ tAuth) DoRegister( + email string, + pwd string, + iu string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + revel.Unbind(args, "pwd", pwd) + revel.Unbind(args, "iu", iu) + return revel.MainRouter.Reverse("Auth.DoRegister", args).Url +} + +func (_ tAuth) FindPassword( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Auth.FindPassword", args).Url +} + +func (_ tAuth) DoFindPassword( + email string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + return revel.MainRouter.Reverse("Auth.DoFindPassword", args).Url +} + +func (_ tAuth) FindPassword2( + token string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + return revel.MainRouter.Reverse("Auth.FindPassword2", args).Url +} + +func (_ tAuth) FindPasswordUpdate( + token string, + pwd string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("Auth.FindPasswordUpdate", args).Url +} + + +type tFile struct {} +var File tFile + + +func (_ tFile) UploadBlogLogo( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url +} + +func (_ tFile) PasteImage( + noteId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("File.PasteImage", args).Url +} + +func (_ tFile) UploadAvatar( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("File.UploadAvatar", args).Url +} + +func (_ tFile) UploadImageLeaui( + albumId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "albumId", albumId) + return revel.MainRouter.Reverse("File.UploadImageLeaui", args).Url +} + +func (_ tFile) GetImages( + albumId string, + key string, + page int, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "albumId", albumId) + revel.Unbind(args, "key", key) + revel.Unbind(args, "page", page) + return revel.MainRouter.Reverse("File.GetImages", args).Url +} + +func (_ tFile) UpdateImageTitle( + fileId string, + title string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "fileId", fileId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("File.UpdateImageTitle", args).Url +} + +func (_ tFile) DeleteImage( + fileId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "fileId", fileId) + return revel.MainRouter.Reverse("File.DeleteImage", args).Url +} + +func (_ tFile) OutputImage( + noteId string, + fileId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "noteId", noteId) + revel.Unbind(args, "fileId", fileId) + return revel.MainRouter.Reverse("File.OutputImage", args).Url +} + +func (_ tFile) CopyImage( + userId string, + fileId string, + toUserId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userId", userId) + revel.Unbind(args, "fileId", fileId) + revel.Unbind(args, "toUserId", toUserId) + return revel.MainRouter.Reverse("File.CopyImage", args).Url +} + +func (_ tFile) CopyHttpImage( + src string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "src", src) + return revel.MainRouter.Reverse("File.CopyHttpImage", args).Url +} + + +type tTag struct {} +var Tag tTag + + +func (_ tTag) UpdateTag( + tag string, ) string { args := make(map[string]string) - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "groupId", groupId) - return revel.MainRouter.Reverse("Share.DeleteShareNotebookGroup", args).Url + revel.Unbind(args, "tag", tag) + return revel.MainRouter.Reverse("Tag.UpdateTag", args).Url } -func (_ tShare) UpdateShareNotebookGroupPerm( - notebookId string, - groupId string, - perm int, +func (_ tTag) DeleteTag( + tag string, ) string { args := make(map[string]string) - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "groupId", groupId) - revel.Unbind(args, "perm", perm) - return revel.MainRouter.Reverse("Share.UpdateShareNotebookGroupPerm", args).Url + revel.Unbind(args, "tag", tag) + return revel.MainRouter.Reverse("Tag.DeleteTag", args).Url } @@ -1232,6 +1184,54 @@ func (_ tUser) UpdateLeftIsMin( } +type tAlbum struct {} +var Album tAlbum + + +func (_ tAlbum) Index( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Album.Index", args).Url +} + +func (_ tAlbum) GetAlbums( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Album.GetAlbums", args).Url +} + +func (_ tAlbum) DeleteAlbum( + albumId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "albumId", albumId) + return revel.MainRouter.Reverse("Album.DeleteAlbum", args).Url +} + +func (_ tAlbum) AddAlbum( + name string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "name", name) + return revel.MainRouter.Reverse("Album.AddAlbum", args).Url +} + +func (_ tAlbum) UpdateAlbum( + albumId string, + name string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "albumId", albumId) + revel.Unbind(args, "name", name) + return revel.MainRouter.Reverse("Album.UpdateAlbum", args).Url +} + + type tAdminBaseController struct {} var AdminBaseController tAdminBaseController @@ -1342,63 +1342,6 @@ func (_ tPreview) Search( } -type tAdminData struct {} -var AdminData tAdminData - - -func (_ tAdminData) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("AdminData.Index", args).Url -} - -func (_ tAdminData) Backup( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("AdminData.Backup", args).Url -} - -func (_ tAdminData) Restore( - createdTime string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "createdTime", createdTime) - return revel.MainRouter.Reverse("AdminData.Restore", args).Url -} - -func (_ tAdminData) Delete( - createdTime string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "createdTime", createdTime) - return revel.MainRouter.Reverse("AdminData.Delete", args).Url -} - -func (_ tAdminData) UpdateRemark( - createdTime string, - remark string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "createdTime", createdTime) - revel.Unbind(args, "remark", remark) - return revel.MainRouter.Reverse("AdminData.UpdateRemark", args).Url -} - -func (_ tAdminData) Download( - createdTime string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "createdTime", createdTime) - return revel.MainRouter.Reverse("AdminData.Download", args).Url -} - - type tAdminSetting struct {} var AdminSetting tAdminSetting @@ -1601,33 +1544,6 @@ func (_ tAdminUser) DoResetPwd( } -type tAdminBlog struct {} -var AdminBlog tAdminBlog - - -func (_ tAdminBlog) Index( - sorter string, - keywords string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "sorter", sorter) - revel.Unbind(args, "keywords", keywords) - return revel.MainRouter.Reverse("AdminBlog.Index", args).Url -} - -func (_ tAdminBlog) SetRecommend( - noteId string, - recommend bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - revel.Unbind(args, "recommend", recommend) - return revel.MainRouter.Reverse("AdminBlog.SetRecommend", args).Url -} - - type tAdmin struct {} var Admin tAdmin @@ -1658,29 +1574,87 @@ func (_ tAdmin) GetView( } -type tAdminUpgrade struct {} -var AdminUpgrade tAdminUpgrade +type tAdminData struct {} +var AdminData tAdminData -func (_ tAdminUpgrade) UpgradeBlog( +func (_ tAdminData) Index( ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBlog", args).Url + return revel.MainRouter.Reverse("AdminData.Index", args).Url } -func (_ tAdminUpgrade) UpgradeBetaToBeta2( +func (_ tAdminData) Backup( ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBetaToBeta2", args).Url + return revel.MainRouter.Reverse("AdminData.Backup", args).Url } -func (_ tAdminUpgrade) UpgradeBeta3ToBeta4( +func (_ tAdminData) Restore( + createdTime string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBeta3ToBeta4", args).Url + revel.Unbind(args, "createdTime", createdTime) + return revel.MainRouter.Reverse("AdminData.Restore", args).Url +} + +func (_ tAdminData) Delete( + createdTime string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "createdTime", createdTime) + return revel.MainRouter.Reverse("AdminData.Delete", args).Url +} + +func (_ tAdminData) UpdateRemark( + createdTime string, + remark string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "createdTime", createdTime) + revel.Unbind(args, "remark", remark) + return revel.MainRouter.Reverse("AdminData.UpdateRemark", args).Url +} + +func (_ tAdminData) Download( + createdTime string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "createdTime", createdTime) + return revel.MainRouter.Reverse("AdminData.Download", args).Url +} + + +type tAdminBlog struct {} +var AdminBlog tAdminBlog + + +func (_ tAdminBlog) Index( + sorter string, + keywords string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "sorter", sorter) + revel.Unbind(args, "keywords", keywords) + return revel.MainRouter.Reverse("AdminBlog.Index", args).Url +} + +func (_ tAdminBlog) SetRecommend( + noteId string, + recommend bool, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "noteId", noteId) + revel.Unbind(args, "recommend", recommend) + return revel.MainRouter.Reverse("AdminBlog.SetRecommend", args).Url } @@ -1854,6 +1828,32 @@ func (_ tAdminEmail) List( } +type tAdminUpgrade struct {} +var AdminUpgrade tAdminUpgrade + + +func (_ tAdminUpgrade) UpgradeBlog( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBlog", args).Url +} + +func (_ tAdminUpgrade) UpgradeBetaToBeta2( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBetaToBeta2", args).Url +} + +func (_ tAdminUpgrade) UpgradeBeta3ToBeta4( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("AdminUpgrade.UpgradeBeta3ToBeta4", args).Url +} + + type tApiFile struct {} var ApiFile tApiFile diff --git a/src/github.com/leanote/leanote/app/service/ConfigService.go b/src/github.com/leanote/leanote/app/service/ConfigService.go index 095a02b..e7c2082 100644 --- a/src/github.com/leanote/leanote/app/service/ConfigService.go +++ b/src/github.com/leanote/leanote/app/service/ConfigService.go @@ -594,5 +594,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool { } func (this *ConfigService) GetVersion() string { - return "1.3" + return "1.3.1" } diff --git a/src/github.com/leanote/leanote/app/tmp/main.go b/src/github.com/leanote/leanote/app/tmp/main.go index 67085f8..479648d 100644 --- a/src/github.com/leanote/leanote/app/tmp/main.go +++ b/src/github.com/leanote/leanote/app/tmp/main.go @@ -78,133 +78,152 @@ func main() { }) - revel.RegisterController((*controllers.Attach)(nil), + revel.RegisterController((*controllers.Index)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "UploadAttach", + Name: "Default", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteAttach", + Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "attachId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetAttachs", + Name: "Suggestion", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.Captcha)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "Download", + Name: "Get", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "attachId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ + 42: []string{ + }, }, }, + + }) + + revel.RegisterController((*controllers.Notebook)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "DownloadAll", + Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, + &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.Auth)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "Login", + Name: "GetNotebooks", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "from", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DoLogin", + Name: "DeleteNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "captcha", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Logout", + Name: "AddNotebook", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "parentNotebookId", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateNotebookTitle", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Demo", + Name: "DragNotebooks", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "data", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Register", + Name: "SetNotebook2Blog", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "from", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "iu", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.Attach)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "DoRegister", + Name: "UploadAttach", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "iu", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "FindPassword", + Name: "DeleteAttach", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "attachId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DoFindPassword", + Name: "GetAttachs", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "FindPassword2", + Name: "Download", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "attachId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "FindPasswordUpdate", + Name: "DownloadAll", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -389,217 +408,153 @@ func main() { }) - revel.RegisterController((*controllers.Tag)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "UpdateTag", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "tag", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "DeleteTag", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "tag", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.Captcha)(nil), + revel.RegisterController((*controllers.NoteContentHistory)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "Get", + Name: "ListHistories", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ - 42: []string{ - }, }, }, }) - revel.RegisterController((*controllers.File)(nil), + revel.RegisterController((*controllers.Note)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "UploadBlogLogo", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "PasteImage", + Name: "Index", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "online", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UploadAvatar", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UploadImageLeaui", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "GetImages", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "page", Type: reflect.TypeOf((*int)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdateImageTitle", + Name: "ListNotes", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteImage", + Name: "ListTrashNotes", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "OutputImage", + Name: "GetNoteAndContent", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "CopyImage", + Name: "GetNoteContent", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "CopyHttpImage", + Name: "UpdateNoteOrContent", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "src", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteOrContent", Type: reflect.TypeOf((*controllers.NoteOrContent)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.Index)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "Default", + Name: "DeleteNote", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "isShared", Type: reflect.TypeOf((*bool)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Index", + Name: "DeleteTrash", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Suggestion", + Name: "MoveNote", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.Notebook)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "Index", + Name: "CopyNote", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, - &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetNotebooks", + Name: "CopySharedNote", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteNotebook", + Name: "SearchNote", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddNotebook", + Name: "SearchNoteByTags", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "parentNotebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "tags", Type: reflect.TypeOf((*[]string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateNotebookTitle", + Name: "ToPdf", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "appKey", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DragNotebooks", + Name: "ExportPdf", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "data", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SetNotebook2Blog", + Name: "SetNote2Blog", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -607,42 +562,48 @@ func main() { }) - revel.RegisterController((*controllers.Note)(nil), + revel.RegisterController((*controllers.Share)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "Index", + Name: "AddShareNote", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "online", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "emails", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ListNotes", + Name: "AddShareNotebook", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "emails", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ListTrashNotes", + Name: "ListShareNotes", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetNoteAndContent", + Name: "GetShareNoteContent", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "sharedUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetNoteContent", + Name: "ListNoteShareUserInfo", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, @@ -650,335 +611,330 @@ func main() { }, }, &revel.MethodType{ - Name: "UpdateNoteOrContent", + Name: "ListNotebookShareUserInfo", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteOrContent", Type: reflect.TypeOf((*controllers.NoteOrContent)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteNote", + Name: "UpdateShareNotePerm", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "isShared", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteTrash", + Name: "UpdateShareNotebookPerm", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "MoveNote", + Name: "DeleteShareNote", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "CopyNote", + Name: "DeleteShareNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "CopySharedNote", + Name: "DeleteShareNoteBySharedUser", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SearchNote", + Name: "DeleteShareNotebookBySharedUser", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SearchNoteByTags", + Name: "DeleteUserShareNoteAndNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "tags", Type: reflect.TypeOf((*[]string)(nil)) }, + &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ToPdf", + Name: "AddShareNoteGroup", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "appKey", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ExportPdf", + Name: "DeleteShareNoteGroup", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SetNote2Blog", + Name: "UpdateShareNoteGroupPerm", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteIds", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, - &revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.Album)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "Index", + Name: "AddShareNotebookGroup", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetAlbums", + Name: "DeleteShareNotebookGroup", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteAlbum", + Name: "UpdateShareNotebookGroupPerm", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.Auth)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "AddAlbum", + Name: "Login", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "from", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateAlbum", + Name: "DoLogin", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "captcha", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.NoteContentHistory)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "ListHistories", + Name: "Logout", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*controllers.Share)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "AddShareNote", + Name: "Demo", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "emails", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddShareNotebook", + Name: "Register", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "emails", Type: reflect.TypeOf((*[]string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "from", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "iu", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ListShareNotes", + Name: "DoRegister", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "iu", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetShareNoteContent", + Name: "FindPassword", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "sharedUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ListNoteShareUserInfo", + Name: "DoFindPassword", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ListNotebookShareUserInfo", + Name: "FindPassword2", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateShareNotePerm", + Name: "FindPasswordUpdate", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.File)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "UpdateShareNotebookPerm", + Name: "UploadBlogLogo", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteShareNote", + Name: "PasteImage", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteShareNotebook", + Name: "UploadAvatar", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteShareNoteBySharedUser", + Name: "UploadImageLeaui", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteShareNotebookBySharedUser", + Name: "GetImages", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "page", Type: reflect.TypeOf((*int)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteUserShareNoteAndNotebook", + Name: "UpdateImageTitle", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "fromUserId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddShareNoteGroup", + Name: "DeleteImage", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteShareNoteGroup", + Name: "OutputImage", Args: []*revel.MethodArg{ &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateShareNoteGroupPerm", + Name: "CopyImage", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "fileId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "toUserId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddShareNotebookGroup", + Name: "CopyHttpImage", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "src", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.Tag)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "DeleteShareNotebookGroup", + Name: "UpdateTag", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "tag", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateShareNotebookGroupPerm", + Name: "DeleteTag", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "groupId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "perm", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "tag", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -1083,6 +1039,50 @@ func main() { }) + revel.RegisterController((*controllers.Album)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Index", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "GetAlbums", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "DeleteAlbum", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "AddAlbum", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateAlbum", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "albumId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + revel.RegisterController((*admin.AdminBaseController)(nil), []*revel.MethodType{ @@ -1176,58 +1176,6 @@ func main() { }) - revel.RegisterController((*admin.AdminData)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Backup", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Restore", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Delete", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdateRemark", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "remark", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Download", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - revel.RegisterController((*admin.AdminSetting)(nil), []*revel.MethodType{ &revel.MethodType{ @@ -1397,22 +1345,27 @@ func main() { }) - revel.RegisterController((*admin.AdminBlog)(nil), + revel.RegisterController((*admin.Admin)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "sorter", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "keywords", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SetRecommend", + Name: "T", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "recommend", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "t", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "GetView", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "view", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -1420,7 +1373,7 @@ func main() { }) - revel.RegisterController((*admin.Admin)(nil), + revel.RegisterController((*admin.AdminData)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", @@ -1430,43 +1383,64 @@ func main() { }, }, &revel.MethodType{ - Name: "T", + Name: "Backup", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "t", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "GetView", + Name: "Restore", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "view", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, - - }) - - revel.RegisterController((*admin.AdminUpgrade)(nil), - []*revel.MethodType{ &revel.MethodType{ - Name: "UpgradeBlog", + Name: "Delete", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpgradeBetaToBeta2", + Name: "UpdateRemark", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "remark", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpgradeBeta3ToBeta4", + Name: "Download", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "createdTime", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + + revel.RegisterController((*admin.AdminBlog)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Index", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "sorter", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "keywords", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SetRecommend", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "recommend", Type: reflect.TypeOf((*bool)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -1614,6 +1588,32 @@ func main() { }) + revel.RegisterController((*admin.AdminUpgrade)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "UpgradeBlog", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpgradeBetaToBeta2", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpgradeBeta3ToBeta4", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + revel.RegisterController((*api.ApiFile)(nil), []*revel.MethodType{ &revel.MethodType{ diff --git a/src/github.com/leanote/leanote/app/views/note/note-dev.html b/src/github.com/leanote/leanote/app/views/note/note-dev.html index 2eaa03d..584a8e5 100644 --- a/src/github.com/leanote/leanote/app/views/note/note-dev.html +++ b/src/github.com/leanote/leanote/app/views/note/note-dev.html @@ -17,16 +17,16 @@ - + - + @@ -174,7 +174,7 @@ @@ -427,6 +427,7 @@
+

@@ -571,7 +572,7 @@

@@ -608,7 +609,7 @@