diff --git a/app/service/ConfigService.go b/app/service/ConfigService.go index 45cd594..eed84bd 100644 --- a/app/service/ConfigService.go +++ b/app/service/ConfigService.go @@ -295,7 +295,7 @@ func (this *ConfigService) Backup(remark string) (ok bool, msg string) { binPath += " -u " + username + " -p " + password } // 保存的路径 - dir := revel.BasePath + "/backup/" + this.getBackupDirname() + dir := revel.BasePath + "/mongodb_backup/" + this.getBackupDirname() binPath += " -o " + dir err := os.MkdirAll(dir, 0755) if err != nil { diff --git a/app/views/Admin/User/list.html b/app/views/Admin/User/list.html index 32dcfe7..aee5a62 100644 --- a/app/views/Admin/User/list.html +++ b/app/views/Admin/User/list.html @@ -84,10 +84,10 @@ {{range .users}} - + - {{.Email}} + {{.Email}} {{.Username}} diff --git a/app/views/Admin/index.html b/app/views/Admin/index.html index bac5a64..65165d9 100644 --- a/app/views/Admin/index.html +++ b/app/views/Admin/index.html @@ -62,7 +62,7 @@ $(function() { // leanote动态 // http://leanote.com/blog/cate/5446753cfacfaa4f56000000 - var url = "http://localhost:9000/blog/listCateLatest/54269c83e5276724ac000000"; + var url = "http://leanote.leanote.com/cate/5446753cfacfaa4f56000000"; function renderItem(item) { return '
  • ' + item.Title + '

    ' + goNowToDatetime(item.PublicTime) + '
  • '; } diff --git a/app/views/Admin/top.html b/app/views/Admin/top.html index 272f577..fb5a50b 100644 --- a/app/views/Admin/top.html +++ b/app/views/Admin/top.html @@ -51,7 +51,7 @@ diff --git a/mongodb_backup/leanote_install_data/albums.bson b/mongodb_backup/leanote_install_data/albums.bson new file mode 100644 index 0000000..dba8d1d Binary files /dev/null and b/mongodb_backup/leanote_install_data/albums.bson differ diff --git a/mongodb_backup/leanote_install_data/files.metadata.json b/mongodb_backup/leanote_install_data/albums.metadata.json similarity index 61% rename from mongodb_backup/leanote_install_data/files.metadata.json rename to mongodb_backup/leanote_install_data/albums.metadata.json index b18f019..93844d9 100644 --- a/mongodb_backup/leanote_install_data/files.metadata.json +++ b/mongodb_backup/leanote_install_data/albums.metadata.json @@ -1 +1 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.files", "name" : "_id_" } ] } \ No newline at end of file +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.albums", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/attachs.bson b/mongodb_backup/leanote_install_data/attachs.bson new file mode 100644 index 0000000..70c97ea Binary files /dev/null and b/mongodb_backup/leanote_install_data/attachs.bson differ diff --git a/mongodb_backup/leanote_install_data/users.metadata.json b/mongodb_backup/leanote_install_data/attachs.metadata.json similarity index 61% rename from mongodb_backup/leanote_install_data/users.metadata.json rename to mongodb_backup/leanote_install_data/attachs.metadata.json index ac86660..0f6ed18 100644 --- a/mongodb_backup/leanote_install_data/users.metadata.json +++ b/mongodb_backup/leanote_install_data/attachs.metadata.json @@ -1 +1 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.users", "name" : "_id_" } ] } \ No newline at end of file +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.attachs", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/blog_comments.bson b/mongodb_backup/leanote_install_data/blog_comments.bson new file mode 100644 index 0000000..65a0527 Binary files /dev/null and b/mongodb_backup/leanote_install_data/blog_comments.bson differ diff --git a/mongodb_backup/leanote_install_data/tokens.metadata.json b/mongodb_backup/leanote_install_data/blog_comments.metadata.json similarity index 60% rename from mongodb_backup/leanote_install_data/tokens.metadata.json rename to mongodb_backup/leanote_install_data/blog_comments.metadata.json index e7947c7..8efd9a5 100644 --- a/mongodb_backup/leanote_install_data/tokens.metadata.json +++ b/mongodb_backup/leanote_install_data/blog_comments.metadata.json @@ -1 +1 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.tokens", "name" : "_id_" } ] } \ No newline at end of file +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.blog_comments", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/blog_likes.bson b/mongodb_backup/leanote_install_data/blog_likes.bson new file mode 100644 index 0000000..218e50b Binary files /dev/null and b/mongodb_backup/leanote_install_data/blog_likes.bson differ diff --git a/mongodb_backup/leanote_install_data/user_blogs.metadata.json b/mongodb_backup/leanote_install_data/blog_likes.metadata.json similarity index 58% rename from mongodb_backup/leanote_install_data/user_blogs.metadata.json rename to mongodb_backup/leanote_install_data/blog_likes.metadata.json index 58e3996..72a50ec 100644 --- a/mongodb_backup/leanote_install_data/user_blogs.metadata.json +++ b/mongodb_backup/leanote_install_data/blog_likes.metadata.json @@ -1 +1 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.user_blogs", "name" : "_id_" } ] } \ No newline at end of file +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.blog_likes", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/configs.bson b/mongodb_backup/leanote_install_data/configs.bson new file mode 100644 index 0000000..d008ecc Binary files /dev/null and b/mongodb_backup/leanote_install_data/configs.bson differ diff --git a/mongodb_backup/leanote_install_data/configs.metadata.json b/mongodb_backup/leanote_install_data/configs.metadata.json new file mode 100644 index 0000000..8bec992 --- /dev/null +++ b/mongodb_backup/leanote_install_data/configs.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.configs", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/email_logs.bson b/mongodb_backup/leanote_install_data/email_logs.bson new file mode 100644 index 0000000..6beca6b Binary files /dev/null and b/mongodb_backup/leanote_install_data/email_logs.bson differ diff --git a/mongodb_backup/leanote_install_data/email_logs.metadata.json b/mongodb_backup/leanote_install_data/email_logs.metadata.json new file mode 100644 index 0000000..5f284e8 --- /dev/null +++ b/mongodb_backup/leanote_install_data/email_logs.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.email_logs", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/files.bson b/mongodb_backup/leanote_install_data/files.bson deleted file mode 100644 index b311785..0000000 Binary files a/mongodb_backup/leanote_install_data/files.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/find_pwds.bson b/mongodb_backup/leanote_install_data/find_pwds.bson new file mode 100644 index 0000000..79c5949 Binary files /dev/null and b/mongodb_backup/leanote_install_data/find_pwds.bson differ diff --git a/mongodb_backup/leanote_install_data/find_pwds.metadata.json b/mongodb_backup/leanote_install_data/find_pwds.metadata.json new file mode 100644 index 0000000..4eb04a3 --- /dev/null +++ b/mongodb_backup/leanote_install_data/find_pwds.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.find_pwds", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/has_share_notes.bson b/mongodb_backup/leanote_install_data/has_share_notes.bson deleted file mode 100644 index 472369c..0000000 Binary files a/mongodb_backup/leanote_install_data/has_share_notes.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/has_share_notes.metadata.json b/mongodb_backup/leanote_install_data/has_share_notes.metadata.json deleted file mode 100644 index 6e75e5c..0000000 --- a/mongodb_backup/leanote_install_data/has_share_notes.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_public_3.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/tags.bson b/mongodb_backup/leanote_install_data/leanote.ShareNotes.bson similarity index 100% rename from mongodb_backup/leanote_install_data/tags.bson rename to mongodb_backup/leanote_install_data/leanote.ShareNotes.bson diff --git a/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json b/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json new file mode 100644 index 0000000..da5e432 --- /dev/null +++ b/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.leanote.ShareNotes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote.leanote.ShareNotes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/leanote.has_share_notes.bson b/mongodb_backup/leanote_install_data/leanote.has_share_notes.bson new file mode 100644 index 0000000..e69de29 diff --git a/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json b/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json new file mode 100644 index 0000000..f93a290 --- /dev/null +++ b/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.leanote.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote.leanote.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/note_content_histories.bson b/mongodb_backup/leanote_install_data/note_content_histories.bson deleted file mode 100644 index 3b75602..0000000 Binary files a/mongodb_backup/leanote_install_data/note_content_histories.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/note_content_histories.metadata.json b/mongodb_backup/leanote_install_data/note_content_histories.metadata.json deleted file mode 100644 index 29c1c82..0000000 --- a/mongodb_backup/leanote_install_data/note_content_histories.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.note_content_histories", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/note_contents.bson b/mongodb_backup/leanote_install_data/note_contents.bson deleted file mode 100644 index e8a1830..0000000 Binary files a/mongodb_backup/leanote_install_data/note_contents.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/note_contents.metadata.json b/mongodb_backup/leanote_install_data/note_contents.metadata.json deleted file mode 100644 index 9fcd8f6..0000000 --- a/mongodb_backup/leanote_install_data/note_contents.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.note_contents", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/note_images.bson b/mongodb_backup/leanote_install_data/note_images.bson new file mode 100644 index 0000000..4931752 Binary files /dev/null and b/mongodb_backup/leanote_install_data/note_images.bson differ diff --git a/mongodb_backup/leanote_install_data/note_images.metadata.json b/mongodb_backup/leanote_install_data/note_images.metadata.json new file mode 100644 index 0000000..58d0a20 --- /dev/null +++ b/mongodb_backup/leanote_install_data/note_images.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.note_images", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/notebooks.bson b/mongodb_backup/leanote_install_data/notebooks.bson deleted file mode 100644 index 54e73be..0000000 Binary files a/mongodb_backup/leanote_install_data/notebooks.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/notebooks.metadata.json b/mongodb_backup/leanote_install_data/notebooks.metadata.json deleted file mode 100644 index dabb006..0000000 --- a/mongodb_backup/leanote_install_data/notebooks.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.notebooks", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_public_3.notebooks", "name" : "UserId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/notes.bson b/mongodb_backup/leanote_install_data/notes.bson deleted file mode 100644 index fe29168..0000000 Binary files a/mongodb_backup/leanote_install_data/notes.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/notes.metadata.json b/mongodb_backup/leanote_install_data/notes.metadata.json deleted file mode 100644 index 5c7dc68..0000000 --- a/mongodb_backup/leanote_install_data/notes.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_public_3.notes", "name" : "UserId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/reports.bson b/mongodb_backup/leanote_install_data/reports.bson new file mode 100644 index 0000000..7b52225 Binary files /dev/null and b/mongodb_backup/leanote_install_data/reports.bson differ diff --git a/mongodb_backup/leanote_install_data/reports.metadata.json b/mongodb_backup/leanote_install_data/reports.metadata.json new file mode 100644 index 0000000..e43c7d1 --- /dev/null +++ b/mongodb_backup/leanote_install_data/reports.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.reports", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/sessions.bson b/mongodb_backup/leanote_install_data/sessions.bson new file mode 100644 index 0000000..24cce60 Binary files /dev/null and b/mongodb_backup/leanote_install_data/sessions.bson differ diff --git a/mongodb_backup/leanote_install_data/sessions.metadata.json b/mongodb_backup/leanote_install_data/sessions.metadata.json new file mode 100644 index 0000000..4c6142d --- /dev/null +++ b/mongodb_backup/leanote_install_data/sessions.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.sessions", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/share_notebooks.bson b/mongodb_backup/leanote_install_data/share_notebooks.bson deleted file mode 100644 index baf4a8f..0000000 Binary files a/mongodb_backup/leanote_install_data/share_notebooks.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/share_notebooks.metadata.json b/mongodb_backup/leanote_install_data/share_notebooks.metadata.json deleted file mode 100644 index d9c92fc..0000000 --- a/mongodb_backup/leanote_install_data/share_notebooks.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.share_notebooks", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/share_notes.bson b/mongodb_backup/leanote_install_data/share_notes.bson deleted file mode 100644 index d17d360..0000000 Binary files a/mongodb_backup/leanote_install_data/share_notes.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/share_notes.metadata.json b/mongodb_backup/leanote_install_data/share_notes.metadata.json deleted file mode 100644 index 68e637f..0000000 --- a/mongodb_backup/leanote_install_data/share_notes.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote_public_3.share_notes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/suggestions.bson b/mongodb_backup/leanote_install_data/suggestions.bson new file mode 100644 index 0000000..26d7013 Binary files /dev/null and b/mongodb_backup/leanote_install_data/suggestions.bson differ diff --git a/mongodb_backup/leanote_install_data/suggestions.metadata.json b/mongodb_backup/leanote_install_data/suggestions.metadata.json new file mode 100644 index 0000000..5d22faf --- /dev/null +++ b/mongodb_backup/leanote_install_data/suggestions.metadata.json @@ -0,0 +1 @@ +{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote.suggestions", "name" : "_id_" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/system.indexes.bson b/mongodb_backup/leanote_install_data/system.indexes.bson deleted file mode 100644 index c89de33..0000000 Binary files a/mongodb_backup/leanote_install_data/system.indexes.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/system.users.bson b/mongodb_backup/leanote_install_data/system.users.bson deleted file mode 100644 index 3793a43..0000000 Binary files a/mongodb_backup/leanote_install_data/system.users.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/system.users.metadata.json b/mongodb_backup/leanote_install_data/system.users.metadata.json deleted file mode 100644 index 54a2869..0000000 --- a/mongodb_backup/leanote_install_data/system.users.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.system.users", "name" : "_id_" }, { "v" : 1, "key" : { "user" : 1, "userSource" : 1 }, "unique" : true, "ns" : "leanote_public_3.system.users", "name" : "user_1_userSource_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/tags.metadata.json b/mongodb_backup/leanote_install_data/tags.metadata.json deleted file mode 100644 index d637332..0000000 --- a/mongodb_backup/leanote_install_data/tags.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_public_3.tags", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_public_3.tags", "name" : "UserId_1" } ] } \ No newline at end of file diff --git a/mongodb_backup/leanote_install_data/tokens.bson b/mongodb_backup/leanote_install_data/tokens.bson deleted file mode 100644 index 3e70bbd..0000000 Binary files a/mongodb_backup/leanote_install_data/tokens.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/user_blogs.bson b/mongodb_backup/leanote_install_data/user_blogs.bson deleted file mode 100644 index 0ff1552..0000000 Binary files a/mongodb_backup/leanote_install_data/user_blogs.bson and /dev/null differ diff --git a/mongodb_backup/leanote_install_data/users.bson b/mongodb_backup/leanote_install_data/users.bson deleted file mode 100644 index fa1399e..0000000 Binary files a/mongodb_backup/leanote_install_data/users.bson and /dev/null differ