diff --git a/app/controllers/AlbumController.go b/app/controllers/AlbumController.go index 50242c0..ab4f336 100644 --- a/app/controllers/AlbumController.go +++ b/app/controllers/AlbumController.go @@ -4,7 +4,7 @@ import ( "github.com/revel/revel" // "encoding/json" "github.com/leanote/leanote/app/info" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // . "github.com/leanote/leanote/app/lea" // "io/ioutil" ) diff --git a/app/controllers/BaseController.go b/app/controllers/BaseController.go index 4024322..573f373 100644 --- a/app/controllers/BaseController.go +++ b/app/controllers/BaseController.go @@ -2,7 +2,7 @@ package controllers import ( "github.com/revel/revel" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "encoding/json" "github.com/leanote/leanote/app/info" // "io/ioutil" diff --git a/app/controllers/BlogController.go b/app/controllers/BlogController.go index 163b4e9..55e4234 100644 --- a/app/controllers/BlogController.go +++ b/app/controllers/BlogController.go @@ -3,7 +3,7 @@ package controllers import ( "github.com/revel/revel" // "encoding/json" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // . "leanote/app/lea" "github.com/leanote/leanote/app/info" // "github.com/leanote/leanote/app/types" diff --git a/app/controllers/NoteController.go b/app/controllers/NoteController.go index 47d5268..ac8558c 100644 --- a/app/controllers/NoteController.go +++ b/app/controllers/NoteController.go @@ -3,7 +3,7 @@ package controllers import ( "github.com/revel/revel" // "encoding/json" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" . "github.com/leanote/leanote/app/lea" "github.com/leanote/leanote/app/lea/html2image" "github.com/leanote/leanote/app/info" diff --git a/app/controllers/NotebookController.go b/app/controllers/NotebookController.go index 10ce201..56db4f4 100644 --- a/app/controllers/NotebookController.go +++ b/app/controllers/NotebookController.go @@ -4,7 +4,7 @@ import ( "github.com/revel/revel" // "encoding/json" "github.com/leanote/leanote/app/info" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // . "github.com/leanote/leanote/app/lea" // "io/ioutil" ) diff --git a/app/controllers/ShareController.go b/app/controllers/ShareController.go index 27f3956..15dc17c 100644 --- a/app/controllers/ShareController.go +++ b/app/controllers/ShareController.go @@ -3,7 +3,7 @@ package controllers import ( "github.com/revel/revel" // "encoding/json" -// "labix.org/v2/mgo/bson" +// "gopkg.in/mgo.v2/bson" // . "github.com/leanote/leanote/app/lea" "github.com/leanote/leanote/app/info" // "github.com/leanote/leanote/app/types" diff --git a/app/controllers/UserController.go b/app/controllers/UserController.go index 4ed9afb..7e4408e 100644 --- a/app/controllers/UserController.go +++ b/app/controllers/UserController.go @@ -3,7 +3,7 @@ package controllers import ( "github.com/revel/revel" // "encoding/json" -// "labix.org/v2/mgo/bson" +// "gopkg.in/mgo.v2/bson" . "github.com/leanote/leanote/app/lea" "github.com/leanote/leanote/app/info" // "github.com/leanote/leanote/app/types" diff --git a/app/db/Mgo.go b/app/db/Mgo.go index 53bd77f..7a330df 100644 --- a/app/db/Mgo.go +++ b/app/db/Mgo.go @@ -2,8 +2,8 @@ package db import ( "fmt" - "labix.org/v2/mgo" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2" + "gopkg.in/mgo.v2/bson" "github.com/revel/revel" ) diff --git a/app/info/AlbumInfo.go b/app/info/AlbumInfo.go index caa6e14..903c7d8 100644 --- a/app/info/AlbumInfo.go +++ b/app/info/AlbumInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/BlogInfo.go b/app/info/BlogInfo.go index 300e8c5..eee7686 100644 --- a/app/info/BlogInfo.go +++ b/app/info/BlogInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" ) // 只为blog, 不为note diff --git a/app/info/FileInfo.go b/app/info/FileInfo.go index 12395d6..199d53c 100644 --- a/app/info/FileInfo.go +++ b/app/info/FileInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/NoteInfo.go b/app/info/NoteInfo.go index 35c401a..0b3b513 100644 --- a/app/info/NoteInfo.go +++ b/app/info/NoteInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/NotebookInfo.go b/app/info/NotebookInfo.go index 6a03040..ee1f256 100644 --- a/app/info/NotebookInfo.go +++ b/app/info/NotebookInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/ShareNotebookNoteInfo.go b/app/info/ShareNotebookNoteInfo.go index 403a11e..dfea67b 100644 --- a/app/info/ShareNotebookNoteInfo.go +++ b/app/info/ShareNotebookNoteInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/SuggestionInfo.go b/app/info/SuggestionInfo.go index aab2584..7c1a5f5 100644 --- a/app/info/SuggestionInfo.go +++ b/app/info/SuggestionInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" ) // 建议 diff --git a/app/info/TagInfo.go b/app/info/TagInfo.go index ec3c81f..b8ab389 100644 --- a/app/info/TagInfo.go +++ b/app/info/TagInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" ) // 这里主要是为了统计每个tag的note数目 diff --git a/app/info/TokenInfo.go b/app/info/TokenInfo.go index 9d892ad..a27a58b 100644 --- a/app/info/TokenInfo.go +++ b/app/info/TokenInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/info/UserInfo.go b/app/info/UserInfo.go index 833eb34..eb28ce6 100644 --- a/app/info/UserInfo.go +++ b/app/info/UserInfo.go @@ -1,7 +1,7 @@ package info import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/lea/Util.go b/app/lea/Util.go index 62ac1c2..1685802 100644 --- a/app/lea/Util.go +++ b/app/lea/Util.go @@ -8,7 +8,7 @@ import ( "encoding/base64" "encoding/hex" "io" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" math_rand "math/rand" ) diff --git a/app/service/AlbumService.go b/app/service/AlbumService.go index 8cd6e8c..992b7bf 100644 --- a/app/service/AlbumService.go +++ b/app/service/AlbumService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" // . "github.com/leanote/leanote/app/lea" "github.com/leanote/leanote/app/db" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/service/AuthService.go b/app/service/AuthService.go index 9493fcf..f4c3928 100644 --- a/app/service/AuthService.go +++ b/app/service/AuthService.go @@ -1,7 +1,7 @@ package service import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" "github.com/revel/revel" diff --git a/app/service/BlogService.go b/app/service/BlogService.go index 9a94160..c62e530 100644 --- a/app/service/BlogService.go +++ b/app/service/BlogService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" // . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // "time" // "sort" ) diff --git a/app/service/FileService.go b/app/service/FileService.go index c011c8b..7d8a7bd 100644 --- a/app/service/FileService.go +++ b/app/service/FileService.go @@ -5,7 +5,7 @@ import ( "github.com/revel/revel" "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" "os" ) diff --git a/app/service/NoteContentHistoryService.go b/app/service/NoteContentHistoryService.go index b01f702..4b67c31 100644 --- a/app/service/NoteContentHistoryService.go +++ b/app/service/NoteContentHistoryService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" // . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // "time" ) diff --git a/app/service/NoteService.go b/app/service/NoteService.go index 89b7594..f1341fd 100644 --- a/app/service/NoteService.go +++ b/app/service/NoteService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" ) diff --git a/app/service/NotebookService.go b/app/service/NotebookService.go index 422be59..4bb794a 100644 --- a/app/service/NotebookService.go +++ b/app/service/NotebookService.go @@ -2,7 +2,7 @@ package service import ( // "fmt" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" // . "github.com/leanote/leanote/app/lea" diff --git a/app/service/PwdService.go b/app/service/PwdService.go index ef4135e..b7857e5 100644 --- a/app/service/PwdService.go +++ b/app/service/PwdService.go @@ -1,7 +1,7 @@ package service import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" . "github.com/leanote/leanote/app/lea" diff --git a/app/service/ShareService.go b/app/service/ShareService.go index c10017f..8e80e55 100644 --- a/app/service/ShareService.go +++ b/app/service/ShareService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" // . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" "sort" ) diff --git a/app/service/SuggestionService.go b/app/service/SuggestionService.go index ab44b14..3eb5207 100644 --- a/app/service/SuggestionService.go +++ b/app/service/SuggestionService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" // . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // "time" // "sort" ) diff --git a/app/service/TagService.go b/app/service/TagService.go index 0a2e1a4..d6ecc28 100644 --- a/app/service/TagService.go +++ b/app/service/TagService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" // "time" ) diff --git a/app/service/TokenService.go b/app/service/TokenService.go index 62cae5f..5fbd274 100644 --- a/app/service/TokenService.go +++ b/app/service/TokenService.go @@ -1,7 +1,7 @@ package service import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" . "github.com/leanote/leanote/app/lea" diff --git a/app/service/TrashService.go b/app/service/TrashService.go index 5ed0d86..23b972a 100644 --- a/app/service/TrashService.go +++ b/app/service/TrashService.go @@ -1,7 +1,7 @@ package service import ( - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" ) diff --git a/app/service/UserService.go b/app/service/UserService.go index c976f1b..526ae59 100644 --- a/app/service/UserService.go +++ b/app/service/UserService.go @@ -4,7 +4,7 @@ import ( "github.com/leanote/leanote/app/info" "github.com/leanote/leanote/app/db" . "github.com/leanote/leanote/app/lea" - "labix.org/v2/mgo/bson" + "gopkg.in/mgo.v2/bson" "time" "strings" "fmt" diff --git a/app/test/TestNoteService.go b/app/test/TestNoteService.go index 0d9705b..3d3e15f 100644 --- a/app/test/TestNoteService.go +++ b/app/test/TestNoteService.go @@ -11,8 +11,8 @@ import ( "github.com/leanote/leanote/app/lea/html2image" "time" "fmt" - "labix.org/v2/mgo/bson" -// "labix.org/v2/mgo" + "gopkg.in/mgo.v2/bson" +// "gopkg.in/mgo.v2" // "encoding/json" // "strings" ) diff --git a/app/views/Home/header.html b/app/views/Home/header.html index fb70131..91d5cad 100644 --- a/app/views/Home/header.html +++ b/app/views/Home/header.html @@ -27,7 +27,7 @@ function log(o) {

- +

diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html index b7c48f9..ec8d635 100644 --- a/app/views/Note/note-dev.html +++ b/app/views/Note/note-dev.html @@ -45,9 +45,8 @@ function log(o) { -->
diff --git a/public/images/logo/leanote.png b/public/images/logo/leanote.png new file mode 100644 index 0000000..8d90ff8 Binary files /dev/null and b/public/images/logo/leanote.png differ diff --git a/public/images/logo/leanote_green.png b/public/images/logo/leanote_green.png new file mode 100644 index 0000000..aafe869 Binary files /dev/null and b/public/images/logo/leanote_green.png differ