mgo package changed to 'gopkg.in/mgo.v2/bson'

2014-09-02 15:45:44 +08:00
parent 1d8be4c012
commit 7cbd38e8bf
38 changed files with 39 additions and 40 deletions
--- 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"
 )
--- 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"
--- 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"
--- 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"
--- 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"
 )
--- 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"
--- 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"
--- 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"
 )

--- 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"
 )

--- 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
--- 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"
 )

--- 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"
 )

--- 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"
 )

--- 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"
 )

--- 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"
 )

 // 建议
--- 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数目
--- 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"
 )

--- 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"
 )

--- 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" 
 )
--- 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"
 )

--- 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"
--- 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"
 )
--- 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"
 )
--- 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"
 )

--- 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"
 )

--- 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"
--- 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"
--- 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"
 )
--- 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"
 )
--- 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"
 )

--- 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"
--- 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"
 )
--- 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"
--- 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"
 )
--- a/app/views/Home/header.html
+++ b/app/views/Home/header.html
@ -27,7 +27,7 @@ function log(o) {
 		<div class="pull-left">
 			<h1>
 				<a href="/index">
-					<img src="/images/logo.png" id="" style="height: 40px" title="leanote, Your own cloud note!"/>
+					<img src="/images/logo/leanote.png" id="" style="height: 50px" title="leanote, Your own cloud note!"/>
 				</a>
 			</h1>
 		</div>
--- a/app/views/Note/note-dev.html
+++ b/app/views/Note/note-dev.html
@ -45,9 +45,8 @@ function log(o) {
 			  </div>
 			-->
 				<div id="logo" class="pull-left">
-					<span>lea</span>note 
-					<!-- <img style="height: 45px;" src="/images/logo.png" title="leanote, 不一样的笔记" alt="leanote">
-					 -->
+					<!--<span>lea</span>note -->
+					<img style="height: 45px;" src="/images/logo/leanote_green.png" title="leanote, 不一样的笔记" alt="leanote">
 				</div>
 				<div id="switcher" class="pull-left">
 					 <i class="fa fa-align-justify" id="leftSwitcher" title="{{msg . "leftHidden"}}"></i>
--- a/public/images/logo/leanote.png
+++ b/public/images/logo/leanote.png
--- a/public/images/logo/leanote_green.png
+++ b/public/images/logo/leanote_green.png