分享给项目组无法输出已设置项目组 #143

fix restore/backup bug: mongo -port to --port

.gitignore

@@ -2,13 +2,19 @@
 pkg
 bin2
 bin/i18n
+bin/leanote*
 bin/release
+bin/test.sh
 bin/tmp
 bin/test
-conf/app.conf
+bin/src
-conf/routes
 public/upload
 app/routes/routes.go
 app/tmp/main.go
 .DS_Store
 .settings
+.project
+public/config.codekit
+files
+/gulpfile.js
+/node_modules

LICENSE

@@ -1,5 +1,25 @@
-GNU GENERAL PUBLIC LICENSE
+leanote - you own cloud note!
-                       Version 2, June 1991
+
+Copyright 2014 by the contributors
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+leanote is licensed under the GPL v2.
+
+                       life(life@leanote.com, lifephp@gmail.com)
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+                       GNU GENERAL PUBLIC LICENSE
+                           Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

README.md

@@ -1,112 +1,70 @@
-## Introduction
 
-Leanote, a cloud note. You can create your own cloud note by leanote. 
+# Leanote
 
-## Features
+## 1. Introduction
-* Knowledge: manage your knowledge in leanote. leanote contains tinymce editor and markdown editor, just enjoy yourself in writting.
-* Share: share your knowledge to your friends in leanote. Well, you are not alone, you can invite your friends to join your cloud note and share your knowledge each other.
-* Cooperation: collaborate with friends to improve your knowledge.
-* Blog: public your knowledge and leanote be your blog.
 
-## Why we create leanote
+Leanote, not just a notepad!
-To be honest, our inspiration comes from evernote, and we use evenote to manage our knowledge everyday. But we find that:
+![leanote.png](leanote.png "")
-* Evernote's editor can't meet our needs, it hasn't document navigation, can't put our codes(as a programmer, put codes is the basic needs), can't resize images...)
+
-* We like markdown, but evernote don't support it.
+**Some Features**
-* We want to public our knowledge, so we have our blog(such as wordpress) and evernote, but why can't be the one!
+
+* Knowledge: Manage your knowledge in leanote. leanote contains the tinymce editor and a markdown editor, just enjoy yourself writing.
+* Share: Share your knowledge with your friends in leanote. You can invite your friends to join your notepad in the cloud so you can share knowledge.
+* Cooperation: Collaborate with friends to improve your skills.
+* Blog: Publish your knowledge and make leanote your blog.
+
+## 2. Why we created leanote
+To be honest, our inspiration comes from Evernote. We use Evernote to manage our knowledge everyday. But we find that:
+* Evernote's editor can't meet our needs, it does not have document navigation, it does not render code properly (as a programmer, syntax highlighted code rendering is a basic need), it cannot resize images and so forth
+* We like markdown, but Evernote does not support it.
+* We want to share our knowledge, so all of us have our blogs (e.g. on Wordpress) and our Evernote accounts, but why can not those two be one!
 * ......
 
-## How to use it
+## 3. How to install leanote
-Leanote build with golang(revel) and mongodb. so you must install mongodb at first.
 
-### Install mongodb
+More information about how to install leanote please see:
-For more tips please go https://github.com/leanote/leanote/wiki/mongodb-in-leanote
+* [leanote binary distribution installation tutorial](https://github.com/leanote/leanote/wiki/leanote-binary-distribution-installation-tutorial)
+* [leanote develop distribution installation tutorial](https://github.com/leanote/leanote/wiki/leanote-develop-distribution-installation-tutorial)
 
-Go http://www.mongodb.org to download and install it.
+## 4. How to develop leanote
 
-### Export initial mongodb data
+Please see [How-to-develop-leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote)
 
-The mongodb data is in path_to_leante/mongodb_backup/leanote_install_data
 
-```
+## 5. Docs
-$> mongorestore -h localhost -d leanote --directoryperdb path_to_leante/mongodb_backup/leanote_install_data
+* [leanote binary distribution installation tutorial](https://github.com/leanote/leanote/wiki/leanote-binary-distribution-installation-tutorial)
-```
+* [leanote develop distribution installation tutorial](https://github.com/leanote/leanote/wiki/leanote-develop-distribution-installation-tutorial)
+* [leanote blog theme api](https://github.com/leanote/leanote/wiki/leanote-blog-theme-api_en)
 
-The initial data contains two users:
+More docs please see [wiki](https://github.com/leanote/leanote/wiki).
 
-```
+## 6. Contributors
-user1 username: leanote, password: abc123
+Thank you to all the [contributors](https://github.com/leanote/leanote/graphs/contributors) on
-user2 username: admin, password: abc123
+this project. Your help is much appreciated.
-```
 
-### Configuration
+## 7.Join us
+Please fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
 
-Copy path_to_leante/conf/app-default.conf to path_to_leante/conf/app.conf, the options contains:
+If you find some problems or has some good ideas, please submit [issues](https://github.com/leanote/leanote/issues).
 
-``mongodb``  **required**
+You are always welcomed!
 
-```Shell
+## 8. Donation
-db.host=localhost
+Support us, [donate us](http://leanote.org/#donate). And thanks [donators](http://leanote.leanote.com/post/leanote-donation-list).
-db.port=27017
-db.dbname=leanote
-db.username=
-db.password=
-```
 
-``http.port``
+## 9. Related projects
+* [Leanote Desktop App](https://github.com/leanote/desktop-app), [Download](http://app.leanote.com)
+* [Leanote IOS](https://github.com/leanote/leanote-ios), development phase
+* [Leanote Android](https://github.com/Dminter/leanote-android-client), development phase
 
-Default is 80
+And also, you are welcome to join us.
 
-``site.url``
+## 9. Discussion
+* [leanote bbs](http://bbs.leanote.com)
+* [leanote google group](https://groups.google.com/forum/#!forum/leanote)
+* QQ Group: 158716820
 
-Default is http://localhost, you must config it when your domain isn't it, it is used when upload images.
+-----------------------------------------------------------------------
+[中文](README_zh.md)
 
-``email``
 
-for find password
-
-``adminUsername``
-
-Default is admin. The index site is the adminUsername's blog
-
-For more infomation please see app/app.conf and revel manuals http://revel.github.io
-
-### Run leanote
-
-```
-$> cd path_to_leanote/bin
-$> sudo sh run.sh
-```
-
-## How to develop leanote
-
-For more tips please go https://github.com/leanote/leanote/wiki/How-to-develop-leanote
-
-Leanote is a app based on revel(http://revel.github.io), so if you want to develop leanote as you want, you must be familar with revel.
-
-### Install golang
-
-Install golang and set GOPATH
-
-### Install revel
-```
-go get github.com/revel/revel
-go get github.com/revel/cmd/revel
-```
-
-### Get leanote
-
-```
-go get github.com/leanote/leanote/app
-```
-
-### Build/Run leanote via revel
-
-cp conf/routes-default to conf/routes
-
-Now you can modify leanote source and build/run with revel
-
-```
-revel run github.com/leanote/leanote
-```
-
-Welcome to join with us and contribute your code to leanote! Thanks.

README_zh.md

@@ -0,0 +1,70 @@
+# Leanote产品
+
+## 1. 介绍
+
+Leanote, 不只是笔记!
+![leanote.png](leanote.png "")
+
+**特性**
+
+* 知识管理: 通过leanote来管理知识, leanote有易操作的界面, 包含两款编辑器tinymce和markdown. 在leanote, 你可以尽情享受写作.
+* 分享: 你也可以通过分享知识给好友, 让好友拥有你的知识.
+* 协作: 在分享的同时也可以与好友一起协作知识.
+* 博客: leanote也可以作为你的博客, 将知识公开成博客, 让leanote把你的知识传播的更远!
+
+## 2. 为什么我们要创建leanote?
+说实话, 我们曾是evernote的忠实粉丝, 但是我们也发现evernote的不足:
+* evernote的编辑器不能满足我们的需求, 不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放.
+* 我们是markdown的爱好者, 可是evernote竟然没有.
+* 我们也想将知识公开, 所以我们有自己的博客, 如wordpress, 但为什么这两者不能合二为一呢?
+* 还有...
+
+## 3.安装leanote
+leanote是一款私有云笔记, 你可以下载它安装在自己的服务器上, 当然也可以在 http://leanote.com 上注册.
+
+这里详细整理了leanote二进版和leanote开发版的安装教程, 请移步至:
+
+* [leanote二进制详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+* [leanote开发版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+
+## 4. 如何对leanote进行二次开发
+
+请查看 [How-to-develop-leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote)
+
+## 5 相关文档
+* [leanote二进制版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+* [leanote开发版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+* [Leanote source leanote源码导读](https://github.com/leanote/leanote/wiki/Leanote-source-leanote源码导读)
+* [leanote blog theme api(中文版)](https://github.com/leanote/leanote/wiki/leanote-blog-theme-api)
+* [How to develop leanote 如何开发leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-如何开发leanote)
+
+更多文档请查看 [wiki](https://github.com/leanote/leanote/wiki).
+
+## 6. 贡献者
+多谢 [贡献者](https://github.com/leanote/leanote/graphs/contributors) 的贡献, leanote因有你们而更完美!
+
+## 7. 加入我们
+
+欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到leanote.
+
+有任何问题或建议, 欢迎提交[issue](https://github.com/leanote/leanote/issues).
+
+Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善leanote.
+
+## 8. 捐赠
+支持我们, [捐赠Leanote](http://leanote.org/#donate). 感谢[捐赠者](http://leanote.leanote.com/post/leanote-donation-list), 谢谢你们的鼓励, Leanote会一直坚持!
+
+## 9. 其它相关项目
+* [Leanote Desktop App](https://github.com/leanote/desktop-app), [下载地址](http://app.leanote.com)
+* [Leanote IOS](https://github.com/leanote/leanote-ios), 开发阶段
+* [Leanote Android](https://github.com/Dminter/leanote-android-client), 开发阶段
+
+同样, 欢迎加入我们!
+
+## 讨论
+* [leanote 社区](http://bbs.leanote.com)
+* QQ群: 158716820
+* [leanote google group](https://groups.google.com/forum/#!forum/leanote)
+
+----------------------------------------------------------------
+[English](README.md)

app/controllers/AlbumController.go

@@ -0,0 +1,47 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+	"github.com/leanote/leanote/app/info"
+	"gopkg.in/mgo.v2/bson"
+//	. "github.com/leanote/leanote/app/lea"
+//	"io/ioutil"
+)
+
+// Album controller
+type Album struct {
+	BaseController
+}
+
+// all albums by userId
+func (c Album) GetAlbums() revel.Result {
+	re := albumService.GetAlbums(c.GetUserId())
+	return c.RenderJson(re)
+}
+
+func (c Album) DeleteAlbum(albumId string) revel.Result {
+	re, msg := albumService.DeleteAlbum(c.GetUserId(), albumId)
+	return c.RenderJson(info.Re{Ok: re, Msg: msg})
+}
+
+// add album
+func (c Album) AddAlbum(name string) revel.Result {
+	album := info.Album{
+		AlbumId: bson.NewObjectId(),
+		Name: name,
+		Seq: -1,
+		UserId: c.GetObjectUserId()}
+	re := albumService.AddAlbum(album)
+
+	if(re) {
+		return c.RenderJson(album)
+	} else {
+		return c.RenderJson(false)
+	}
+}
+
+// update alnum name
+func (c Album) UpdateAlbum(albumId, name string) revel.Result {
+	return c.RenderJson(albumService.UpdateAlbum(albumId, c.GetUserId(), name))
+}

app/controllers/AttachController.go

@@ -0,0 +1,219 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+	"gopkg.in/mgo.v2/bson"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+	"io/ioutil"
+	"os"
+	"strings"
+	"time"
+    "io"
+    "fmt"
+    "archive/tar"
+    "compress/gzip"
+)
+
+// 附件
+type Attach struct {
+	BaseController
+}
+
+// 上传附件
+func (c Attach) UploadAttach(noteId string) revel.Result {
+	re := c.uploadAttach(noteId)
+	return c.RenderJson(re)
+}
+func (c Attach) uploadAttach(noteId string) (re info.Re) {
+	var fileId = ""
+	var resultMsg = "error" // 错误信息
+	var Ok = false
+	var fileInfo info.Attach
+	
+	re = info.NewRe()
+	
+	defer func() {
+		re.Id = fileId // 只是id, 没有其它信息
+		re.Msg = resultMsg
+		re.Ok = Ok
+		re.Item = fileInfo
+	}()
+	
+	// 判断是否有权限为笔记添加附件
+	if !shareService.HasUpdateNotePerm(noteId, c.GetUserId()) {
+		return re
+	}
+	
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		return re
+	}
+	defer file.Close()
+	
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return re
+	}
+	// > 5M?
+	maxFileSize := configService.GetUploadSize("uploadAttachSize");
+	if maxFileSize <= 0 {
+		maxFileSize = 1000
+	}
+	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+		resultMsg = fmt.Sprintf("The file's size is bigger than %vM", maxFileSize)
+		return re
+	}
+	
+	// 生成上传路径
+	filePath := "files/" + c.GetUserId() + "/attachs"
+	dir := revel.BasePath + "/" +  filePath
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		return re
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+	_, ext := SplitFilename(filename) // .doc
+	filename = NewGuid() + ext
+	toPath := dir + "/" + filename;
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		return re
+	}
+	
+	// add File to db
+	fileType := ""
+	if ext != "" {
+		fileType = strings.ToLower(ext[1:])
+	}
+	filesize := GetFilesize(toPath)
+	fileInfo = info.Attach{Name: filename,
+		Title: handel.Filename,
+		NoteId: bson.ObjectIdHex(noteId),
+		UploadUserId: c.GetObjectUserId(),
+		Path: filePath + "/" + filename,
+		Type: fileType,
+		Size: filesize}
+		
+	id := bson.NewObjectId();
+	fileInfo.AttachId = id
+	fileId = id.Hex()
+	Ok, resultMsg = attachService.AddAttach(fileInfo, false)
+	if resultMsg != "" {
+		resultMsg = c.Message(resultMsg)
+	}
+	
+	fileInfo.Path = ""; // 不要返回
+	if Ok {
+		resultMsg = "success"
+	}
+	return re
+}
+
+// 删除附件
+func (c Attach) DeleteAttach(attachId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = attachService.DeleteAttach(attachId, c.GetUserId())
+	return c.RenderJson(re)
+}
+
+// get all attachs by noteId
+func (c Attach) GetAttachs(noteId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = true
+	re.List = attachService.ListAttachs(noteId, c.GetUserId())
+	return c.RenderJson(re)
+}
+
+// 下载附件
+// 权限判断
+func (c Attach) Download(attachId string) revel.Result {
+	attach := attachService.GetAttach(attachId, c.GetUserId()); // 得到路径
+	path := attach.Path
+	if path == "" {
+		return c.RenderText("")
+	}
+	fn := revel.BasePath + "/" +  strings.TrimLeft(path, "/")
+    file, _ := os.Open(fn)
+    return c.RenderBinary(file, attach.Title, revel.Attachment, time.Now()) // revel.Attachment
+    // return c.RenderFile(file, revel.Attachment) // revel.Attachment
+}
+
+func (c Attach) DownloadAll(noteId string) revel.Result {
+	note := noteService.GetNoteById(noteId)
+	if note.NoteId == "" {
+		return c.RenderText("")
+	}
+	// 得到文件列表
+	attachs := attachService.ListAttachs(noteId, c.GetUserId())
+	if attachs == nil || len(attachs) == 0 {
+		return c.RenderText("")
+	}
+	
+	/*
+	dir := revel.BasePath + "/files/tmp"
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		return c.RenderText("")
+	}
+	*/
+	
+	filename := note.Title + ".tar.gz"
+	if note.Title == "" {
+		filename = "all.tar.gz"
+	}
+	
+	// file write
+    fw, err := os.Create(revel.BasePath + "/files/" + filename)
+    if err != nil {
+		return c.RenderText("")
+    }
+    // defer fw.Close() // 不需要关闭, 还要读取给用户下载
+  
+    // gzip write
+    gw := gzip.NewWriter(fw)
+    defer gw.Close()
+  
+    // tar write
+    tw := tar.NewWriter(gw)
+    defer tw.Close()
+    
+    // 遍历文件列表
+    for _, attach := range attachs {
+		fn := revel.BasePath + "/" +  strings.TrimLeft(attach.Path, "/")
+	    fr, err := os.Open(fn)
+	    fileInfo, _ := fr.Stat()
+        if err != nil {
+			return c.RenderText("")
+        }
+        defer fr.Close()
+        
+        // 信息头
+        h := new(tar.Header)
+        h.Name = attach.Title
+        h.Size = fileInfo.Size()
+        h.Mode = int64(fileInfo.Mode())
+        h.ModTime = fileInfo.ModTime()
+  
+        // 写信息头
+        err = tw.WriteHeader(h)
+        if err != nil {
+            panic(err)
+        }
+  
+        // 写文件
+        _, err = io.Copy(tw, fr)
+        if err != nil {
+            panic(err)
+        }
+    } // for
+    
+//    tw.Close()
+//    gw.Close()
+//    fw.Close()
+//    file, _ := os.Open(dir + "/" + filename)
+	// fw.Seek(0, 0)
+    return c.RenderBinary(fw, filename, revel.Attachment, time.Now()) // revel.Attachment
+}

app/controllers/AuthController.go

@@ -4,6 +4,7 @@ import (
 	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
+//	"strconv"
 )
 
 // 用户登录/注销/找回密码
@@ -14,11 +15,19 @@ type Auth struct {
 
 //--------
 // 登录
-func (c Auth) Login(email string) revel.Result {
+func (c Auth) Login(email, from string) revel.Result {
 	c.RenderArgs["title"] = c.Message("login")
 	c.RenderArgs["subTitle"] = c.Message("login")
 	c.RenderArgs["email"] = email
-	c.RenderArgs["openRegister"] = openRegister
+	c.RenderArgs["from"] = from
+	c.RenderArgs["openRegister"] = configService.IsOpenRegister()
+	
+	sessionId := c.Session.Id()
+	if sessionService.LoginTimesIsOver(sessionId) {
+		c.RenderArgs["needCaptcha"] = true
+	}
+	
+	c.SetLocale()
 	
 	if c.Has("demo") {
 		c.RenderArgs["demo"] = true
@@ -26,73 +35,97 @@ func (c Auth) Login(email string) revel.Result {
 	}
 	return c.RenderTemplate("home/login.html")
 }
-func (c Auth) DoLogin(email, pwd string) revel.Result {
+
+// 为了demo和register
+func (c Auth) doLogin(email, pwd string) revel.Result {
+	sessionId := c.Session.Id()
+	var msg = ""
+	
 	userInfo := authService.Login(email, pwd)
 	if userInfo.Email != "" {
 		c.SetSession(userInfo)
-		// 必须要redirect, 不然用户刷新会重复提交登录信息
+		sessionService.ClearLoginTimes(sessionId)
-//		return c.Redirect("/")
 		return c.RenderJson(info.Re{Ok: true})
+	} else {
+		// 登录错误, 则错误次数++
+		msg = "wrongUsernameOrPassword"
 	}
-//	return c.RenderTemplate("login.html")
+	
-	return c.RenderJson(info.Re{Ok: false, Msg: c.Message("wrongUsernameOrPassword")})
+	return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId) , Msg: c.Message(msg)})
+}
+func (c Auth) DoLogin(email, pwd string, captcha string) revel.Result {
+	sessionId := c.Session.Id()
+	var msg = ""
+	
+	// > 5次需要验证码, 直到登录成功
+	if sessionService.LoginTimesIsOver(sessionId) && sessionService.GetCaptcha(sessionId) != captcha {
+		msg = "captchaError"
+	} else {
+		userInfo := authService.Login(email, pwd)
+		if userInfo.Email != "" {
+			c.SetSession(userInfo)
+			sessionService.ClearLoginTimes(sessionId)
+			return c.RenderJson(info.Re{Ok: true})
+		} else {
+			// 登录错误, 则错误次数++
+			msg = "wrongUsernameOrPassword"
+			sessionService.IncrLoginTimes(sessionId)
+		}
+	}
+	
+	return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId) , Msg: c.Message(msg)})
 }
 // 注销
 func (c Auth) Logout() revel.Result {
+	sessionId := c.Session.Id()
+	sessionService.Clear(sessionId)
 	c.ClearSession()
 	return c.Redirect("/login")
 }
 
 // 体验一下
 func (c Auth) Demo() revel.Result {
-	c.DoLogin("demo@leanote.com", "demo@leanote.com")
+	c.doLogin(configService.GetGlobalStringConfig("demoUsername"), configService.GetGlobalStringConfig("demoPassword"))
 	return c.Redirect("/note")
 }
 
 //--------
 // 注册
-func (c Auth) Register() revel.Result {
+func (c Auth) Register(from, iu string) revel.Result {
-	if !openRegister {
+	if !configService.IsOpenRegister() {
 		return c.Redirect("/index")
 	}
+	c.SetLocale()
+	c.RenderArgs["from"] = from
+	c.RenderArgs["iu"] = iu
 	
 	c.RenderArgs["title"] = c.Message("register")
 	c.RenderArgs["subTitle"] = c.Message("register")
 	return c.RenderTemplate("home/register.html")
 }
-func (c Auth) DoRegister(email, pwd string) revel.Result {
+func (c Auth) DoRegister(email, pwd, iu string) revel.Result {
-	if !openRegister {
+	if !configService.IsOpenRegister() {
 		return c.Redirect("/index")
 	}
 	
 	re := info.NewRe();
 	
-	if email == "" {
+	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		re.Msg = c.Message("inputEmail")
+		return c.RenderRe(re);
-		return c.RenderJson(re)
-	} else if !IsEmail(email) {
-		re.Msg = c.Message("wrongEmail")
-		return c.RenderJson(re)
 	}
-	
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-	// 密码
+		return c.RenderRe(re);
-	if pwd == "" {
-		re.Msg = c.Message("inputPassword")
-		return c.RenderJson(re)
-	} else if len(pwd) < 6 {
-		re.Msg = c.Message("wrongPassword")
-		return c.RenderJson(re)
 	}
 	
 	// 注册
-	re.Ok, re.Msg = authService.Register(email, pwd)
+	re.Ok, re.Msg = authService.Register(email, pwd, iu)
 	
 	// 注册成功, 则立即登录之
 	if re.Ok {
-		c.DoLogin(email, pwd)
+		c.doLogin(email, pwd)
 	}
 	
-	return c.RenderJson(re)
+	return c.RenderRe(re)
 }
 
 //--------
@@ -130,12 +163,11 @@ func (c Auth) FindPassword2(token string) revel.Result {
 func (c Auth) FindPasswordUpdate(token, pwd string) revel.Result {
 	re := info.NewRe();
 
-	re.Ok, re.Msg = IsGoodPwd(pwd)
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-	if !re.Ok {
+		return c.RenderRe(re);
-		return c.RenderJson(re)
 	}
 
 	// 修改之
 	re.Ok, re.Msg = pwdService.UpdatePwd(token, pwd)
-	return c.RenderJson(re)
+	return c.RenderRe(re)
 }

app/controllers/BaseController.go

@@ -2,14 +2,16 @@ 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"
+//	. "github.com/leanote/leanote/app/lea"
 //	"io/ioutil"
 //	"fmt"
 	"math"
 	"strconv"
 	"strings"
+	"bytes"
 )
 
 // 公用Controller, 其它Controller继承它
@@ -54,15 +56,21 @@ func (c BaseController) GetUsername() string {
 // 得到用户信息
 func (c BaseController) GetUserInfo() info.User {
 	if userId, ok := c.Session["UserId"]; ok && userId != "" {
+		return userService.GetUserInfo(userId);
+		/*
 		notebookWidth, _ := strconv.Atoi(c.Session["NotebookWidth"])
 		noteListWidth, _ := strconv.Atoi(c.Session["NoteListWidth"])
+		mdEditorWidth, _ := strconv.Atoi(c.Session["MdEditorWidth"])
+		LogJ(c.Session)
 		user := info.User{UserId: bson.ObjectIdHex(userId), 
 			Email: c.Session["Email"], 
+			Logo: c.Session["Logo"], 
 			Username: c.Session["Username"], 
 			UsernameRaw: c.Session["UsernameRaw"], 
 			Theme: c.Session["Theme"], 
 			NotebookWidth: notebookWidth, 
 			NoteListWidth: noteListWidth,
+			MdEditorWidth: mdEditorWidth, 
 			}
 		if c.Session["Verified"] == "1" {
 			user.Verified = true
@@ -71,10 +79,19 @@ func (c BaseController) GetUserInfo() info.User {
 			user.LeftIsMin = true
 		}
 		return user
+		*/
 	}
 	return info.User{}
 }
 
+// 这里的session都是cookie中的, 与数据库session无关
+func (c BaseController) GetSession(key string) string {
+	v, ok := c.Session[key]
+	if !ok {
+		v = ""
+	}
+	return v
+}
 func (c BaseController) SetSession(userInfo info.User) {
 	if userInfo.UserId.Hex() != "" {
 		c.Session["UserId"] = userInfo.UserId.Hex()
@@ -82,6 +99,7 @@ func (c BaseController) SetSession(userInfo info.User) {
 		c.Session["Username"] = userInfo.Username
 		c.Session["UsernameRaw"] = userInfo.UsernameRaw
 		c.Session["Theme"] = userInfo.Theme
+		c.Session["Logo"] = userInfo.Logo
 		
 		c.Session["NotebookWidth"] = strconv.Itoa(userInfo.NotebookWidth)
 		c.Session["NoteListWidth"] = strconv.Itoa(userInfo.NoteListWidth)
@@ -154,7 +172,7 @@ func (c BaseController) E404() revel.Result {
 }
 
 // 设置本地
-func (c BaseController) SetLocale() {
+func (c BaseController) SetLocale() string {
 	locale := string(c.Request.Locale) // zh-CN
 	lang := locale
 	if strings.Contains(locale, "-") {
@@ -165,10 +183,68 @@ func (c BaseController) SetLocale() {
 		lang = "en";
 	}
 	c.RenderArgs["locale"] = lang;
+	c.RenderArgs["siteUrl"] = configService.GetSiteUrl();
+	
+	c.RenderArgs["blogUrl"] = configService.GetBlogUrl()
+	c.RenderArgs["leaUrl"] = configService.GetLeaUrl()
+	c.RenderArgs["noteUrl"] = configService.GetNoteUrl()
+	
+	return lang
 }
 
 // 设置userInfo
-func (c BaseController) SetUserInfo() {
+func (c BaseController) SetUserInfo() info.User {
 	userInfo := c.GetUserInfo()
 	c.RenderArgs["userInfo"] = userInfo
+	if(userInfo.Username == configService.GetAdminUsername()) {
+		c.RenderArgs["isAdmin"] = true
+	}
+	return userInfo
+}
+
+// life
+// 返回解析后的字符串, 只是为了解析模板得到字符串
+func (c BaseController) RenderTemplateStr(templatePath string) string {
+	// Get the Template.
+	// 返回 GoTemplate{tmpl, loader}
+	template, err := revel.MainTemplateLoader.Template(templatePath)
+	if err != nil {
+	}
+
+	tpl := &revel.RenderTemplateResult{
+		Template:   template,
+		RenderArgs: c.RenderArgs, // 把args给它
+	}
+	
+	var buffer bytes.Buffer
+	tpl.Template.Render(&buffer, c.RenderArgs)
+	return buffer.String();
+}
+
+// json, result
+// 为了msg
+// msg-v1-v2-v3
+func (c BaseController) RenderRe(re info.Re) revel.Result {
+	oldMsg := re.Msg
+	if re.Msg != "" {
+		if(strings.Contains(re.Msg, "-")) {
+			msgAndValues := strings.Split(re.Msg, "-")
+			if len(msgAndValues) == 2 {
+				re.Msg = c.Message(msgAndValues[0], msgAndValues[1])
+			} else {
+				others := msgAndValues[0:]
+				a := make([]interface{}, len(others))
+				for i, v := range others {
+					a[i] = v
+				}
+				re.Msg = c.Message(msgAndValues[0], a...)
+			}
+		} else {
+			re.Msg = c.Message(re.Msg)
+		}
+	}
+	if strings.HasPrefix(re.Msg, "???") {
+		re.Msg = oldMsg
+	}
+	return c.RenderJson(re)
 }

app/controllers/CaptchaController.go

@@ -0,0 +1,43 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+//	"gopkg.in/mgo.v2/bson"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/lea/captcha"
+//	"github.com/leanote/leanote/app/types"
+//	"io/ioutil"
+//	"fmt"
+//	"math"
+//	"os"
+//	"path"
+//	"strconv"
+	"net/http"
+)
+
+// 验证码服务
+type Captcha struct {
+	BaseController
+}
+
+type Ca string
+func (r Ca) Apply(req *revel.Request, resp *revel.Response) {
+	resp.WriteHeader(http.StatusOK,  "image/png")
+}
+
+func (c Captcha) Get() revel.Result {
+	c.Response.ContentType = "image/png"
+	image, str := captcha.Fetch()
+	image.WriteTo(c.Response.Out)
+	
+	sessionId := c.Session["_ID"]
+//	LogJ(c.Session)
+//	Log("------")
+//	Log(str)
+//	Log(sessionId)
+Log("..")
+	sessionService.SetCaptcha(sessionId, str)
+	
+	return c.Render()
+}

app/controllers/FileController.go

@@ -3,10 +3,15 @@ package controllers
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
+	"gopkg.in/mgo.v2/bson"
 	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/lea/netutil"
 	"github.com/leanote/leanote/app/info"
 	"io/ioutil"
 	"os"
+	"fmt"
+//	"strconv"
+	"strings"
 )
 
 // 首页
@@ -14,44 +19,80 @@ type File struct {
 	BaseController
 }
 
-// 上传图片 editor
+// 上传的是博客logo
-func (c File) UploadImage(renderHtml string) revel.Result {
+// TODO logo不要设置权限, 另外的目录
-	if renderHtml == "" {
+func (c File) UploadBlogLogo() revel.Result {
-		renderHtml = "file/image.html"
+	re := c.uploadImage("blogLogo", "");
-	}
 	
-	re := c.uploadImage();
+	c.RenderArgs["fileUrlPath"] = re.Id
-	
-	c.RenderArgs["fileUrlPath"] = siteUrl + re.Id
 	c.RenderArgs["resultCode"] = re.Code
 	c.RenderArgs["resultMsg"] = re.Msg
 
-	return c.RenderTemplate(renderHtml)
+	return c.RenderTemplate("file/blog_logo.html")
 }
 
-// 上传的是博客logo
+// 拖拉上传, pasteImage
-func (c File) UploadBlogLogo() revel.Result {
+// noteId 是为了判断是否是协作的note, 如果是则需要复制一份到note owner中
-	return c.UploadImage("file/blog_logo.html");
+func (c File) PasteImage(noteId string) revel.Result {
+	re := c.uploadImage("pasteImage", "");
+	
+	userId := c.GetUserId()
+	note := noteService.GetNoteById(noteId)
+	if note.UserId != "" {
+		noteUserId := note.UserId.Hex()
+		if noteUserId != userId {
+			// 是否是有权限协作的
+			if shareService.HasUpdatePerm(noteUserId, userId, noteId) {
+				// 复制图片之, 图片复制给noteUserId
+				_, re.Id = fileService.CopyImage(userId, re.Id, noteUserId)				
+			} else {
+				// 怎么可能在这个笔记下paste图片呢?
+				// 正常情况下不会
+			}
+		}
+	}
+	
+	return c.RenderJson(re)
 }
 
-// 拖拉上传
+// 头像设置
-func (c File) UploadImageJson(renderHtml string) revel.Result {
+func (c File) UploadAvatar() revel.Result {
-	re := c.uploadImage();
+	re := c.uploadImage("logo", "");
-	re.Id = siteUrl + re.Id
+	
-//	re.Id = re.Id
+	c.RenderArgs["fileUrlPath"] = re.Id
+	c.RenderArgs["resultCode"] = re.Code
+	c.RenderArgs["resultMsg"] = re.Msg
+	
+	if re.Ok {
+		re.Ok = userService.UpdateAvatar(c.GetUserId(), re.Id)
+		if re.Ok {
+			c.UpdateSession("Logo", re.Id);
+		}
+	}
+	
+	return c.RenderJson(re)
+}
+
+// leaui image plugin upload image
+func (c File) UploadImageLeaui(albumId string) revel.Result {
+	re := c.uploadImage("", albumId);
 	return c.RenderJson(re)
 }
 
 // 上传图片, 公用方法
-func (c File) uploadImage() (re info.Re) {
+// upload image common func
+func (c File) uploadImage(from, albumId string) (re info.Re) {
 	var fileUrlPath = ""
+	var fileId = ""
 	var resultCode = 0 // 1表示正常
-	var resultMsg = "内部错误" // 错误信息
+	var resultMsg = "error" // 错误信息
+	var Ok = false
 	
 	defer func() {
-		re.Id = fileUrlPath
+		re.Id = fileId // 只是id, 没有其它信息
 		re.Code = resultCode
 		re.Msg = resultMsg
+		re.Ok = Ok
 	}()
 	
 	file, handel, err := c.Request.FormFile("file")
@@ -60,20 +101,30 @@ func (c File) uploadImage() (re info.Re) {
 	}
 	defer file.Close()
 	// 生成上传路径
-	fileUrlPath = "/upload/" + c.GetUserId() + "/images"
+	if(from == "logo" || from == "blogLogo") {
-	dir := revel.BasePath + "/public/" + fileUrlPath
+		fileUrlPath = "public/upload/" + c.GetUserId() + "/images/logo"
+	} else {
+		fileUrlPath = "files/" + c.GetUserId() + "/images"
+	}
+	dir := revel.BasePath + "/" +  fileUrlPath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
-		Log(err)
 		return re
 	}
 	// 生成新的文件名
 	filename := handel.Filename
-	_, ext := SplitFilename(filename)
+	
-	if(ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg") {
+	var ext string;
-		resultMsg = "不是图片"
+	if from == "pasteImage" {
-		return re
+		ext = ".png"; // TODO 可能不是png类型
+	} else {
+		_, ext = SplitFilename(filename)
+		if(ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg") {
+			resultMsg = "Please upload image"
+			return re
+		}
 	}
+
 	filename = NewGuid() + ext
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
@@ -81,10 +132,22 @@ func (c File) uploadImage() (re info.Re) {
 		return re
 	}
 	
+	var maxFileSize float64
+	if(from == "logo") {
+		maxFileSize = configService.GetUploadSize("uploadAvatarSize");
+	} else if from == "blogLogo" {
+		maxFileSize = configService.GetUploadSize("uploadBlogLogoSize");
+	} else {
+		maxFileSize = configService.GetUploadSize("uploadImageSize");
+	}
+	if maxFileSize <= 0 {
+		maxFileSize = 1000
+	}
+	
 	// > 2M?
-	if(len(data) > 5 * 1024 * 1024) {
+	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
 		resultCode = 0
-		resultMsg = "图片大于2M"
+		resultMsg = fmt.Sprintf("The file Size is bigger than %vM", maxFileSize)
 		return re
 	}
 	
@@ -96,10 +159,102 @@ func (c File) uploadImage() (re info.Re) {
 	}
 	// 改变成gif图片
 	_, toPathGif := TransToGif(toPath, 0, true)
-	
+	filename = GetFilename(toPathGif)
-	fileUrlPath += "/" + GetFilename(toPathGif)
+	filesize := GetFilesize(toPathGif)
+	fileUrlPath += "/" + filename
 	resultCode = 1
-	resultMsg = "上传成功!"
+	resultMsg = "Upload Success!"
+	
+	// File
+	fileInfo := info.File{Name: filename,
+		Title: handel.Filename,
+		Path: fileUrlPath,
+		Size: filesize}
+		
+	id := bson.NewObjectId();
+	fileInfo.FileId = id
+	fileId = id.Hex()
+	if(from == "logo" || from == "blogLogo") {
+		fileId = "public/upload/" + c.GetUserId() + "/images/logo/" + filename
+	}
+	
+	Ok, resultMsg = fileService.AddImage(fileInfo, albumId, c.GetUserId(), from == "" || from == "pasteImage")
+	resultMsg = c.Message(resultMsg)
+	
+	fileInfo.Path = ""; // 不要返回
+	re.Item = fileInfo
 	
 	return re
 }
+
+// get all images by userId with page
+func (c File) GetImages(albumId, key string, page int) revel.Result {
+	re := fileService.ListImagesWithPage(c.GetUserId(), albumId, key, page, 12)
+	return c.RenderJson(re)
+}
+
+func (c File) UpdateImageTitle(fileId, title string) revel.Result {
+	re := info.NewRe()
+	re.Ok = fileService.UpdateImageTitle(c.GetUserId(), fileId, title)
+	return c.RenderJson(re)
+}
+
+func (c File) DeleteImage(fileId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = fileService.DeleteImage(c.GetUserId(), fileId)
+	return c.RenderJson(re)
+}
+//-----------
+
+// 输出image
+// 权限判断
+func (c File) OutputImage(noteId, fileId string) revel.Result {
+	path := fileService.GetFile(c.GetUserId(), fileId); // 得到路径
+	if path == "" {
+		return c.RenderText("")
+	}
+	fn := revel.BasePath + "/" +  strings.TrimLeft(path, "/")
+    file, _ := os.Open(fn)
+    return c.RenderFile(file, revel.Inline) // revel.Attachment
+}
+
+// 协作时复制图片到owner
+// 需要计算对方大小
+func (c File) CopyImage(userId, fileId, toUserId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId)
+	return c.RenderJson(re)
+}
+
+// 复制外网的图片, 成公共图片 放在/upload下
+// 都要好好的计算大小
+func (c File) CopyHttpImage(src string) revel.Result {
+	re := info.NewRe()
+	fileUrlPath := "upload/" + c.GetUserId() + "/images"
+	dir := revel.BasePath + "/public/" +  fileUrlPath
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		return c.RenderJson(re)
+	}
+	filesize, filename, _, ok := netutil.WriteUrl(src, dir)
+	
+	if !ok {
+		re.Msg = "copy error"
+		return c.RenderJson(re)
+	}
+	
+	// File
+	fileInfo := info.File{Name: filename,
+		Title: filename,
+		Path: fileUrlPath + "/" + filename,
+		Size: filesize}
+		
+	id := bson.NewObjectId();
+	fileInfo.FileId = id
+	
+	re.Id = id.Hex()
+	re.Item = fileInfo.Path
+	re.Ok, re.Msg = fileService.AddImage(fileInfo, "", c.GetUserId(), true)
+	
+	return c.RenderJson(re)
+}

app/controllers/IndexController.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
-	. "github.com/leanote/leanote/app/lea"
+//	. "github.com/leanote/leanote/app/lea"
 )
 
 // 首页
@@ -12,14 +12,22 @@ type Index struct {
 	BaseController
 }
 
+func (c Index) Default() revel.Result {
+	if configService.HomePageIsAdminsBlog(){ 
+		blog := Blog{c.BaseController}
+		return blog.Index(configService.GetAdminUsername());
+	}
+	return c.Index()
+}
 // leanote展示页, 没有登录的, 或已登录明确要进该页的
 func (c Index) Index() revel.Result {
+
 	c.SetUserInfo()
 	c.RenderArgs["title"] = "leanote"
-	c.RenderArgs["openRegister"] = openRegister
+	c.RenderArgs["openRegister"] = configService.GlobalStringConfigs["openRegister"]
-	c.SetLocale()
+	lang := c.SetLocale()
 	
-	return c.RenderTemplate("home/index.html");
+	return c.RenderTemplate("home/index_" + lang + ".html");
 }
 
 // 建议
@@ -29,7 +37,7 @@ func (c Index) Suggestion(addr, suggestion string) revel.Result {
 	
 	// 发给我
 	go func() {
-		SendToLeanote("建议", "建议", "UserId: " + c.GetUserId() + " <br /> Suggestions: " + suggestion)
+		emailService.SendEmail("leanote@leanote.com", "建议", "UserId: " + c.GetUserId() + " <br /> Suggestions: " + suggestion)
 	}();
 	
 	return c.RenderJson(re)

app/controllers/MobileController.go

@@ -1,42 +0,0 @@
-package controllers
-
-import (
-	"github.com/revel/revel"
-//	"github.com/leanote/leanote/app/info"
-)
-
-// 首页
-type Mobile struct {
-	BaseController
-}
-
-// leanote展示页, 没有登录的, 或已登录明确要进该页的
-func (c Mobile) Index() revel.Result {
-	c.SetLocale()
-	
-	userInfo := c.GetUserInfo()
-	userId := userInfo.UserId.Hex()
-	
-	// 没有登录
-	if userId == "" {
-		return c.RenderTemplate("mobile/login.html")
-	}
-	
-	// 已登录了, 那么得到所有信息
-	notebooks := notebookService.GetNotebooks(userId)
-	shareNotebooks, sharedUserInfos := shareService.GetShareNotebooks(userId)
-	
-	c.RenderArgs["userInfo"] = userInfo
-	c.RenderArgs["userInfoJson"] = c.Json(userInfo)
-	c.RenderArgs["notebooks"] = c.Json(notebooks)
-	c.RenderArgs["shareNotebooks"] = c.Json(shareNotebooks)
-	c.RenderArgs["sharedUserInfos"] = c.Json(sharedUserInfos)
-	c.RenderArgs["tagsJson"] = c.Json(tagService.GetTags(c.GetUserId()))
-	
-	return c.RenderTemplate("mobile/index.html");
-}
-
-func (c Mobile) Logout() revel.Result {
-	c.ClearSession()
-	return c.RenderTemplate("mobile/login.html");
-}

app/controllers/NoteController.go

@@ -3,14 +3,16 @@ 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"
-//	"os"
+	"strings"
+//	"time"
 //	"github.com/leanote/leanote/app/types"
 //	"io/ioutil"
 //	"fmt"
+//	"bytes"
+//	"os"
 )
 
 type Note struct {
@@ -20,9 +22,8 @@ type Note struct {
 // 笔记首页, 判断是否已登录
 // 已登录, 得到用户基本信息(notebook, shareNotebook), 跳转到index.html中
 // 否则, 转向登录页面
-func (c Note) Index() revel.Result {
+func (c Note) Index(noteId string) revel.Result {
 	c.SetLocale()
-	
 	userInfo := c.GetUserInfo()
 	
 	userId := userInfo.UserId.Hex()
@@ -32,7 +33,7 @@ func (c Note) Index() revel.Result {
 		return c.Redirect("/login")
 	}
 	
-	c.RenderArgs["openRegister"] = openRegister
+	c.RenderArgs["openRegister"] = configService.IsOpenRegister()
 
 	// 已登录了, 那么得到所有信息
 	notebooks := notebookService.GetNotebooks(userId)
@@ -41,29 +42,89 @@ func (c Note) Index() revel.Result {
 	// 还需要按时间排序(DESC)得到notes
 	notes := []info.Note{}
 	noteContent := info.NoteContent{}
+	
 	if len(notebooks) > 0 {
-//		_, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), pageSize, defaultSortField, false, false);
+		// noteId是否存在
-		// 变成最新
+		// 是否传入了正确的noteId
-		_, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false);
+		hasRightNoteId := false
-		if len(notes) > 0 {
+		if IsObjectId(noteId) {
-			noteContent = noteService.GetNoteContent(notes[0].NoteId.Hex(), userId)
+			note := noteService.GetNoteById(noteId)
+			var noteOwner = note.UserId.Hex()
+			noteContent = noteService.GetNoteContent(noteId, noteOwner)
+			
+			if note.NoteId != "" {
+				hasRightNoteId = true
+				c.RenderArgs["curNoteId"] = noteId
+				c.RenderArgs["curNotebookId"] = note.NotebookId.Hex()
+				
+				// 打开的是共享的笔记, 那么判断是否是共享给我的默认笔记
+				if noteOwner != c.GetUserId() {
+					if shareService.HasReadPerm(noteOwner, c.GetUserId(), noteId) {
+						// 不要获取notebook下的笔记
+						// 在前端下发请求
+						c.RenderArgs["curSharedNoteNotebookId"] = note.NotebookId.Hex()
+						c.RenderArgs["curSharedUserId"] = noteOwner;
+					// 没有读写权限
+					} else {
+						hasRightNoteId = false
+					}
+				} else {
+					_, notes = noteService.ListNotes(c.GetUserId(), note.NotebookId.Hex(), false, c.GetPage(), 50, defaultSortField, false, false);
+					
+					// 如果指定了某笔记, 则该笔记放在首位
+					lenNotes := len(notes)
+					if lenNotes > 1 {
+						notes2 := make([]info.Note, len(notes))
+						notes2[0] = note
+						i := 1
+						for _, note := range notes {
+							if note.NoteId.Hex() != noteId {
+								if i == lenNotes { // 防止越界
+									break;
+								}
+								notes2[i] = note
+								i++
+							}
+						}
+						notes = notes2
+					}
+				}
+			}
+			
+			// 得到最近的笔记
+			_, latestNotes := noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false);
+			c.RenderArgs["latestNotes"] = latestNotes
+		}
+		
+		// 没有传入笔记
+		// 那么得到最新笔记
+		if !hasRightNoteId {
+			_, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false);
+			if len(notes) > 0 {
+				noteContent = noteService.GetNoteContent(notes[0].NoteId.Hex(), userId)
+				c.RenderArgs["curNoteId"] = notes[0].NoteId.Hex()
+			}
 		}
 	}
+	
 	// 当然, 还需要得到第一个notes的content
 	//...
+	c.RenderArgs["isAdmin"] = configService.GetAdminUsername() == userInfo.Username
 	
 	c.RenderArgs["userInfo"] = userInfo
-	c.RenderArgs["userInfoJson"] = c.Json(userInfo)
+	c.RenderArgs["notebooks"] = notebooks
-	c.RenderArgs["notebooks"] = c.Json(notebooks)
+	c.RenderArgs["shareNotebooks"] = shareNotebooks // note信息在notes列表中
-	c.RenderArgs["shareNotebooks"] = c.Json(shareNotebooks)
+	c.RenderArgs["sharedUserInfos"] = sharedUserInfos
-	c.RenderArgs["sharedUserInfos"] = c.Json(sharedUserInfos)
 	
-	c.RenderArgs["notes"] = c.Json(notes)
+	c.RenderArgs["notes"] = notes
-	c.RenderArgs["noteContentJson"] = c.Json(noteContent)
+	c.RenderArgs["noteContentJson"] = noteContent
 	c.RenderArgs["noteContent"] = noteContent.Content
 	
-	c.RenderArgs["tagsJson"] = c.Json(tagService.GetTags(c.GetUserId()))
+	c.RenderArgs["tags"] = tagService.GetTags(c.GetUserId())
 	
+	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
+	
+//		return c.RenderTemplate("note/note.html")
 	if isDev, _ := revel.Config.Bool("mode.dev"); isDev {
 		return c.RenderTemplate("note/note-dev.html")
 	} else {
@@ -85,6 +146,11 @@ func (c Note) ListTrashNotes() revel.Result {
 	return c.RenderJson(notes)
 }
 
+// 得到note和内容
+func (c Note) GetNoteAndContent(noteId string) revel.Result {
+	return c.RenderJson(noteService.GetNoteAndContent(noteId, c.GetUserId()))
+}
+
 // 得到内容
 func (c Note) GetNoteContent(noteId string) revel.Result {
 	noteContent := noteService.GetNoteContent(noteId, c.GetUserId())
@@ -101,7 +167,7 @@ type NoteOrContent struct {
 	Title string
 	Desc string
 	ImgSrc string
-	Tags []string
+	Tags string
 	Content string
 	Abstract string
 	IsNew bool
@@ -112,10 +178,9 @@ type NoteOrContent struct {
 // 这里不能用json, 要用post
 func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 	// 新添加note
-	LogJ(noteOrContent)
 	if noteOrContent.IsNew {
 		userId := c.GetObjectUserId();
-		myUserId := userId
+//		myUserId := userId
 		// 为共享新建?
 		if noteOrContent.FromUserId != "" {
 			userId = bson.ObjectIdHex(noteOrContent.FromUserId)
@@ -125,7 +190,7 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 			NoteId: bson.ObjectIdHex(noteOrContent.NoteId), 
 			NotebookId: bson.ObjectIdHex(noteOrContent.NotebookId), 
 			Title: noteOrContent.Title, 
-			Tags: noteOrContent.Tags,
+			Tags: strings.Split(noteOrContent.Tags, ","),
 			Desc: noteOrContent.Desc,
 			ImgSrc: noteOrContent.ImgSrc,
 			IsBlog: noteOrContent.IsBlog,
@@ -137,7 +202,7 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 			Content: noteOrContent.Content, 
 			Abstract: noteOrContent.Abstract};
 		
-		note = noteService.AddNoteAndContent(note, noteContent, myUserId)
+		note = noteService.AddNoteAndContentForController(note, noteContent, c.GetUserId())
 		return c.RenderJson(note)
 	}
 	
@@ -158,23 +223,32 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 		noteUpdate["Title"] = noteOrContent.Title;
 	}
 	
-	if c.Has("Tags[]") {
+	if c.Has("Tags") {
 		needUpdateNote = true
-		noteUpdate["Tags"] = noteOrContent.Tags;
+		noteUpdate["Tags"] = strings.Split(noteOrContent.Tags, ",");
 	}
 	
+	// web端不控制
 	if needUpdateNote { 
-		noteService.UpdateNote(noteOrContent.UserId, c.GetUserId(), 
+		noteService.UpdateNote(c.GetUserId(), 
-			noteOrContent.NoteId, noteUpdate)
+			noteOrContent.NoteId, noteUpdate, -1)
 	}
 	
 	//-------------
-	
+	afterContentUsn := 0
+	contentOk := false
+	contentMsg := ""
 	if c.Has("Content") {
-		noteService.UpdateNoteContent(noteOrContent.UserId, c.GetUserId(), 
+//		noteService.UpdateNoteContent(noteOrContent.UserId, c.GetUserId(), 
-			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract)
+//			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract)
+		contentOk, contentMsg, afterContentUsn = noteService.UpdateNoteContent(c.GetUserId(),
+			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract, needUpdateNote, -1)
 	}
 	
+	Log(afterContentUsn)
+	Log(contentOk)
+	Log(contentMsg)
+	
 	return c.RenderJson(true)
 }
 
@@ -217,31 +291,8 @@ func (c Note) SearchNoteByTags(tags []string) revel.Result {
 	return c.RenderJson(blogs)
 }
 
-//-----------------
+// 设置/取消Blog; 置顶
-// html2image
+func (c Note) SetNote2Blog(noteId string, isBlog, isTop bool) revel.Result {
-func (c Note) Html2Image(noteId string) revel.Result {
+	re := noteService.ToBlog(c.GetUserId(), noteId, isBlog, isTop)
-	re := info.NewRe()
-	userId := c.GetUserId()
-	note := noteService.GetNote(noteId, userId)
-	if note.NoteId == "" {
-		return c.RenderJson(re)
-	}
-	content := noteService.GetNoteContent(noteId, userId)
-	
-	// path 判断是否需要重新生成之
-	fileUrlPath := "/upload/" + userId + "/images/weibo"
-	dir := revel.BasePath + "/public/" + fileUrlPath
-	if !ClearDir(dir) {
-		return c.RenderJson(re)
-	}
-	
-	filename := note.NoteId.Hex() + ".png";
-	path := dir + "/" + filename
-	
-	// 生成之
-	html2image.ToImage(userId, c.GetUsername(), noteId, note.Title, content.Content, path)
-	
-	re.Ok = true
-	re.Id = fileUrlPath + "/" + filename
 	return c.RenderJson(re)
 }

app/controllers/NotebookController.go

@@ -2,9 +2,9 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	"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"
 )
@@ -13,17 +13,12 @@ type Notebook struct {
 	BaseController
 }
 
-// 得到笔记本
-// 该用户下的
-func (c Notebook) GetNotebooks() {
-}
-
 func (c Notebook) Index(notebook info.Notebook, i int, name string) revel.Result {
 	return c.RenderJson(notebook)
 }
 
 // 得到用户的所有笔记本
-func (c Notebook) getNotebooks() revel.Result {
+func (c Notebook) GetNotebooks() revel.Result {
 	re := notebookService.GetNotebooks(c.GetUserId())
 	return c.RenderJson(re)
 }
@@ -34,12 +29,16 @@ func (c Notebook) DeleteNotebook(notebookId string) revel.Result {
 }
 
 // 添加notebook
-func (c Notebook) AddNotebook(notebookId, title string) revel.Result {
+func (c Notebook) AddNotebook(notebookId, title, parentNotebookId string) revel.Result {
 	notebook := info.Notebook{NotebookId: bson.ObjectIdHex(notebookId), 
 		Title: title,
 		Seq: -1,
 		UserId: c.GetObjectUserId()}
-	re := notebookService.AddNotebook(notebook)
+	if(parentNotebookId != "") {
+		notebook.ParentNotebookId = bson.ObjectIdHex(parentNotebookId)
+	}
+
+	re, notebook := notebookService.AddNotebook(notebook)
 	
 	if(re) {
 		return c.RenderJson(notebook)
@@ -51,7 +50,29 @@ func (c Notebook) AddNotebook(notebookId, title string) revel.Result {
 func (c Notebook) UpdateNotebookTitle(notebookId, title string) revel.Result {
 	return c.RenderJson(notebookService.UpdateNotebookTitle(notebookId, c.GetUserId(), title))
 }
+
 // 排序
+// 无用
 func (c Notebook) SortNotebooks(notebookId2Seqs map[string]int) revel.Result {
 	return c.RenderJson(notebookService.SortNotebooks(c.GetUserId(), notebookId2Seqs))
 }
+
+// 调整notebooks, 可能是排序, 可能是移动到其它笔记本下
+type DragNotebooksInfo struct {
+	CurNotebookId string
+	ParentNotebookId string
+	Siblings []string
+}
+// 传过来的data是JSON.stringfy数据
+func (c Notebook) DragNotebooks(data string) revel.Result {
+	info := DragNotebooksInfo{}
+	json.Unmarshal([]byte(data), &info)
+	
+	return c.RenderJson(notebookService.DragNotebooks(c.GetUserId(), info.CurNotebookId, info.ParentNotebookId, info.Siblings))
+}
+
+// 设置notebook <-> blog
+func (c Notebook) SetNotebook2Blog(notebookId string, isBlog bool) revel.Result {
+	re := notebookService.ToBlog(c.GetUserId(), notebookId, isBlog)
+	return c.RenderJson(re)
+}

app/controllers/PreviewController.go

@@ -0,0 +1,103 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"strings"
+//	"time"
+	//	"encoding/json"
+//	"github.com/leanote/leanote/app/info"
+//	. "github.com/leanote/leanote/app/lea"
+//	"github.com/leanote/leanote/app/lea/blog"
+//	"gopkg.in/mgo.v2/bson"
+	//	"github.com/leanote/leanote/app/types"
+	//	"io/ioutil"
+	//	"math"
+	//	"os"
+	//	"path"
+)
+
+type Preview struct {
+	Blog
+}
+
+// 得到要预览的主题绝对路径
+func (c Preview) getPreviewThemeAbsolutePath(themeId string) bool {
+	if themeId != "" {
+		c.Session["themeId"] = themeId // 存到session中, 下次的url就不能带了
+	} else {
+		themeId = c.Session["themeId"] // 直接从session中获取
+	}
+	if themeId == "" {
+		return false
+	}
+	theme := themeService.GetTheme(c.GetUserId(), themeId)
+	
+	c.RenderArgs["isPreview"] = true
+	c.RenderArgs["themeId"] = themeId
+	c.RenderArgs["themeInfoPreview"] = theme.Info
+	c.RenderArgs["themePath"] = theme.Path
+	if theme.Path == "" {
+		return false
+	}
+	return true
+}
+
+func (c Preview) Index(userIdOrEmail string, themeId string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath(themeId) {
+		return c.E404()
+	}
+	return c.Blog.Index(c.GetUserId())
+//	return blog.RenderTemplate("index.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(themeId))
+}
+
+func (c Preview) Tag(userIdOrEmail, tag string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Tag(c.GetUserId(), tag)
+}
+func (c Preview) Tags(userIdOrEmail string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Tags(c.GetUserId())
+//	if tag == "" {
+//		return blog.RenderTemplate("tags.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+//	}
+//	return blog.RenderTemplate("tag_posts.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}
+func (c Preview) Archives(userIdOrEmail string, notebookId string, year, month int) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Archives(c.GetUserId(), notebookId, year, month)
+//	return blog.RenderTemplate("archive.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}
+func (c Preview) Cate(userIdOrEmail, notebookId string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Cate(userIdOrEmail, notebookId)
+//	return blog.RenderTemplate("cate.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}
+func (c Preview) Post(userIdOrEmail, noteId string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Post(userIdOrEmail, noteId)
+//	return blog.RenderTemplate("view.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}
+func (c Preview) Single(userIdOrEmail, singleId string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Single(userIdOrEmail, singleId)
+//	return blog.RenderTemplate("single.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}
+func (c Preview) Search(userIdOrEmail, keywords string) revel.Result {
+	if !c.getPreviewThemeAbsolutePath("") {
+		return c.E404()
+	}
+	return c.Blog.Search(c.GetUserId(), keywords)
+//	return blog.RenderTemplate("search.html", c.RenderArgs, c.getPreviewThemeAbsolutePath(""))
+}

app/controllers/ShareController.go

@@ -3,8 +3,8 @@ 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"
 	"github.com/leanote/leanote/app/info"
 //	"github.com/leanote/leanote/app/types"
 //	"io/ioutil"
@@ -87,6 +87,8 @@ func (c Share) ListNoteShareUserInfo(noteId string) revel.Result {
 	noteShareUserInfos := shareService.ListNoteShareUserInfo(noteId, c.GetUserId())
 	c.RenderArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos 
 	
+	c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId())
+	
 	c.RenderArgs["isNote"] = true
 	c.RenderArgs["noteOrNotebookId"] = note.NoteId.Hex();
 	c.RenderArgs["title"] = note.Title
@@ -99,6 +101,9 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result {
 	notebookShareUserInfos := shareService.ListNotebookShareUserInfo(notebookId, c.GetUserId())
 	c.RenderArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos 
 	
+	c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId())
+	LogJ(c.RenderArgs["noteOrNotebookShareGroupInfos"])
+	
 	c.RenderArgs["isNote"] = false
 	c.RenderArgs["noteOrNotebookId"] = notebook.NotebookId.Hex();
 	c.RenderArgs["title"] = notebook.Title
@@ -140,3 +145,44 @@ func (c Share) DeleteShareNotebookBySharedUser(notebookId string, fromUserId str
 func (c Share) DeleteUserShareNoteAndNotebook(fromUserId string) revel.Result {
 	return c.RenderJson(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId()));
 }
+
+//-------------
+// 用户组
+
+
+// 将笔记分享给分组
+func (c Share) AddShareNoteGroup(noteId, groupId string, perm int) revel.Result {
+	re := info.NewRe()
+	re.Ok = shareService.AddShareNoteGroup(c.GetUserId(), noteId, groupId, perm);
+	return c.RenderJson(re);
+}
+// 删除
+func (c Share) DeleteShareNoteGroup(noteId, groupId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = shareService.DeleteShareNoteGroup(c.GetUserId(), noteId, groupId);
+	return c.RenderJson(re);
+}
+// 更新, 也是一样, 先删后加
+func (c Share) UpdateShareNoteGroupPerm(noteId, groupId string, perm int) revel.Result {
+	return c.AddShareNoteGroup(noteId, groupId, perm)
+}
+
+
+//------
+
+// 将笔记分享给分组
+func (c Share) AddShareNotebookGroup(notebookId, groupId string, perm int) revel.Result {
+	re := info.NewRe()
+	re.Ok = shareService.AddShareNotebookGroup(c.GetUserId(), notebookId, groupId, perm);
+	return c.RenderJson(re);
+}
+// 删除
+func (c Share) DeleteShareNotebookGroup(notebookId, groupId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = shareService.DeleteShareNotebookGroup(c.GetUserId(), notebookId, groupId);
+	return c.RenderJson(re);
+}
+// 更新, 也是一样, 先删后加
+func (c Share) UpdateShareNotebookGroupPerm(notebookId, groupId string, perm int) revel.Result {
+	return c.AddShareNotebookGroup(notebookId, groupId, perm)
+}

app/controllers/TagController.go

@@ -0,0 +1,30 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+//	"gopkg.in/mgo.v2/bson"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+//	"os/exec"
+)
+
+type Tag struct {
+	BaseController
+}
+
+// 更新Tag
+func (c Tag) UpdateTag(tag string) revel.Result {
+	ret := info.NewRe()
+	ret.Ok = true
+	ret.Item = tagService.AddOrUpdateTag(c.GetUserId(), tag)
+	return c.RenderJson(ret)
+}
+
+// 删除标签
+func (c Tag) DeleteTag(tag string) revel.Result {
+	ret := info.Re{}
+	ret.Ok = true
+	ret.Item = tagService.DeleteTag(c.GetUserId(), tag)
+	return c.RenderJson(ret)
+}

app/controllers/UserController.go

@@ -3,12 +3,12 @@ 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"
 //	"io/ioutil"
-	"fmt"
+//	"fmt"
 //	"math"
 //	"os"
 //	"path"
@@ -19,43 +19,48 @@ type User struct {
 	BaseController
 }
 
+func (c User) Account(tab int) revel.Result {
+	userInfo := c.GetUserInfo()
+	c.RenderArgs["userInfo"] = userInfo
+	c.RenderArgs["tab"] = tab
+	c.SetLocale()
+	return c.RenderTemplate("user/account.html")
+}
+
 // 修改用户名, 需要重置session
 func (c User) UpdateUsername(username string) revel.Result {
 	re := info.NewRe();
-	// 判断是否满足最基本的, 4位, 不含特殊字符, 大小写无关. email大小写无关
+	if(c.GetUsername() == "demo") {
-	if len(username) < 4 {
+		re.Msg = "cannotUpdateDemo"
-		re.Ok = false
+		return c.RenderRe(re);
-		re.Msg = "至少4位"
-		return c.RenderJson(re);
 	}
-	if !IsUsername(username) {
+	
-		re.Ok = false
+	if re.Ok, re.Msg = Vd("username", username); !re.Ok {
-		re.Msg = "不能包含特殊字符"
+		return c.RenderRe(re);
-		return c.RenderJson(re);
 	}
 	
 	re.Ok, re.Msg = userService.UpdateUsername(c.GetUserId(), username)
 	if(re.Ok) {
 		c.UpdateSession("Username", username)
 	}
-	return c.RenderJson(re);
+	return c.RenderRe(re);
 }
 
 // 修改密码
 func (c User) UpdatePwd(oldPwd, pwd string) revel.Result {
 	re := info.NewRe();
-	if oldPwd == "" {
+	if(c.GetUsername() == "demo") {
-		re.Msg = "旧密码错误"
+		re.Msg = "cannotUpdateDemo"
-		return c.RenderJson(re);
+		return c.RenderRe(re);
 	}
-	
+	if re.Ok, re.Msg = Vd("password", oldPwd); !re.Ok {
-	re.Ok, re.Msg = IsGoodPwd(pwd)
+		return c.RenderRe(re);
-	if !re.Ok {
+	}
-		return c.RenderJson(re);
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
+		return c.RenderRe(re);
 	}
-	
 	re.Ok, re.Msg = userService.UpdatePwd(c.GetUserId(), oldPwd, pwd)
-	return c.RenderJson(re);
+	return c.RenderRe(re);
 }
 
 // 更新主题
@@ -75,13 +80,7 @@ func (c User) SendRegisterEmail(content, toEmail string) revel.Result {
 		return c.RenderJson(re);
 	}
 	
-	// 发送邮件
+	re.Ok = emailService.SendInviteEmail(c.GetUserInfo(), toEmail, content)
-	var userInfo = c.GetUserInfo();
-	url := "http://leanote.com/register?from=" + userInfo.Username
-	body := fmt.Sprintf("点击链接注册leanote: <a href='%v'>%v</a>. ", url, url);
-	body = content + "<br />" + body
-	re.Ok = SendEmail(toEmail, userInfo.Username + "邀请您注册leanote", "邀请注册", body)
-	
 	return c.RenderJson(re);
 }
 
@@ -90,15 +89,23 @@ func (c User) SendRegisterEmail(content, toEmail string) revel.Result {
 // 重新发送激活邮件
 func (c User) ReSendActiveEmail() revel.Result {
 	re := info.NewRe()
-	re.Ok = userService.RegisterSendActiveEmail(c.GetUserId(), c.GetEmail())
+	re.Ok = emailService.RegisterSendActiveEmail(c.GetUserInfo(), c.GetEmail())
 	return c.RenderJson(re)
 }
 
 // 修改Email发送激活邮箱
 func (c User) UpdateEmailSendActiveEmail(email string) revel.Result {
 	re := info.NewRe()
-	re.Ok, re.Msg = userService.UpdateEmailSendActiveEmail(c.GetUserId(), email)
+	if(c.GetUsername() == "demo") {
-	return c.RenderJson(re)
+		re.Msg = "cannotUpdateDemo"
+		return c.RenderJson(re);
+	}
+	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
+		return c.RenderRe(re);
+	}
+	
+	re.Ok, re.Msg = emailService.UpdateEmailSendActiveEmail(c.GetUserInfo(), email)
+	return c.RenderRe(re)
 }
 
 // 通过点击链接
@@ -145,21 +152,11 @@ func (c User) ActiveEmail(token string) revel.Result {
 func (c User) AddAccount(email, pwd string) revel.Result {
 	re := info.NewRe()
 	
-	if email == "" {
+	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		re.Msg = "请输入邮箱"
+		return c.RenderRe(re);
-		return c.RenderJson(re)
-	} else if !IsEmail(email) {
-		re.Msg = "请输入正确的邮箱"
-		return c.RenderJson(re)
 	}
-	
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-	// 密码
+		return c.RenderRe(re);
-	if pwd == "" {
-		re.Msg = "请输入密码"
-		return c.RenderJson(re)
-	} else if len(pwd) < 6 {
-		re.Msg = "密码长度至少6位"
-		return c.RenderJson(re)
 	}
 	
 	re.Ok, re.Msg = userService.ThirdAddUser(c.GetUserId(), email, pwd)
@@ -168,17 +165,20 @@ func (c User) AddAccount(email, pwd string) revel.Result {
 		c.UpdateSession("Email", email);
 	}
 	
-	return c.RenderJson(re)
+	return c.RenderRe(re)
 }
 
 //-----------------
 // 用户偏爱
-func (c User) UpdateColumnWidth(notebookWidth, noteListWidth int) revel.Result {
+func (c User) UpdateColumnWidth(notebookWidth, noteListWidth, mdEditorWidth int) revel.Result {
 	re := info.NewRe()
-	re.Ok = userService.UpdateColumnWidth(c.GetUserId(), notebookWidth, noteListWidth)
+	re.Ok = userService.UpdateColumnWidth(c.GetUserId(), notebookWidth, noteListWidth, mdEditorWidth)
 	if re.Ok {
 		c.UpdateSession("NotebookWidth", strconv.Itoa(notebookWidth));
 		c.UpdateSession("NoteListWidth", strconv.Itoa(noteListWidth)); 
+		c.UpdateSession("MdEditorWidth", strconv.Itoa(mdEditorWidth)); 
+		
+		LogJ(c.Session)
 	}
 	return c.RenderJson(re)
 }

app/controllers/admin/AdminBaseController.go

@@ -0,0 +1,59 @@
+package admin
+
+import (
+//	"github.com/revel/revel"
+//	"gopkg.in/mgo.v2/bson"
+//	"encoding/json"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/controllers"
+//	"io/ioutil"
+//	"fmt"
+//	"math"
+//	"strconv"
+	"strings"
+)
+
+// 公用Controller, 其它Controller继承它
+type AdminBaseController struct {
+	controllers.BaseController // 不能用*BaseController
+}
+
+// 得到sorterField 和 isAsc
+// okSorter = ['email', 'username']
+func (c AdminBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool){
+	sorter := ""
+	c.Params.Bind(&sorter, "sorter")
+	if sorter == "" {
+		return sorterField, isAsc;
+	}
+	
+	// sorter形式 email-up, email-down
+	s2 := strings.Split(sorter, "-")
+	if len(s2) != 2 {
+		return sorterField, isAsc;
+	}
+	
+	// 必须是可用的sorter
+	if okSorter != nil && len(okSorter) > 0 {
+		if !InArray(okSorter, s2[0]) {
+			return sorterField, isAsc;
+		}
+	}
+	
+	sorterField = strings.Title(s2[0])
+	if s2[1] == "up" {
+		isAsc = true
+	} else {
+		isAsc = false
+	}
+	c.RenderArgs["sorter"] = sorter
+	return sorterField, isAsc;
+}
+
+func (c AdminBaseController) updateConfig(keys []string) {
+	userId := c.GetUserId()
+	for _, key := range keys {
+		v := c.Params.Values.Get(key)
+		configService.UpdateGlobalStringConfig(userId, key, v)
+	}
+}

app/controllers/admin/AdminBlogController.go

@@ -0,0 +1,30 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+)
+
+// admin 首页
+
+type AdminBlog struct {
+	AdminBaseController
+}
+
+// admin 主页
+func (c AdminBlog) Index(sorter, keywords string) revel.Result {
+	pageNumber := c.GetPage()
+	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"title", "userId", "isRecommed", "createdTime"});
+	pageInfo, blogs := blogService.ListAllBlogs("", "", keywords, false, pageNumber, userPageSize, sorterField, isAsc);
+	c.RenderArgs["pageInfo"] = pageInfo
+	c.RenderArgs["blogs"] = blogs
+	c.RenderArgs["keywords"] = keywords
+	return c.RenderTemplate("admin/blog/list.html");
+}
+
+func (c AdminBlog) SetRecommend(noteId string, recommend bool) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.SetRecommend(noteId, recommend);
+	return c.RenderJson(re)
+}

app/controllers/admin/AdminController.go

@@ -0,0 +1,39 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+)
+
+// admin 首页
+
+type Admin struct {
+	AdminBaseController
+}
+
+// admin 主页
+func (c Admin) Index() revel.Result {
+	c.SetUserInfo()
+	
+	c.RenderArgs["title"] = "leanote"
+	c.SetLocale()
+	
+	c.RenderArgs["countUser"] = userService.CountUser()
+	c.RenderArgs["countNote"] = noteService.CountNote("")
+	c.RenderArgs["countBlog"] = noteService.CountBlog("")
+	
+	return c.RenderTemplate("admin/index.html");
+}
+
+// 模板
+func (c Admin) T(t string) revel.Result {
+	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.RenderArgs["arr"] = configService.GlobalArrayConfigs
+	c.RenderArgs["map"] = configService.GlobalMapConfigs
+	c.RenderArgs["arrMap"] = configService.GlobalArrMapConfigs
+	c.RenderArgs["version"] = configService.GetVersion()
+	return c.RenderTemplate("admin/" + t + ".html")
+}
+
+func (c Admin) GetView(view string) revel.Result {
+	return c.RenderTemplate("admin/" + view);
+}

app/controllers/admin/AdminData.go

@@ -0,0 +1,114 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+	 "archive/tar"
+    "compress/gzip"	
+    "os"
+    "io"
+    "time"
+)
+
+// 数据管理, 备份和恢复
+
+type AdminData struct {
+	AdminBaseController
+}
+
+func (c AdminData) Index() revel.Result {
+	backups := configService.GetGlobalArrMapConfig("backups")
+	// 逆序之
+	backups2 := make([]map[string]string, len(backups))
+	j := 0
+	for i := len(backups)-1; i >= 0; i-- {
+		backups2[j] = backups[i]
+		j++
+	}
+	c.RenderArgs["backups"] = backups2
+	return c.RenderTemplate("admin/data/index.html");
+}
+
+func (c AdminData) Backup() revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = configService.Backup("")
+    return c.RenderJson(re)
+}
+
+// 还原
+func (c AdminData) Restore(createdTime string) revel.Result {
+	re := info.Re{}
+	re.Ok, re.Msg = configService.Restore(createdTime)
+	return c.RenderJson(re)
+}
+
+func (c AdminData) Delete(createdTime string) revel.Result {
+	re := info.Re{}
+	re.Ok, re.Msg = configService.DeleteBackup(createdTime)
+	return c.RenderJson(re)
+}
+func (c AdminData) UpdateRemark(createdTime, remark string) revel.Result {
+	re := info.Re{}
+	re.Ok, re.Msg = configService.UpdateBackupRemark(createdTime, remark)
+	
+	return c.RenderJson(re)
+}
+func (c AdminData) Download(createdTime string) revel.Result {
+	backup, ok := configService.GetBackup(createdTime)
+	if !ok {
+		return c.RenderText("")
+	}
+	
+	dbname, _ := revel.Config.String("db.dbname")
+	path := backup["path"] + "/" + dbname
+    allFiles := ListDir(path)
+    
+	filename := "backup_" + dbname + "_" + backup["createdTime"] + ".tar.gz"
+	
+	// file write
+    fw, err := os.Create(revel.BasePath + "/files/" + filename)
+    if err != nil {
+		return c.RenderText("")
+    }
+    // defer fw.Close() // 不需要关闭, 还要读取给用户下载
+    // gzip write
+    gw := gzip.NewWriter(fw)
+    defer gw.Close()
+  
+    // tar write
+    tw := tar.NewWriter(gw)
+    defer tw.Close()
+    
+    // 遍历文件列表
+    for _, file := range allFiles {
+		fn := path + "/" + file
+	    fr, err := os.Open(fn)
+	    fileInfo, _ := fr.Stat()
+        if err != nil {
+			return c.RenderText("")
+        }
+        defer fr.Close()
+        
+        // 信息头
+        h := new(tar.Header)
+        h.Name = file
+        h.Size = fileInfo.Size()
+        h.Mode = int64(fileInfo.Mode())
+        h.ModTime = fileInfo.ModTime()
+  
+        // 写信息头
+        err = tw.WriteHeader(h)
+        if err != nil {
+            panic(err)
+        }
+  
+        // 写文件
+        _, err = io.Copy(tw, fr)
+        if err != nil {
+            panic(err)
+        }
+    } // for
+    
+    return c.RenderBinary(fw, filename, revel.Attachment, time.Now()) // revel.Attachm
+}

app/controllers/admin/AdminEmailController.go

@@ -0,0 +1,233 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+	"strings"
+	"strconv"
+)
+
+// admin 首页
+
+type AdminEmail struct {
+	AdminBaseController
+}
+
+// email配置
+func (c AdminEmail) Email() revel.Result {
+	return nil
+}
+
+// blog标签设置
+func (c AdminEmail) Blog() revel.Result {
+	recommendTags := configService.GetGlobalArrayConfig("recommendTags")
+	newTags := configService.GetGlobalArrayConfig("newTags")
+	c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",")
+	c.RenderArgs["newTags"] = strings.Join(newTags, ",")
+	return c.RenderTemplate("admin/setting/blog.html");
+}
+func (c AdminEmail) DoBlogTag(recommendTags, newTags string) revel.Result {
+	re := info.NewRe()
+	
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ","))
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ","))
+	
+	return c.RenderJson(re)
+}
+
+// demo
+// blog标签设置
+func (c AdminEmail) Demo() revel.Result {
+	c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
+	c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
+	return c.RenderTemplate("admin/setting/demo.html");
+}
+func (c AdminEmail) DoDemo(demoUsername, demoPassword string) revel.Result {
+	re := info.NewRe()
+	
+	userInfo := authService.Login(demoUsername, demoPassword)
+	if userInfo.UserId == "" {
+		re.Msg = "The User is Not Exists";
+		return c.RenderJson(re)
+	}
+	
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex())
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword)
+	
+	return c.RenderJson(re)
+}
+
+// ToImage
+// 长微博的bin路径phantomJs
+func (c AdminEmail) ToImage() revel.Result {
+	c.RenderArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath")
+	return c.RenderTemplate("admin/setting/toImage.html");
+}
+func (c AdminEmail) DoToImage(toImageBinPath string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "toImageBinPath", toImageBinPath)
+	return c.RenderJson(re)
+}
+
+func (c AdminEmail) Set(emailHost, emailPort, emailUsername, emailPassword string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailHost", emailHost)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailPort", emailPort)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailUsername", emailUsername)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailPassword", emailPassword)
+	
+	return c.RenderJson(re)
+}
+func (c AdminEmail) Template() revel.Result {
+	re := info.NewRe()
+	
+	keys := []string{"emailTemplateHeader", "emailTemplateFooter", 
+		"emailTemplateRegisterSubject",
+		"emailTemplateRegister",
+		"emailTemplateFindPasswordSubject",
+		"emailTemplateFindPassword",
+		"emailTemplateUpdateEmailSubject",
+		"emailTemplateUpdateEmail",
+		"emailTemplateInviteSubject",
+		"emailTemplateInvite",
+		"emailTemplateCommentSubject",
+		"emailTemplateComment",
+	}
+	
+	userId := c.GetUserId()
+	for _, key := range keys {
+		v := c.Params.Values.Get(key)
+		if v != "" {
+			ok, msg := emailService.ValidTpl(v)
+			if !ok {
+				re.Ok = false
+				re.Msg = "Error key: " + key + "<br />" + msg
+				return c.RenderJson(re)
+			} else {
+				configService.UpdateGlobalStringConfig(userId, key, v)
+			}
+		}
+	}
+	
+	re.Ok = true
+	return c.RenderJson(re)
+}
+
+// 发送Email
+func (c AdminEmail) SendEmailToEmails(sendEmails, latestEmailSubject, latestEmailBody string, verified, saveAsOldEmail bool) revel.Result {
+	re := info.NewRe()
+	
+	c.updateConfig([]string{"sendEmails", "latestEmailSubject", "latestEmailBody"})
+	
+	if latestEmailSubject == "" || latestEmailBody == "" {
+		re.Msg = "subject or body is blank"
+		return c.RenderJson(re)
+	}
+	
+	if saveAsOldEmail {
+		oldEmails := configService.GetGlobalMapConfig("oldEmails")
+		oldEmails[latestEmailSubject] = latestEmailBody
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+	}
+	
+	sendEmails = strings.Replace(sendEmails, "\r", "", -1)
+	emails := strings.Split(sendEmails, "\n")
+	
+	re.Ok, re.Msg = emailService.SendEmailToEmails(emails, latestEmailSubject, latestEmailBody);
+	return c.RenderJson(re)
+}
+
+// 发送Email
+func (c AdminEmail) SendToUsers2(emails, latestEmailSubject, latestEmailBody string, verified, saveAsOldEmail bool) revel.Result {
+	re := info.NewRe()
+	
+	c.updateConfig([]string{"sendEmails", "latestEmailSubject", "latestEmailBody"})
+	
+	if latestEmailSubject == "" || latestEmailBody == "" {
+		re.Msg = "subject or body is blank"
+		return c.RenderJson(re)
+	}
+	
+	if saveAsOldEmail {
+		oldEmails := configService.GetGlobalMapConfig("oldEmails")
+		oldEmails[latestEmailSubject] = latestEmailBody
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+	}
+	
+	emails = strings.Replace(emails, "\r", "", -1)
+	emailsArr := strings.Split(emails, "\n")
+	
+	users := userService.ListUserInfosByEmails(emailsArr)
+	LogJ(emailsArr)
+	
+	
+	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody);
+	
+	return c.RenderJson(re)
+}
+
+// send Email dialog
+func (c AdminEmail) SendEmailDialog(emails string) revel.Result{
+	emailsArr := strings.Split(emails, ",")
+	emailsNl := strings.Join(emailsArr, "\n")
+	
+	c.RenderArgs["emailsNl"] = emailsNl
+	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.RenderArgs["map"] = configService.GlobalMapConfigs
+	
+	return c.RenderTemplate("admin/email/emailDialog.html");
+}
+
+func (c AdminEmail) SendToUsers(userFilterEmail, userFilterWhiteList, userFilterBlackList, latestEmailSubject, latestEmailBody string, verified, saveAsOldEmail bool) revel.Result {
+	re := info.NewRe()
+	
+	c.updateConfig([]string{"userFilterEmail", "userFilterWhiteList", "userFilterBlackList", "latestEmailSubject", "latestEmailBody"})
+	
+	if latestEmailSubject == "" || latestEmailBody == "" {
+		re.Msg = "subject or body is blank"
+		return c.RenderJson(re)
+	}
+	
+	if saveAsOldEmail {
+		oldEmails := configService.GetGlobalMapConfig("oldEmails")
+		oldEmails[latestEmailSubject] = latestEmailBody
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+	}
+	
+	users := userService.GetAllUserByFilter(userFilterEmail, userFilterWhiteList, userFilterBlackList, verified)
+	
+	if(users == nil || len(users) == 0) {
+		re.Ok = false
+		re.Msg = "no users"
+		return c.RenderJson(re)
+	}
+	
+	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody);
+	if(!re.Ok) {
+		return c.RenderJson(re)
+	}
+	
+	re.Ok = true
+	re.Msg = "users:" + strconv.Itoa(len(users))
+	
+	return c.RenderJson(re)
+}
+
+// 删除emails
+func (c AdminEmail) DeleteEmails(ids string) revel.Result {
+	re := info.NewRe()
+	re.Ok = emailService.DeleteEmails(strings.Split(ids, ","))
+	return c.RenderJson(re)
+}
+
+func (c AdminEmail) List(sorter, keywords string) revel.Result {
+	pageNumber := c.GetPage()
+	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "ok", "subject", "createdTime"});
+	pageInfo, emails := emailService.ListEmailLogs(pageNumber, userPageSize, sorterField, isAsc, keywords);
+	c.RenderArgs["pageInfo"] = pageInfo
+	c.RenderArgs["emails"] = emails
+	c.RenderArgs["keywords"] = keywords
+	return c.RenderTemplate("admin/email/list.html");
+}

app/controllers/admin/AdminSettingController.go

@@ -0,0 +1,138 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
+	"strings"
+	"fmt"
+)
+
+// admin 首页
+
+type AdminSetting struct {
+	AdminBaseController
+}
+
+// email配置
+func (c AdminSetting) Email() revel.Result {
+	return nil
+}
+
+// blog标签设置
+func (c AdminSetting) Blog() revel.Result {
+	recommendTags := configService.GetGlobalArrayConfig("recommendTags")
+	newTags := configService.GetGlobalArrayConfig("newTags")
+	c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",")
+	c.RenderArgs["newTags"] = strings.Join(newTags, ",")
+	return c.RenderTemplate("admin/setting/blog.html");
+}
+func (c AdminSetting) DoBlogTag(recommendTags, newTags string) revel.Result {
+	re := info.NewRe()
+	
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ","))
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ","))
+	
+	return c.RenderJson(re)
+}
+
+// 共享设置
+func (c AdminSetting) ShareNote(registerSharedUserId string, 
+	registerSharedNotebookPerms, registerSharedNotePerms []int, 
+	registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds []string) revel.Result {
+	
+	re := info.NewRe()
+	re.Ok, re.Msg = configService.UpdateShareNoteConfig(registerSharedUserId, registerSharedNotebookPerms, registerSharedNotePerms, registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds);
+	return c.RenderJson(re)
+}
+
+// demo
+// blog标签设置
+func (c AdminSetting) Demo() revel.Result {
+	c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
+	c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
+	return c.RenderTemplate("admin/setting/demo.html");
+}
+func (c AdminSetting) DoDemo(demoUsername, demoPassword string) revel.Result {
+	re := info.NewRe()
+	
+	userInfo := authService.Login(demoUsername, demoPassword)
+	if userInfo.UserId == "" {
+		re.Msg = "The User is Not Exists";
+		return c.RenderJson(re)
+	}
+	
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex())
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword)
+	
+	return c.RenderJson(re)
+}
+
+// ToImage
+// 长微博的bin路径phantomJs
+func (c AdminSetting) ToImage() revel.Result {
+	c.RenderArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath")
+	return c.RenderTemplate("admin/setting/toImage.html");
+}
+func (c AdminSetting) DoToImage(toImageBinPath string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "toImageBinPath", toImageBinPath)
+	return c.RenderJson(re)
+}
+
+// SubDomain
+func (c AdminSetting) SubDomain() revel.Result {
+	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.RenderArgs["arr"] = configService.GlobalArrayConfigs
+	
+	c.RenderArgs["noteSubDomain"] = configService.GetGlobalStringConfig("noteSubDomain")
+	c.RenderArgs["blogSubDomain"] = configService.GetGlobalStringConfig("blogSubDomain")
+	c.RenderArgs["leaSubDomain"] = configService.GetGlobalStringConfig("leaSubDomain")
+	
+	return c.RenderTemplate("admin/setting/subDomain.html");
+}
+func (c AdminSetting) DoSubDomain(noteSubDomain, blogSubDomain, leaSubDomain, blackSubDomains, allowCustomDomain, blackCustomDomains string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "noteSubDomain", noteSubDomain)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "blogSubDomain", blogSubDomain)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "leaSubDomain", leaSubDomain)
+	
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "allowCustomDomain", allowCustomDomain)
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackSubDomains", strings.Split(blackSubDomains, ","))
+	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackCustomDomains", strings.Split(blackCustomDomains, ","))
+	
+	return c.RenderJson(re)
+}
+
+func (c AdminSetting) OpenRegister(openRegister string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "openRegister", openRegister)
+	return c.RenderJson(re)
+}
+
+func (c AdminSetting) HomePage(homePage string) revel.Result {
+	re := info.NewRe()
+	if homePage == "0" {
+		homePage = ""
+	}
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "homePage", homePage)
+	return c.RenderJson(re)
+}
+
+func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongodumpPath", mongodumpPath)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongorestorePath", mongorestorePath)
+
+	return c.RenderJson(re)
+}
+
+func (c AdminSetting) UploadSize(uploadImageSize, uploadAvatarSize, uploadBlogLogoSize, uploadAttachSize float64) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadImageSize", fmt.Sprintf("%v", uploadImageSize))
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAvatarSize", fmt.Sprintf("%v", uploadAvatarSize))
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadBlogLogoSize", fmt.Sprintf("%v", uploadBlogLogoSize))
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAttachSize", fmt.Sprintf("%v", uploadAttachSize))
+	return c.RenderJson(re)
+}

app/controllers/admin/AdminUpgradeController.go

@@ -0,0 +1,30 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+	"github.com/leanote/leanote/app/info"
+//	"io/ioutil"
+)
+
+// Upgrade controller
+type AdminUpgrade struct {
+	AdminBaseController
+}
+
+func (c AdminUpgrade) UpgradeBlog() revel.Result {
+	upgradeService.UpgradeBlog()
+	return nil;
+}
+
+func (c AdminUpgrade) UpgradeBetaToBeta2() revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = upgradeService.UpgradeBetaToBeta2(c.GetUserId())
+	return c.RenderJson(re)
+}
+
+func (c AdminUpgrade) UpgradeBeta3ToBeta4() revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = upgradeService.Api(c.GetUserId())
+	return c.RenderJson(re)
+}

app/controllers/admin/AdminUserController.go

@@ -0,0 +1,66 @@
+package admin
+
+import (
+	"github.com/revel/revel"
+	. "github.com/leanote/leanote/app/lea"
+//	"time"
+	"github.com/leanote/leanote/app/info"
+)
+
+// admin 首页
+
+type AdminUser struct {
+	AdminBaseController
+}
+
+// admin 主页
+var userPageSize = 10
+func (c AdminUser) Index(sorter, keywords string, pageSize int) revel.Result {
+	pageNumber := c.GetPage()
+	if userPageSize == 0 {
+		pageSize = userPageSize
+	}
+	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "username", "verified", "createdTime", "accountType"});
+	pageInfo, users := userService.ListUsers(pageNumber, pageSize, sorterField, isAsc, keywords);
+	c.RenderArgs["pageInfo"] = pageInfo
+	c.RenderArgs["users"] = users
+	c.RenderArgs["keywords"] = keywords
+	return c.RenderTemplate("admin/user/list.html");
+}
+
+func (c AdminUser) Add() revel.Result {
+	return c.RenderTemplate("admin/user/add.html");
+}
+
+// 添加
+func (c AdminUser) Register(email, pwd string) revel.Result {
+	re := info.NewRe();
+	
+	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
+		return c.RenderRe(re);
+	}
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
+		return c.RenderRe(re);
+	}
+	
+	// 注册
+	re.Ok, re.Msg = authService.Register(email, pwd, "")
+	
+	return c.RenderRe(re)
+}
+
+// 修改帐户
+func (c AdminUser) ResetPwd(userId string) revel.Result {
+	userInfo := userService.GetUserInfo(userId)
+	c.RenderArgs["userInfo"] = userInfo
+	return c.RenderTemplate("admin/user/reset_pwd.html");
+}
+
+func (c AdminUser) DoResetPwd(userId, pwd string) revel.Result {
+	re := info.NewRe();
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
+		return c.RenderRe(re);
+	}
+	re.Ok, re.Msg = userService.ResetPwd(c.GetUserId(), userId, pwd)
+	return c.RenderRe(re)
+}

app/controllers/admin/init.go

@@ -0,0 +1,131 @@
+package admin
+
+import (
+	"github.com/leanote/leanote/app/service"
+	"github.com/leanote/leanote/app/info"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+//	"strings"
+)
+
+var userService *service.UserService
+var noteService *service.NoteService
+var trashService *service.TrashService
+var notebookService *service.NotebookService
+var noteContentHistoryService *service.NoteContentHistoryService
+var authService *service.AuthService
+var shareService *service.ShareService
+var blogService *service.BlogService
+var tagService *service.TagService
+var pwdService *service.PwdService
+var tokenService *service.TokenService
+var suggestionService *service.SuggestionService 
+var albumService *service.AlbumService 
+var noteImageService *service.NoteImageService 
+var fileService *service.FileService
+var attachService *service.AttachService
+var configService *service.ConfigService
+var emailService *service.EmailService
+var upgradeService *service.UpgradeService
+
+// 拦截器
+// 不需要拦截的url
+// Index 除了Note之外都不需要
+var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": true, 
+		"Login": true, 
+		"DoLogin": true,
+		"Logout": true,
+		"Register": true,
+		"DoRegister": true,
+		"FindPasswword": true,
+		"DoFindPassword": true,
+		"FindPassword2": true,
+		"FindPasswordUpdate": true,
+		"Suggestion": true,
+	},
+	"Blog": map[string]bool{"Index": true,
+		"View": true,
+		"AboutMe": true,
+		"SearchBlog": true,
+		},
+	// 用户的激活与修改邮箱都不需要登录, 通过链接地址
+	"User": map[string]bool{"UpdateEmail": true,
+		"ActiveEmail":true,
+		},
+	"Oauth": map[string]bool{"GithubCallback": true},
+	"File": map[string]bool{"OutputImage": true, "OutputFile": true},
+	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
+}
+func needValidate(controller, method string) bool {
+	// 在里面
+	if v, ok := commonUrl[controller]; ok {
+		// 在commonUrl里
+		if _, ok2 := v[method]; ok2 {
+			return false
+		}
+		return true
+	} else {
+		// controller不在这里的, 肯定要验证
+		return true;
+	}
+}
+func AuthInterceptor(c *revel.Controller) revel.Result {
+	// 全部变成首字大写
+	/*
+	var controller = strings.Title(c.Name)
+	var method = strings.Title(c.MethodName)
+	// 是否需要验证?
+	if !needValidate(controller, method) {
+		return nil
+	}
+	*/
+	
+	// 验证是否已登录
+	// 必须是管理员
+	if username, ok := c.Session["Username"]; ok && username == configService.GetAdminUsername() {
+		return nil // 已登录
+	}
+	
+	// 没有登录, 判断是否是ajax操作
+	if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" {
+		re := info.NewRe()
+		re.Msg = "NOTLOGIN"
+		return c.RenderJson(re)
+	}
+	
+	return c.Redirect("/login")
+}
+
+// 最外层init.go调用
+// 获取service, 单例
+func InitService() {
+	notebookService = service.NotebookS
+	noteService = service.NoteS
+	noteContentHistoryService = service.NoteContentHistoryS
+	trashService = service.TrashS
+	shareService = service.ShareS
+	userService = service.UserS
+	tagService = service.TagS
+	blogService = service.BlogS
+	tokenService = service.TokenS
+	noteImageService = service.NoteImageS
+	fileService = service.FileS
+	albumService= service.AlbumS
+	attachService = service.AttachS
+	pwdService = service.PwdS
+	suggestionService = service.SuggestionS
+	authService = service.AuthS
+	configService = service.ConfigS
+	emailService = service.EmailS
+	upgradeService = service.UpgradeS
+}
+
+func init() {
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Admin{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminSetting{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminUser{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminBlog{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminEmail{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminUpgrade{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminData{})
+}

app/controllers/api/API列表-v0.1.md

@@ -0,0 +1,465 @@
+# API 列表
+
+## 前言
+
+### api url
+
+所有api的url前面带/api/, 如:
+
+`/api/user/info?userId=xxxx&token=xxxx`
+
+除了/auth/login, /auth/register外其它的都需要另外带参数token=xxxx
+
+### 文件目录结构
+* 所有API的Controller都在app/api文件夹下
+* 文件命名: Api功能Controller.go, 如ApiUserController.go
+* 结构体命名为 Api功能, 如ApiUser
+* API公用Controller: ApiBaseController
+* init.go 注入service和定义拦截器
+
+### 流程
+用户登录后返回一个token, 以后所有的请求都携带该token. 
+在init.go中的拦截器会得到token并调用sessionService判断是否登录了 
+
+## 返回值结构
+* 全部返回JSON, JSON, 除二进制文件(图片, 附件外), 如果返回其它非JSON格式的值, 肯定是出错了
+* 错误信息全部返回 {Ok: false, Msg: "相应的错误信息"}
+* 正确信息返回分两种:
+1. 一些操作型的api, 比如updateUsername, updateLogo之类的, 成功后返回 {Ok: true, Msg:""}
+2. 一些获取型api, 如getNote, 全部返回真实的返回数据, 如返回笔记:
+```
+{
+  "NoteId": "54bdc7e305fcd13ea3000000",
+  "NotebookId": "54bdc65599c37b0da9000003",
+  "UserId": "54bdc65599c37b0da9000002",
+  "Title": "笔记标题",
+  "Desc": "",
+  "Tags": null,
+  "Abstract": "",
+  "Content": "",
+  "IsMarkdown": false,
+  "IsBlog": false,
+  "IsTrash": true,
+  "IsDeleted": false,
+  "Usn": 15,
+  "Files": [],
+  "CreatedTime": "2015-01-20T11:13:41.34+08:00",
+  "UpdatedTime": "2015-01-20T11:13:41.34+08:00",
+  "PublicTime": "0001-01-01T00:00:00Z"
+}
+```
+* 时间类型全是返回如 "2015-01-20T11:13:41.34+08:00" 的格式, (因为golang的time转成Json就是这样, 历史原因)
+
+-----------------
+
+## Auth 登录与注册
+
+### /auth/login 登录 
+
+```
+参数: email, pwd
+Method: GET
+返回: 
+错误: {"Ok":false, "Msg":"用户名或密码有误"}
+正确: 比如:
+{
+	"Ok":true,
+	"Token":"5500830738f41138e90003232",
+	"UserId":"52d26b4e99c37b609a000001",
+	"Email":"leanote@leanote.com",
+	"Username":"leanote"
+}
+```
+
+登录成功后将使用token作为之后的请求
+
+### /auth/logout 注销
+```
+参数: token
+Method: GET
+返回:
+错误: {Ok: false, Msg: ""}
+成功: {Ok: true, Msg: ""}
+```
+
+### /auth/register 注册
+```
+参数: email, pwd
+Method: POST
+返回:
+错误: {Ok: false, Msg: ""}
+成功: {Ok: true, Msg: ""}
+```
+
+## User 用户
+### /user/info 获取用户信息
+```
+参数: userId
+Method: GET
+返回:
+错误: {Ok: false, Msg: ""}
+成功: type.User
+```
+
+### /user/updateUsername 修改用户名
+```
+参数: username(新用户名)
+Method: POST
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: {Ok: true, Msg: ""}
+```
+
+### /user/updatePwd 修改密码
+```
+参数: oldPwd(旧密码), pwd(新密码)
+Method: POST
+返回:
+错误: {Ok: false, Msg: ""}
+成功: {Ok: true, Msg: ""}
+```
+
+### /user/updateLogo 修改头像
+```
+参数: file(文件)
+Method: POST
+返回:
+错误: {Ok: false, Msg: ""}
+成功: {Ok: true, Msg: ""}
+```
+
+### /user/getSyncState 获取最新同步状态
+```
+参数: 无
+Method: POST
+返回:
+错误: {Ok: false, Msg: ""}
+成功: {LastSyncUsn: 3232, LastSyncTime: "上次同步时间"(暂时无用)}
+```
+
+-----
+
+## Notebook 笔记本
+
+### /notebook/getSyncNotebooks 得到需要同步的笔记本 
+```
+参数: afterUsn(int, 在此usn后的笔记本是需要同步的), maxEntry(int, 最大要同步的量)
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: [type.Notebook] 数组
+```
+
+### /notebook/getNotebooks 得到所有笔记本 
+```
+无参数
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: [type.Notebook] 数组
+```
+
+### /notebook/addNotebook 添加笔记本
+```
+参数: title(string), parentNotebookId(string, 父notebookId, 可空), seq(int) 排列
+Method: POST
+返回: 
+错误: {Ok: false, Msg:""}
+成功: type.Notebook
+```
+
+### /notebook/updateNotebook 修改笔记本
+```
+参数: notebookId, title, parentNotebookId, seq(int), usn(int)
+Method: POST
+返回: 
+错误: {Ok: false, msg: ""} msg == "conflict" 表示冲突
+成功: type.Notebook
+```
+
+### /notebook/deleteNotebook 删除笔记本
+```
+参数: notebookId, usn(int)
+Method: GET
+返回: 
+错误: {Ok: false, msg: ""} msg == "conflict" 表示冲突
+成功: {Ok: true}
+```
+
+----
+
+## Note 笔记
+
+
+### /note/getSyncNotes 获取需要同步的笔记
+```
+参数: afterUsn(int, 在此usn后的笔记是需要同步的), maxEntry(int, 最大要同步的量)
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: [type.Note] 数组, 笔记不包含Abstract和Content
+```
+
+
+### /note/getNotes 获得某笔记本下的笔记(无内容)
+```
+参数: notebookId
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: [type.Note] 数组, 笔记不包含Abstract和Content
+```
+
+### /note/getNoteAndContent 获得笔记与内容
+```
+参数: noteId
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: type.Note
+```
+
+### /note/getNoteContent 获得笔记内容
+```
+参数: noteId
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: type.NoteContent
+```
+
+### /note/addNote 添加笔记
+```
+参数: (注意首字大写)
+	NotebookId string 必传
+	Title string 必传
+	Tags []string 可选
+	Content string 必传
+	Abstract string 可选, 当是markdown笔记时必须传
+	IsMarkdown bool 可选
+	Files []type.NoteFiles 数组  可选
+Method: POST
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: type.Note, 不包含Abstract, Content
+```
+
+** 关于笔记中的图片/附件**
+客户端应该添加一个"图片/附件表"来存元数据, 图片应该要缓存到本地, 附件可在需要的时候再调用相应api获取.
+
+Content中的数据, 图片,附件在Leanote的链接是, 所以, 不管你在本地的笔记中是以什么形式来保存图片,附件的链接的,请addNote和updateNote时务必将链接修改成leanote服务器上的链接.
+http://leanote.com/api/file/getImage?fileId=xx
+单个附件: 
+http://leanote.com/api/file/getAttach?fileId=xx 
+所有附件:
+http://leanote.com/api/file/getAllAttachs?noteId=xxx 
+
+**注意:**
+addNote时必须要把Files, 和相关的图片/附件一起传到服务器中
+其中Files(文件的元数据)和其它字段以POST方式传出, 而真正数据则以http的multipart传入, 每个文件的name为"FileDatas[LocalFileId]"
+
+图片在笔记内的链接必须为: http://leanote.com/api/file/getImage?fileId=LocalFileId或FileId
+附件如果插入到了笔记内容内, 其链接必须为: http://leanote.com/api/file/getAttach?fileId=LocalFileId或FileId
+其中, fileId为文件在本地的LocalFileId或服务器上的FileId
+
+服务器端会生成FileId传给Client. Client在本地必须要建立LocalFileId与FileId的关联.
+
+如果笔记内容传了, 且笔记内有图片, 则必须要传Files 文件元数据, 因为Server端还要对内容内的图片, 附件链接进行修改, 可能你传过去的是LocalFileId, 服务器端会将LocalFileId替换成FileId存到数据库中.
+
+同样适用于 updateNote
+
+http://leanote.com 不绝对, 因为用户可以自建服务, 所以在开发时需要可配置
+
+### /note/updateNote 更新笔记
+
+当更新了笔记某个属性时, 只要传某个属性就行, 其它不用传, 比如把笔记拉入了trash, 那么就传IsTrash: true
+
+```
+参数: (注意首字大写)
+	NoteId string 必传
+	Usn int 必传
+	NotebookId string 可选
+	Title string 可选
+	Tags []string 可选
+	Content string 可选
+	Abstract string 可选, 当是markdown笔记时必须传
+	IsMarkdown bool 可选	
+	IsTrash bool 是否是trash 可选
+	Files []type.NoteFiles 数组  可选
+Method: POST
+返回: 
+错误: {Ok: false, msg: ''} msg == 'conflict' 表示冲突
+成功: type.Note, 不包含Abstract和Content
+```
+
+### /note/deleteTrash 彻底删除笔记
+```
+参数: noteId, usn
+Method: GET
+返回: 
+错误: {Ok: false, msg: ''} msg == 'conflict' 表示冲突
+成功: type.UpdateRet
+```
+
+-------
+
+## Tag 标签
+
+### /tag/getSyncTags 获取需要同步的标签
+```
+参数: afterUsn(int, 在此usn后的标签是需要同步的), maxEntry(int, 最大要同步的量)
+Method: GET
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: [type.Tag] 数组
+```
+
+### /tag/addTag 添加标签
+```
+参数: tag(string)
+Method: POST
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: type.Tag
+```
+
+### /tag/deleteTag 删除标签 
+```
+参数: tag(string)
+Method: POST
+返回: 
+错误: {Ok: false, Msg: ""}
+成功: type.UpdateRet
+```
+
+### File 文件(获取图片, 附件)
+
+### /file/getImage 获取图片
+```
+参数: fileId
+Method: GET
+返回: 
+错误: 非二进制文件数据
+成功: 二进制文件
+```
+
+### /file/getAttach 获取附件
+```
+参数: fileId
+Method: GET
+返回: 
+错误: 非二进制文件数据
+成功: 二进制文件
+```
+
+### /file/getAllAttachs 获取所有附件
+```
+参数: noteId
+Method: GET
+返回: 
+错误: 非二进制文件数据
+成功: 二进制文件
+```
+
+--------
+
+## 数据类型
+
+### type.User 用户信息
+
+```
+User {
+	UserId  string
+	Username string
+	Email string
+	Verified bool
+	Logo string
+}
+```
+
+### type.Notebook 笔记本
+
+```
+Notebook {
+	NotebookId        
+	UserId           
+	ParentNotebookId // 上级
+	Seq              int // 排序
+	Title            string 
+	IsBlog           bool  
+	IsDeleted	 bool
+	CreatedTime      time.Time   
+	UpdatedTime      time.Time 
+	
+	// 更新序号
+	Usn int  // UpdateSequenceNum 
+}
+```
+
+### type.Note 笔记
+```
+Note {
+	NoteId     string
+	NotebookId string
+	UserId     string
+	Title      string
+	Tags       []string
+	Content    string
+	IsMarkdown bool
+	IsBlog     bool 
+	IsTrash bool
+	Files []NoteFile // 图片, 附件
+	CreatedTime time.Time
+	UpdatedTime time.Time
+	PublicTime time.Time
+	
+	// 更新序号
+	Usn int
+}
+```
+
+### type.NoteContent 笔记内容
+```
+NoteContent {
+	NoteId string
+	UserId string
+	Content string
+}
+```
+
+### type.NoteFile 笔记文件(图片,附件)
+```
+NoteFile {
+	FileId string // 服务器端Id
+	LocalFileId string // 客户端Id
+	Type string // images/png, doc, xls, 根据fileName确定
+	Title string
+	HasBody bool // 传过来的值是否要更新内容, 如果有true, 则必须传文件
+	IsAttach bool // 是否是附件, 不是附件就是图片
+}
+```
+
+### type.Tag 标签
+```
+Tag {
+	TagId string
+	UserId string
+	Tag string 
+	CreatedTime
+	UpdatedTime
+	IsDeleted bool  // 删除位
+	// 更新序号
+	Usn 
+}
+```
+
+### type.UpdateRe 更新后返回的值, 包含Usn
+```
+ReUpdate {
+	Ok bool
+	Msg string
+	
+	// 更新序号
+	Usn int
+}
+```

app/controllers/api/API设计-v0.1.md

@@ -0,0 +1,47 @@
+# API设计
+
+By life (life@leanote.com)
+
+## api url
+
+所有api的url前面带/api/, 如:
+
+`/api/user/info?userId=xxxx&token=xxxx`
+
+## 文件目录结构
+* 所有API的Controller都在app/api文件夹下
+* 文件命名: Api功能Controller.go, 如ApiUserController.go
+* 结构体命名为 Api功能, 如ApiUser
+* API公用Controller: ApiBaseController
+* init.go 注入service和定义拦截器
+
+## 流程
+用户登录后返回一个token, 以后所有的请求都携带该token. 
+在init.go中的拦截器会得到token并调用sessionService判断是否登录了 
+
+## 返回值结构
+* 全部返回JSON, JSON, 除二进制文件(图片, 附件外), 如果返回其它非JSON格式的值, 肯定是出错了
+* 错误信息全部返回 {Ok: false, Msg: ""}
+* 正确信息全部返回真实的返回数据, 如返回笔记:
+```
+{
+  "NoteId": "54bdc7e305fcd13ea3000000",
+  "NotebookId": "54bdc65599c37b0da9000003",
+  "UserId": "54bdc65599c37b0da9000002",
+  "Title": "asdfads",
+  "Desc": "",
+  "Tags": null,
+  "Abstract": "",
+  "Content": "",
+  "IsMarkdown": false,
+  "IsBlog": false,
+  "IsTrash": true,
+  "IsDeleted": false,
+  "Usn": 15,
+  "Files": [],
+  "CreatedTime": "2015-01-20T11:13:41.34+08:00",
+  "UpdatedTime": "2015-01-20T11:13:41.34+08:00",
+  "PublicTime": "0001-01-01T00:00:00Z"
+}
+```
+* 时间类型全是返回如 "2015-01-20T11:13:41.34+08:00" 的格式, (因为golang的time转成Json就是这样, 历史原因)

app/controllers/api/ApiAuthController.go

@@ -0,0 +1,69 @@
+package api
+
+import (
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"gopkg.in/mgo.v2/bson"
+	//	"strconv"
+)
+
+// 用户登录后生成一个token, 将这个token保存到session中
+// 以后每次的请求必须带这个token, 并从session中获取userId
+
+// 用户登录/注销/找回密码
+
+type ApiAuth struct {
+	ApiBaseContrller
+}
+
+// 登录
+// [ok]
+// 成功返回 {Ok: true, Item: token }
+// 失败返回 {Ok: false, Msg: ""}
+func (c ApiAuth) Login(email, pwd string) revel.Result {
+	var msg = ""
+
+	userInfo := authService.Login(email, pwd)
+	if userInfo.Email != "" {
+		token := bson.NewObjectId().Hex()
+		sessionService.SetUserId(token, userInfo.UserId.Hex())
+		return c.RenderJson(info.AuthOk{Ok: true, Token: token, UserId: userInfo.UserId, Email: userInfo.Email, Username: userInfo.Username})
+	} else {
+		// 登录错误, 则错误次数++
+		msg = "wrongUsernameOrPassword"
+	}
+	return c.RenderJson(info.ApiRe{Ok: false, Msg: c.Message(msg)})
+}
+
+// 注销
+// [Ok]
+func (c ApiAuth) Logout() revel.Result {
+	token := c.getToken()
+	sessionService.Clear(token)
+	re := info.NewApiRe()
+	re.Ok = true
+	return c.RenderJson(re)
+}
+
+// 注册
+// [Ok]
+// 成功后并不返回用户ID, 需要用户重新登录
+func (c ApiAuth) Register(email, pwd string) revel.Result {
+	re := info.NewApiRe()
+	if !configService.IsOpenRegister() {
+		re.Msg = "notOpenRegister" // 未开放注册
+		return c.RenderJson(re)
+	}
+
+	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
+		return c.RenderJson(re)
+	}
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
+		return c.RenderJson(re)
+	}
+
+	// 注册
+	re.Ok, re.Msg = authService.Register(email, pwd, "")
+	return c.RenderJson(re)
+}

app/controllers/api/ApiBaseController.go

@@ -0,0 +1,181 @@
+package api
+
+import (
+	"github.com/revel/revel"
+	"gopkg.in/mgo.v2/bson"
+	//	"encoding/json"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/controllers"
+	"github.com/leanote/leanote/app/info"
+	"os"
+//	"fmt"
+	"io/ioutil"
+	//	"fmt"
+	//	"math"
+	//	"strconv"
+	"strings"
+)
+
+// 公用Controller, 其它Controller继承它
+type ApiBaseContrller struct {
+	controllers.BaseController // 不能用*BaseController
+}
+
+// 得到token, 这个token是在AuthInterceptor设到Session中的
+func (c ApiBaseContrller) getToken() string {
+	return c.Session["_token"]
+}
+
+// userId
+// _userId是在AuthInterceptor设置的
+func (c ApiBaseContrller) getUserId() string {
+	return c.Session["_userId"]
+}
+
+// 得到用户信息
+func (c ApiBaseContrller) getUserInfo() info.User {
+	userId := c.Session["_userId"]
+	if userId == "" {
+		return info.User{}
+	}
+	return userService.GetUserInfo(userId)
+}
+
+// 上传附件
+func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg string, id string) {
+	userId := c.getUserId();
+	
+	// 判断是否有权限为笔记添加附件
+	// 如果笔记还没有添加是不是会有问题
+	/*
+	if !shareService.HasUpdateNotePerm(noteId, userId) {
+		return 
+	}
+	*/
+	
+	file, handel, err := c.Request.FormFile(name)
+	if err != nil {
+		return 
+	}
+	defer file.Close()
+	
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return 
+	}
+	// > 5M?
+	maxFileSize := configService.GetUploadSize("uploadAttachSize");
+	if maxFileSize <= 0 {
+		maxFileSize = 1000
+	}
+	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+		msg = "fileIsTooLarge" 
+		return 
+	}
+	
+	// 生成上传路径
+	filePath := "files/" + userId + "/attachs"
+	dir := revel.BasePath + "/" +  filePath
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		return 
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+	_, ext := SplitFilename(filename) // .doc
+	filename = NewGuid() + ext
+	toPath := dir + "/" + filename;
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		return 
+	}
+	
+	// add File to db
+	fileType := ""
+	if ext != "" {
+		fileType = strings.ToLower(ext[1:])
+	}
+	filesize := GetFilesize(toPath)
+	fileInfo := info.Attach{AttachId:  bson.NewObjectId(), 
+		Name: filename,
+		Title: handel.Filename,
+		NoteId: bson.ObjectIdHex(noteId),
+		UploadUserId: bson.ObjectIdHex(userId),
+		Path: filePath + "/" + filename,
+		Type: fileType,
+		Size: filesize}
+	
+	ok, msg = attachService.AddAttach(fileInfo, true)
+	if !ok {
+		return
+	}
+	
+	id = fileInfo.AttachId.Hex()
+	return
+}
+
+// 上传图片
+func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok bool, msg string, id string) {
+	if isAttach {
+		return c.uploadAttach(name, noteId)
+	}
+	file, handel, err := c.Request.FormFile(name)
+	if err != nil {
+		return 
+	}
+	defer file.Close()
+	// 生成上传路径
+	fileUrlPath := "files/" + c.getUserId() + "/images"
+	dir := revel.BasePath + "/" +  fileUrlPath
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		return
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+	_, ext := SplitFilename(filename)
+	if(ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg") {
+		msg = "notImage"
+		return
+	}
+
+	filename = NewGuid() + ext
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return
+	}
+	
+	maxFileSize := configService.GetUploadSize("uploadImageSize");
+	if maxFileSize <= 0 {
+		maxFileSize = 1000
+	}
+	
+	// > 2M?
+	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+		msg = "fileIsTooLarge"
+		return
+	}
+	
+	toPath := dir + "/" + filename;
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		return 
+	}
+	// 改变成gif图片
+	_, toPathGif := TransToGif(toPath, 0, true)
+	filename = GetFilename(toPathGif)
+	filesize := GetFilesize(toPathGif)
+	fileUrlPath += "/" + filename
+	
+	// File
+	fileInfo := info.File{FileId: bson.NewObjectId(),
+		Name: filename,
+		Title: handel.Filename,
+		Path: fileUrlPath,
+		Size: filesize}
+	ok, msg = fileService.AddImage(fileInfo, "", c.getUserId(), true)
+	if ok {
+		id = fileInfo.FileId.Hex()
+	}
+	return
+}

app/controllers/api/ApiFileController.go

@@ -0,0 +1,164 @@
+package api
+
+import (
+	"github.com/revel/revel"
+	//	"encoding/json"
+//	. "github.com/leanote/leanote/app/lea"
+//	"gopkg.in/mgo.v2/bson"
+	//	"github.com/leanote/leanote/app/lea/netutil"
+//	"github.com/leanote/leanote/app/info"
+//	"io/ioutil"
+	"os"
+	//	"strconv"
+	"io"
+	"time"
+	"strings"
+   "archive/tar"
+    "compress/gzip"
+)
+
+// 文件操作, 图片, 头像上传, 输出
+
+type ApiFile struct {
+	ApiBaseContrller
+}
+
+/*
+// 协作时复制图片到owner
+func (c ApiFile) CopyImage(userId, fileId, toUserId string) revel.Result {
+	re := info.NewRe()
+
+	re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId)
+
+	return c.RenderJson(re)
+}
+
+// get all images by userId with page
+func (c ApiFile) GetImages(albumId, key string, page int) revel.Result {
+	imagesPage := fileService.ListImagesWithPage(c.getUserId(), albumId, key, page, 12)
+	re := info.NewRe()
+	re.Ok = true
+	re.Item = imagesPage
+	return c.RenderJson(re)
+}
+
+func (c ApiFile) UpdateImageTitle(fileId, title string) revel.Result {
+	re := info.NewRe()
+	re.Ok = fileService.UpdateImageTitle(c.getUserId(), fileId, title)
+	return c.RenderJson(re)
+}
+
+func (c ApiFile) DeleteImage(fileId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = fileService.DeleteImage(c.getUserId(), fileId)
+	return c.RenderJson(re)
+}
+
+*/
+
+//-----------
+
+// 输出image
+// [OK]
+func (c ApiFile) GetImage(fileId string) revel.Result {
+	path := fileService.GetFile(c.getUserId(), fileId) // 得到路径
+	if path == "" {
+		return c.RenderText("")
+	}
+	fn := revel.BasePath + "/" + strings.TrimLeft(path, "/")
+	file, _ := os.Open(fn)
+	return c.RenderFile(file, revel.Inline) // revel.Attachment
+}
+
+// 下载附件
+// [OK]
+func (c ApiFile) GetAttach(fileId string) revel.Result {
+	attach := attachService.GetAttach(fileId, c.getUserId()); // 得到路径
+	path := attach.Path
+	if path == "" {
+		return c.RenderText("No Such File")
+	}
+	fn := revel.BasePath + "/" +  strings.TrimLeft(path, "/")
+    file, _ := os.Open(fn)
+    return c.RenderBinary(file, attach.Title, revel.Attachment, time.Now()) // revel.Attachment
+}
+
+// 下载所有附件
+// [OK]
+func (c ApiFile) GetAllAttachs(noteId string) revel.Result {
+	note := noteService.GetNoteById(noteId)
+	if note.NoteId == "" {
+		return c.RenderText("")
+	}
+	// 得到文件列表
+	attachs := attachService.ListAttachs(noteId, c.getUserId())
+	if attachs == nil || len(attachs) == 0 {
+		return c.RenderText("")
+	}
+	
+	/*
+	dir := revel.BasePath + "/files/tmp"
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		return c.RenderText("")
+	}
+	*/
+	
+	filename := note.Title + ".tar.gz"
+	if note.Title == "" {
+		filename = "all.tar.gz"
+	}
+	
+	// file write
+    fw, err := os.Create(revel.BasePath + "/files/" + filename)
+    if err != nil {
+		return c.RenderText("")
+    }
+    // defer fw.Close() // 不需要关闭, 还要读取给用户下载
+  
+    // gzip write
+    gw := gzip.NewWriter(fw)
+    defer gw.Close()
+  
+    // tar write
+    tw := tar.NewWriter(gw)
+    defer tw.Close()
+    
+    // 遍历文件列表
+    for _, attach := range attachs {
+		fn := revel.BasePath + "/" +  strings.TrimLeft(attach.Path, "/")
+	    fr, err := os.Open(fn)
+	    fileInfo, _ := fr.Stat()
+        if err != nil {
+			return c.RenderText("")
+        }
+        defer fr.Close()
+        
+        // 信息头
+        h := new(tar.Header)
+        h.Name = attach.Title
+        h.Size = fileInfo.Size()
+        h.Mode = int64(fileInfo.Mode())
+        h.ModTime = fileInfo.ModTime()
+  
+        // 写信息头
+        err = tw.WriteHeader(h)
+        if err != nil {
+            panic(err)
+        }
+  
+        // 写文件
+        _, err = io.Copy(tw, fr)
+        if err != nil {
+            panic(err)
+        }
+    } // for
+    
+//    tw.Close()
+//    gw.Close()
+//    fw.Close()
+//    file, _ := os.Open(dir + "/" + filename)
+	// fw.Seek(0, 0)
+    return c.RenderBinary(fw, filename, revel.Attachment, time.Now()) // revel.Attachment
+}
+

app/controllers/api/ApiNoteController.go

@@ -0,0 +1,573 @@
+package api
+
+import (
+	"github.com/revel/revel"
+	//	"encoding/json"
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"regexp"
+	"strings"
+	"time"
+	//	"github.com/leanote/leanote/app/types"
+	//	"io/ioutil"
+	//	"fmt"
+	//	"bytes"
+	//	"os"
+)
+
+// 笔记API
+
+type ApiNote struct {
+	ApiBaseContrller
+}
+
+// 获取同步的笔记
+// > afterUsn的笔记
+// 无Desc, Abstract, 有Files
+/*
+  {
+    "NoteId": "55195fa199c37b79be000005",
+    "NotebookId": "55195fa199c37b79be000002",
+    "UserId": "55195fa199c37b79be000001",
+    "Title": "Leanote语法Leanote语法Leanote语法Leanote语法Leanote语法",
+    "Desc": "",
+    "Tags": null,
+    "Abstract": "",
+    "Content": "",
+    "IsMarkdown": true,
+    "IsBlog": false,
+    "IsTrash": false,
+    "Usn": 5,
+    "Files": [],
+    "CreatedTime": "2015-03-30T22:37:21.695+08:00",
+    "UpdatedTime": "2015-03-30T22:37:21.724+08:00",
+    "PublicTime": "2015-03-30T22:37:21.695+08:00"
+  }
+*/
+func (c ApiNote) GetSyncNotes(afterUsn, maxEntry int) revel.Result {
+	if maxEntry == 0 {
+		maxEntry = 100
+	}
+	notes := noteService.GetSyncNotes(c.getUserId(), afterUsn, maxEntry)
+	return c.RenderJson(notes)
+}
+
+// 得到笔记本下的笔记
+// [OK]
+func (c ApiNote) GetNotes(notebookId string) revel.Result {
+	if notebookId != "" && !bson.IsObjectIdHex(notebookId) { 
+		re := info.NewApiRe()
+		re.Msg = "notebookIdInvalid"
+		return c.RenderJson(re)
+	}
+	_, notes := noteService.ListNotes(c.getUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false)
+	return c.RenderJson(noteService.ToApiNotes(notes))
+}
+
+// 得到trash
+// [OK]
+func (c ApiNote) GetTrashNotes() revel.Result {
+	_, notes := noteService.ListNotes(c.getUserId(), "", true, c.GetPage(), pageSize, defaultSortField, false, false)
+	return c.RenderJson(noteService.ToApiNotes(notes))
+}
+
+// get Note
+// [OK]
+/*
+{
+  "NoteId": "550c0bee2ec82a2eb5000000",
+  "NotebookId": "54a1676399c37b1c77000004",
+  "UserId": "54a1676399c37b1c77000002",
+  "Title": "asdfadsf--=",
+  "Desc": "",
+  "Tags": [
+    ""
+  ],
+  "Abstract": "",
+  "Content": "",
+  "IsMarkdown": false,
+  "IsBlog": false,
+  "IsTrash": false,
+  "Usn": 8,
+  "Files": [
+    {
+      "FileId": "551975d599c37b970f000002",
+      "LocalFileId": "",
+      "Type": "",
+      "Title": "",
+      "HasBody": false,
+      "IsAttach": false
+    },
+    {
+      "FileId": "551975de99c37b970f000003",
+      "LocalFileId": "",
+      "Type": "doc",
+      "Title": "李铁-简历-ali-print-en.doc",
+      "HasBody": false,
+      "IsAttach": true
+    },
+    {
+      "FileId": "551975de99c37b970f000004",
+      "LocalFileId": "",
+      "Type": "doc",
+      "Title": "李铁-简历-ali-print.doc",
+      "HasBody": false,
+      "IsAttach": true
+    }
+  ],
+  "CreatedTime": "2015-03-20T20:00:52.463+08:00",
+  "UpdatedTime": "2015-03-31T00:12:44.967+08:00",
+  "PublicTime": "2015-03-20T20:00:52.463+08:00"
+}
+*/
+func (c ApiNote) GetNote(noteId string) revel.Result {
+	if !bson.IsObjectIdHex(noteId) { 
+		re := info.NewApiRe()
+		re.Msg = "noteIdInvalid"
+		return c.RenderJson(re)
+	}
+	
+	note := noteService.GetNote(noteId, c.getUserId())
+	if note.NoteId == "" {
+		re := info.NewApiRe()
+		re.Msg = "notExists"
+		return c.RenderJson(re)
+	}
+	apiNotes := noteService.ToApiNotes([]info.Note{note})
+	return c.RenderJson(apiNotes[0])
+}
+
+// 得到note和内容
+// [OK]
+func (c ApiNote) GetNoteAndContent(noteId string) revel.Result {
+	noteAndContent := noteService.GetNoteAndContent(noteId, c.getUserId())
+	
+	apiNotes := noteService.ToApiNotes([]info.Note{noteAndContent.Note})
+	apiNote := apiNotes[0]
+	apiNote.Content = noteAndContent.Content
+	return c.RenderJson(apiNote)
+}
+
+// 处理笔记内容数据 http://leanote.com/file/outputImage -> https://leanote.com/api/file/getImage
+// 图片, 附件都替换
+func (c ApiNote) fixContent(content string) string {
+	// TODO, 这个url需要从config中取
+//	baseUrl := "http://leanote.com"
+	baseUrl := configService.GetSiteUrl()
+//	baseUrl := "http://localhost:9000"
+	
+	patterns := []map[string]string{
+		map[string]string{"src": "src", "middle": "/file/outputImage", "param": "fileId", "to": "getImage?fileId="},
+		map[string]string{"src": "href", "middle": "/attach/download", "param": "attachId", "to": "getAttach?fileId="},
+		map[string]string{"src": "href", "middle": "/attach/downloadAll", "param": "noteId", "to": "getAllAttachs?noteId="},
+	}
+	
+	for _, eachPattern := range patterns {
+	
+		// src="http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1"
+		// href="http://leanote.com/attach/download?attachId=5504243a38f4111dcb00017d"
+		// href="http://leanote.com/attach/downloadAll?noteId=55041b6a38f4111dcb000159"
+		
+		regImage, _ := regexp.Compile(eachPattern["src"] + `=('|")`+ baseUrl + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})("|')`)
+		findsImage := regImage.FindAllStringSubmatch(content, -1) // 查找所有的
+		
+		// [[src='http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" ' 54672e8d38f411286b000069 "] [src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" " 54672e8d38f411286b000069 "] [src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" " 54672e8d38f411286b000069 "] [src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" " 54672e8d38f411286b000069 "]]
+		for _, eachFind := range findsImage {
+			// [src='http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" ' 54672e8d38f411286b000069 "]
+			if len(eachFind) == 4 {
+				content = strings.Replace(content, 
+					eachFind[0], 
+					eachPattern["src"] + "=\"" + baseUrl + "/api/file/" + eachPattern["to"] + eachFind[2] + "\"", 
+					1);
+			}
+		}
+		
+		// markdown处理
+		// ![](http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1)
+		// [selection 2.html](http://leanote.com/attach/download?attachId=5504262638f4111dcb00017f)
+		// [all.tar.gz](http://leanote.com/attach/downloadAll?noteId=5503b57d59f81b4eb4000000)
+		
+		pre := "!" // 默认图片
+		if eachPattern["src"] == "href" { // 是attach
+			pre = ""
+		}
+		
+		regImageMarkdown, _ := regexp.Compile(pre + `\[(.*?)\]\(`+ baseUrl + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})\)`)
+		findsImageMarkdown := regImageMarkdown.FindAllStringSubmatch(content, -1) // 查找所有的
+		// [[![](http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1) 5503537b38f4111dcb0000d1] [![你好啊, 我很好, 为什么?](http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1) 5503537b38f4111dcb0000d1]]
+		for _, eachFind := range findsImageMarkdown {
+			// [![你好啊, 我很好, 为什么?](http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1) 你好啊, 我很好, 为什么? 5503537b38f4111dcb0000d1]
+			if len(eachFind) == 3 {
+				content = strings.Replace(content, eachFind[0], pre + "[" + eachFind[1] + "](" + baseUrl + "/api/file/" + eachPattern["to"] + eachFind[2]  + ")", 1);
+			}
+		}
+	}
+	
+	return content
+}
+
+// content里的image, attach链接是
+// https://leanote.com/api/file/getImage?fileId=xx
+// https://leanote.com/api/file/getAttach?fileId=xx
+// 将fileId=映射成ServerFileId, 这里的fileId可能是本地的FileId
+func (c ApiNote) fixPostNotecontent(noteOrContent *info.ApiNote) {
+	if noteOrContent.Content == "" {
+		return
+	}
+	files := noteOrContent.Files
+	if files != nil && len(files) > 0 {
+		for _, file := range files {
+			if file.LocalFileId != "" {
+				noteOrContent.Content = strings.Replace(noteOrContent.Content, "fileId=" + file.LocalFileId, "fileId=" + file.FileId, -1)
+			}
+		}
+	}
+}
+
+// 得到内容
+// [OK]
+func (c ApiNote) GetNoteContent(noteId string) revel.Result {
+	//	re := info.NewRe()
+	noteContent := noteService.GetNoteContent(noteId, c.getUserId())
+	if noteContent.Content != "" {
+		noteContent.Content = c.fixContent(noteContent.Content)
+	}
+	
+	apiNoteContent := info.ApiNoteContent{
+		NoteId: noteContent.NoteId,
+		UserId: noteContent.UserId,
+		Content: noteContent.Content,
+	}
+	
+	//	re.Item = noteContent
+	return c.RenderJson(apiNoteContent)
+}
+
+// 添加笔记
+// [OK]
+func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
+	userId := bson.ObjectIdHex(c.getUserId())
+	re := info.NewRe()
+	myUserId := userId
+	// 为共享新建?
+	/*
+	if noteOrContent.FromUserId != "" {
+		userId = bson.ObjectIdHex(noteOrContent.FromUserId)
+	}
+	*/
+	//	Log(noteOrContent.Title)
+	//	LogJ(noteOrContent)
+	/*
+		LogJ(c.Params)
+		for name, _ := range c.Params.Files {
+			Log(name)
+			file, _, _ := c.Request.FormFile(name)
+			LogJ(file)
+		}
+	*/
+	//	return c.RenderJson(re)
+	if noteOrContent.NotebookId == "" || !bson.IsObjectIdHex(noteOrContent.NotebookId) {
+		re.Msg = "notebookIdNotExists"
+		return c.RenderJson(re)
+	}
+
+	noteId := bson.NewObjectId()
+	// TODO 先上传图片/附件, 如果不成功, 则返回false
+	//
+	attachNum := 0
+	if noteOrContent.Files != nil && len(noteOrContent.Files) > 0 {
+		for i, file := range noteOrContent.Files {
+			if file.HasBody {
+				if file.LocalFileId != "" {
+					// FileDatas[54c7ae27d98d0329dd000000]
+					ok, msg, fileId := c.upload("FileDatas["+file.LocalFileId+"]", noteId.Hex(), file.IsAttach)
+
+					if !ok {
+						re.Ok = false
+						if msg != "" {
+							Log(msg)
+							Log(file.LocalFileId)
+							re.Msg = "fileUploadError"
+						}
+						// 报不是图片的错误没关系, 证明客户端传来非图片的数据
+						if msg != "notImage" {
+							return c.RenderJson(re)
+						}
+					} else {
+						// 建立映射
+						file.FileId = fileId
+						noteOrContent.Files[i] = file
+
+						if file.IsAttach {
+							attachNum++
+						}
+					}
+				} else {
+					return c.RenderJson(re)
+				}
+			}
+		}
+	}
+
+	c.fixPostNotecontent(&noteOrContent)
+
+//	Log("Add")
+//	LogJ(noteOrContent)
+
+	//	return c.RenderJson(re)
+
+	note := info.Note{UserId: userId,
+		NoteId:     noteId,
+		NotebookId: bson.ObjectIdHex(noteOrContent.NotebookId),
+		Title:      noteOrContent.Title,
+		Tags:       noteOrContent.Tags,
+		Desc:       noteOrContent.Desc,
+//		ImgSrc:     noteOrContent.ImgSrc,
+		IsBlog:     noteOrContent.IsBlog,
+		IsMarkdown: noteOrContent.IsMarkdown,
+		AttachNum:  attachNum,
+	}
+	noteContent := info.NoteContent{NoteId: note.NoteId,
+		UserId:   userId,
+		IsBlog:   note.IsBlog,
+		Content:  noteOrContent.Content,
+		Abstract: noteOrContent.Abstract}
+
+	// 通过内容得到Desc, abstract
+	note.Desc = SubStringHTMLToRaw(noteContent.Content, 50)
+	noteContent.Abstract = SubStringHTML(noteContent.Content, 200, "")
+
+	note = noteService.AddNoteAndContentApi(note, noteContent, myUserId)
+	
+	if note.NoteId == "" {
+		re.Ok = false
+		return c.RenderJson(re)
+	}
+
+	// 添加需要返回的
+	noteOrContent.NoteId = note.NoteId.Hex()
+	noteOrContent.Usn = note.Usn
+	noteOrContent.CreatedTime = note.CreatedTime
+	noteOrContent.UpdatedTime = note.UpdatedTime
+	noteOrContent.UserId = c.getUserId()
+	noteOrContent.IsMarkdown = note.IsMarkdown
+	// 删除一些不要返回的
+	noteOrContent.Content = ""
+	noteOrContent.Abstract = ""
+	//	apiNote := info.NoteToApiNote(note, noteOrContent.Files)
+	return c.RenderJson(noteOrContent)
+}
+
+// 更新笔记
+// [OK]
+func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
+	re := info.NewReUpdate()
+
+	noteUpdate := bson.M{}
+	needUpdateNote := false
+
+	noteId := noteOrContent.NoteId
+
+	if noteOrContent.NoteId == "" {
+		re.Msg = "noteIdNotExists"
+		return c.RenderJson(re)
+	}
+
+	if noteOrContent.Usn <= 0 {
+		re.Msg = "usnNotExists"
+		return c.RenderJson(re)
+	}
+
+//	Log("_____________")
+//	LogJ(noteOrContent)
+	/*
+		LogJ(c.Params.Files)
+		LogJ(c.Request.Header)
+		LogJ(c.Params.Values)
+	*/
+
+	// 先判断USN的问题, 因为很可能添加完附件后, 会有USN冲突, 这时附件就添错了
+	userId := c.getUserId()
+	note := noteService.GetNote(noteId, userId)
+	if note.NoteId == "" {
+		re.Msg = "notExists"
+		return c.RenderJson(re)
+	}
+	if note.Usn != noteOrContent.Usn {
+		re.Msg = "conflict"
+		Log("conflict")
+		return c.RenderJson(re)
+	}
+
+	// 如果传了files
+	// TODO 测试
+	/*
+	for key, v := range c.Params.Values {
+		Log(key)
+		Log(v)
+	}
+	*/
+//	Log(c.Has("Files[0]"))
+	if c.Has("Files[0][LocalFileId]") { 
+//		LogJ(c.Params.Files)
+		if noteOrContent.Files != nil && len(noteOrContent.Files) > 0 {
+			for i, file := range noteOrContent.Files {
+				if file.HasBody {
+					if file.LocalFileId != "" {
+						// FileDatas[54c7ae27d98d0329dd000000]
+						ok, msg, fileId := c.upload("FileDatas["+file.LocalFileId+"]", noteId, file.IsAttach)
+						if !ok {
+							Log("upload file error")
+							re.Ok = false
+							if msg == "" {
+								re.Msg = "fileUploadError"
+							} else {
+								re.Msg = msg
+							}
+							return c.RenderJson(re)
+						} else {
+							// 建立映射
+							file.FileId = fileId
+							noteOrContent.Files[i] = file
+						}
+					} else {
+						return c.RenderJson(re)
+					}
+				}
+			}
+		}
+	
+//		Log("after upload")
+//		LogJ(noteOrContent.Files)
+	}
+	
+	// 移到外面来, 删除最后一个file时也要处理, 不然总删不掉
+	// 附件问题, 根据Files, 有些要删除的, 只留下这些
+	attachService.UpdateOrDeleteAttachApi(noteId, userId, noteOrContent.Files)
+	
+	// Desc前台传来
+	if c.Has("Desc") {
+		needUpdateNote = true
+		noteUpdate["Desc"] = noteOrContent.Desc
+	}
+	/*
+	if c.Has("ImgSrc") {
+		needUpdateNote = true
+		noteUpdate["ImgSrc"] = noteOrContent.ImgSrc
+	}
+	*/
+	if c.Has("Title") {
+		needUpdateNote = true
+		noteUpdate["Title"] = noteOrContent.Title
+	}
+	if c.Has("IsTrash") {
+		needUpdateNote = true
+		noteUpdate["IsTrash"] = noteOrContent.IsTrash
+	}
+	
+	// 是否是博客
+	if c.Has("IsBlog") {
+		needUpdateNote = true
+		noteUpdate["IsBlog"] = noteOrContent.IsBlog
+	}
+
+	/*
+		Log(c.Has("tags[0]"))
+		Log(c.Has("Tags[]"))
+		for key, v := range c.Params.Values {
+			Log(key)
+			Log(v)
+		}
+	*/
+
+	if c.Has("Tags[0]") {
+		needUpdateNote = true
+		noteUpdate["Tags"] = noteOrContent.Tags
+	}
+
+	if c.Has("NotebookId") {
+		if bson.IsObjectIdHex(noteOrContent.NotebookId) {
+			needUpdateNote = true
+			noteUpdate["NotebookId"] = bson.ObjectIdHex(noteOrContent.NotebookId)
+		}
+	}
+
+	if c.Has("Content") {
+		// 通过内容得到Desc, abstract
+		noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Content, 50)
+	}
+
+	afterNoteUsn := 0
+	noteOk := false
+	noteMsg := ""
+	if needUpdateNote {
+		noteOk, noteMsg, afterNoteUsn = noteService.UpdateNote(c.getUserId(), noteOrContent.NoteId, noteUpdate, noteOrContent.Usn)
+		if !noteOk {
+			re.Ok = false
+			re.Msg = noteMsg
+			return c.RenderJson(re)
+		}
+	}
+
+	//-------------
+	afterContentUsn := 0
+	contentOk := false
+	contentMsg := ""
+	if c.Has("Content") {
+		// 把fileId替换下
+		c.fixPostNotecontent(&noteOrContent)
+		// 如果传了Abstract就用之
+		if noteOrContent.Abstract == "" {
+			noteOrContent.Abstract = SubStringHTML(noteOrContent.Content, 200, "")
+		}
+//		Log("--------> afte fixed")
+//		Log(noteOrContent.Content)
+		contentOk, contentMsg, afterContentUsn = noteService.UpdateNoteContent(c.getUserId(),
+			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract, needUpdateNote, noteOrContent.Usn)
+	}
+
+	if needUpdateNote {
+		re.Ok = noteOk
+		re.Msg = noteMsg
+		re.Usn = afterNoteUsn
+	} else {
+		re.Ok = contentOk
+		re.Msg = contentMsg
+		re.Usn = afterContentUsn
+	}
+
+	if !re.Ok {
+		return c.RenderJson(re)
+	}
+
+	noteOrContent.Content = ""
+	noteOrContent.Usn = re.Usn
+	noteOrContent.UpdatedTime = time.Now()
+
+//	Log("after upload")
+//	LogJ(noteOrContent.Files)
+	noteOrContent.UserId = c.getUserId()
+
+	return c.RenderJson(noteOrContent)
+}
+
+// 删除trash
+func (c ApiNote) DeleteTrash(noteId string, usn int) revel.Result {
+	re := info.NewReUpdate()
+	re.Ok, re.Msg, re.Usn = trashService.DeleteTrashApi(noteId, c.getUserId(), usn)
+	return c.RenderJson(re)
+}
+
+// 得到历史列表
+/*
+func (c ApiNote) GetHistories(noteId string) revel.Result {
+	re := info.NewRe()
+	histories := noteContentHistoryService.ListHistories(noteId, c.getUserId())
+	if len(histories) > 0 {
+		re.Ok = true
+		re.Item = histories
+	}
+	return c.RenderJson(re)
+}
+*/

app/controllers/api/ApiNotebookController.go

@@ -0,0 +1,106 @@
+package api
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/revel/revel"
+	"gopkg.in/mgo.v2/bson"
+		. "github.com/leanote/leanote/app/lea"
+	//	"io/ioutil"
+)
+
+// 笔记本API
+
+type ApiNotebook struct {
+	ApiBaseContrller
+}
+
+// 从Notebook -> ApiNotebook
+func (c ApiNotebook) fixNotebooks(notebooks []info.Notebook) []info.ApiNotebook {
+	if notebooks == nil {
+		return nil
+	}
+	apiNotebooks := make([]info.ApiNotebook, len(notebooks))
+	for i, notebook := range notebooks {
+		apiNotebooks[i] = c.fixNotebook(&notebook)
+	}
+	return apiNotebooks
+}
+func (c ApiNotebook) fixNotebook(notebook *info.Notebook) info.ApiNotebook {
+	if notebook == nil {
+		return info.ApiNotebook{}
+	}
+	return info.ApiNotebook{
+		NotebookId       : notebook.NotebookId,
+		UserId           : notebook.UserId,
+		ParentNotebookId : notebook.ParentNotebookId,
+		Seq              : notebook.Seq,
+		Title            : notebook.Title,
+		UrlTitle         : notebook.UrlTitle,
+		IsBlog           : notebook.IsBlog,
+		CreatedTime      : notebook.CreatedTime,
+		UpdatedTime      : notebook.UpdatedTime,
+		Usn: notebook.Usn,
+		IsDeleted: notebook.IsDeleted,
+	}
+}
+
+// 获取同步的笔记本
+// [OK]
+// > afterUsn的笔记
+// 返回 {ChunkHighUsn: 本下最大的usn, 借此可以知道是否还有, Notebooks: []}
+func (c ApiNotebook) GetSyncNotebooks(afterUsn, maxEntry int) revel.Result {
+	if maxEntry == 0 {
+		maxEntry = 100
+	}
+	notebooks := notebookService.GeSyncNotebooks(c.getUserId(), afterUsn, maxEntry)
+	return c.RenderJson(c.fixNotebooks(notebooks))
+}
+
+// 得到用户的所有笔记本
+// [OK]
+// info.SubNotebooks
+func (c ApiNotebook) GetNotebooks() revel.Result {
+	notebooks := notebookService.GeSyncNotebooks(c.getUserId(), 0, 99999)
+	return c.RenderJson(c.fixNotebooks(notebooks))
+}
+
+// 添加notebook
+// [OK]
+func (c ApiNotebook) AddNotebook(title, parentNotebookId string, seq int) revel.Result {
+	notebook := info.Notebook{NotebookId: bson.NewObjectId(),
+		Title:  title,
+		Seq:    seq,
+		UserId: bson.ObjectIdHex(c.getUserId())}
+	if parentNotebookId != "" && bson.IsObjectIdHex(parentNotebookId) {
+		notebook.ParentNotebookId = bson.ObjectIdHex(parentNotebookId)
+	}
+	re := info.NewRe()
+	re.Ok, notebook = notebookService.AddNotebook(notebook)
+	if !re.Ok {
+		return c.RenderJson(re)
+	}
+	return c.RenderJson(c.fixNotebook(&notebook))
+}
+
+// 修改笔记
+// [OK]
+func (c ApiNotebook) UpdateNotebook(notebookId, title, parentNotebookId string, seq, usn int) revel.Result {
+	re := info.NewApiRe()
+	
+	ok, msg, notebook := notebookService.UpdateNotebookApi(c.getUserId(), notebookId, title, parentNotebookId, seq, usn)
+	if !ok {
+		re.Ok = false
+		re.Msg = msg
+		return c.RenderJson(re)
+	}
+	LogJ(notebook)
+	return c.RenderJson(c.fixNotebook(&notebook))
+}
+
+// 删除笔记本
+// [OK]
+func (c ApiNotebook) DeleteNotebook(notebookId string, usn int) revel.Result {
+	re := info.NewApiRe()
+	re.Ok, re.Msg = notebookService.DeleteNotebookForce(c.getUserId(), notebookId, usn)
+	return c.RenderJson(re)
+}

app/controllers/api/ApiTagController.go

@@ -0,0 +1,56 @@
+package api
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/revel/revel"
+//	"gopkg.in/mgo.v2/bson"
+	//	. "github.com/leanote/leanote/app/lea"
+	//	"io/ioutil"
+)
+
+// 标签API
+
+type ApiTag struct {
+	ApiBaseContrller
+}
+
+// 获取同步的标签
+// [OK]
+// > afterUsn的笔记
+// 返回 {ChunkHighUsn: 本下最大的usn, 借此可以知道是否还有, Notebooks: []}
+func (c ApiTag) GetSyncTags(afterUsn, maxEntry int) revel.Result {
+	if maxEntry == 0 {
+		maxEntry = 100
+	}
+	tags := tagService.GeSyncTags(c.getUserId(), afterUsn, maxEntry)
+	return c.RenderJson(tags)
+}
+
+// 添加Tag
+// [OK]
+// 不会产生冲突, 即使里面有
+// 返回
+/*
+{
+  "TagId": "551978dd99c37b9bc5000001",
+  "UserId": "54a1676399c37b1c77000002",
+  "Tag": "32",
+  "Usn": 25,
+  "Count": 1,
+  "CreatedTime": "2015-03-31T00:25:01.149312407+08:00",
+  "UpdatedTime": "2015-03-31T00:25:01.149312407+08:00",
+  "IsDeleted": false
+}
+*/
+func (c ApiTag) AddTag(tag string) revel.Result {
+	ret := tagService.AddOrUpdateTag(c.getUserId(), tag)
+	return c.RenderJson(ret)
+}
+
+// 删除标签
+// [OK]
+func (c ApiTag) DeleteTag(tag string, usn int) revel.Result {
+	re := info.NewReUpdate()
+	re.Ok, re.Msg, re.Usn = tagService.DeleteTagApi(c.getUserId(), tag, usn)
+	return c.RenderJson(re)
+}

app/controllers/api/ApiUserController.go

@@ -0,0 +1,155 @@
+package api
+
+import (
+	"github.com/revel/revel"
+	//	"encoding/json"
+	"gopkg.in/mgo.v2/bson"
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"time"
+	//	"github.com/leanote/leanote/app/types"
+		"io/ioutil"
+	//	"fmt"
+	//	"math"
+		"os"
+
+	//	"path"
+	//	"strconv"
+)
+
+type ApiUser struct {
+	ApiBaseContrller
+}
+
+// 获取用户信息
+// [OK]
+func (c ApiUser) Info() revel.Result {
+	re := info.NewApiRe()
+
+	userInfo := c.getUserInfo()
+	if userInfo.UserId == "" {
+		return c.RenderJson(re)
+	}
+	apiUser := info.ApiUser{
+		UserId: userInfo.UserId.Hex(),
+		Username: userInfo.Username,
+		Email: userInfo.Email,
+		Logo: userInfo.Logo,
+		Verified: userInfo.Verified,
+	}
+	return c.RenderJson(apiUser)
+}
+
+// 修改用户名
+// [OK]
+func (c ApiUser) UpdateUsername(username string) revel.Result {
+	re := info.NewApiRe()
+	if c.GetUsername() == "demo" {
+		re.Msg = "cannotUpdateDemo"
+		return c.RenderJson(re)
+	}
+
+	if re.Ok, re.Msg = Vd("username", username); !re.Ok {
+		return c.RenderJson(re)
+	}
+
+	re.Ok, re.Msg = userService.UpdateUsername(c.getUserId(), username)
+	return c.RenderJson(re)
+}
+
+// 修改密码
+// [OK]
+func (c ApiUser) UpdatePwd(oldPwd, pwd string) revel.Result {
+	re := info.NewApiRe()
+	if c.GetUsername() == "demo" {
+		re.Msg = "cannotUpdateDemo"
+		return c.RenderJson(re)
+	}
+	if re.Ok, re.Msg = Vd("password", oldPwd); !re.Ok {
+		return c.RenderJson(re)
+	}
+	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
+		return c.RenderJson(re)
+	}
+	re.Ok, re.Msg = userService.UpdatePwd(c.getUserId(), oldPwd, pwd)
+	return c.RenderJson(re)
+}
+
+// 获得同步状态
+// [OK]
+func (c ApiUser) GetSyncState() revel.Result {
+	ret := bson.M{"LastSyncUsn": userService.GetUsn(c.getUserId()), "LastSyncTime": time.Now().Unix()}
+	return c.RenderJson(ret)
+}
+
+
+// 头像设置
+// 参数file=文件
+// 成功返回{Logo: url} 头像新url
+// [OK]
+func (c ApiUser) UpdateLogo() revel.Result {
+	ok, msg, url := c.uploadImage()
+
+	if ok {
+		ok = userService.UpdateAvatar(c.getUserId(), url)
+		return c.RenderJson(map[string]string{"Logo": url})
+	} else {
+		re := info.NewApiRe()
+		re.Msg = msg
+		return c.RenderJson(re)
+	}
+}
+
+// 上传图片
+func (c ApiUser) uploadImage() (ok bool, msg, url string) {
+	var fileUrlPath = ""
+	ok = false
+
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		return
+	}
+	defer file.Close()
+	// 生成上传路径
+	fileUrlPath = "public/upload/" + c.getUserId() + "/images/logo"
+	
+	dir := revel.BasePath + "/" + fileUrlPath
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		return
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+
+	var ext string
+	
+	_, ext = SplitFilename(filename)
+	if ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg" {
+		msg = "notImage"
+		return 
+	}
+
+	filename = NewGuid() + ext
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		LogJ(err)
+		return
+	}
+
+	// > 5M?
+	if len(data) > 5*1024*1024 {
+		msg = "fileIsTooLarge"
+		return
+	}
+
+	toPath := dir + "/" + filename
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		LogJ(err)
+		return
+	}
+	
+	ok = true
+	url = configService.GetSiteUrl() + "/" + fileUrlPath + "/" + filename
+	return 
+}

app/controllers/api/init.go

@@ -0,0 +1,144 @@
+package api
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/service"
+//		. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"strings"
+)
+
+var userService *service.UserService
+var noteService *service.NoteService
+var trashService *service.TrashService
+var notebookService *service.NotebookService
+var noteContentHistoryService *service.NoteContentHistoryService
+var authService *service.AuthService
+var shareService *service.ShareService
+var blogService *service.BlogService
+var tagService *service.TagService
+var pwdService *service.PwdService
+var tokenService *service.TokenService
+var suggestionService *service.SuggestionService
+var albumService *service.AlbumService
+var noteImageService *service.NoteImageService
+var fileService *service.FileService
+var attachService *service.AttachService
+var configService *service.ConfigService
+var emailService *service.EmailService
+var sessionService *service.SessionService
+
+var pageSize = 1000
+var defaultSortField = "UpdatedTime"
+var leanoteUserId = "admin" // 不能更改
+
+// 状态
+const (
+	S_DEFAULT                 = iota // 0
+	S_NOT_LOGIN                      // 1
+	S_WRONG_USERNAME_PASSWORD        // 2
+	S_WRONG_CAPTCHA                  // 3
+	S_NEED_CAPTCHA                   // 4
+	S_NOT_OPEN_REGISTER              // 4
+)
+
+// 拦截器
+// 不需要拦截的url
+var commonUrl = map[string]map[string]bool{"ApiAuth": map[string]bool{"Login": true,
+	"Register": true,
+	},
+	// 文件的操作也不用登录, userId会从session中获取
+	"ApiFile": map[string]bool{"GetImage": true,
+		"GetAttach": true,
+		"GetAllAttachs": true,
+	},
+}
+
+func needValidate(controller, method string) bool {
+	// 在里面
+	if v, ok := commonUrl[controller]; ok {
+		// 在commonUrl里
+		if _, ok2 := v[method]; ok2 {
+			return false
+		}
+		return true
+	} else {
+		// controller不在这里的, 肯定要验证
+		return true
+	}
+}
+
+// 这里得到token, 若不是login, logout等公用操作, 必须验证是否已登录
+func AuthInterceptor(c *revel.Controller) revel.Result {
+	// 得到token /api/user/info?userId=xxx&token=xxxxx
+	token := c.Params.Values.Get("token")
+	noToken := false
+	if token == "" {
+		// 若无, 则取sessionId
+		token = c.Session.Id()
+		noToken = true
+	}
+	c.Session["_token"] = token
+
+	// 全部变成首字大写
+	var controller = strings.Title(c.Name)
+	var method = strings.Title(c.MethodName)
+
+	// 验证是否已登录
+	// 通过sessionService判断该token下是否有userId, 并返回userId
+	userId := sessionService.GetUserId(token)
+	if noToken && userId == "" {
+		// 从session中获取, api/file/getImage, api/file/getAttach, api/file/getAllAttach
+		// 客户端
+		userId, _ = c.Session["UserId"];
+	}
+	c.Session["_userId"] = userId
+	
+	// 是否需要验证?
+	if !needValidate(controller, method) {
+		return nil
+	}
+	
+	if userId != "" {
+		return nil // 已登录
+	}
+
+	// 没有登录, 返回错误的信息, 需要登录
+	re := info.NewApiRe()
+	re.Msg = "NOTLOGIN"
+	return c.RenderJson(re)
+}
+
+func init() {
+	// interceptors
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiAuth{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiUser{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiFile{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiNote{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiTag{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &ApiNotebook{})
+}
+
+// 最外层init.go调用
+// 获取service, 单例
+func InitService() {
+	notebookService = service.NotebookS
+	noteService = service.NoteS
+	noteContentHistoryService = service.NoteContentHistoryS
+	trashService = service.TrashS
+	shareService = service.ShareS
+	userService = service.UserS
+	tagService = service.TagS
+	blogService = service.BlogS
+	tokenService = service.TokenS
+	noteImageService = service.NoteImageS
+	fileService = service.FileS
+	albumService = service.AlbumS
+	attachService = service.AttachS
+	pwdService = service.PwdS
+	suggestionService = service.SuggestionS
+	authService = service.AuthS
+	configService = service.ConfigS
+	emailService = service.EmailS
+	sessionService = service.SessionS
+}

app/controllers/init.go

@@ -3,18 +3,17 @@ package controllers
 import (
 	"github.com/leanote/leanote/app/service"
 	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/lea/blog"
+//	. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
 	"strings"
 )
 
-// 该文件初始化所有service方法
-
 var userService *service.UserService
 var noteService *service.NoteService
 var trashService *service.TrashService
 var notebookService *service.NotebookService
 var noteContentHistoryService *service.NoteContentHistoryService
-
 var authService *service.AuthService
 var shareService *service.ShareService
 var blogService *service.BlogService
@@ -22,50 +21,67 @@ var tagService *service.TagService
 var pwdService *service.PwdService
 var tokenService *service.TokenService
 var suggestionService *service.SuggestionService
+var albumService *service.AlbumService
+var noteImageService *service.NoteImageService
+var fileService *service.FileService
+var attachService *service.AttachService
+var configService *service.ConfigService
+var emailService *service.EmailService
+var sessionService *service.SessionService
+var themeService *service.ThemeService
 
 var pageSize = 1000
 var defaultSortField = "UpdatedTime"
-var leanoteUserId = "52d26b4e99c37b609a000001"
-var siteUrl = "http://leanote.com"
-var openRegister = true
 
 // 拦截器
 // 不需要拦截的url
 // Index 除了Note之外都不需要
 var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": true,
-		"Login": true, 
+	"Login":              true,
-		"DoLogin": true,
+	"DoLogin":            true,
-		"Logout": true,
+	"Logout":             true,
-		"Register": true,
+	"Register":           true,
-		"DoRegister": true,
+	"DoRegister":         true,
-		"FindPasswword": true,
+	"FindPasswword":      true,
-		"DoFindPassword": true,
+	"DoFindPassword":     true,
-		"FindPassword2": true,
+	"FindPassword2":      true,
-		"FindPasswordUpdate": true,
+	"FindPasswordUpdate": true,
-		"Suggestion": true,
+	"Suggestion":         true,
-	},
+},
+	"Note": map[string]bool{"ToImage": true},
 	"Blog": map[string]bool{"Index": true,
-		"View": true,
+		"View":               true,
-		"AboutMe": true,
+		"AboutMe":            true,
-		"SearchBlog": true,
+		"Cate":               true,
-		},
+		"ListCateLatest":     true,
+		"Search":             true,
+		"GetLikeAndComments": true,
+		"IncReadNum":         true,
+		"ListComments":       true,
+		"Single":             true,
+		"Archive":            true,
+		"Tags":               true,
+	},
 	// 用户的激活与修改邮箱都不需要登录, 通过链接地址
 	"User": map[string]bool{"UpdateEmail": true,
-		"ActiveEmail":true,
+		"ActiveEmail": true,
-		},
+	},
-	"oauth": map[string]bool{"githubCallback": true},
+	"Oauth":  map[string]bool{"GithubCallback": true},
+	"File":   map[string]bool{"OutputImage": true, "OutputFile": true},
+	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
 }
+
 func needValidate(controller, method string) bool {
 	// 在里面
 	if v, ok := commonUrl[controller]; ok {
-		// 不在commonUrl里
+		// 在commonUrl里
 		if _, ok2 := v[method]; ok2 {
 			return false
 		}
 		return true
 	} else {
 		// controller不在这里的, 肯定要验证
-		return true;
+		return true
 	}
 }
 func AuthInterceptor(c *revel.Controller) revel.Result {
@@ -73,13 +89,11 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	var controller = strings.Title(c.Name)
 	var method = strings.Title(c.MethodName)
 
-	
 	// 是否需要验证?
 	if !needValidate(controller, method) {
 		return nil
 	}
 
-	
 	// 验证是否已登录
 	if userId, ok := c.Session["UserId"]; ok && userId != "" {
 		return nil // 已登录
@@ -95,6 +109,36 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	return c.Redirect("/login")
 }
 
+// 最外层init.go调用
+// 获取service, 单例
+func InitService() {
+	notebookService = service.NotebookS
+	noteService = service.NoteS
+	noteContentHistoryService = service.NoteContentHistoryS
+	trashService = service.TrashS
+	shareService = service.ShareS
+	userService = service.UserS
+	tagService = service.TagS
+	blogService = service.BlogS
+	tokenService = service.TokenS
+	noteImageService = service.NoteImageS
+	fileService = service.FileS
+	albumService = service.AlbumS
+	attachService = service.AttachS
+	pwdService = service.PwdS
+	suggestionService = service.SuggestionS
+	authService = service.AuthS
+	configService = service.ConfigS
+	emailService = service.EmailS
+	sessionService = service.SessionS
+	themeService = service.ThemeS
+}
+
+// 初始化博客模板
+// 博客模板不由revel的
+func initBlogTemplate() {
+}
+
 func init() {
 	// interceptor
 	// revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Index{}) // Index.Note自己校验
@@ -103,27 +147,12 @@ func init() {
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Share{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &User{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &File{})
-	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Blog{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Attach{})
+//	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Blog{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &NoteContentHistory{})
 
-	// service 
-	
-	userService = &service.UserService{}
-	noteService = &service.NoteService{}
-	trashService = &service.TrashService{}
-	notebookService = &service.NotebookService{}
-	noteContentHistoryService = &service.NoteContentHistoryService{}
-	authService = &service.AuthService{}
-	shareService = &service.ShareService{}
-	blogService = &service.BlogService{}
-	tagService = &service.TagService{}
-	pwdService = &service.PwdService{}
-	tokenService = &service.TokenService{}
-	suggestionService = &service.SuggestionService{}
-	
 	revel.OnAppStart(func() {
-		leanoteUserId, _ = revel.Config.String("adminUsername")
+		// 博客初始化模板
-		siteUrl, _ = revel.Config.String("site.url")
+		blog.Init()
-		openRegister, _ = revel.Config.Bool("register.open")
 	})
 }

app/controllers/member/MemberBaseController.go

@@ -0,0 +1,59 @@
+package member
+
+import (
+//	"github.com/revel/revel"
+//	"gopkg.in/mgo.v2/bson"
+//	"encoding/json"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/controllers"
+//	"io/ioutil"
+//	"fmt"
+//	"math"
+//	"strconv"
+	"strings"
+)
+
+// 公用Controller, 其它Controller继承它
+type MemberBaseController struct {
+	controllers.BaseController // 不能用*BaseController
+}
+
+// 得到sorterField 和 isAsc
+// okSorter = ['email', 'username']
+func (c MemberBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool){
+	sorter := ""
+	c.Params.Bind(&sorter, "sorter")
+	if sorter == "" {
+		return sorterField, isAsc;
+	}
+	
+	// sorter形式 email-up, email-down
+	s2 := strings.Split(sorter, "-")
+	if len(s2) != 2 {
+		return sorterField, isAsc;
+	}
+	
+	// 必须是可用的sorter
+	if okSorter != nil && len(okSorter) > 0 {
+		if !InArray(okSorter, s2[0]) {
+			return sorterField, isAsc;
+		}
+	}
+	
+	sorterField = strings.Title(s2[0])
+	if s2[1] == "up" {
+		isAsc = true
+	} else {
+		isAsc = false
+	}
+	c.RenderArgs["sorter"] = sorter
+	return sorterField, isAsc;
+}
+
+func (c MemberBaseController) updateConfig(keys []string) {
+	userId := c.GetUserId()
+	for _, key := range keys {
+		v := c.Params.Values.Get(key)
+		configService.UpdateGlobalStringConfig(userId, key, v)
+	}
+}

app/controllers/member/MemberBlogController.go

@@ -0,0 +1,526 @@
+package member
+
+import (
+	"fmt"
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"io/ioutil"
+	"os"
+	"strings"
+	"time"
+	//	"github.com/leanote/leanote/app/lea/blog"
+)
+
+// 博客管理
+
+type MemberBlog struct {
+	MemberBaseController
+}
+
+func (c MemberBlog) common() info.UserBlog {
+	userId := c.GetUserId()
+	userInfo := userService.GetUserInfo(userId)
+	c.RenderArgs["userInfo"] = userInfo
+
+	// 得到博客设置信息
+	c.RenderArgs["allowCustomDomain"] = configService.GetGlobalStringConfig("allowCustomDomain")
+
+	userBlog := blogService.GetUserBlog(userId)
+	c.RenderArgs["userBlog"] = userBlog
+
+	c.SetUserInfo()
+	c.SetLocale()
+	return userBlog
+}
+
+// 得到sorterField 和 isAsc
+// okSorter = ['email', 'username']
+func (c MemberBlog) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool) {
+	sorter := ""
+	c.Params.Bind(&sorter, "sorter")
+	if sorter == "" {
+		return sorterField, isAsc
+	}
+
+	// sorter形式 email-up, email-down
+	s2 := strings.Split(sorter, "-")
+	if len(s2) != 2 {
+		return sorterField, isAsc
+	}
+
+	// 必须是可用的sorter
+	if okSorter != nil && len(okSorter) > 0 {
+		if !InArray(okSorter, s2[0]) {
+			return sorterField, isAsc
+		}
+	}
+
+	sorterField = strings.Title(s2[0])
+	if s2[1] == "up" {
+		isAsc = true
+	} else {
+		isAsc = false
+	}
+	c.RenderArgs["sorter"] = sorter
+	return sorterField, isAsc
+}
+
+// 博客列表
+var userPageSize = 15
+
+func (c MemberBlog) Index(sorter, keywords string) revel.Result {
+	userId := c.GetUserId()
+	userInfo := userService.GetUserInfo(userId)
+	c.RenderArgs["userInfo"] = userInfo
+
+	c.RenderArgs["title"] = "Posts"
+	pageNumber := c.GetPage()
+	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"title", "urlTitle", "updatedTime", "publicTime", "createdTime"})
+	pageInfo, blogs := blogService.ListAllBlogs(c.GetUserId(), "", keywords, false, pageNumber, userPageSize, sorterField, isAsc)
+	c.RenderArgs["pageInfo"] = pageInfo
+	c.RenderArgs["blogs"] = blogs
+	c.RenderArgs["keywords"] = keywords
+
+	userAndBlog := userService.GetUserAndBlog(c.GetUserId())
+	c.RenderArgs["userAndBlog"] = userAndBlog
+
+	return c.RenderTemplate("member/blog/list.html")
+}
+
+// 修改笔记的urlTitle
+func (c MemberBlog) UpdateBlogUrlTitle(noteId, urlTitle string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Item = blogService.UpateBlogUrlTitle(c.GetUserId(), noteId, urlTitle)
+	return c.RenderJson(re)
+}
+
+// 修改笔记的urlTitle
+func (c MemberBlog) UpdateBlogAbstract(noteId string) revel.Result {
+	c.RenderArgs["title"] = "Update Post Abstract"
+	note := noteService.GetNoteAndContent(noteId, c.GetUserId())
+	if !note.Note.IsBlog {
+		return c.E404()
+	}
+	c.RenderArgs["note"] = note
+	c.RenderArgs["noteId"] = noteId
+	return c.RenderTemplate("member/blog/update_abstract.html")
+}
+func (c MemberBlog) DoUpdateBlogAbstract(noteId, imgSrc, desc, abstract string) revel.Result {
+
+	re := info.NewRe()
+	re.Ok = blogService.UpateBlogAbstract(c.GetUserId(), noteId, imgSrc, desc, abstract)
+	return c.RenderJson(re)
+}
+
+// 基本信息设置
+func (c MemberBlog) Base() revel.Result {
+	c.common()
+	c.RenderArgs["title"] = "Blog Base Info"
+	return c.RenderTemplate("member/blog/base.html")
+}
+func (c MemberBlog) Comment() revel.Result {
+	c.common()
+	c.RenderArgs["title"] = "Comment"
+	return c.RenderTemplate("member/blog/comment.html")
+}
+
+func (c MemberBlog) Paging() revel.Result {
+	c.common()
+	c.RenderArgs["title"] = "Paging"
+	return c.RenderTemplate("member/blog/paging.html")
+}
+
+func (c MemberBlog) Cate() revel.Result {
+	userBlog := c.common()
+	c.RenderArgs["title"] = "Cate"
+
+	notebooks := blogService.ListBlogNotebooks(c.GetUserId())
+	notebooksMap := map[string]info.Notebook{}
+	for _, each := range notebooks {
+		notebooksMap[each.NotebookId.Hex()] = each
+	}
+
+	var i = 0
+	notebooks2 := make([]info.Notebook, len(notebooks))
+
+	// 先要保证已有的是正确的排序
+	cateIds := userBlog.CateIds
+	has := map[string]bool{} // cateIds中有的
+	if cateIds != nil && len(cateIds) > 0 {
+		for _, cateId := range cateIds {
+			if n, ok := notebooksMap[cateId]; ok {
+				notebooks2[i] = n
+				i++
+				has[cateId] = true
+			}
+		}
+	}
+	// 之后
+	for _, each := range notebooks {
+		id := each.NotebookId.Hex()
+		if !has[id] {
+			notebooks2[i] = each
+			i++
+		}
+	}
+	c.RenderArgs["notebooks"] = notebooks2
+
+	return c.RenderTemplate("member/blog/cate.html")
+}
+
+// 修改分类排序
+func (c MemberBlog) UpateCateIds(cateIds []string) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.UpateCateIds(c.GetUserId(), cateIds)
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) UpdateCateUrlTitle(cateId, urlTitle string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Item = blogService.UpateCateUrlTitle(c.GetUserId(), cateId, urlTitle)
+	return c.RenderJson(re)
+}
+
+// 保存之, 包含增加与保存
+func (c MemberBlog) DoAddOrUpdateSingle(singleId, title, content string) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.AddOrUpdateSingle(c.GetUserId(), singleId, title, content)
+	return c.RenderJson(re)
+}
+func (c MemberBlog) AddOrUpdateSingle(singleId string) revel.Result {
+	c.common()
+	c.RenderArgs["title"] = "Add Single"
+	c.RenderArgs["singleId"] = singleId
+	if singleId != "" {
+		c.RenderArgs["title"] = "Update Single"
+		c.RenderArgs["single"] = blogService.GetSingle(singleId)
+	}
+	return c.RenderTemplate("member/blog/add_single.html")
+}
+func (c MemberBlog) SortSingles(singleIds []string) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.SortSingles(c.GetUserId(), singleIds)
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) DeleteSingle(singleId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.DeleteSingle(c.GetUserId(), singleId)
+	return c.RenderJson(re)
+}
+
+// 修改页面标题
+func (c MemberBlog) UpdateSingleUrlTitle(singleId, urlTitle string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Item = blogService.UpdateSingleUrlTitle(c.GetUserId(), singleId, urlTitle)
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) Single() revel.Result {
+	c.common()
+	c.RenderArgs["title"] = "Cate"
+	c.RenderArgs["singles"] = blogService.GetSingles(c.GetUserId())
+
+	return c.RenderTemplate("member/blog/single.html")
+}
+
+// 主题
+func (c MemberBlog) Theme() revel.Result {
+	c.common()
+	activeTheme, otherThemes := themeService.GetUserThemes(c.GetUserId())
+	c.RenderArgs["activeTheme"] = activeTheme
+	c.RenderArgs["otherThemes"] = otherThemes
+
+	c.RenderArgs["optionThemes"] = themeService.GetDefaultThemes()
+
+	c.RenderArgs["title"] = "Theme"
+	return c.RenderTemplate("member/blog/theme.html")
+}
+
+// 编辑主题
+var baseTpls = []string{"header.html", "footer.html", "index.html", "cate.html", "search.html", "post.html", "single.html", "tags.html", "tag_posts.html", "archive.html", "share_comment.html", "404.html", "theme.json", "style.css", "blog.js"}
+
+func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result {
+	// 查看用户是否有该theme, 若没有则复制default之
+	// 得到主题的文件列表
+	userBlog := blogService.GetUserBlog(c.GetUserId())
+	if themeId == "" {
+		_, themeId = themeService.NewThemeForFirst(userBlog)
+		return c.Redirect("/member/blog/updateTheme?themeId=" + themeId)
+	}
+
+	c.common()
+	c.RenderArgs["title"] = "Upate Theme"
+	c.RenderArgs["isNew"] = isNew
+
+	// 先复制之
+	c.RenderArgs["themeId"] = themeId
+
+	// 得到脚本目录
+	userId := c.GetUserId()
+
+	theme := themeService.GetTheme(userId, themeId)
+	if theme.ThemeId == "" {
+		return c.E404()
+	}
+	c.RenderArgs["theme"] = theme
+
+	path := revel.BasePath + "/" + theme.Path
+
+	tpls := ListDir(path)
+	myTpls := make([]string, len(baseTpls))
+	tplMap := map[string]bool{}
+	for i, t := range baseTpls {
+		myTpls[i] = t
+		tplMap[t] = true
+	}
+	// 得到没有的tpls
+	for _, t := range tpls {
+		if t == "images" {
+			continue
+		}
+		if !tplMap[t] {
+			myTpls = append(myTpls, t)
+		}
+	}
+
+	c.RenderArgs["myTpls"] = myTpls
+
+	return c.RenderTemplate("member/blog/update_theme.html")
+}
+
+// 得到文件内容
+func (c MemberBlog) GetTplContent(themeId string, filename string) revel.Result {
+	re := info.NewRe()
+	re.Ok = true
+	re.Item = themeService.GetTplContent(c.GetUserId(), themeId, filename)
+
+	return c.RenderJson(re)
+}
+func (c MemberBlog) UpdateTplContent(themeId, filename, content string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = themeService.UpdateTplContent(c.GetUserId(), themeId, filename, content)
+	return c.RenderRe(re)
+}
+
+func (c MemberBlog) DeleteTpl(themeId, filename string) revel.Result {
+	re := info.NewRe()
+	re.Ok = themeService.DeleteTpl(c.GetUserId(), themeId, filename)
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) ListThemeImages(themeId string) revel.Result {
+	re := info.NewRe()
+	userId := c.GetUserId()
+	path := themeService.GetThemeAbsolutePath(userId, themeId) + "/images"
+	os.MkdirAll(path, 0755)
+	images := ListDir(path)
+	re.List = images
+	re.Ok = true
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) DeleteThemeImage(themeId, filename string) revel.Result {
+	re := info.NewRe()
+	path := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images/" + filename
+	re.Ok = DeleteFile(path)
+	return c.RenderJson(re)
+}
+
+// 上传主题图片
+func (c MemberBlog) UploadThemeImage(themeId string) revel.Result {
+	re := c.uploadImage(themeId)
+	c.RenderArgs["fileUrlPath"] = re.Id
+	c.RenderArgs["resultCode"] = re.Code
+	c.RenderArgs["resultMsg"] = re.Msg
+	return c.RenderTemplate("file/blog_logo.html")
+}
+func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
+	var fileId = ""
+	var resultCode = 0     // 1表示正常
+	var resultMsg = "内部错误" // 错误信息
+	var Ok = false
+
+	defer func() {
+		re.Id = fileId // 只是id, 没有其它信息
+		re.Code = resultCode
+		re.Msg = resultMsg
+		re.Ok = Ok
+	}()
+
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		return re
+	}
+	defer file.Close()
+	// 生成上传路径
+	dir := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images"
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		return re
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+
+	var ext string
+
+	_, ext = SplitFilename(filename)
+	if ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg" {
+		resultMsg = "不是图片"
+		return re
+	}
+
+	filename = filename
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		LogJ(err)
+		return re
+	}
+
+	// > 2M?
+	if len(data) > 5*1024*1024 {
+		resultCode = 0
+		resultMsg = "图片大于2M"
+		return re
+	}
+
+	toPath := dir + "/" + filename
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		LogJ(err)
+		return re
+	}
+	TransToGif(toPath, 0, true)
+	resultCode = 1
+	resultMsg = "上传成功!"
+
+	return re
+}
+
+//
+// 使用主题
+func (c MemberBlog) ActiveTheme(themeId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = themeService.ActiveTheme(c.GetUserId(), themeId)
+	return c.RenderJson(re)
+}
+
+// 删除主题
+func (c MemberBlog) DeleteTheme(themeId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = themeService.DeleteTheme(c.GetUserId(), themeId)
+	return c.RenderJson(re)
+}
+
+// 管理员公开主题
+func (c MemberBlog) PublicTheme(themeId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = themeService.PublicTheme(c.GetUserId(), themeId)
+	return c.RenderJson(re)
+}
+
+// 导出
+func (c MemberBlog) ExportTheme(themeId string) revel.Result {
+	re := info.NewRe()
+	var path string
+	re.Ok, path = themeService.ExportTheme(c.GetUserId(), themeId)
+	if !re.Ok {
+		return c.RenderText("error...")
+	}
+	fw, err := os.Open(path)
+	if err != nil {
+		return c.RenderText("error")
+	}
+	return c.RenderBinary(fw, GetFilename(path), revel.Attachment, time.Now()) // revel.Attachment
+}
+
+// 导入主题
+func (c MemberBlog) ImportTheme() revel.Result {
+	re := info.NewRe()
+
+	file, handel, err := c.Request.FormFile("file")
+	if err != nil {
+		re.Msg = fmt.Sprintf("%v", err)
+		return c.RenderJson(re)
+
+	}
+	defer file.Close()
+	// 生成上传路径
+	userId := c.GetUserId()
+	dir := revel.BasePath + "/public/upload/" + userId + "/tmp"
+	err = os.MkdirAll(dir, 0755)
+	if err != nil {
+		re.Msg = fmt.Sprintf("%v", err)
+		return c.RenderJson(re)
+	}
+	// 生成新的文件名
+	filename := handel.Filename
+
+	var ext string
+	_, ext = SplitFilename(filename)
+	if ext != ".zip" {
+		re.Msg = "请上传zip文件"
+		return c.RenderJson(re)
+	}
+
+	filename = filename
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return c.RenderJson(re)
+	}
+
+	// > 10M?
+	if len(data) > 10*1024*1024 {
+		re.Msg = "文件大于10M"
+		return c.RenderJson(re)
+	}
+
+	toPath := dir + "/" + filename
+	err = ioutil.WriteFile(toPath, data, 0777)
+	if err != nil {
+		re.Msg = fmt.Sprintf("%v", err)
+		return c.RenderJson(re)
+	}
+
+	// 上传好后, 增加之
+	re.Ok, re.Msg = themeService.ImportTheme(c.GetUserId(), toPath)
+	return c.RenderRe(re)
+}
+
+// 安装
+func (c MemberBlog) InstallTheme(themeId string) revel.Result {
+	re := info.NewRe()
+	re.Ok = themeService.InstallTheme(c.GetUserId(), themeId)
+	return c.RenderJson(re)
+}
+
+// 新建主题
+func (c MemberBlog) NewTheme() revel.Result {
+	_, themeId := themeService.NewTheme(c.GetUserId())
+	return c.Redirect("/member/blog/updateTheme?isNew=1&themeId=" + themeId)
+}
+
+//-----------
+//
+func (c MemberBlog) SetUserBlogBase(userBlog info.UserBlogBase) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.UpdateUserBlogBase(c.GetUserId(), userBlog)
+	return c.RenderJson(re)
+}
+func (c MemberBlog) SetUserBlogComment(userBlog info.UserBlogComment) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.UpdateUserBlogComment(c.GetUserId(), userBlog)
+	return c.RenderJson(re)
+}
+func (c MemberBlog) SetUserBlogStyle(userBlog info.UserBlogStyle) revel.Result {
+	re := info.NewRe()
+	re.Ok = blogService.UpdateUserBlogStyle(c.GetUserId(), userBlog)
+	return c.RenderJson(re)
+}
+
+func (c MemberBlog) SetUserBlogPaging(perPageSize int, sortField string, isAsc bool) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = blogService.UpdateUserBlogPaging(c.GetUserId(), perPageSize, sortField, isAsc)
+	return c.RenderRe(re)
+}

app/controllers/member/MemberGroupController.go

@@ -0,0 +1,58 @@
+package member
+
+import (
+	"github.com/revel/revel"
+	"github.com/leanote/leanote/app/info"
+)
+
+// 分组管理
+type MemberGroup struct {
+	MemberBaseController
+}
+
+// 首页, 显示所有分组和用户
+func (c MemberGroup) Index() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "My Group"
+	c.RenderArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId())
+	return c.RenderTemplate("member/group/index.html");
+}
+
+// 添加分组
+func (c MemberGroup) AddGroup(title string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Item = groupService.AddGroup(c.GetUserId(), title)
+	return c.RenderJson(re)
+}
+
+func (c MemberGroup) UpdateGroupTitle(groupId, title string) revel.Result {
+	re := info.NewRe()
+	re.Ok = groupService.UpdateGroupTitle(c.GetUserId(), groupId, title)
+	return c.RenderJson(re)
+}
+
+func (c MemberGroup) DeleteGroup(groupId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = groupService.DeleteGroup(c.GetUserId(), groupId)
+	return c.RenderRe(re)
+}
+
+// 添加用户
+func (c MemberGroup) AddUser(groupId, email string) revel.Result {
+	re := info.NewRe()
+	userInfo := userService.GetUserInfoByAny(email)
+	if userInfo.UserId == "" {
+		re.Msg = "userNotExists"
+	} else {
+		re.Ok, re.Msg = groupService.AddUser(c.GetUserId(), groupId, userInfo.UserId.Hex())
+		re.Item = userInfo
+	}
+	return c.RenderRe(re)
+}
+
+func (c MemberGroup) DeleteUser(groupId, userId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = groupService.DeleteUser(c.GetUserId(), groupId, userId)
+	return c.RenderRe(re)
+}

app/controllers/member/MemberIndexController.go

@@ -0,0 +1,37 @@
+package member
+
+import (
+	"github.com/revel/revel"
+)
+
+// admin 首页
+
+type MemberIndex struct {
+	MemberBaseController
+}
+
+// admin 主页
+func (c MemberIndex) Index() revel.Result {
+	c.SetUserInfo()
+	c.RenderArgs["title"] = "Leanote Member Center"
+	
+	c.RenderArgs["countNote"] = noteService.CountNote(c.GetUserId())
+	c.RenderArgs["countBlog"] = noteService.CountBlog(c.GetUserId())
+	
+	c.SetLocale()
+	
+	return c.RenderTemplate("member/index.html");
+}
+
+// 模板
+func (c MemberIndex) T(t string) revel.Result {
+	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.RenderArgs["arr"] = configService.GlobalArrayConfigs
+	c.RenderArgs["map"] = configService.GlobalMapConfigs
+	c.RenderArgs["arrMap"] = configService.GlobalArrMapConfigs
+	return c.RenderTemplate("admin/" + t + ".html")
+}
+
+func (c MemberIndex) GetView(view string) revel.Result {
+	return c.RenderTemplate("admin/" + view);
+}

app/controllers/member/MemberUserController.go

@@ -0,0 +1,46 @@
+package member
+
+import (
+	"github.com/revel/revel"
+)
+
+// 帐户信息
+
+type MemberUser struct {
+	MemberBaseController
+}
+
+func (c MemberUser) Username() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "Username"
+	return c.RenderTemplate("member/user/username.html");
+}
+
+func (c MemberUser) Email() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "Email"
+	return c.RenderTemplate("member/user/email.html");
+}
+
+func (c MemberUser) Password() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "Password"
+	return c.RenderTemplate("member/user/password.html");
+}
+
+func (c MemberUser) Avatar() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "Avatar"
+	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
+	return c.RenderTemplate("member/user/avatar.html");
+}
+func (c MemberUser) AddAccount() revel.Result {
+	c.SetUserInfo()
+	c.SetLocale()
+	c.RenderArgs["title"] = "Add Account"
+	return c.RenderTemplate("member/user/add_account.html");
+}

app/controllers/member/init.go

@@ -0,0 +1,134 @@
+package member
+
+import (
+	"github.com/leanote/leanote/app/service"
+	"github.com/leanote/leanote/app/info"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+//	"strings"
+)
+
+var userService *service.UserService
+var groupService *service.GroupService
+var noteService *service.NoteService
+var trashService *service.TrashService
+var notebookService *service.NotebookService
+var noteContentHistoryService *service.NoteContentHistoryService
+var authService *service.AuthService
+var shareService *service.ShareService
+var blogService *service.BlogService
+var tagService *service.TagService
+var pwdService *service.PwdService
+var tokenService *service.TokenService
+var suggestionService *service.SuggestionService 
+var albumService *service.AlbumService 
+var noteImageService *service.NoteImageService 
+var fileService *service.FileService
+var attachService *service.AttachService
+var configService *service.ConfigService
+var emailService *service.EmailService
+var upgradeService *service.UpgradeService
+var themeService *service.ThemeService
+
+// 拦截器
+// 不需要拦截的url
+// Index 除了Note之外都不需要
+var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": true, 
+		"Login": true, 
+		"DoLogin": true,
+		"Logout": true,
+		"Register": true,
+		"DoRegister": true,
+		"FindPasswword": true,
+		"DoFindPassword": true,
+		"FindPassword2": true,
+		"FindPasswordUpdate": true,
+		"Suggestion": true,
+	},
+	"Blog": map[string]bool{"Index": true,
+		"View": true,
+		"AboutMe": true,
+		"SearchBlog": true,
+		},
+	// 用户的激活与修改邮箱都不需要登录, 通过链接地址
+	"User": map[string]bool{"UpdateEmail": true,
+		"ActiveEmail":true,
+		},
+	"Oauth": map[string]bool{"GithubCallback": true},
+	"File": map[string]bool{"OutputImage": true, "OutputFile": true},
+	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
+}
+func needValidate(controller, method string) bool {
+	// 在里面
+	if v, ok := commonUrl[controller]; ok {
+		// 在commonUrl里
+		if _, ok2 := v[method]; ok2 {
+			return false
+		}
+		return true
+	} else {
+		// controller不在这里的, 肯定要验证
+		return true;
+	}
+}
+func AuthInterceptor(c *revel.Controller) revel.Result {
+	// 全部变成首字大写
+	/*
+	var controller = strings.Title(c.Name)
+	var method = strings.Title(c.MethodName)
+	// 是否需要验证?
+	if !needValidate(controller, method) {
+		return nil
+	}
+	*/
+	
+	// 验证是否已登录
+	// 必须是管理员
+	if _, ok := c.Session["Username"]; ok {
+		return nil // 已登录
+	}
+	
+	// 没有登录, 判断是否是ajax操作
+	if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" {
+		re := info.NewRe()
+		re.Msg = "NOTLOGIN"
+		return c.RenderJson(re)
+	}
+	
+	return c.Redirect("/login")
+}
+
+// 最外层init.go调用
+// 获取service, 单例
+func InitService() {
+	notebookService = service.NotebookS
+	noteService = service.NoteS
+	noteContentHistoryService = service.NoteContentHistoryS
+	trashService = service.TrashS
+	shareService = service.ShareS
+	userService = service.UserS
+	groupService = service.GroupS
+	tagService = service.TagS
+	blogService = service.BlogS
+	tokenService = service.TokenS
+	noteImageService = service.NoteImageS
+	fileService = service.FileS
+	albumService= service.AlbumS
+	attachService = service.AttachS
+	pwdService = service.PwdS
+	suggestionService = service.SuggestionS
+	authService = service.AuthS
+	configService = service.ConfigS
+	emailService = service.EmailS
+	upgradeService = service.UpgradeS
+	themeService = service.ThemeS
+}
+
+func init() {
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &MemberIndex{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &MemberUser{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &MemberBlog{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &MemberGroup{})
+	revel.OnAppStart(func() {
+	})
+}

app/controllers/member/个人中心.md

@@ -0,0 +1,2 @@
+包括基本信息设置
+博客设置

app/db/Mgo.go

@@ -2,9 +2,10 @@ package db
 
 import (
 	"fmt"
-	"labix.org/v2/mgo"
-	"labix.org/v2/mgo/bson"
 	"github.com/revel/revel"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // Init mgo and the common DAO
@@ -23,9 +24,12 @@ var ShareNotebooks *mgo.Collection
 var HasShareNotes *mgo.Collection
 var Blogs *mgo.Collection
 var Users *mgo.Collection
+var Groups *mgo.Collection
+var GroupUsers *mgo.Collection
 
 var Tags *mgo.Collection
-var TagNotes *mgo.Collection
+var NoteTags *mgo.Collection
+var TagCounts *mgo.Collection
 
 var UserBlogs *mgo.Collection
 
@@ -33,13 +37,35 @@ var Tokens *mgo.Collection
 
 var Suggestions *mgo.Collection
 
+// Album & file(image)
+var Albums *mgo.Collection
+var Files *mgo.Collection
+var Attachs *mgo.Collection
+
+var NoteImages *mgo.Collection
+var Configs *mgo.Collection
+var EmailLogs *mgo.Collection
+
+// blog
+var BlogLikes *mgo.Collection
+var BlogComments *mgo.Collection
+var Reports *mgo.Collection
+var BlogSingles *mgo.Collection
+var Themes *mgo.Collection
+
+// session
+var Sessions *mgo.Collection
+
 // 初始化时连接数据库
-func Init() {
+func Init(url, dbname string) {
-	var url string
+	ok := true
-	var ok bool
+	config := revel.Config
-	config := revel.Config;
+	if url == "" { 
-	url, ok = config.String("db.url")
+		url, ok = config.String("db.url")
-	dbname, _ := config.String("db.dbname")
+	}
+	if dbname == "" {
+		dbname, _ = config.String("db.dbname")
+	}
 	if !ok {
 		host, _ := revel.Config.String("db.host")
 		port, _ := revel.Config.String("db.port")
@@ -49,8 +75,9 @@ func Init() {
 		if username == "" || password == "" {
 			usernameAndPassword = ""
 		}
-		url = "mongodb://" + usernameAndPassword  + host + ":" + port + "/" + dbname
+		url = "mongodb://" + usernameAndPassword + host + ":" + port + "/" + dbname
 	}
+	Log(url)
 
 	// [mongodb://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
 	// mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
@@ -80,28 +107,48 @@ func Init() {
 
 	// user
 	Users = Session.DB(dbname).C("users")
+	// group 
+	Groups = Session.DB(dbname).C("groups")
+	GroupUsers = Session.DB(dbname).C("group_users")
 
 	// blog
 	Blogs = Session.DB(dbname).C("blogs")
 
 	// tag
 	Tags = Session.DB(dbname).C("tags")
-	TagNotes = Session.DB(dbname).C("tag_notes")
+	NoteTags = Session.DB(dbname).C("note_tags")
+	TagCounts = Session.DB(dbname).C("tag_count")
 
 	// blog
 	UserBlogs = Session.DB(dbname).C("user_blogs")
+	BlogSingles = Session.DB(dbname).C("blog_singles")
+	Themes = Session.DB(dbname).C("themes")
 
 	// find password
 	Tokens = Session.DB(dbname).C("tokens")
 
-	// 
+	// Suggestion
 	Suggestions = Session.DB(dbname).C("suggestions")
-}
 
-func init() { 
+	// Album & file
-	revel.OnAppStart(func() {
+	Albums = Session.DB(dbname).C("albums")
-		Init()
+	Files = Session.DB(dbname).C("files")
-	})
+	Attachs = Session.DB(dbname).C("attachs")
+
+	NoteImages = Session.DB(dbname).C("note_images")
+
+	Configs = Session.DB(dbname).C("configs")
+	EmailLogs = Session.DB(dbname).C("email_logs")
+
+	// 社交
+	BlogLikes = Session.DB(dbname).C("blog_likes")
+	BlogComments = Session.DB(dbname).C("blog_comments")
+
+	// 举报
+	Reports = Session.DB(dbname).C("reports")
+
+	// session
+	Sessions = Session.DB(dbname).C("sessions")
 }
 
 func close() {
@@ -143,22 +190,29 @@ func UpdateByIdAndUserId2(collection *mgo.Collection, id, userId bson.ObjectId,
 	return Err(err)
 }
 func UpdateByIdAndUserIdField(collection *mgo.Collection, id, userId, field string, value interface{}) bool {
-	return UpdateByIdAndUserId(collection, id, userId, bson.M{"$set": bson.M{field:value}})
+	return UpdateByIdAndUserId(collection, id, userId, bson.M{"$set": bson.M{field: value}})
 }
 func UpdateByIdAndUserIdMap(collection *mgo.Collection, id, userId string, v bson.M) bool {
 	return UpdateByIdAndUserId(collection, id, userId, bson.M{"$set": v})
 }
+
 func UpdateByIdAndUserIdField2(collection *mgo.Collection, id, userId bson.ObjectId, field string, value interface{}) bool {
-	return UpdateByIdAndUserId2(collection, id, userId, bson.M{"$set": bson.M{field:value}})
+	return UpdateByIdAndUserId2(collection, id, userId, bson.M{"$set": bson.M{field: value}})
 }
 func UpdateByIdAndUserIdMap2(collection *mgo.Collection, id, userId bson.ObjectId, v bson.M) bool {
 	return UpdateByIdAndUserId2(collection, id, userId, bson.M{"$set": v})
 }
+
 //
 func UpdateByQField(collection *mgo.Collection, q interface{}, field string, value interface{}) bool {
 	_, err := collection.UpdateAll(q, bson.M{"$set": bson.M{field: value}})
 	return Err(err)
 }
+func UpdateByQI(collection *mgo.Collection, q interface{}, v interface{}) bool {
+	_, err := collection.UpdateAll(q, bson.M{"$set": v})
+	return Err(err)
+}
+
 // 查询条件和值
 func UpdateByQMap(collection *mgo.Collection, q interface{}, v interface{}) bool {
 	_, err := collection.UpdateAll(q, bson.M{"$set": v})
@@ -224,6 +278,7 @@ func GetByQWithFields(collection *mgo.Collection, q bson.M, fields []string, i i
 	}
 	collection.Find(q).Select(selector).One(i)
 }
+
 // 查询某些字段, q是查询条件, fields是字段名列表
 func ListByQWithFields(collection *mgo.Collection, q bson.M, fields []string, i interface{}) {
 	selector := make(bson.M, len(fields))
@@ -239,6 +294,11 @@ func GetByIdAndUserId2(collection *mgo.Collection, id, userId bson.ObjectId, i i
 	collection.Find(GetIdAndUserIdBsonQ(id, userId)).One(i)
 }
 
+// 按field去重
+func Distinct(collection *mgo.Collection, q bson.M, field string, i interface{}) {
+	collection.Find(q).Distinct(field, i)
+}
+
 //----------------------
 
 func Count(collection *mgo.Collection, q interface{}) int {
@@ -272,7 +332,7 @@ func Err(err error) bool {
 		fmt.Println(err)
 		// 删除时, 查找
 		if err.Error() == "not found" {
-			return true;
+			return true
 		}
 		return false
 	}

app/i18n/i18n.go

@@ -10,8 +10,8 @@ import (
 
 // convert revel msg to js msg
 
-var msgBasePath = "/Users/life/Documents/Go/package/src/leanote/messages/"
+var msgBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/messages/"
-var targetBasePath = "/Users/life/Documents/Go/package/src/leanote/public/js/i18n/"
+var targetBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/public/js/i18n/"
 func parse(filename string) {
 	file, err := os.Open(msgBasePath + filename)
 	reader := bufio.NewReader(file)
@@ -62,11 +62,28 @@ func parse(filename string) {
 	if err2 != nil {
 		file2, err2 = os.Create(targetName)
 	}
-	file2.WriteString("var MSG = " + str + ";")
+	file2.WriteString("var MSG = " + str + ";" + `
+function getMsg(key, data) {
+	var msg = MSG[key]
+	if(msg) {
+		if(data) {
+			if(!isArray(data)) {
+				data = [data];
+			}
+			for(var i = 0; i < data.length; ++i) {
+				msg = msg.replace("%s", data[i]);
+			}
+		}
+		return msg;
+	}
+	return key;
+}`)
 }
 
 // 生成js的i18n文件
 func main() {
 	parse("msg.en")
 	parse("msg.zh")
+	parse("blog.zh")
+	parse("blog.en")
 }

app/info/AlbumInfo.go

@@ -0,0 +1,15 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+type Album struct {
+	AlbumId     bson.ObjectId `bson:"_id,omitempty"` //
+	UserId      bson.ObjectId `bson:"UserId"`
+	Name        string        `Name` // album name
+	Type        int           `Type` // type, the default is image: 0
+	Seq         int           `Seq`
+	CreatedTime time.Time     `CreatedTime`
+}

app/info/Api.go

@@ -0,0 +1,119 @@
+package info
+
+import (
+	"time"
+	"gopkg.in/mgo.v2/bson"
+)
+
+//---------
+// 数据结构
+//---------
+type NoteFile struct {
+	FileId string // 服务器端Id
+	LocalFileId string // 客户端Id
+	Type string // images/png, doc, xls, 根据fileName确定
+	Title string
+	HasBody bool // 传过来的值是否要更新内容
+	IsAttach bool // 是否是附件, 不是附件就是图片
+}
+type ApiNote struct {
+	NoteId     string
+	NotebookId string
+	UserId     string
+	Title      string
+	Desc       string
+//	ImgSrc     string
+	Tags       []string
+	Abstract   string
+	Content    string
+	IsMarkdown bool
+//	FromUserId string // 为共享而新建
+	IsBlog     bool   // 是否是blog, 更新note不需要修改, 添加note时才有可能用到, 此时需要判断notebook是否设为Blog
+	IsTrash bool
+	IsDeleted bool
+	Usn int
+	Files []NoteFile
+	CreatedTime time.Time
+	UpdatedTime time.Time
+	PublicTime time.Time
+}
+
+
+// 内容
+type ApiNoteContent struct {
+	NoteId bson.ObjectId `bson:"_id,omitempty"`
+	UserId bson.ObjectId `bson:"UserId"`
+
+	Content  string `Content`
+
+//	CreatedTime   time.Time     `CreatedTime`
+//	UpdatedTime   time.Time     `UpdatedTime`
+}
+
+// 转换
+func NoteToApiNote(note Note, files []NoteFile) ApiNote {
+	apiNote := ApiNote{}
+	return apiNote
+}
+
+//----------
+// 用户信息
+//----------
+
+type ApiUser struct {
+	UserId  string
+	Username string
+	Email string
+	Verified bool
+	Logo string
+}
+
+//----------
+// Notebook
+//----------
+type ApiNotebook struct {
+	NotebookId       bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
+	UserId           bson.ObjectId `bson:"UserId"`
+	ParentNotebookId bson.ObjectId `bson:"ParentNotebookId,omitempty"` // 上级
+	Seq              int           `Seq`                               // 排序
+	Title            string        `Title`                             // 标题
+	UrlTitle         string        `UrlTitle`                          // Url标题 2014/11.11加
+	IsBlog           bool          `IsBlog,omitempty`                  // 是否是Blog 2013/12/29 新加
+	CreatedTime      time.Time     `CreatedTime,omitempty`
+	UpdatedTime      time.Time     `UpdatedTime,omitempty`
+	Usn int `Usn` // UpdateSequenceNum 
+	IsDeleted bool `IsDeleted`
+}
+
+//---------
+// api 返回
+//---------
+
+// 一般返回
+type ApiRe struct {
+	Ok bool
+	Msg string
+}
+
+func NewApiRe() ApiRe {
+	return ApiRe{Ok: false}
+}
+
+// auth
+type AuthOk struct {
+	Ok bool
+	Token string
+	UserId bson.ObjectId
+	Email string
+	Username string
+}
+
+// 供notebook, note, tag更新的返回数据用
+type ReUpdate struct {
+	Ok bool
+	Msg string
+	Usn int
+}
+func NewReUpdate() ReUpdate {
+	return ReUpdate{Ok: false}
+}

app/info/AttachInfo.go

@@ -0,0 +1,21 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// Attach belongs to note
+type Attach struct {
+	AttachId         bson.ObjectId `bson:"_id,omitempty"` //
+	NoteId         bson.ObjectId `bson:"NoteId"` // 
+	UploadUserId         bson.ObjectId `bson:"UploadUserId"` // 可以不是note owner, 协作者userId
+	Name           string        `Name`  // file name, md5, such as 13232312.doc
+	Title          string        `Title` // raw file name
+	Size           int64         `Size`  // file size (byte)
+	Type           string        `Type`  // file type, "doc" = word
+	Path           string        `Path`  // the file path such as: files/userId/attachs/adfadf.doc
+	CreatedTime    time.Time     `CreatedTime`
+	
+	// FromFileId bson.ObjectId `bson:"FromFileId,omitempty"` // copy from fileId, for collaboration
+}

app/info/BlogCustom.go

@@ -0,0 +1,57 @@
+package info
+
+import (
+	"time"
+)
+
+// 仅仅为了博客的主题
+
+type BlogInfoCustom struct {
+	UserId string
+	Username string
+	UserLogo string
+	Title string
+	SubTitle string
+	Logo string
+	OpenComment bool
+	CommentType string
+	ThemeId string
+	SubDomain string
+	Domain string
+}
+
+type Post struct {
+	NoteId string
+	Title string
+	UrlTitle string
+	ImgSrc string
+	CreatedTime time.Time
+	UpdatedTime time.Time
+	PublicTime time.Time
+	Desc string
+	Abstract string
+	Content string
+	Tags []string
+	CommentNum int
+	ReadNum int
+	LikeNum int
+	IsMarkdown bool
+}
+// 归档
+type ArchiveMonth struct {
+	Month int
+	Posts []*Post
+}
+type Archive struct {
+	Year int	
+	MonthAchives []ArchiveMonth
+	Posts []*Post
+}
+
+type Cate struct {
+	CateId string
+	ParentCateId string
+	Title string
+	UrlTitle string
+	Children []*Cate
+}

app/info/BlogInfo.go

@@ -1,43 +1,128 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
+	"time"
 )
 
 // 只为blog, 不为note
 
 type BlogItem struct {
 	Note
+	Abstract string 
 	Content string // 可能是content的一部分, 截取. 点击more后就是整个信息了
 	HasMore bool   // 是否是否还有
+	User    User   // 用户信息
 }
 
 type UserBlogBase struct {
-	Logo       string        `Logo`
+	Logo     string `Logo`
-	Title      string        `Title`      // 标题
+	Title    string `Title`    // 标题
-	SubTitle   string        `SubTitle`   // 副标题
+	SubTitle string `SubTitle` // 副标题
-	AboutMe    string        `AboutMe` // 关于我
+//	AboutMe  string `AboutMe`  // 关于我
 }
 
 type UserBlogComment struct {
-	CanComment bool          `CanComment` // 是否可以评论
+	CanComment  bool   `CanComment`  // 是否可以评论
-	DisqusId   string        `DisqusId`
+	CommentType string `CommentType` // default 或 disqus
+	DisqusId    string `DisqusId`
 }
 
 type UserBlogStyle struct {
-	Style      string        `Style`   // 风格
+	Style string `Style` // 风格
+	Css   string `Css`   // 自定义css
 }
 
 // 每个用户一份博客设置信息
 type UserBlog struct {
-	UserId     bson.ObjectId `bson:"_id"` // 谁的
+	UserId   bson.ObjectId `bson:"_id"` // 谁的
-	Logo       string        `Logo`
+	Logo     string        `Logo`
-	Title      string        `Title`      // 标题
+	Title    string        `Title`    // 标题
-	SubTitle   string        `SubTitle`   // 副标题
+	SubTitle string        `SubTitle` // 副标题
-	AboutMe    string        `AboutMe` // 关于我
+	AboutMe  string        `AboutMe`  // 关于我, 弃用
 
-	CanComment bool          `CanComment` // 是否可以评论
+	CanComment bool `CanComment` // 是否可以评论
-	DisqusId   string        `DisqusId`
+
+	CommentType string `CommentType` // default 或 disqus
+	DisqusId    string `DisqusId`
+
+	Style string `Style` // 风格
+	Css   string `Css`   // 自定义css
+
+	ThemeId bson.ObjectId `ThemeId,omitempty` // 主题Id
+	ThemePath string `bson:"ThemePath" json:"-"` // 不存值, 从Theme中获取, 相对路径 public/
+
+	CateIds []string            `CateIds,omitempty` // 分类Id, 排序好的
+	Singles   []map[string]string `Singles,omitempty`   // 单页, 排序好的, map包含: ["Title"], ["SingleId"]
+	
+	PerPageSize int `PerPageSize,omitempty`
+	SortField string `SortField` // 排序字段
+	IsAsc bool `IsAsc,omitempty` // 排序类型, 降序, 升序, 默认是false, 表示降序
+
+	SubDomain string `SubDomain` // 二级域名
+	Domain    string `Domain`    // 自定义域名
 	
-	Style      string        `Style`   // 风格
+}
+
+// 博客统计信息
+type BlogStat struct {
+	NoteId        bson.ObjectId `bson:"_id,omitempty"` 
+	ReadNum    int `ReadNum,omitempty`    // 阅读次数 2014/9/28
+	LikeNum    int `LikeNum,omitempty`    // 点赞次数 2014/9/28
+	CommentNum int `CommentNum,omitempty` // 评论次数 2014/9/28
+}
+
+// 单页
+type BlogSingle struct {
+	SingleId      bson.ObjectId `bson:"_id,omitempty"`
+	UserId      bson.ObjectId `UserId`
+	Title       string        `Title`
+	UrlTitle    string        `UrlTitle` // 2014/11/11
+	Content     string        `Content`
+	UpdatedTime time.Time     `UpdatedTime`
+	CreatedTime time.Time     `CreatedTime`
+}
+
+//------------------------
+// 社交功能, 点赞, 分享, 评论
+
+// 点赞记录
+type BlogLike struct {
+	LikeId      bson.ObjectId `bson:"_id,omitempty"`
+	NoteId      bson.ObjectId `NoteId`
+	UserId      bson.ObjectId `UserId`
+	CreatedTime time.Time     `CreatedTime`
+}
+
+// 评论
+type BlogComment struct {
+	CommentId bson.ObjectId `bson:"_id,omitempty"`
+	NoteId    bson.ObjectId `NoteId`
+
+	UserId  bson.ObjectId `UserId`  // UserId回复ToUserId
+	Content string        `Content` // 评论内容
+
+	ToCommentId bson.ObjectId `ToCommendId,omitempty` // 对某条评论进行回复
+	ToUserId    bson.ObjectId `ToUserId,omitempty`    // 为空表示直接评论, 不回空表示回复某人
+
+	LikeNum     int      `LikeNum`     // 点赞次数, 评论也可以点赞
+	LikeUserIds []string `LikeUserIds` // 点赞的用户ids
+
+	CreatedTime time.Time `CreatedTime`
+}
+
+type BlogCommentPublic struct {
+	BlogComment
+	IsILikeIt bool
+}
+
+type BlogUrls struct {
+	IndexUrl string
+	CateUrl string
+	SearchUrl string
+	SingleUrl string
+	PostUrl string
+	ArchiveUrl string
+	TagsUrl string
+	TagPostsUrl string
 }

app/info/Configinfo.go

@@ -0,0 +1,25 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// 配置, 每一个配置一行记录
+type Config struct {
+	ConfigId    bson.ObjectId       `bson:"_id"`
+	UserId      bson.ObjectId       `UserId`
+	Key         string              `Key`
+	ValueStr    string              `ValueStr,omitempty` // "1"
+	ValueArr    []string            `ValueArr,omitempty` // ["1","b","c"]
+	ValueMap    map[string]string   `ValueMap,omitempty` // {"a":"bb", "CC":"xx"}
+	ValueArrMap []map[string]string `ValueArrMap,omitempty` // [{"a":"B"}, {}, {}]
+	IsArr       bool                `IsArr`                 // 是否是数组
+	IsMap       bool                `IsMap`                 // 是否是Map
+	IsArrMap    bool                `IsArrMap`              // 是否是数组Map
+
+	// StringConfigs map[string]string   `StringConfigs` // key => value
+	// ArrayConfigs  map[string][]string `ArrayConfigs`  // key => []value
+
+	UpdatedTime time.Time `UpdatedTime`
+}

app/info/EmailLogInfo.go

@@ -0,0 +1,19 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// 发送邮件
+type EmailLog struct {
+	LogId bson.ObjectId `bson:"_id"`
+
+	Email   string `Email`   // 发送者
+	Subject string `Subject` // 主题
+	Body    string `Body`    // 内容
+	Msg     string `Msg`     // 发送失败信息
+	Ok      bool   `Ok`      // 发送是否成功
+
+	CreatedTime time.Time `CreatedTime`
+}

app/info/FileInfo.go

@@ -0,0 +1,21 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+type File struct {
+	FileId         bson.ObjectId `bson:"_id,omitempty"` //
+	UserId         bson.ObjectId `bson:"UserId"`
+	AlbumId        bson.ObjectId `bson:"AlbumId"`
+	Name           string        `Name`  // file name
+	Title          string        `Title` // file name or user defined for search
+	Size           int64         `Size`  // file size (byte)
+	Type           string        `Type`  // file type, "" = image, "doc" = word
+	Path           string        `Path`  // the file path
+	IsDefaultAlbum bool          `IsDefaultAlbum`
+	CreatedTime    time.Time     `CreatedTime`
+
+	FromFileId bson.ObjectId `bson:"FromFileId,omitempty"` // copy from fileId, for collaboration
+}

app/info/GroupInfo.go

@@ -0,0 +1,25 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// 分组
+type Group struct {
+	GroupId     bson.ObjectId `bson:"_id"` // 谁的
+	UserId      bson.ObjectId `UserId`     // 所有者Id
+	Title       string        `Title`      // 标题
+	UserCount   int           `UserCount`  // 用户数
+	CreatedTime time.Time     `CreatedTime`
+
+	Users []User `Users,omitempty` // 分组下的用户, 不保存, 仅查看
+}
+
+// 分组好友
+type GroupUser struct {
+	GroupUserId bson.ObjectId `bson:"_id"` // 谁的
+	GroupId     bson.ObjectId `GroupId`    // 分组
+	UserId      bson.ObjectId `UserId`     //  用户
+	CreatedTime time.Time     `CreatedTime`
+}

app/info/NoteImage.go

@@ -0,0 +1,12 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+)
+
+// 笔记内部图片
+type NoteImage struct {
+	NoteImageId bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
+	NoteId      bson.ObjectId `bson:"NoteId"`        // 笔记
+	ImageId     bson.ObjectId `bson:"ImageId"`       // 图片fileId
+}

app/info/NoteInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 
@@ -15,18 +15,36 @@ type Note struct {
 	Title         string        `Title` // 标题
 	Desc          string        `Desc`  // 描述, 非html
 
-	ImgSrc  string   `ImgSrc` // 图片, 第一张缩略图地址
+	ImgSrc string   `ImgSrc` // 图片, 第一张缩略图地址
-	Tags    []string `Tags,omitempty`
+	Tags   []string `Tags,omitempty`
-	IsTrash bool     `IsTrash` // 是否是trash, 默认是false
 
-	IsBlog bool `IsBlog,omitempty` // 是否设置成了blog 2013/12/29 新加
+	IsTrash bool `IsTrash` // 是否是trash, 默认是false
-	IsTop  bool `IsTop,omitempty`  // blog是否置顶
+
+	IsBlog         bool   `IsBlog,omitempty`      // 是否设置成了blog 2013/12/29 新加
+	UrlTitle       string `UrlTitle,omitempty`    // 博客的url标题, 为了更友好的url, 在UserId, UrlName下唯一
+	IsRecommend    bool   `IsRecommend,omitempty` // 是否为推荐博客 2014/9/24新加
+	IsTop          bool   `IsTop,omitempty`       // blog是否置顶
+	HasSelfDefined bool   `HasSelfDefined`        // 是否已经自定义博客图片, desc, abstract
+
+	// 2014/9/28 添加评论社交功能
+	ReadNum    int `ReadNum,omitempty`    // 阅读次数 2014/9/28
+	LikeNum    int `LikeNum,omitempty`    // 点赞次数 2014/9/28
+	CommentNum int `CommentNum,omitempty` // 评论次数 2014/9/28
 
 	IsMarkdown bool `IsMarkdown` // 是否是markdown笔记, 默认是false
 
+	AttachNum int `AttachNum` // 2014/9/21, attachments num
+	
 	CreatedTime   time.Time     `CreatedTime`
 	UpdatedTime   time.Time     `UpdatedTime`
-	UpdatedUserId bson.ObjectId `bson:"UpdatedUserId"` // 如果共享了, 并可写, 那么可能是其它他修改了
+	RecommendTime time.Time     `RecommendTime,omitempty` // 推荐时间
+	PublicTime    time.Time     `PublicTime,omitempty`    // 发表时间, 公开为博客则设置
+	UpdatedUserId bson.ObjectId `bson:"UpdatedUserId"`    // 如果共享了, 并可写, 那么可能是其它他修改了
+	
+	// 2015/1/15, 更新序号
+	Usn int `Usn` // UpdateSequenceNum 
+
+	IsDeleted bool `IsDeleted` // 删除位
 }
 
 // 内容
@@ -54,11 +72,11 @@ type NoteAndContent struct {
 // 每一个历史记录对象
 type EachHistory struct {
 	UpdatedUserId bson.ObjectId `UpdatedUserId`
-	UpdatedTime   time.Time `UpdatedTime`
+	UpdatedTime   time.Time     `UpdatedTime`
-	Content  string `Content`
+	Content       string        `Content`
 }
 type NoteContentHistory struct {
-	NoteId bson.ObjectId `bson:"_id,omitempty"`
+	NoteId    bson.ObjectId `bson:"_id,omitempty"`
-	UserId bson.ObjectId `bson:"UserId"` // 所属者
+	UserId    bson.ObjectId `bson:"UserId"` // 所属者
-	Histories  []EachHistory `Histories`
+	Histories []EachHistory `Histories`
 }

app/info/NotebookInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 
@@ -13,15 +13,20 @@ type Notebook struct {
 	ParentNotebookId bson.ObjectId `bson:"ParentNotebookId,omitempty"` // 上级
 	Seq              int           `Seq`                               // 排序
 	Title            string        `Title`                             // 标题
+	UrlTitle         string        `UrlTitle`                          // Url标题 2014/11.11加
 	NumberNotes      int           `NumberNotes`                       // 笔记数
 	IsTrash          bool          `IsTrash,omitempty`                 // 是否是trash, 默认是false
 	IsBlog           bool          `IsBlog,omitempty`                  // 是否是Blog 2013/12/29 新加
 	CreatedTime      time.Time     `CreatedTime,omitempty`
 	UpdatedTime      time.Time     `UpdatedTime,omitempty`
+	
+	// 2015/1/15, 更新序号
+	Usn int `Usn` // UpdateSequenceNum 
+	IsDeleted bool `IsDeleted`
 }
 
 // 仅仅是为了返回前台
-type SubNotebooks []Notebooks
+type SubNotebooks []*Notebooks // 存地址, 为了生成tree
 type Notebooks struct {
 	Notebook
 	Subs SubNotebooks // 子notebook 在数据库中是没有的
@@ -32,7 +37,7 @@ func (this SubNotebooks) Len() int {
 	return len(this)
 }
 func (this SubNotebooks) Less(i, j int) bool {
-	return this[i].Seq < this[j].Seq
+	return (*this[i]).Seq < (*this[j]).Seq
 }
 func (this SubNotebooks) Swap(i, j int) {
 	this[i], this[j] = this[j], this[i]

app/info/ReportInfo.go

@@ -0,0 +1,19 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// 举报
+type Report struct {
+	ReportId bson.ObjectId `bson:"_id"`
+	NoteId   bson.ObjectId `NoteId`
+
+	UserId bson.ObjectId `UserId` // UserId回复ToUserId
+	Reason string        `Reason` // 评论内容
+
+	CommentId bson.ObjectId `CommendId,omitempty` // 对某条评论进行回复
+
+	CreatedTime time.Time `CreatedTime`
+}

app/info/SessionInfo.go

@@ -0,0 +1,21 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// http://docs.mongodb.org/manual/tutorial/expire-data/
+type Session struct {
+	Id bson.ObjectId `bson:"_id,omitempty"` // 没有意义
+
+	SessionId string `bson:"SessionId"` // SessionId
+
+	LoginTimes int    `LoginTimes` // 登录错误时间
+	Captcha    string `Captcha`    // 验证码
+	
+	UserId     string `UserId`     // API时有值UserId
+
+	CreatedTime time.Time `CreatedTime`
+	UpdatedTime time.Time `UpdatedTime` // 更新时间, expire这个时间会自动清空
+}

app/info/ShareNotebookNoteInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 
@@ -76,7 +76,9 @@ type SharingNotebookAndNotes struct {
 type ShareNotebook struct {
 	ShareNotebookId bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
 	UserId          bson.ObjectId `bson:"UserId"`
-	ToUserId        bson.ObjectId `bson:"ToUserId"`
+	ToUserId        bson.ObjectId `bson:"ToUserId,omitempty"`
+	ToGroupId       bson.ObjectId `bson:"ToGroupId,omitempty"` // 分享给的用户组
+	ToGroup     Group         `ToGroup,omitempty`            // 仅仅为了显示, 不存储, 分组信息
 	NotebookId      bson.ObjectId `bson:"NotebookId"`
 	Seq             int           `bson:"Seq"`  // 排序
 	Perm            int           `bson:"Perm"` // 权限, 其下所有notes 0只读, 1可修改
@@ -134,7 +136,9 @@ type ShareNotebooksByUser struct {
 type ShareNote struct {
 	ShareNoteId bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
 	UserId      bson.ObjectId `bson:"UserId"`
-	ToUserId    bson.ObjectId `bson:"ToUserId"`
+	ToUserId    bson.ObjectId `bson:"ToUserId,omitempty"`
+	ToGroupId   bson.ObjectId `bson:"ToGroupId,omitempty"` // 分享给的用户组
+	ToGroup     Group         `ToGroup,omitempty`            // 仅仅为了显示, 不存储, 分组信息
 	NoteId      bson.ObjectId `bson:"NoteId"`
 	Perm        int           `bson:"Perm"` // 权限, 0只读, 1可修改
 	CreatedTime time.Time     `CreatedTime`

app/info/SuggestionInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 建议

app/info/TagInfo.go

@@ -1,19 +1,56 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
+	"time"
 )
 
 // 这里主要是为了统计每个tag的note数目
+// 暂时没用
+/*
 type TagNote struct {
 	TagId   bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
 	UserId  bson.ObjectId `bson:"UserId"`
 	Tag   string        `Title`   // 标题
 	NoteNum int           `NoteNum` // note数目
 }
+*/
 
 // 每个用户一条记录, 存储用户的所有tags
 type Tag struct {
 	UserId  bson.ObjectId `bson:"_id"`
 	Tags []string `Tags`
 }
+
+// v2 版标签
+type NoteTag struct {
+	TagId  bson.ObjectId `bson:"_id"`
+	UserId bson.ObjectId `UserId` // 谁的
+	Tag string `Tag` // UserId, Tag是唯一索引
+	Usn int `Usn` // Update Sequence Number
+	Count int `Count` // 笔记数
+	CreatedTime   time.Time     `CreatedTime`
+	UpdatedTime   time.Time     `UpdatedTime`
+	IsDeleted bool `IsDeleted` // 删除位
+}
+
+type TagCount struct {
+	TagCountId bson.ObjectId `bson:"_id,omitempty"`
+	UserId bson.ObjectId `UserId` // 谁的
+	Tag string `Tag`
+	IsBlog bool `IsBlog` // 是否是博客的tag统计
+	Count int `Count` // 统计数量
+}
+
+/*
+type TagsCounts []TagCount
+func (this TagsCounts) Len() int {
+	return len(this)
+}
+func (this TagsCounts) Less(i, j int) bool {
+	return this[i].Count > this[j].Count
+}
+func (this TagsCounts) Swap(i, j int) {
+	this[i], this[j] = this[j], this[i]
+}
+*/

app/info/ThemeInfo.go

@@ -0,0 +1,26 @@
+package info
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+// 主题, 每个用户有多个主题, 这里面有主题的配置信息
+// 模板, css, js, images, 都在路径Path下
+type Theme struct {
+	ThemeId   bson.ObjectId          `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
+	UserId    bson.ObjectId          `UserId`
+	Name      string                 `Name`
+	Version   string                 `Version`
+	Author    string                 `Author`
+	AuthorUrl string                 `AuthorUrl`
+	Path      string                 `Path`     // 文件夹路径
+	Info      map[string]interface{} `Info`     // 所有信息
+	IsActive  bool                   `IsActive` // 是否在用
+
+	IsDefault bool   `IsDefault` // leanote默认主题, 如果用户修改了默认主题, 则先copy之. 也是admin用户的主题
+	Style     string `Style,omitempty` // 之前的, 只有default的用户才有blog_default, blog_daqi, blog_left_fixed
+
+	CreatedTime time.Time `CreatedTime`
+	UpdatedTime time.Time `UpdatedTime`
+}

app/info/TokenInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/UserInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 
@@ -20,16 +20,65 @@ type User struct {
 	Pwd         string        `bson:"Pwd" json:"-"`
 	CreatedTime time.Time     `CreatedTime`
 
+	Logo string `Logo` // 9-24
 	// 主题
 	Theme string `Theme`
 
 	// 用户配置
 	NotebookWidth int  `NotebookWidth` // 笔记本宽度
 	NoteListWidth int  `NoteListWidth` // 笔记列表宽度
+	MdEditorWidth int  `MdEditorWidth` // markdown 左侧编辑器宽度
 	LeftIsMin     bool `LeftIsMin`     // 左侧是否是隐藏的, 默认是打开的
 
 	// 这里 第三方登录
 	ThirdUserId   string `ThirdUserId`   // 用户Id, 在第三方中唯一可识别
 	ThirdUsername string `ThirdUsername` // 第三方中username, 为了显示
 	ThirdType     int    `ThirdType`     // 第三方类型
+
+	// 用户的帐户类型
+
+	ImageNum   int           `bson:"ImageNum" json:"-"`   // 图片数量
+	ImageSize  int           `bson:"ImageSize" json:"-"`  // 图片大小
+	AttachNum  int           `bson:"AttachNum" json:"-"`  // 附件数量
+	AttachSize int           `bson:"AttachSize" json:"-"` // 附件大小
+	FromUserId bson.ObjectId `FromUserId,omitempty`       // 邀请的用户
+
+	AccountType      string    `bson:"AccountType" json:"-"`      // normal(为空), premium
+	AccountStartTime time.Time `bson:"AccountStartTime" json:"-"` // 开始日期
+	AccountEndTime   time.Time `bson:"AccountEndTime" json:"-"`   // 结束日期
+	// 阈值
+	MaxImageNum      int `bson:"MaxImageNums" json:"-"`     // 图片数量
+	MaxImageSize     int `bson:"MaxImageSize" json:"-"`     // 图片大小
+	MaxAttachNum     int `bson:"MaxAttachNum" json:"-"`     // 图片数量
+	MaxAttachSize    int `bson:"MaxAttachSize" json:"-"`    // 图片大小
+	MaxPerAttachSize int `bson:"MaxPerAttachSize" json:"-"` // 单个附件大小
+
+	// 2015/1/15, 更新序号
+	Usn            int       `Usn`                   // UpdateSequenceNum , 全局的
+	FullSyncBefore time.Time `bson:"FullSyncBefore"` // 需要全量同步的时间, 如果 > 客户端的LastSyncTime, 则需要全量更新
+}
+
+type UserAccount struct {
+	AccountType      string    `bson:"AccountType" json:"-"`      // normal(为空), premium
+	AccountStartTime time.Time `bson:"AccountStartTime" json:"-"` // 开始日期
+	AccountEndTime   time.Time `bson:"AccountEndTime" json:"-"`   // 结束日期
+	// 阈值
+	MaxImageNum      int `bson:"MaxImageNums" json:"-"`     // 图片数量
+	MaxImageSize     int `bson:"MaxImageSize" json:"-"`     // 图片大小
+	MaxAttachNum     int `bson:"MaxAttachNum" json:"-"`     // 图片数量
+	MaxAttachSize    int `bson:"MaxAttachSize" json:"-"`    // 图片大小
+	MaxPerAttachSize int `bson:"MaxPerAttachSize" json:"-"` // 单个附件大小
+}
+
+// 用户与博客信息结合, 公开
+type UserAndBlog struct {
+	UserId    bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键
+	Email     string        `Email`                // 全是小写
+	Username  string        `Username`             // 不区分大小写, 全是小写
+	Logo      string        `Logo`
+	BlogTitle string        `BlogTitle` // 博客标题
+	BlogLogo  string        `BlogLogo`  // 博客Logo
+	BlogUrl   string        `BlogUrl`   // 博客链接, 主页
+
+	BlogUrls // 各个页面
 }

app/info/common.go

@@ -1,6 +1,7 @@
 package info
 
 import (
+	"math"
 )
 
 
@@ -8,5 +9,15 @@ import (
 type Page struct {
 	CurPage int // 当前页码
 	TotalPage int // 总页
+	PerPageSize int
+	Count int // 总记录数
 	List interface{}
 }
+
+func NewPage(page, perPageSize, count int, list interface{}) Page {
+	totalPage := 0
+	if count > 0 {
+		totalPage = int(math.Ceil(float64(count) / float64(perPageSize)))
+	}
+	return Page{page, totalPage, perPageSize, count, list}
+}

app/init.go

@@ -3,26 +3,42 @@ package app
 import (
 	"github.com/revel/revel"
 	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/service"
+	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/controllers"
+	"github.com/leanote/leanote/app/controllers/api"
+	"github.com/leanote/leanote/app/controllers/admin"
+	"github.com/leanote/leanote/app/controllers/member"
 	_ "github.com/leanote/leanote/app/lea/binder"
+//	"github.com/leanote/leanote/app/lea/session"
+//	"github.com/leanote/leanote/app/lea/memcache"
+	"github.com/leanote/leanote/app/lea/route"
 	"reflect"
 	"fmt"
 	"html/template"
 	"math"
+	"strings"
 	"strconv"
 	"time"
+	"encoding/json"
+	"net/url"
 )
 
 func init() {
 	// Filters is the default set of global filters.
 	revel.Filters = []revel.Filter{
 		revel.PanicFilter,             // Recover from panics and display an error page instead.
-		revel.RouterFilter,            // Use the routing table to select the right Action
+		route.RouterFilter,
+		// revel.RouterFilter,            // Use the routing table to select the right Action
 		// AuthFilter,						// Invoke the action.
 		revel.FilterConfiguringFilter, // A hook for adding or removing per-Action filters.
 		revel.ParamsFilter,            // Parse parameters into Controller.Params.
 		revel.SessionFilter,           // Restore and write the session cookie.
 		
-//		session.SessionFilter,         // leanote memcache session life
+		// 使用SessionFilter标准版从cookie中得到sessionID, 然后通过MssessionFilter从Memcache中得到
+		// session, 之后MSessionFilter将session只存sessionID然后返回给SessionFilter返回到web
+		// session.SessionFilter,         // leanote session 
+		// session.MSessionFilter,         // leanote memcache session 
 		
 		revel.FlashFilter,             // Restore and write the flash cookie.
 		revel.ValidationFilter,        // Restore kept validation errors and save new ones from cookie.
@@ -35,16 +51,58 @@ func init() {
 	revel.TemplateFuncs["raw"] = func(str string) template.HTML {
 		return template.HTML(str)
 	}
-	revel.TemplateFuncs["add"] = func(i int) template.HTML {
+	revel.TemplateFuncs["add"] = func(i int) string {
 		i = i + 1;
-		return template.HTML(fmt.Sprintf("%v", i))
+		return fmt.Sprintf("%v", i)
+	}
+	revel.TemplateFuncs["sub"] = func(i int) int {
+		i = i - 1;
+		return i
+	}
+	// 增加或减少
+	revel.TemplateFuncs["incr"] = func(n, i int) int {
+		n = n + i;
+		return n
+	}
+	revel.TemplateFuncs["join"] = func(arr []string) template.HTML {
+		if arr == nil {
+			return template.HTML("")
+		}
+		return template.HTML(strings.Join(arr, ","))
 	}
 	revel.TemplateFuncs["concat"] = func(s1, s2 string) template.HTML {
 		return template.HTML(s1 + s2)
 	}
+	revel.TemplateFuncs["concatStr"] = func(strs ...string) string {
+		str := ""
+		for _, s := range strs {
+			str += s
+		}
+		return str
+	}
+	revel.TemplateFuncs["decodeUrlValue"] = func(i string) string {
+		v, _ := url.ParseQuery("a=" + i)
+		return v.Get("a")
+	}
+	revel.TemplateFuncs["json"] = func(i interface{}) string {
+		b, _ := json.Marshal(i) 
+		return string(b)
+	}
+	revel.TemplateFuncs["jsonJs"] = func(i interface{}) template.JS {
+		b, _ := json.Marshal(i) 
+		return template.JS(string(b))
+	}
 	revel.TemplateFuncs["datetime"] = func(t time.Time) template.HTML {
 		return template.HTML(t.Format("2006-01-02 15:04:05"))
 	}
+	revel.TemplateFuncs["dateFormat"] = func(t time.Time, format string) template.HTML {
+		return template.HTML(t.Format(format))
+	}
+	revel.TemplateFuncs["unixDatetime"] = func(unixSec string) template.HTML {
+		sec, _ := strconv.Atoi(unixSec)
+		t := time.Unix(int64(sec), 0)
+		return template.HTML(t.Format("2006-01-02 15:04:05"))
+	}
 	
 	// interface是否有该字段
 	revel.TemplateFuncs["has"] = func(i interface{}, key string) bool {
@@ -54,6 +112,77 @@ func init() {
 	}
 
 	// tags
+	// 2014/12/30 标签添加链接
+	revel.TemplateFuncs["blogTags"] = func(renderArgs map[string]interface{}, tags []string) template.HTML {
+		if tags == nil || len(tags) == 0 {
+			return ""
+		}
+		locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		tagStr := ""
+		lenTags := len(tags)
+		
+		tagPostUrl, _ := renderArgs["tagPostsUrl"].(string)
+		
+		for i, tag := range tags {
+			str := revel.Message(locale, tag)
+			var classes = "label"
+			if strings.HasPrefix(str, "???") {
+				str = tag
+			}
+			if InArray([]string{"red", "blue", "yellow", "green"}, tag) {
+				classes += " label-" + tag
+			} else {
+				classes += " label-default"
+			}
+			
+			classes += " label-post"
+			var url = tagPostUrl + "/" + url.QueryEscape(tag)
+			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>";
+			if i != lenTags - 1 {
+				tagStr += " "
+			}
+		}
+		return template.HTML(tagStr)
+	}
+	
+	// lea++
+	revel.TemplateFuncs["blogTagsLea"] = func(renderArgs map[string]interface{}, tags []string, isRecommend bool) template.HTML {
+		if tags == nil || len(tags) == 0 {
+			return ""
+		}
+		locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		tagStr := ""
+		lenTags := len(tags)
+		
+		tagPostUrl := "http://lea.leanote.com/"
+		if isRecommend {
+			tagPostUrl += "?tag=";
+		} else {
+			tagPostUrl += "latest?tag=";
+		}
+		
+		for i, tag := range tags {
+			str := revel.Message(locale, tag)
+			var classes = "label"
+			if strings.HasPrefix(str, "???") {
+				str = tag
+			}
+			if InArray([]string{"red", "blue", "yellow", "green"}, tag) {
+				classes += " label-" + tag
+			} else {
+				classes += " label-default"
+			}
+			classes += " label-post"
+			var url = tagPostUrl + url.QueryEscape(tag)
+			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>";
+			if i != lenTags - 1 {
+				tagStr += " "
+			}
+		}
+		return template.HTML(tagStr)
+	}
+	
+	/*
 	revel.TemplateFuncs["blogTags"] = func(tags []string) template.HTML {
 		if tags == nil || len(tags) == 0 {
 			return ""
@@ -74,9 +203,86 @@ func init() {
 		}
 		return template.HTML(tagStr)
 	}
+	*/
+	revel.TemplateFuncs["li"] = func(a string) string {
+		return ""
+	}
+	// str连接
+	revel.TemplateFuncs["urlConcat"] = func(url string, v... interface{}) string {
+		html := ""
+		for i := 0; i < len(v); i = i + 2 {
+			item := v[i]
+			if i+1 == len(v) {
+				break;
+			}
+			value := v[i+1]
+			if item != nil && value != nil {
+			    keyStr, _ := item.(string)
+			    valueStr, err := value.(string)
+			    if !err {
+				    valueInt, _ := value.(int)
+				    valueStr = strconv.Itoa(valueInt)
+			    }
+			    if keyStr != "" && valueStr != "" {
+			    	s := keyStr + "=" + valueStr
+		    		if html != "" {
+			    		html += "&" + s
+			    	} else {
+			    		html += s
+			    	}
+			    }
+		    }
+		}
+		
+		if html != "" {
+			if strings.Index(url, "?") >= 0 {
+				return url + "&" + html
+			} else {
+				return url + "?" + html
+			}
+		}
+		return url
+	}
+	
+	revel.TemplateFuncs["urlCond"] = func(url string, sorterI, keyords interface{}) template.HTML {
+		return ""
+	}
+	
+	// http://stackoverflow.com/questions/14226416/go-lang-templates-always-quotes-a-string-and-removes-comments
+	revel.TemplateFuncs["rawMsg"] = func(renderArgs map[string]interface{}, message string, args ...interface{}) template.JS {
+		str, ok := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		if !ok {
+			return ""
+		}
+		return template.JS(revel.Message(str, message, args...))
+	}
+	
+	// 为后台管理sorter th使用
+	// 必须要返回HTMLAttr, 返回html, golang 会执行安全检查返回ZgotmplZ
+	// sorterI 可能是nil, 所以用interfalce{}来接收
+	/*
+	data-url="/adminUser/index"
+	data-sorter="email"
+	class="th-sortable {{if eq .sorter "email-up"}}th-sort-up{{else}}{{if eq .sorter "email-down"}}th-sort-down{{end}}{{end}}"
+	*/
+	revel.TemplateFuncs["sorterTh"] = func(url, sorterField string, sorterI interface{}) template.HTMLAttr {
+		sorter := ""
+		if sorterI != nil {
+			sorter, _ = sorterI.(string)
+		}
+		html := "data-url=\"" + url + "\" data-sorter=\"" + sorterField + "\"";
+		html += " class=\"th-sortable ";
+		if sorter == sorterField + "-up" {
+			html += "th-sort-up\"";
+		} else if(sorter == sorterField + "-down") {
+			html += "th-sort-down";
+		}
+		html += "\"";
+		return template.HTMLAttr(html)
+	}
 	
 	// pagination
-	revel.TemplateFuncs["page"] = func(userId, notebookId string, page, pageSize, count int) template.HTML {
+	revel.TemplateFuncs["page"] = func(urlBase string, page, pageSize, count int) template.HTML {
 		if count == 0 {
 			return "";
 		}
@@ -91,11 +297,6 @@ func init() {
 		nextPage := page + 1
 		var preUrl, nextUrl string
 		
-		urlBase := "/blog/" + userId
-		if notebookId != "" {
-			urlBase += "/" + notebookId
-		}
-		
 		preUrl = urlBase + "?page="  + strconv.Itoa(prePage)
 		nextUrl = urlBase + "?page=" + strconv.Itoa(nextPage)
 		
@@ -111,9 +312,68 @@ func init() {
 		}
 		return template.HTML("<li class='" + preClass + "'><a href='" + preUrl + "'>Previous</a></li> <li  class='" + nextClass + "'><a href='" + nextUrl + "'>Next</a></li>")
 	}
+	// life
+	// https://groups.google.com/forum/#!topic/golang-nuts/OEdSDgEC7js
+	// http://play.golang.org/p/snygrVpQva
+	// http://grokbase.com/t/gg/golang-nuts/142a6dhfh3/go-nuts-text-template-using-comparison-operators-eq-gt-etc-on-non-existent-variable-causes-the-template-to-stop-outputting-but-with-no-error-correct-behaviour
+	/*
+	revel.TemplateFuncs["gt"] = func(a1, a2 interface{}) bool {
+		switch a1.(type) {
+		case string:
+			switch a2.(type) {
+			case string:
+				return reflect.ValueOf(a1).String() > reflect.ValueOf(a2).String()
+			}
+		case int, int8, int16, int32, int64:
+			switch a2.(type) {
+			case int, int8, int16, int32, int64:
+				return reflect.ValueOf(a1).Int() > reflect.ValueOf(a2).Int()
+			}
+		case uint, uint8, uint16, uint32, uint64:
+			switch a2.(type) {
+			case uint, uint8, uint16, uint32, uint64:
+				return reflect.ValueOf(a1).Uint() > reflect.ValueOf(a2).Uint()
+			}
+		case float32, float64:
+			switch a2.(type) {
+			case float32, float64:
+				return reflect.ValueOf(a1).Float() > reflect.ValueOf(a2).Float()
+			}
+		}
+		return false
+	}
+	*/
+	
+	/*
+	{{range $i := N 1 10}}
+        <div>{{$i}}</div>
+    {{end}}
+   */
+	revel.TemplateFuncs["N"] = func(start, end int) (stream chan int) {
+	    stream = make(chan int)
+	    go func() {
+	        for i := start; i <= end; i++ {
+	            stream <- i
+	        }
+	        close(stream)
+	    }()
+	    return
+	}
 	
 	// init Email
 	revel.OnAppStart(func() {
+		// 数据库
+		db.Init("", "")
+		// email配置
 		InitEmail()
+		InitVd()
+		// memcache.InitMemcache() // session服务
+		// 其它service
+		service.InitService()
+		controllers.InitService()
+		admin.InitService()
+		member.InitService()
+		service.ConfigS.InitGlobalConfigs()
+		api.InitService()
 	})
 }

app/lea/Debug.go

@@ -3,6 +3,7 @@ package lea
 import (
 	"encoding/json"
 	"github.com/revel/revel"
+	"fmt"
 )
 
 func Log(i interface{}) {
@@ -13,3 +14,13 @@ func LogJ(i interface{}) {
 	b, _ := json.MarshalIndent(i, "", "	") 
 	revel.INFO.Println(string(b))
 }
+
+// 为test用
+func L(i interface{}) {
+	fmt.Println(i)
+}
+
+func LJ(i interface{}) {
+	b, _ := json.MarshalIndent(i, "", "	") 
+	fmt.Println(string(b))
+}

app/lea/Email.go

@@ -22,14 +22,14 @@ func InitEmail() {
 var bodyTpl = `
 	<html>
 	<body>
-		<div style="width: 800px; margin:auto; border-radius:5px; border: 1px solid #ccc; padding: 20px;">
+		<div style="width: 600px; margin:auto; border-radius:5px; border: 1px solid #ccc; padding: 20px;">
 			<div>
 				<div>
 					<div style="float:left; height: 40px;">
 						<a href="http://leanote.com" style="font-size: 24px">leanote</a>
 					</div>
-					<div style="float:left; height:40px; line-height:16px;">
+					<div style="float:left; height:40px; line-height:40px;">
-						&nbsp;&nbsp;| &nbsp;<span style="font-size:24px">$title</span>
+						&nbsp;&nbsp;| &nbsp;<span style="font-size:14px">$title</span>
 					</div>
 					<div style="clear:both"></div>
 				</div>
@@ -50,13 +50,13 @@ var bodyTpl = `
 						font-size: 12px;
 					}
 				</style>
-				<a href="http://leanote.com">leanote</a>, your own cloud note
+				<a href="http://leanote.com">leanote</a>, your own cloud note!
 			</div>
 		</div>
 	</body>
 	</html>
 `
-func SendEmail(to, subject, title, body string) bool {
+func SendEmailOld(to, subject, body string) bool {
 	hp := strings.Split(host, ":")
 	auth := smtp.PlainAuth("", username, password, hp[0])
 	
@@ -69,21 +69,21 @@ func SendEmail(to, subject, title, body string) bool {
 		content_type = "Content-Type: text/plain" + "; charset=UTF-8"
 	}
 	
-	// 登录之
+	//body = strings.Replace(bodyTpl, "$body", body, 1)
-	body = strings.Replace(bodyTpl, "$body", body, 1)
+	//body = strings.Replace(body, "$title", title, 1)
-	body = strings.Replace(body, "$title", title, 1)
 
 	msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
 	send_to := strings.Split(to, ";")
 	err := smtp.SendMail(host+":"+port, auth, username, send_to, msg)
 	
 	if err != nil {
+		Log(err)
 		return false
 	}
 	return true
 }
 
-func SendToLeanote(subject, title, body string) {
+func SendToLeanoteOld(subject, title, body string) {
 	to := "leanote@leanote.com"
-	SendEmail(to, subject, title, body);
+	SendEmailOld(to, subject, body);
 }

app/lea/File.go

@@ -1,9 +1,11 @@
 package lea
 
 import (
-	"strings"
+	"io"
-	"path/filepath"
+	"io/ioutil"
 	"os"
+	"path/filepath"
+	"strings"
 )
 
 // 分离文件名与扩展名(包含.)
@@ -13,14 +15,14 @@ func SplitFilename(filename string) (baseName, ext string) {
 	ext = SubstringByte(filename, strings.LastIndex(filename, "."))
 	baseName = strings.TrimRight(filename, ext)
 	ext = strings.ToLower(ext)
-	return;
+	return
 }
 
 // 转换文件的格式
 // toExt包含.
 func TransferExt(path string, toExt string) string {
-	dir := filepath.Dir(path) + "/"  // 文件路径
+	dir := filepath.Dir(path) + "/" // 文件路径
-	name := filepath.Base(path) // 文件名 a.jpg
+	name := filepath.Base(path)     // 文件名 a.jpg
 	// 获取文件名与路径
 	baseName, _ := SplitFilename(name)
 	return dir + baseName + toExt
@@ -30,6 +32,16 @@ func GetFilename(path string) string {
 	return filepath.Base(path)
 }
 
+// file size
+// length in bytes
+func GetFilesize(path string) int64 {
+	fileinfo, err := os.Stat(path)
+	if err == nil {
+		return fileinfo.Size()
+	}
+	return 0
+}
+
 // 清空dir下所有的文件和文件夹
 // RemoveAll会清空本文件夹, 所以还要创建之
 func ClearDir(dir string) bool {
@@ -43,3 +55,128 @@ func ClearDir(dir string) bool {
 	}
 	return true
 }
+
+// list dir's all file, return filenames
+func ListDir(dir string) []string {
+	f, err := os.Open(dir)
+	if err != nil {
+		return nil
+	}
+	names, _ := f.Readdirnames(0)
+	return names
+}
+
+func CopyFile(srcName, dstName string) (written int64, err error) {
+	src, err := os.Open(srcName)
+	if err != nil {
+		return
+	}
+	defer src.Close()
+	dst, err := os.OpenFile(dstName, os.O_WRONLY|os.O_CREATE, 0644)
+	if err != nil {
+		return
+	}
+	defer dst.Close()
+	return io.Copy(dst, src)
+}
+
+func CopyDir(source string, dest string) (err error) {
+	// get properties of source dir
+	sourceinfo, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+
+	// create dest dir
+
+	err = os.MkdirAll(dest, sourceinfo.Mode())
+	if err != nil {
+		return err
+	}
+
+	directory, _ := os.Open(source)
+
+	objects, err := directory.Readdir(-1)
+
+	for _, obj := range objects {
+
+		sourcefilepointer := source + "/" + obj.Name()
+
+		destinationfilepointer := dest + "/" + obj.Name()
+
+		if obj.IsDir() {
+			// create sub-directories - recursively
+			err = CopyDir(sourcefilepointer, destinationfilepointer)
+			if err != nil {
+//				fmt.Println(err)
+			}
+		} else {
+			// perform copy
+			_, err = CopyFile(sourcefilepointer, destinationfilepointer)
+			if err != nil {
+//				fmt.Println(err)
+			}
+		}
+	}
+	return
+}
+
+func DeleteFile(path string) bool {
+	err := os.Remove(path)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
+func IsDirExists(path string) bool {
+	fi, err := os.Stat(path)
+	if err != nil {
+		return os.IsExist(err)
+	} else {
+		return fi.IsDir()
+	}
+	return false
+}
+
+// 获得文件str内容
+func GetFileStrContent(path string) string {
+	fileBytes, err := ioutil.ReadFile(path)
+	if err != nil {
+		return ""
+	}
+	return string(fileBytes)
+}
+
+func IsFileExist(filename string) bool {
+	var exist = true
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		exist = false
+	}
+	return exist
+}
+
+// 写入string内容
+func PutFileStrContent(path, content string) bool {
+	var f *os.File
+	var err1 error
+	defer (func() {
+		if f != nil {
+			f.Close()
+		}
+	})()
+	f, err1 = os.OpenFile(path, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0666) //打开文件
+	//	Log(err1)
+	//	var n int
+	_, err1 = io.WriteString(f, content) //写入文件(字符串)
+	//	Log(content)
+	//	Log(err1)
+	//	Log(n)
+	//	Log(path)
+
+	if err1 != nil {
+		Log(err1)
+		return false
+	}
+	return true
+}

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" 
 )
@@ -122,9 +122,44 @@ func ReplaceAll(oldStr, pattern, newStr string) string {
 	return string(s)
 }
 
-func SubStringHTML(param string, length int, end string) string {
+// 获取纯文本
-	// 先取出<pre></pre>占位..
+func SubStringHTMLToRaw(param string, length int) (result string) {
+	if param == "" {
+		return ""
+	}
+	result = ""
+	n := 0
+	var temp rune // 中文问题, 用rune来解决
+	rStr := []rune(param)
+	isCode := false
+	for i := 0; i < len(rStr); i++ {
+		temp = rStr[i]
+		if temp == '<' {
+			isCode = true
+			continue
+		} else if temp == '>' {
+			isCode = false
+			result += " "; // 空格
+			continue
+		}
+		if !isCode {
+			result += string(temp)
+			n++
+			if n >= length {
+				break
+			}
+		}
+	}
+	return 
+}
 
+// 获取摘要, HTML
+func SubStringHTML(param string, length int, end string) string {
+	if param == "" {
+		return ""
+	}
+	
+	// 先取出<pre></pre>占位..
 	result := ""
 
 	// 1
@@ -196,6 +231,7 @@ func SubStringHTML(param string, length int, end string) string {
 	
 	return result
 }
+
 // 是否是合格的密码
 func IsGoodPwd(pwd string) (bool, string) {
 	if pwd == "" {
@@ -212,7 +248,7 @@ func IsEmail(email string) bool {
 	if email == "" {
 		return false;
 	}
-	ok, _ := regexp.MatchString(`^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[0-9a-zA-Z]{2,3}$`, email)
+	ok, _ := regexp.MatchString(`^([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-z\-A-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|\-]?)*[a-zA-Z0-9\-]+\.[0-9a-zA-Z]{2,3}$`, email)
 	return ok
 }
 
@@ -267,3 +303,15 @@ func RandomPwd(num int) string {
 	
 	return str
 }
+
+func InArray(arr []string, str string) bool {
+	if arr == nil {
+		return false
+	}
+	for _, v := range arr {
+		if v == str {
+			return true
+		}
+	}
+	return false
+}

app/lea/Vd.go

@@ -0,0 +1,170 @@
+package lea
+
+import (
+	"encoding/json"
+	"strconv"
+	"regexp"
+)
+
+// 验证
+
+var rulesStr = `{
+	"username": [
+		{"rule": "required", "msg": "inputUsername"}, 
+		{"rule": "noSpecialChars", "msg": "noSpecialChars"},
+		{"rule": "minLength", "data": "4", "msg": "minLength", "msgData": "4"}
+	],
+	"email": [
+		{"rule": "required", "msg": "inputEmail"}, 
+		{"rule": "email", "msg": "errorEmail"}
+	],
+	"password": [
+		{"rule": "required", "msg": "inputPassword"}, 
+		{"rule": "password", "msg": "errorPassword"}
+	],
+	"subDomain": [
+		{"rule": "subDomain", "msg": "errorSubDomain"}
+	],
+	"domain": [
+		{"rule": "domain", "msg": "errorDomain"}
+	],
+	"perPageSize": [
+		{"rule": "min", "data": "1", "msg": "errorPerPageSize"}
+	],
+	"sortField": [
+		{"rule": "sortField", "msg": "errorSortField"}
+	]
+}
+`
+var rulesMap map[string][]map[string]string
+
+var rules = map[string]func(string, map[string]string)(bool, string) {
+	"required": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		ok = true
+		return 
+	},
+	"minLength": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		data := rule["data"]
+		dataI, _ := strconv.Atoi(data)
+		ok = len(value) >= dataI
+		return
+	},
+	"min": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		data := rule["data"]
+		dataI, _ := strconv.Atoi(data)
+		vI, _ := strconv.Atoi(value)
+		ok = vI >= dataI
+		return
+	},
+	
+	"sortField": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		sortFields := []string{"PublicTime", "CreatedTime", "UpdatedTime", "Title"}
+		ok = InArray(sortFields, value)
+		return
+	},
+	
+	"password": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		ok = len(value) >= 6
+		return
+	},
+	"email": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		ok = IsEmail(value)
+		return
+	},
+	"noSpecialChars": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			return
+		}
+		ok = IsUsername(value)
+		return
+	},
+	// www.baidu.com
+	// 
+	"domain": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			ok = true
+			return // 可为空
+		}
+		ok2, _ := regexp.MatchString(`[^0-9a-zA-Z_\.\-]`, value)
+		ok = !ok2
+		if !ok {
+			return 
+		}
+		ok = true
+		return
+	},
+	// abcd
+	"subDomain": func(value string, rule map[string]string)(ok bool, msg string) {
+		if value == "" {
+			ok = true
+			return  // 可为空
+		}
+		if len(value) < 4 {
+			ok = false
+			return
+		}
+		ok2, _ := regexp.MatchString(`[^0-9a-zA-Z_\-]`, value)
+		ok = !ok2
+		return
+	},
+}
+
+func InitVd() {
+	json.Unmarshal([]byte(rulesStr), &rulesMap)
+	LogJ(rulesMap)
+}
+
+// 验证
+// Vd("username", "life")
+
+func Vd(name, value string) (ok bool, msg string) {
+	rs, _ := rulesMap[name]
+	
+	for _, rule := range rs {
+		ruleFunc, _ := rules[rule["rule"]]
+		if ok2, msg2 := ruleFunc(value, rule); !ok2 {
+			ok = false
+			if msg2 != "" {
+				msg = msg2
+			} else {
+				msg = rule["msg"]
+			}
+			msgData := rule["msgData"]
+			if msgData != "" {
+				msg += "-" + msgData
+			}
+			return 
+		}
+	}
+	ok = true
+	return 
+}
+
+func Vds(m map[string]string) (ok bool, msg string) {
+	for name, value := range m {
+		ok, msg = Vd(name, value)
+		if !ok {
+			return
+		}
+	}
+	ok = true
+	return 
+}

app/lea/archive/tar.go

@@ -0,0 +1,230 @@
+package archive
+
+import (
+    "archive/tar"
+    "compress/gzip"
+    "fmt"
+    "io"
+    "os"
+    "path"
+)
+
+// main functions shows how to TarGz a directory/file and
+// UnTarGz a file
+// Gzip and tar from source directory or file to destination file
+// you need check file exist before you call this function
+
+func main() {
+	/*
+    os.Mkdir("/home/ty4z2008/tar", 0777)
+    w, err := CopyFile("/home/ty4z2008/tar/1.pdf", "/home/ty4z2008/src/1.pdf")
+    //targetfile,sourcefile
+    if err != nil {
+        fmt.Println(err.Error())
+    }
+    fmt.Println(w)
+
+    TarGz("/home/ty4z2008/tar/1.pdf", "/home/ty4z2008/test.tar.gz") //压缩
+    //UnTarGz("/home/ty4z2008/1.tar.gz", "/home/ty4z2008")     //解压
+    os.RemoveAll("/home/ty4z2008/tar")
+    */
+//    TaZip("/Users/life/Desktop/j", "/Users/life/Desktop/aaa.tar.gz")
+    Zip("/Users/life/Desktop/j", "/Users/life/Desktop/aaa.zip")
+    fmt.Println("ok")
+}
+
+func TarGz(srcDirPath string, destFilePath string) (ok bool) {
+	defer func() {     //必须要先声明defer，否则不能捕获到panic异常
+		if err := recover(); err != nil {
+			ok = false
+		}
+		
+	}()
+
+    fw, err := os.Create(destFilePath)
+    
+    if err != nil {
+        panic(err)
+    }
+    defer fw.Close()
+
+    // Gzip writer
+    gw := gzip.NewWriter(fw)
+    defer gw.Close()
+
+    // Tar writer
+    tw := tar.NewWriter(gw)
+    defer tw.Close()
+
+    // Check if it's a file or a directory
+    f, err := os.Open(srcDirPath)
+    if err != nil {
+        panic(err)
+    }
+    fi, err := f.Stat()
+    if err != nil {
+        panic(err)
+    }
+    if fi.IsDir() {
+        // handle source directory
+//        fmt.Println("Cerating tar.gz from directory...")
+        tarGzDir(srcDirPath, path.Base(srcDirPath), tw)
+    } else {
+        // handle file directly
+//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
+        tarGzFile(srcDirPath, fi.Name(), tw, fi)
+    }
+    ok = true
+    return
+}
+
+// Deal with directories
+// if find files, handle them with tarGzFile
+// Every recurrence append the base path to the recPath
+// recPath is the path inside of tar.gz
+func tarGzDir(srcDirPath string, recPath string, tw *tar.Writer) {
+    // Open source diretory
+    dir, err := os.Open(srcDirPath)
+    if err != nil {
+        panic(err)
+    }
+    defer dir.Close()
+
+    // Get file info slice
+    fis, err := dir.Readdir(0)
+    if err != nil {
+        panic(err)
+    }
+    for _, fi := range fis {
+        // Append path
+        curPath := srcDirPath + "/" + fi.Name()
+        // Check it is directory or file
+        if fi.IsDir() {
+            // Directory
+            // (Directory won't add unitl all subfiles are added)
+//            fmt.Printf("Adding path...%s\n", curPath)
+            tarGzDir(curPath, recPath+"/"+fi.Name(), tw)
+        } else {
+            // File
+//            fmt.Printf("Adding file...%s\n", curPath)
+        }
+
+        tarGzFile(curPath, recPath+"/"+fi.Name(), tw, fi)
+    }
+}
+
+// Deal with files
+func tarGzFile(srcFile string, recPath string, tw *tar.Writer, fi os.FileInfo) {
+    if fi.IsDir() {
+//    	fmt.Println("??")
+        // Create tar header
+        hdr := new(tar.Header)
+        // if last character of header name is '/' it also can be directory
+        // but if you don't set Typeflag, error will occur when you untargz
+        hdr.Name = recPath // + "/"
+//        fmt.Println(hdr.Name)
+        hdr.Typeflag = tar.TypeDir
+//        hdr.Size = 0
+        //hdr.Mode = 0755 | c_ISDIR
+//        hdr.Mode = int64(fi.Mode()) // 加这个会有错误!!!
+//        hdr.ModTime = fi.ModTime() // 加这个会有错误!!
+
+        // Write hander
+        err := tw.WriteHeader(hdr)
+        if err != nil {
+            panic(err)
+        }
+    } else {
+        // File reader
+        fr, err := os.Open(srcFile)
+        if err != nil {
+            panic(err)
+        }
+        defer fr.Close()
+
+        // Create tar header
+        hdr := new(tar.Header)
+        hdr.Name = recPath
+//        fmt.Println(hdr.Name)
+        hdr.Size = fi.Size()
+        hdr.Mode = int64(fi.Mode())
+        hdr.ModTime = fi.ModTime()
+
+        // Write hander
+        err = tw.WriteHeader(hdr)
+        if err != nil {
+            panic(err)
+        }
+
+        // Write file data
+        _, err = io.Copy(tw, fr)
+        if err != nil {
+            panic(err)
+        }
+    }
+}
+
+// Ungzip and untar from source file to destination directory
+// you need check file exist before you call this function
+func UnTarGz(srcFilePath string, destDirPath string) {
+//    fmt.Println("UnTarGzing " + srcFilePath + "...")
+    // Create destination directory
+    os.Mkdir(destDirPath, os.ModePerm)
+
+    fr, err := os.Open(srcFilePath)
+    if err != nil {
+        panic(err)
+    }
+    defer fr.Close()
+
+    // Gzip reader
+    gr, err := gzip.NewReader(fr)
+    if err != nil {
+        panic(err)
+    }
+    defer gr.Close()
+
+    // Tar reader
+    tr := tar.NewReader(gr)
+
+    for {
+        hdr, err := tr.Next()
+        if err == io.EOF {
+            // End of tar archive
+            break
+        }
+        //handleError(err)
+//        fmt.Println("UnTarGzing file..." + hdr.Name)
+        // Check if it is diretory or file
+        if hdr.Typeflag != tar.TypeDir {
+            // Get files from archive
+            // Create diretory before create file
+            os.MkdirAll(destDirPath+"/"+path.Dir(hdr.Name), os.ModePerm)
+            // Write data to file
+            fw, _ := os.Create(destDirPath + "/" + hdr.Name)
+            if err != nil {
+                panic(err)
+            }
+            _, err = io.Copy(fw, tr)
+            if err != nil {
+                panic(err)
+            }
+        }
+    }
+//    fmt.Println("Well done!")
+}
+
+// Copyfile
+func CopyFile(dstName, srcName string) (written int64, err error) {
+    src, err := os.Open(srcName)
+    if err != nil {
+        return
+    }
+    defer src.Close()
+    dst, err := os.OpenFile(dstName, os.O_WRONLY|os.O_CREATE, 0644)
+    if err != nil {
+        return
+    }
+    defer dst.Close()
+    return io.Copy(dst, src)
+}

app/lea/archive/zip.go

@@ -0,0 +1,192 @@
+package archive
+
+import (
+    "archive/zip"
+    "fmt"
+	"strings"
+    "io"
+    "os"
+    "path"
+)
+
+// main functions shows how to TarGz a directory/file and
+// UnTarGz a file
+// Gzip and tar from source directory or file to destination file
+// you need check file exist before you call this function
+
+func Zip(srcDirPath string, destFilePath string) (ok bool) {
+	defer func() {     //必须要先声明defer，否则不能捕获到panic异常
+		if err := recover(); err != nil {
+			ok = false
+		}
+	}()
+
+    fw, err := os.Create(destFilePath)
+    
+    if err != nil {
+        panic(err)
+    }
+    defer fw.Close()
+
+    // Tar writer
+    tw := zip.NewWriter(fw)
+    defer tw.Close()
+
+    // Check if it's a file or a directory
+    f, err := os.Open(srcDirPath)
+    if err != nil {
+        panic(err)
+    }
+    fi, err := f.Stat()
+    if err != nil {
+        panic(err)
+    }
+    if fi.IsDir() {
+        // handle source directory
+//        fmt.Println("Cerating tar.gz from directory...")
+        zipDir(srcDirPath, path.Base(srcDirPath), tw)
+    } else {
+        // handle file directly
+//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
+        zipFile(srcDirPath, fi.Name(), tw, fi)
+    }
+    ok = true
+    return
+}
+
+// Deal with directories
+// if find files, handle them with zipFile
+// Every recurrence append the base path to the recPath
+// recPath is the path inside of tar.gz
+func zipDir(srcDirPath string, recPath string, tw *zip.Writer) {
+    // Open source diretory
+    dir, err := os.Open(srcDirPath)
+    if err != nil {
+        panic(err)
+    }
+    defer dir.Close()
+
+    // Get file info slice
+    fis, err := dir.Readdir(0)
+    if err != nil {
+        panic(err)
+    }
+    for _, fi := range fis {
+        // Append path
+        curPath := srcDirPath + "/" + fi.Name()
+        // Check it is directory or file
+        if fi.IsDir() {
+            // Directory
+            // (Directory won't add unitl all subfiles are added)
+//            fmt.Printf("Adding path...%s\n", curPath)
+            zipDir(curPath, recPath+"/"+fi.Name(), tw)
+        } else {
+            // File
+//            fmt.Printf("Adding file...%s\n", curPath)
+        }
+
+        zipFile(curPath, recPath+"/"+fi.Name(), tw, fi)
+    }
+}
+
+// Deal with files
+func zipFile(srcFile string, recPath string, tw *zip.Writer, fi os.FileInfo) {
+    if fi.IsDir() {
+//    	fmt.Println("??")
+        // Create tar header
+        /*
+        fh, err := zip.FileInfoHeader(fi)
+        if err != nil {
+            panic(err)
+        }
+        fh.Name = recPath // + "/"
+        err = tw.WriteHeader(hdr)
+        tw.Create(recPath)
+        */
+    } else {
+        // File reader
+        fr, err := os.Open(srcFile)
+        if err != nil {
+            panic(err)
+        }
+        defer fr.Close()
+
+        // Write hander
+        w, err2 := tw.Create(recPath)
+        if err2 != nil {
+            panic(err)
+        }
+        // Write file data
+        _, err = io.Copy(w, fr)
+        if err != nil {
+            panic(err)
+        }
+    }
+}
+
+// Ungzip and untar from source file to destination directory
+// you need check file exist before you call this function
+func Unzip(srcFilePath string, destDirPath string) (ok bool, msg string) {
+	ok = false
+	msg = ""
+	
+	defer func() {     //必须要先声明defer，否则不能捕获到panic异常
+		if err := recover(); err != nil {
+			msg = fmt.Sprintf("%v", err)
+			ok = false
+		}
+	}()
+	
+	os.Mkdir(destDirPath, os.ModePerm)
+	r, err := zip.OpenReader(srcFilePath);
+	if err != nil {
+		panic(err)
+	}
+	defer r.Close();
+	for _, f := range r.File {
+//		fmt.Println("FileName : ", f.Name); // j/aaa.zip
+		rc, err := f.Open();
+		if err!=nil {
+			panic(err)
+		}
+		
+		// 把首文件夹去掉, 即j去掉, 分离出文件夹和文件名
+		paths := strings.Split(f.Name, "/")
+		prePath := ""
+		filename := ""
+		l := len(paths)
+//		fmt.Println(l)
+		if l > 1 {
+			// 去掉第1个文件夹
+			if l == 2 {
+				filename = paths[1]
+			} else {
+				filename = paths[l-1]
+				prePath = strings.Join(paths[1:l-1], "/")
+			}
+		} else {
+			filename = f.Name
+		}
+//		fmt.Println(prePath)
+		
+		// 相对于目标文件件下的路径
+        destPath := destDirPath + "/" + filename
+		if prePath != "" {
+			os.MkdirAll(destDirPath + "/" + prePath, os.ModePerm)
+			destPath = destDirPath + "/" + prePath + "/" + filename
+		}
+        // Write data to file
+//        fmt.Println(destPath)
+        fw, _ := os.Create(destPath)
+        if err != nil {
+            panic(err)
+        }
+        _, err = io.Copy(fw, rc)
+        if err != nil {
+            panic(err)
+        }
+	}
+	
+	ok = true
+	return
+}

app/lea/binder/binder.go

@@ -4,6 +4,7 @@ import (
 	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/controllers"
+//	"github.com/leanote/leanote/app/controllers/api"
 	"fmt"
 	"reflect"
 	"strings"
@@ -54,15 +55,34 @@ func nextKey(key string) string {
 	return key[:fieldLen]
 }
 var leanoteStructBinder = revel.Binder{
+	// name == "noteOrContent"
 	Bind: func(params *revel.Params, name string, typ reflect.Type) reflect.Value {
-		result := reflect.New(typ).Elem()
+		result := reflect.New(typ).Elem() // 创建一个该类型的, 然后其field从所有的param去取
 		fieldValues := make(map[string]reflect.Value)
-		for key, _ := range params.Values {
+//		fmt.Println(name)
+		// fmt.Println(typ) // api.NoteFiles
+		// name = files[0], files[1], noteContent
+//		fmt.Println(params.Values)
+		/*
+map[Title:[test1] METHOD:[POST] NotebookId:[54c4f51705fcd14031000002] 
+files[1][FileId]:[] 
+controller:[note] 
+files[1][LocalFileId]:[54c7ae27d98d0329dd000000] files[1][HasBody]:[true] files[0][FileId]:[] files[0][LocalFileId]:[54c7ae855e94ea2dba000000] action:[addNote] Content:[<p>lifedddddd</p><p><img src="app://leanote/data/54bdc65599c37b0da9000002/images/1422368307147_2.png" alt="" data-mce-src="app://leanote/data/54bdc65599c37b0da9000002/images/1422368307147_2.png" style="display: block; margin-left: auto; margin-right: auto;"></p><p><img src="http://127.0.0.1:8008/api/file/getImage?fileId=54c7ae27d98d0329dd000000" alt="" data-mce-src="http://127.0.0.1:8008/api/file/getImg?fileId=54c7ae27d98d0329dd000000"></p><p><br></p><p><img src="http://127.0.0.1:8008/api/file/getImage?fileId=54c7ae855e94ea2dba000000" alt="" data-mce-src="http://127.0.0.1:8008/api/file/getImage?fileId=54c7ae855e94ea2dba000000" style="display: block; margin-left: auto; margin-right: auto;"></p><p><br></p><p><br></p>] IsBlog:[false] token:[user1] 
+files[0][HasBody]:[true]]		
+		*/
+		nameIsSlice := strings.Contains(name, "[")
+//		fmt.Println(params.Values["files[1]"])
+//		fmt.Println(params.Values["Title"])
+		for key, _ := range params.Values {// Title, Content, Files
 			// 这里, 如果没有点, 默认就是a.
 			// life
+//			fmt.Println("key:" + key); // files[0][LocalFileId]
+//			fmt.Println("name:" + name); // files[0][LocalFileId]
 			var suffix string
 			var noPrefix = false
-			if !strings.HasPrefix(key, name + ".") {
+			if nameIsSlice && strings.HasPrefix(key, name) {
+				suffix = key[len(name)+1:len(key)-1] // files[0][LocalFileId] 去掉 => LocalFileId
+			} else if !strings.HasPrefix(key, name + ".") {
 				noPrefix = true
 				suffix = key
 	//			continue
@@ -71,13 +91,18 @@ var leanoteStructBinder = revel.Binder{
 				// Strip off the prefix. e.g. foo.bar.baz => bar.baz
 				suffix = key[len(name)+1:]
 			}
+//			fmt.Println(suffix);
 	
 			fieldName := nextKey(suffix) // e.g. bar => "bar", bar.baz => "bar", bar[0] => "bar"
+//			fmt.Println(fieldName);
 			fieldLen := len(fieldName)
 			
 			if _, ok := fieldValues[fieldName]; !ok {
 				// Time to bind this field.  Get it and make sure we can set it.
+				fieldName = strings.Title(fieldName) // 传过来title, 但struct是Title
+//				fmt.Println("xx: " + fieldName)
 				fieldValue := result.FieldByName(fieldName)
+//				fmt.Println(fieldValue)
 				if !fieldValue.IsValid() {
 					continue
 				}
@@ -87,8 +112,16 @@ var leanoteStructBinder = revel.Binder{
 				var boundVal reflect.Value
 				// 没有name前缀
 				if(noPrefix) {
+					// life
+//					fmt.Println("<<")
+//					fmt.Println(strings.Title(key[:fieldLen]));
 					boundVal = revel.Bind(params, key[:fieldLen], fieldValue.Type())
 				} else {
+//					fmt.Println("final")
+//					fmt.Println(key[:len(name)+1+fieldLen]) // files[0][HasBody
+					if nameIsSlice {
+						fieldLen += 1
+					}
 					boundVal = revel.Bind(params, key[:len(name)+1+fieldLen], fieldValue.Type())
 				}
 				fieldValue.Set(boundVal)
@@ -116,5 +149,8 @@ func init() {
 	revel.TypeBinders[reflect.TypeOf(info.UserBlogComment{})] = leanoteStructBinder
 	revel.TypeBinders[reflect.TypeOf(info.UserBlogStyle{})] = leanoteStructBinder
 	revel.TypeBinders[reflect.TypeOf(info.Notebook{})] = leanoteStructBinder
+	revel.TypeBinders[reflect.TypeOf(info.UserAccount{})] = leanoteStructBinder
 	revel.TypeBinders[reflect.TypeOf(controllers.NoteOrContent{})] = leanoteStructBinder
+	revel.TypeBinders[reflect.TypeOf(info.ApiNote{})] = leanoteStructBinder
+	revel.TypeBinders[reflect.TypeOf(info.NoteFile{})] = leanoteStructBinder
 }

app/lea/blog/Template.go

@@ -0,0 +1,300 @@
+package blog
+
+import (
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"html/template"
+	"io/ioutil"
+	//	"os"
+	"fmt"
+	"bytes"
+	"io"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+//--------------------
+// leanote 自定义主题
+// 不使用revel的模板机制
+// By life
+//--------------------
+
+var ts = []string{"header.html", "footer.html", "highlight.html", "comment.html", "view.html", "404.html"}
+var selfTs = []string{"header.html", "footer.html", "index.html", "about_me.html"} // 用户自定义的文件列表
+
+type BlogTpl struct {
+	Template    *template.Template
+	PathContent map[string]string // path => content
+}
+
+func (this *BlogTpl) Content(name string) string {
+	return this.PathContent[name]
+}
+
+var BlogTplObject *BlogTpl
+var CloneTemplate *template.Template
+
+type RenderTemplateResult struct {
+	Template    *template.Template
+	PathContent map[string]string
+	RenderArgs  map[string]interface{}
+	
+	IsPreview bool // 是否是预览
+	CurBlogTpl *BlogTpl
+}
+
+func parseTemplateError(err error) (templateName string, line int, description string) {
+	description = err.Error()
+	i := regexp.MustCompile(`:\d+:`).FindStringIndex(description)
+	if i != nil {
+		line, err = strconv.Atoi(description[i[0]+1 : i[1]-1])
+		if err != nil {
+		}
+		templateName = description[:i[0]]
+		if colon := strings.Index(templateName, ":"); colon != -1 {
+			templateName = templateName[colon+1:]
+		}
+		templateName = strings.TrimSpace(templateName)
+		description = description[i[1]+1:]
+	}
+	return templateName, line, description
+}
+func (r *RenderTemplateResult) render(req *revel.Request, resp *revel.Response, wr io.Writer) {
+	err := r.Template.Execute(wr, r.RenderArgs)
+	if err == nil {
+		return
+	}
+
+	var templateContent []string
+	templateName, line, description := parseTemplateError(err)
+	var content = ""
+	if templateName == "" {
+		templateName = r.Template.Name()
+		content = r.PathContent[templateName]
+	} else {
+		content = r.PathContent[templateName]
+	}
+	if content != "" {
+		templateContent = strings.Split(content, "\n")
+	}
+
+	compileError := &revel.Error{
+		Title:       "Template Execution Error",
+		Path:        templateName,
+		Description: description,
+		Line:        line,
+		SourceLines: templateContent,
+	}
+	
+	// 这里, 错误!!
+	// 这里应该导向到本主题的错误页面
+	resp.Status = 500
+	ErrorResult{r.RenderArgs, compileError, r.IsPreview, r.CurBlogTpl}.Apply(req, resp)
+}
+
+func (r *RenderTemplateResult) Apply(req *revel.Request, resp *revel.Response) {
+	// Handle panics when rendering templates.
+	defer func() {
+		if err := recover(); err != nil {
+		}
+	}()
+
+	chunked := revel.Config.BoolDefault("results.chunked", false)
+
+	// If it's a HEAD request, throw away the bytes.
+	out := io.Writer(resp.Out)
+	if req.Method == "HEAD" {
+		out = ioutil.Discard
+	}
+
+	// In a prod mode, write the status, render, and hope for the best.
+	// (In a dev mode, always render to a temporary buffer first to avoid having
+	// error pages distorted by HTML already written)
+	if chunked && !revel.DevMode {
+		resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
+		r.render(req, resp, out) // 这里!!!
+		return
+	}
+	
+	// Render the template into a temporary buffer, to see if there was an error
+	// rendering the template.  If not, then copy it into the response buffer.
+	// Otherwise, template render errors may result in unpredictable HTML (and
+	// would carry a 200 status code)
+	var b bytes.Buffer
+	r.render(req, resp, &b)
+	if !chunked {
+		resp.Out.Header().Set("Content-Length", strconv.Itoa(b.Len()))
+	}
+	resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
+	b.WriteTo(out)
+}
+
+// 博客模板
+func Init() {
+	BlogTplObject = &BlogTpl{PathContent: map[string]string{}}
+	BlogTplObject.Template = template.New("blog").Funcs(revel.TemplateFuncs)
+	for _, path := range ts {
+		fileBytes, _ := ioutil.ReadFile(revel.ViewsPath + "/Blog/" + path)
+		fileStr := string(fileBytes)
+		path := "blog/" + path
+//		path := path
+		BlogTplObject.PathContent[path] = fileStr
+		BlogTplObject.Template.New(path).Parse(fileStr) // 以blog为根
+	}
+	// 复制一份
+	CloneTemplate, _ = BlogTplObject.Template.Clone()
+}
+
+// name = index.html, search.html, cate.html, page.html
+// basePath 表未用户主题的基路径, 如/xxx/public/upload/32323232/themes/theme1, 如果没有, 则表示用自带的
+// isPreview 如果是, 错误提示则显示系统的 500 错误详情信息, 供debug
+//
+func RenderTemplate(name string, args map[string]interface{}, basePath string, isPreview bool) revel.Result {
+	var r *RenderTemplateResult
+	// 传来的主题路径为空, 则用系统的
+	// 都不会为空的
+	if basePath == "" {
+		path := "blog/" + name
+//		path := name
+		t := BlogTplObject.Template.Lookup(path)
+		r = &RenderTemplateResult{
+			Template:    t,
+			PathContent: BlogTplObject.PathContent, // 为了显示错误
+			RenderArgs:  args,                      // 把args给它
+		}
+	} else {
+		// 复制一份
+		newBlogTplObject := &BlogTpl{}
+		var err error
+		newBlogTplObject.Template, err = CloneTemplate.Clone() // 复制一份, 为防止多用户出现问题, 因为newBlogTplObject是全局的
+		if err != nil {
+			return nil
+		}
+		newBlogTplObject.PathContent = map[string]string{}
+		for k, v := range BlogTplObject.PathContent {
+			newBlogTplObject.PathContent[k] = v
+		}
+
+		// 将该basePath下的所有文件提出
+		files := ListDir(basePath)
+		for _, t := range files {
+			if !strings.Contains(t, ".html") {
+				continue;
+			}
+			fileBytes, err := ioutil.ReadFile(basePath + "/" + t)
+			if err != nil {
+				continue
+			}
+			fileStr := string(fileBytes)
+			newBlogTplObject.PathContent[t] = fileStr
+			newBlogTplObject.Template.New(t).Parse(fileStr)
+		}
+
+		// 如果本主题下没有, 则用系统的
+		t := newBlogTplObject.Template.Lookup(name)
+		
+		if t == nil {
+			path := "blog/" + name
+			t = BlogTplObject.Template.Lookup(path)
+		}
+		r = &RenderTemplateResult{
+			Template:    t,
+			PathContent: newBlogTplObject.PathContent, // 为了显示错误
+			RenderArgs:  args,
+			CurBlogTpl: newBlogTplObject,
+			IsPreview: isPreview,
+		}
+	}
+
+	return r
+}
+
+
+////////////////////
+//
+
+
+type ErrorResult struct {
+	RenderArgs map[string]interface{}
+	Error      error
+	IsPreview bool
+	CurBlogTpl *BlogTpl
+}
+
+// 错误显示出
+func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) {
+	format := req.Format
+	status := resp.Status
+	if status == 0 {
+		status = http.StatusInternalServerError
+	}
+
+	contentType := revel.ContentTypeByFilename("xxx." + format)
+	if contentType == revel.DefaultFileContentType {
+		contentType = "text/plain"
+	}
+
+	// Get the error template.
+	var err error
+	templatePath := fmt.Sprintf("errors/%d.%s", status, format)
+	err = nil
+//	tmpl, err := revel.MainTemplateLoader.Template("index.html") // 这里找到错误页面主题
+
+	// This func shows a plaintext error message, in case the template rendering
+	// doesn't work.
+	showPlaintext := func(err error) {
+		revel.PlaintextErrorResult{fmt.Errorf("Server Error:\n%s\n\n"+
+			"Additionally, an error occurred when rendering the error page:\n%s",
+			r.Error, err)}.Apply(req, resp)
+	}
+
+	// 根据是否是preview来得到404模板
+	// 是, 则显示系统的错误信息, blog-500.html
+	var tmpl *template.Template
+	if r.IsPreview {
+		tmpl = r.CurBlogTpl.Template.Lookup("blog/404.html")
+	} else {
+		tmpl = r.CurBlogTpl.Template.Lookup("404.html")
+	}
+	if tmpl == nil {
+		if err == nil {
+			err = fmt.Errorf("Couldn't find template %s", templatePath)
+		}
+		showPlaintext(err)
+		return
+	}
+
+	// If it's not a revel error, wrap it in one.
+	var revelError *revel.Error
+	switch e := r.Error.(type) {
+	case *revel.Error:
+		revelError = e
+	case error:
+		revelError = &revel.Error{
+			Title:       "Server Error",
+			Description: e.Error(),
+		}
+	}
+
+	if revelError == nil {
+		panic("no error provided")
+	}
+
+	if r.RenderArgs == nil {
+		r.RenderArgs = make(map[string]interface{})
+	}
+	r.RenderArgs["Error"] = revelError
+	r.RenderArgs["Router"] = revel.MainRouter
+
+	// 不是preview就不要显示错误了
+	if r.IsPreview {
+		var b bytes.Buffer
+		out := io.Writer(resp.Out)
+		//	out = ioutil.Discard
+		err = tmpl.Execute(&b, r.RenderArgs)
+		resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
+		b.WriteTo(out)
+	}
+}

app/lea/captcha/Captcha.go

@@ -0,0 +1,399 @@
+package captcha
+
+import (
+    "image"
+    "image/color"
+    "image/png"
+    "io"
+    "math/rand"
+    crand "crypto/rand"
+    "time"
+    "strconv"
+)
+const (
+    stdWidth = 100
+    stdHeight = 40
+    maxSkew = 2
+)
+
+const (
+    fontWidth  = 5
+    fontHeight = 8
+    blackChar  = 1
+)
+ 
+var font = [][]byte{
+    { // 0
+        0, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        0, 1, 1, 1, 0,
+    },
+    { // 1
+        0, 0, 1, 0, 0,
+        0, 1, 1, 0, 0,
+        1, 0, 1, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 1, 0, 0,
+        1, 1, 1, 1, 1,
+    },
+    { // 2
+        0, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 1, 1,
+        0, 1, 1, 0, 0,
+        1, 0, 0, 0, 0,
+        1, 0, 0, 0, 0,
+        1, 1, 1, 1, 1,
+    },
+    { // 3
+        1, 1, 1, 1, 0,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 1, 0,
+        0, 1, 1, 1, 0,
+        0, 0, 0, 1, 0,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        1, 1, 1, 1, 0,
+    },
+    { // 4
+        1, 0, 0, 1, 0,
+        1, 0, 0, 1, 0,
+        1, 0, 0, 1, 0,
+        1, 0, 0, 1, 0,
+        1, 1, 1, 1, 1,
+        0, 0, 0, 1, 0,
+        0, 0, 0, 1, 0,
+        0, 0, 0, 1, 0,
+    },
+    { // 5
+        1, 1, 1, 1, 1,
+        1, 0, 0, 0, 0,
+        1, 0, 0, 0, 0,
+        1, 1, 1, 1, 0,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        1, 1, 1, 1, 0,
+    },
+    { // 6
+        0, 0, 1, 1, 1,
+        0, 1, 0, 0, 0,
+        1, 0, 0, 0, 0,
+        1, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        0, 1, 1, 1, 0,
+    },
+    { // 7
+        1, 1, 1, 1, 1,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 1, 0,
+        0, 0, 1, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 1, 0, 0, 0,
+    },
+    { // 8
+        0, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        0, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        0, 1, 1, 1, 0,
+    },
+    { // 9
+        0, 1, 1, 1, 0,
+        1, 0, 0, 0, 1,
+        1, 0, 0, 0, 1,
+        1, 1, 0, 0, 1,
+        0, 1, 1, 1, 1,
+        0, 0, 0, 0, 1,
+        0, 0, 0, 0, 1,
+        1, 1, 1, 1, 0,
+    },
+}
+ 
+type Image struct {
+    *image.NRGBA
+    color   *color.NRGBA
+    width   int  //a digit width
+    height  int  //a digit height
+    dotsize int
+}
+func init(){
+    rand.Seed(int64(time.Second))
+}
+ 
+func NewImage(digits []byte, width, height int) *Image {
+    img := new(Image)
+    r := image.Rect(img.width, img.height, stdWidth, stdHeight)
+    img.NRGBA = image.NewNRGBA(r)
+     
+    img.color = &color.NRGBA{
+        uint8(rand.Intn(129)),
+        uint8(rand.Intn(129)),
+        uint8(rand.Intn(129)),
+        0xFF,
+    }
+    // Draw background (10 random circles of random brightness)
+    img.calculateSizes(width, height, len(digits))
+    img.fillWithCircles(10, img.dotsize)
+ 
+    maxx := width - (img.width+img.dotsize)*len(digits) - img.dotsize
+    maxy := height - img.height - img.dotsize*2
+ 
+    x := rnd(img.dotsize*2, maxx)
+    y := rnd(img.dotsize*2, maxy)
+ 
+    // Draw digits.
+    for _, n := range digits {
+        img.drawDigit(font[n], x, y)
+        x += img.width + img.dotsize
+    }
+ 
+    // Draw strike-through line.
+    // 中间线不要
+    //img.strikeThrough()
+    
+    return img
+}
+ 
+func (img *Image) WriteTo(w io.Writer) (int64, error) {
+    return 0, png.Encode(w, img)
+}
+ 
+func (img *Image) calculateSizes(width, height, ncount int) {
+ 
+    // Goal: fit all digits inside the image.
+    var border int
+    if width > height {
+        border = height / 5
+    } else {
+        border = width / 5
+    }
+    // Convert everything to floats for calculations.
+    w := float64(width - border*2) //268
+    h := float64(height - border*2) //48
+    // fw takes into account 1-dot spacing between digits.
+ 
+    fw := float64(fontWidth) + 1 //6
+ 
+    fh := float64(fontHeight)  //8
+    nc := float64(ncount)  //7
+ 
+    // Calculate the width of a single digit taking into account only the
+    // width of the image.
+    nw := w / nc //38
+    // Calculate the height of a digit from this width.
+    nh := nw * fh / fw //51
+ 
+    // Digit too high?
+ 
+    if nh > h {
+        // Fit digits based on height.
+        nh = h //nh = 44
+        nw = fw / fh * nh
+    }
+    // Calculate dot size.
+    img.dotsize = int(nh / fh)
+    // Save everything, making the actual width smaller by 1 dot to account
+    // for spacing between digits.
+    img.width = int(nw)
+    img.height = int(nh) - img.dotsize
+}
+ 
+func (img *Image) fillWithCircles(n, maxradius int) {
+    color := img.color
+    maxx := img.Bounds().Max.X
+    maxy := img.Bounds().Max.Y
+    for i := 0; i < n; i++ {
+        setRandomBrightness(color, 255)
+        r := rnd(1, maxradius)
+        img.drawCircle(color, rnd(r, maxx-r), rnd(r, maxy-r), r)
+    }
+}
+ 
+func (img *Image) drawHorizLine(color color.Color, fromX, toX, y int) {
+    for x := fromX; x <= toX; x++ {
+        img.Set(x, y, color)
+    }
+}
+ 
+func (img *Image) drawCircle(color color.Color, x, y, radius int) {
+    f := 1 - radius
+    dfx := 1
+    dfy := -2 * radius
+    xx := 0
+    yy := radius
+ 
+    img.Set(x, y+radius, color)
+    img.Set(x, y-radius, color)
+    img.drawHorizLine(color, x-radius, x+radius, y)
+ 
+    for xx < yy {
+        if f >= 0 {
+            yy--
+            dfy += 2
+            f += dfy
+        }
+        xx++
+        dfx += 2
+        f += dfx
+        img.drawHorizLine(color, x-xx, x+xx, y+yy)
+        img.drawHorizLine(color, x-xx, x+xx, y-yy)
+        img.drawHorizLine(color, x-yy, x+yy, y+xx)
+        img.drawHorizLine(color, x-yy, x+yy, y-xx)
+    }
+}
+ 
+func (img *Image) strikeThrough() {
+    r := 0
+    maxx := img.Bounds().Max.X
+    maxy := img.Bounds().Max.Y
+    y := rnd(maxy/3, maxy-maxy/3)
+    for x := 0; x < maxx; x += r {
+        r = rnd(1, img.dotsize/3)
+        y += rnd(-img.dotsize/2, img.dotsize/2)
+        if y <= 0 || y >= maxy {
+            y = rnd(maxy/3, maxy-maxy/3)
+        }
+        img.drawCircle(img.color, x, y, r)
+    }
+}
+ 
+func (img *Image) drawDigit(digit []byte, x, y int) {
+    skf := rand.Float64() * float64(rnd(-maxSkew, maxSkew))
+    xs := float64(x)
+    minr := img.dotsize / 2               // minumum radius
+    maxr := img.dotsize/2 + img.dotsize/4 // maximum radius
+    y += rnd(-minr, minr)
+    for yy := 0; yy < fontHeight; yy++ {
+        for xx := 0; xx < fontWidth; xx++ {
+            if digit[yy*fontWidth+xx] != blackChar {
+                continue
+            }
+            // Introduce random variations.
+            or := rnd(minr, maxr)
+            ox := x + (xx * img.dotsize) + rnd(0, or/2)
+            oy := y + (yy * img.dotsize) + rnd(0, or/2)
+ 
+            img.drawCircle(img.color, ox, oy, or)
+        }
+        xs += skf
+        x = int(xs)
+    }
+}
+ 
+func setRandomBrightness(c *color.NRGBA, max uint8) {
+    minc := min3(c.R, c.G, c.B)
+    maxc := max3(c.R, c.G, c.B)
+    if maxc > max {
+        return
+    }
+    n := rand.Intn(int(max-maxc)) - int(minc)
+    c.R = uint8(int(c.R) + n)
+    c.G = uint8(int(c.G) + n)
+    c.B = uint8(int(c.B) + n)
+}
+ 
+func min3(x, y, z uint8) (o uint8) {
+    o = x
+    if y < o {
+        o = y
+    }
+    if z < o {
+        o = z
+    }
+    return
+}
+ 
+func max3(x, y, z uint8) (o uint8) {
+    o = x
+    if y > o {
+        o = y
+    }
+    if z > o {
+        o = z
+    }
+    return
+}
+ 
+// rnd returns a random number in range [from, to].
+func rnd(from, to int) int {
+    //println(to+1-from)
+    return rand.Intn(to+1-from) + from
+}
+ 
+const (
+    // Standard length of uniuri string to achive ~95 bits of entropy.
+    StdLen = 16
+    // Length of uniurl string to achive ~119 bits of entropy, closest
+    // to what can be losslessly converted to UUIDv4 (122 bits).
+    UUIDLen = 20
+)
+ 
+// Standard characters allowed in uniuri string.
+var StdChars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")
+ 
+// New returns a new random string of the standard length, consisting of
+// standard characters.
+func New() string {
+    return NewLenChars(StdLen, StdChars)
+}
+ 
+// NewLen returns a new random string of the provided length, consisting of
+// standard characters.
+func NewLen(length int) string {
+    return NewLenChars(length, StdChars)
+}
+ 
+// NewLenChars returns a new random string of the provided length, consisting
+// of the provided byte slice of allowed characters (maximum 256).
+func NewLenChars(length int, chars []byte) string {
+    b := make([]byte, length)
+    r := make([]byte, length+(length/4)) // storage for random bytes.
+    clen := byte(len(chars))
+    maxrb := byte(256 - (256 % len(chars)))
+    i := 0
+    for {
+        if _, err := io.ReadFull(crand.Reader, r); err != nil {
+            panic("error reading from random source: " + err.Error())
+        }
+        for _, c := range r {
+            if c >= maxrb {
+                // Skip this number to avoid modulo bias.
+                continue
+            }
+            b[i] = chars[c%clen]
+            i++
+            if i == length {
+                return string(b)
+            }
+        }
+    }
+    panic("unreachable")
+}
+
+func Fetch() (*Image, string) {
+    d := make([]byte, 4)
+    s := NewLen(4)
+    ss := ""
+    d = []byte(s)
+    for v := range d {
+        d[v] %= 10
+        ss += strconv.FormatInt(int64(d[v]), 32)
+    }
+    return NewImage(d, 100, 40), ss
+}

app/lea/html2image/ToImage.go

@@ -0,0 +1,10 @@
+package html2image
+
+import (
+	"github.com/leanote/leanote/app/info"
+)
+
+func Html2Image(userInfo info.User, note info.Note, content, toPath string) bool {
+	return true
+}
+

app/lea/memcache/Memcache.go

@@ -3,9 +3,20 @@ package memcache
 import (
 	"github.com/robfig/gomemcache/memcache"
 	"encoding/json"
+	"strconv"
 )
 
-func Set(key string, value map[string]string, expiration int32) {
+var client *memcache.Client
+
+// onAppStart后调用
+func InitMemcache() {
+	client = memcache.New("localhost:11211")	
+}
+
+//------------
+// map
+
+func SetMap(key string, value map[string]string, expiration int32) {
 	// 把value转成byte
 	bytes, _ := json.Marshal(value)
 	if expiration == -1 {
@@ -14,7 +25,7 @@ func Set(key string, value map[string]string, expiration int32) {
 	client.Set(&memcache.Item{Key: key, Value: bytes, Expiration: expiration})
 }
 
-func Get(key string) map[string]string {
+func GetMap(key string) map[string]string {
 	item, err := client.Get(key)
 	if err != nil {
 		return nil
@@ -24,3 +35,32 @@ func Get(key string) map[string]string {
 	json.Unmarshal(item.Value, &m)	
 	return m
 }
+
+//------------
+// string
+func GetString(key string) string {
+	item, err := client.Get(key)
+	if err != nil {
+		return ""
+	}
+	return string(item.Value)
+}
+func SetString(key string, value string, expiration int32) {
+	if expiration == -1 {
+		expiration = 30 * 24 * 60 * 60 // 30天
+	}
+	client.Set(&memcache.Item{Key: key, Value: []byte(value), Expiration: expiration})
+}
+
+//-------------------------
+// int, 是通过转成string来存的
+
+func GetInt(key string) int {
+	str := GetString(key)
+	i, _ := strconv.Atoi(str)
+	return i
+}
+func SetInt(key string, value int, expiration int32) {
+	str := strconv.Itoa(value)
+	SetString(key, str, expiration)
+}

app/lea/memcache/init.go

@@ -1,11 +0,0 @@
-package memcache
-
-import (
-	"github.com/robfig/gomemcache/memcache"
-)
-
-var client *memcache.Client
-
-func init() {
-	// client = memcache.New("localhost:11211")	
-}

app/lea/netutil/NetUtil.go

@@ -3,6 +3,7 @@ import (
 	"strings"
 	"os"
 //	"path/filepath"
+	"net"
 	"net/http"
 	"io/ioutil"
 	. "github.com/leanote/leanote/app/lea"
@@ -13,7 +14,7 @@ import (
 // toPath 文件保存的目录
 // 默认是/tmp
 // 返回文件的完整目录
-func WriteUrl(url string, toPath string) (path string, ok bool) {
+func WriteUrl(url string, toPath string) (length int64, newFilename, path string, ok bool) {
 	if url == "" {
 		return;
 	}
@@ -22,6 +23,8 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
 		return;
 	}
 	
+	length = int64(len(content))
+	
 	// a.html?a=a11&xxx
 	url = trimQueryParams(url)
 	_, ext := SplitFilename(url)
@@ -29,13 +32,8 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
 		toPath = "/tmp"
 	}
 //	dir := filepath.Dir(toPath)
-	newFilename := NewGuid() + ext
+	newFilename = NewGuid() + ext
 	fullPath := toPath + "/" + newFilename
-	/*
-	if err := os.MkdirAll(dir, 0777); err != nil {
-		return 
-	}
-	*/
 	
 	// 写到文件中
 	file, err := os.Create(fullPath)
@@ -54,6 +52,7 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
 func GetContent(url string) (content []byte, err error) {
 	var resp *http.Response
 	resp, err = http.Get(url)
+	Log(err)
 	if(resp != nil && resp.Body != nil) {
 		defer resp.Body.Close()
 	} else {
@@ -65,6 +64,7 @@ func GetContent(url string) (content []byte, err error) {
     var buf []byte
    	buf, err = ioutil.ReadAll(resp.Body)
    	if(err != nil) {
+   		Log(err)
 		return
 	}
 	
@@ -91,3 +91,12 @@ func trimQueryParams(url string) string {
 	}
 	return url;
 }
+
+// 通过domain得到ip
+func GetIpFromDomain(domain string) string {
+	ip, _ := net.LookupIP(domain)
+	if ip != nil && len(ip) > 0 {
+		return ip[0].String()
+	}
+	return ""
+}

app/lea/route/Route.go

@@ -0,0 +1,83 @@
+package route
+
+import (
+	"github.com/revel/revel"
+//	"github.com/leanote/leanote/app/service"
+//	. "github.com/leanote/leanote/app/lea"
+	"net/url"
+	"strings"
+)
+
+// overwite revel RouterFilter
+// /api/user/Info => ApiUser.Info()
+var staticPrefix = []string{"/public", "/favicon.ico", "/css", "/js", "/images", "/tinymce", "/upload", "/fonts"}
+func RouterFilter(c *revel.Controller, fc []revel.Filter) {
+	// 补全controller部分
+	path := c.Request.Request.URL.Path
+	
+	// Figure out the Controller/Action
+	var route *revel.RouteMatch = revel.MainRouter.Route(c.Request.Request)
+	if route == nil {
+		c.Result = c.NotFound("No matching route found: " + c.Request.RequestURI)
+		return
+	}
+
+	// The route may want to explicitly return a 404.
+	if route.Action == "404" {
+		c.Result = c.NotFound("(intentionally)")
+		return
+	}
+	
+	//----------
+	// life start
+	/*
+	type URL struct {
+	    Scheme   string
+	    Opaque   string    // encoded opaque data
+	    User     *Userinfo // username and password information
+	    Host     string    // host or host:port
+	    Path     string
+	    RawQuery string // encoded query values, without '?'
+	    Fragment string // fragment for references, without '#'
+	}
+	*/
+	if route.ControllerName != "Static" {
+		// api设置
+		// leanote.com/api/user/get => ApiUser::Get
+		//*       /api/login               ApiAuth.Login,  这里的设置, 其实已经转成了ApiAuth了
+		if strings.HasPrefix(path, "/api") && !strings.HasPrefix(route.ControllerName, "Api"){
+			route.ControllerName = "Api" + route.ControllerName
+		} else if strings.HasPrefix(path, "/member") && !strings.HasPrefix(route.ControllerName, "Member") {
+			// member设置
+			route.ControllerName = "Member" + route.ControllerName
+		}
+		// end
+	}
+	
+	// Set the action.
+	if err := c.SetAction(route.ControllerName, route.MethodName); err != nil {
+		c.Result = c.NotFound(err.Error())
+		return
+	}
+
+	// Add the route and fixed params to the Request Params.
+	c.Params.Route = route.Params
+
+	// Add the fixed parameters mapped by name.
+	// TODO: Pre-calculate this mapping.
+	for i, value := range route.FixedParams {
+		if c.Params.Fixed == nil {
+			c.Params.Fixed = make(url.Values)
+		}
+		if i < len(c.MethodType.Args) {
+			arg := c.MethodType.Args[i]
+			c.Params.Fixed.Set(arg.Name, value)
+		} else {
+			revel.WARN.Println("Too many parameters to", route.Action, "trying to add", value)
+			break
+		}
+	}
+
+	fc[0](c, fc[1:])
+}
+

app/lea/session/MSession.go

@@ -0,0 +1,38 @@
+package session
+
+import (
+	"github.com/revel/revel"
+	"github.com/leanote/leanote/app/lea/memcache"
+	. "github.com/leanote/leanote/app/lea"
+)
+
+// 使用filter
+// 很巧妙就使用了memcache来处理session
+// revel的session(cookie)只存sessionId, 其它信息存在memcache中
+
+func MSessionFilter(c *revel.Controller, fc []revel.Filter) {
+	sessionId := c.Session.Id()
+	
+	// 从memcache中得到cache, 赋给session
+	cache := revel.Session(memcache.GetMap(sessionId))
+	
+	Log("memcache")
+	LogJ(cache)
+	if cache == nil {
+		cache = revel.Session{}
+		cache.Id()
+	}
+	c.Session = cache
+	
+	// Make session vars available in templates as {{.session.xyz}}
+	c.RenderArgs["session"] = c.Session
+
+	fc[0](c, fc[1:])
+	
+	// 再把session保存之
+	LogJ(c.Session)
+	memcache.SetMap(sessionId, c.Session, -1)	
+
+	// 只留下sessionId
+	c.Session = revel.Session{revel.SESSION_ID_KEY: sessionId}
+}

app/lea/session/session.go

@@ -1,31 +1,208 @@
 package session
 
 import (
-	"github.com/robfig/revel"
+	"github.com/revel/revel"
-	"leanote/app/lea/memcache"
+//	. "github.com/leanote/leanote/app/lea"
-//	. "leanote/app/lea"
+	"crypto/rand"
+	"encoding/hex"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
 )
 
-// 使用filter
+// 主要修改revel的cookie, 设置Domain
-// 很巧妙就使用了memcache来处理session
+// 为了使sub domain共享cookie
-// revel的session(cookie)只存sessionId, 其它信息存在memcache中
+// cookie.domain = leanote.com
 
-func SessionFilter(c *revel.Controller, fc []revel.Filter) {
+// A signed cookie (and thus limited to 4kb in size).
-	sessionId := c.Session.Id()
+// Restriction: Keys may not have a colon in them.
+type Session map[string]string
 
-	// 从memcache中得到cache, 赋给session
+const (
-	cache := revel.Session(memcache.Get(sessionId))
+	SESSION_ID_KEY = "_ID"
-	if cache == nil {
+	TIMESTAMP_KEY  = "_TS"
-		cache = revel.Session{}
+)
-		cache.Id()
+
+// expireAfterDuration is the time to live, in seconds, of a session cookie.
+// It may be specified in config as "session.expires". Values greater than 0
+// set a persistent cookie with a time to live as specified, and the value 0
+// sets a session cookie.
+var expireAfterDuration time.Duration
+var cookieDomain = "" // life
+func init() {
+	// Set expireAfterDuration, default to 30 days if no value in config
+	revel.OnAppStart(func() {
+		var err error
+		if expiresString, ok := revel.Config.String("session.expires"); !ok {
+			expireAfterDuration = 30 * 24 * time.Hour
+		} else if expiresString == "session" {
+			expireAfterDuration = 0
+		} else if expireAfterDuration, err = time.ParseDuration(expiresString); err != nil {
+			panic(fmt.Errorf("session.expires invalid: %s", err))
+		}
+		
+		cookieDomain, _ = revel.Config.String("cookie.domain")
+	})
+}
+
+// Id retrieves from the cookie or creates a time-based UUID identifying this
+// session.
+func (s Session) Id() string {
+	if sessionIdStr, ok := s[SESSION_ID_KEY]; ok {
+		return sessionIdStr
 	}
-	c.Session = cache
+
+	buffer := make([]byte, 32)
+	if _, err := rand.Read(buffer); err != nil {
+		panic(err)
+	}
+
+	s[SESSION_ID_KEY] = hex.EncodeToString(buffer)
+	return s[SESSION_ID_KEY]
+}
+
+// getExpiration return a time.Time with the session's expiration date.
+// If previous session has set to "session", remain it
+func (s Session) getExpiration() time.Time {
+	if expireAfterDuration == 0 || s[TIMESTAMP_KEY] == "session" {
+		// Expire after closing browser
+		return time.Time{}
+	}
+	return time.Now().Add(expireAfterDuration)
+}
+
+// cookie returns an http.Cookie containing the signed session.
+func (s Session) cookie() *http.Cookie {
+	var sessionValue string
+	ts := s.getExpiration()
+	s[TIMESTAMP_KEY] = getSessionExpirationCookie(ts)
+	for key, value := range s {
+		if strings.ContainsAny(key, ":\x00") {
+			panic("Session keys may not have colons or null bytes")
+		}
+		if strings.Contains(value, "\x00") {
+			panic("Session values may not have null bytes")
+		}
+		sessionValue += "\x00" + key + ":" + value + "\x00"
+	}
+
+	sessionData := url.QueryEscape(sessionValue)
+	cookie := http.Cookie{
+		Name:     revel.CookiePrefix + "_SESSION",
+		Value:    revel.Sign(sessionData) + "-" + sessionData,
+		Path:     "/",
+		HttpOnly: revel.CookieHttpOnly,
+		Secure:   revel.CookieSecure,
+		Expires:  ts.UTC(),
+	}
+	
+	if cookieDomain != "" {
+		cookie.Domain = cookieDomain
+	}
+	
+	return &cookie
+}
+
+// sessionTimeoutExpiredOrMissing returns a boolean of whether the session
+// cookie is either not present or present but beyond its time to live; i.e.,
+// whether there is not a valid session.
+func sessionTimeoutExpiredOrMissing(session Session) bool {
+	if exp, present := session[TIMESTAMP_KEY]; !present {
+		return true
+	} else if exp == "session" {
+		return false
+	} else if expInt, _ := strconv.Atoi(exp); int64(expInt) < time.Now().Unix() {
+		return true
+	}
+	return false
+}
+
+// getSessionFromCookie returns a Session struct pulled from the signed
+// session cookie.
+func getSessionFromCookie(cookie *http.Cookie) Session {
+	session := make(Session)
+
+	// Separate the data from the signature.
+	hyphen := strings.Index(cookie.Value, "-")
+	if hyphen == -1 || hyphen >= len(cookie.Value)-1 {
+		return session
+	}
+	sig, data := cookie.Value[:hyphen], cookie.Value[hyphen+1:]
+
+	// Verify the signature.
+	if !revel.Verify(data, sig) {
+		revel.INFO.Println("Session cookie signature failed")
+		return session
+	}
+
+	revel.ParseKeyValueCookie(data, func(key, val string) {
+		session[key] = val
+	})
+
+	if sessionTimeoutExpiredOrMissing(session) {
+		session = make(Session)
+	}
+
+	return session
+}
+
+// SessionFilter is a Revel Filter that retrieves and sets the session cookie.
+// Within Revel, it is available as a Session attribute on Controller instances.
+// The name of the Session cookie is set as CookiePrefix + "_SESSION".
+func SessionFilter(c *revel.Controller, fc []revel.Filter) {
+	session := restoreSession(c.Request.Request)
+	// c.Session, 重新生成一个revel.Session给controller!!!
+//	Log("sessoin--------")
+//	LogJ(session)
+	revelSession := revel.Session(session) // 强制转换 还是同一个对象, 但有个问题, 这样Session.Id()方法是用revel的了
+	c.Session = revelSession
+	// 生成sessionId
+	c.Session.Id()
+	sessionWasEmpty := len(c.Session) == 0
+
+	// Make session vars available in templates as {{.session.xyz}}
+	c.RenderArgs["session"] = c.Session
 
 	fc[0](c, fc[1:])
 
-	// 再把session保存之
+	// Store the signed session if it could have changed.
-	memcache.Set(sessionId, c.Session, -1)	
+	if len(c.Session) > 0 || !sessionWasEmpty {
+		// 转换成lea.Session
+		session = Session(c.Session)
+		c.SetCookie(session.cookie())
+	}
+}
 
-	// 只留下sessionId
+// restoreSession returns either the current session, retrieved from the
-	c.Session = revel.Session{revel.SESSION_ID_KEY: sessionId}
+// session cookie, or a new session.
+func restoreSession(req *http.Request) Session {
+	cookie, err := req.Cookie(revel.CookiePrefix + "_SESSION")
+	if err != nil {
+		return make(Session)
+	} else {
+		return getSessionFromCookie(cookie)
+	}
+}
+
+// getSessionExpirationCookie retrieves the cookie's time to live as a
+// string of either the number of seconds, for a persistent cookie, or
+// "session".
+func getSessionExpirationCookie(t time.Time) string {
+	if t.IsZero() {
+		return "session"
+	}
+	return strconv.FormatInt(t.Unix(), 10)
+}
+
+// SetNoExpiration sets session to expire when browser session ends
+func (s Session) SetNoExpiration() {
+	s[TIMESTAMP_KEY] = "session"
+}
+
+// SetDefaultExpiration sets session to expire after default duration
+func (s Session) SetDefaultExpiration() {
+	delete(s, TIMESTAMP_KEY)
 }

app/release/release.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"strings"
 )
+
 /*
 用golang exec 总是说找不到uglifyjs命令, 需要全部路径
 而且node, npm要在/usr/bin下, 已建ln
@@ -31,13 +32,15 @@ import (
 //var jss = []string{"js/jquery-cookie", "js/bootstrap"}
 var jss = []string{"js/jquery-cookie", "js/bootstrap", 
 	"js/common", "js/app/note", "js/app/tag", "js/app/notebook", "js/app/share", 
-	"js/object_id", "js/ZeroClipboard/ZeroClipboard"}
+	"js/object_id"}
 	
-var base = "/Users/life/Documents/Go/package/src/github.com/leanote/leanote/public/"
+var base1 = "/Users/life/Documents/Go/package2/src/github.com/leanote/leanote/"
+var base = "/Users/life/Documents/Go/package2/src/github.com/leanote/leanote/public/"
 var cmdPath = "/usr/local/bin/uglifyjs"
 
 func cmdError(err error) {
 	if err != nil {
+		fmt.Println(err)
 		fmt.Fprintf(os.Stderr, "The command failed to perform: %s (Command: %s, Arguments: %s)", err, "", "")
 	} else {
 		fmt.Println("OK")
@@ -50,7 +53,7 @@ func compressJs(filename string) {
 	to := base + filename + "-min.js"
 	cmd := exec.Command(cmdPath, source, "-o", to)
 	_, err := cmd.CombinedOutput()
-
+	fmt.Println(source);
 	cmdError(err)
 }
 	
@@ -62,6 +65,7 @@ func combineJs() {
 	
 	for _, js := range jss {
 		to := base + js + "-min.js"
+		fmt.Println(to)
 		compressJs(js)
 		
 		// 每个压缩后的文件放入之
@@ -77,20 +81,25 @@ func combineJs() {
 // 改note-dev->note
 func dev() {
 	// 即替换note.js->note-min.js
-	m := map[string]string{"note.js": "note-min.js", 
+	m := map[string]string{"tinymce.dev.js": "tinymce.min.js", 
+		"tinymce.js": "tinymce.min.js", 
+		"jquery.ztree.all-3.5.js": "jquery.ztree.all-3.5-min.js",
+		"note.js": "note-min.js", 
 		"app.js": "app-min.js", 
 		"page.js": "page-min.js", 
 		"common.js": "common-min.js",
 		"notebook.js": "notebook-min.js",
 		"share.js": "share-min.js",
 		"tag.js": "tag-min.js",
+		"main.js": "main-min.js",
+		"jquery.slimscroll.js": "jquery.slimscroll-min.js",
 		"jquery.contextmenu.js": "jquery.contextmenu-min.js",
 		"editor/editor.js": "editor/editor-min.js",
 		"/public/mdeditor/editor/scrollLink.js": "/public/mdeditor/editor/scrollLink-min.js",
 		"console.log(o);": "",
 		}
-	path := "/Users/life/Documents/Go/package/src/github.com/leanote/leanote/src/views/note/note-dev.html"
+	path := base1 + "/src/views/note/note-dev.html"
-	target := "/Users/life/Documents/Go/package/src/github.com/leanote/leanote/src/views/note/note.html"
+	target := base1 + "/src/views/note/note.html"
 	
 	bs, _ := ioutil.ReadFile(path)
 	content := string(bs)
@@ -107,19 +116,30 @@ func tinymce() {
 //	cmd := exec.Command("/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master/node_modules/jake/bin/cli.js", "minify", "bundle[themes:modern,plugins:table,paste,advlist,autolink,link,image,lists,charmap,hr,searchreplace,visualblocks,visualchars,code,nav,tabfocus,contextmenu,directionality,codemirror,codesyntax,textcolor,fullpage]")
 	cmd := exec.Command("/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master/node_modules/jake/bin/cli.js", "minify")
 	cmd.Dir = "/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master"
-	_, err := cmd.CombinedOutput()
+	
-	cmdError(err)
+	// 必须要先删除
+	cmd2 := exec.Command("/bin/sh", "-c", "rm " + cmd.Dir + "/js/tinymce/tinymce.dev.js")
+	cmd2.CombinedOutput()
+	cmd2 = exec.Command("/bin/sh", "-c", "rm " + cmd.Dir + "/js/tinymce/tinymce.jquery.dev.js")
+	c, _ := cmd2.CombinedOutput()
+	fmt.Println(string(c))
+	c, _ = cmd.CombinedOutput()
+	fmt.Println(string(c))
 }
 
 func main() {
+	// 压缩tinymce
+	tinymce()
+	
 	dev();
 	
 	// 其它零散的需要压缩的js
-	otherJss := []string{"tinymce/tinymce", "js/app/page", "js/contextmenu/jquery.contextmenu", 
+	otherJss := []string{"tinymce/tinymce", "js/main", "js/app/page", "js/contextmenu/jquery.contextmenu", 
 		"mdeditor/editor/scrollLink", 
 		"mdeditor/editor/editor",
 		"mdeditor/editor/jquery.waitforimages",
 		"mdeditor/editor/pagedown/local/Markdown.local.zh",
+		"mdeditor/editor/pagedown/local/Markdown.local.en",
 		"mdeditor/editor/pagedown/Markdown.Editor",
 		"mdeditor/editor/pagedown/Markdown.Sanitizer",
 		"mdeditor/editor/pagedown/Markdown.Converter",
@@ -127,6 +147,10 @@ func main() {
 		"mdeditor/editor/underscore",
 		"mdeditor/editor/mathJax",
 		"js/jQuery-slimScroll-1.3.0/jquery.slimscroll",
+		"js/app/editor_drop_paste",
+		"js/app/attachment_upload",
+		"js/jquery.ztree.all-3.5",
+		"js/jQuery-slimScroll-1.3.0/jquery.slimscroll",
 		}
 		
 	for _, js := range otherJss {
@@ -136,6 +160,4 @@ func main() {
 	// 先压缩后合并
 	combineJs()
 
-	// 压缩tinymce
-	tinymce()
 }

app/service/AlbumService.go

@@ -0,0 +1,44 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/info"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/db"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
+
+const IMAGE_TYPE = 0
+
+type AlbumService struct {
+}
+
+// add album
+func (this *AlbumService) AddAlbum(album info.Album) bool {
+	album.CreatedTime = time.Now()
+	album.Type = IMAGE_TYPE
+	return db.Insert(db.Albums, album)
+}
+
+// get albums
+func (this *AlbumService) GetAlbums(userId string) []info.Album {
+	albums := []info.Album{}
+	db.ListByQ(db.Albums, bson.M{"UserId": bson.ObjectIdHex(userId)}, &albums)
+	return albums
+}
+
+// delete album
+// presupposition: has no images under this ablum
+func (this *AlbumService) DeleteAlbum(userId, albumId string) (bool, string) {
+	if db.Count(db.Files, bson.M{"AlbumId": bson.ObjectIdHex(albumId), 
+		"UserId": bson.ObjectIdHex(userId),
+		}) == 0 {
+		return db.DeleteByIdAndUserId(db.Albums, albumId, userId), ""
+	}
+	return false, "has images"
+}
+
+// update album name
+func (this *AlbumService) UpdateAlbum(albumId, userId, name string) bool {
+	return db.UpdateByIdAndUserIdField(db.Albums, albumId, userId, "Name", name)
+}

app/service/AttachService.go

@@ -0,0 +1,238 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"gopkg.in/mgo.v2/bson"
+	"os"
+	"strings"
+	"time"
+)
+
+type AttachService struct {
+}
+
+// add attach
+// api调用时, 添加attach之前是没有note的
+// fromApi表示是api添加的, updateNote传过来的, 此时不要incNote's usn, 因为updateNote会inc的
+func (this *AttachService) AddAttach(attach info.Attach, fromApi bool) (ok bool, msg string) {
+	attach.CreatedTime = time.Now()
+	ok = db.Insert(db.Attachs, attach)
+	
+	note := noteService.GetNoteById(attach.NoteId.Hex())
+	
+	// api调用时, 添加attach之前是没有note的
+	var userId string
+	if note.NoteId != "" {
+		userId = note.UserId.Hex()
+	} else {
+		userId = attach.UploadUserId.Hex()
+	}
+
+	if ok {
+		// 更新笔记的attachs num
+		this.updateNoteAttachNum(attach.NoteId, 1)
+	}
+	
+	if !fromApi {
+		// 增长note's usn
+		noteService.IncrNoteUsn(attach.NoteId.Hex(), userId)
+	}
+	
+	return 
+}
+
+// 更新笔记的附件个数
+// addNum 1或-1
+func (this *AttachService) updateNoteAttachNum(noteId bson.ObjectId, addNum int) bool {
+	num := db.Count(db.Attachs, bson.M{"NoteId": noteId})
+	/*
+	note := info.Note{}
+	note = noteService.GetNoteById(noteId.Hex())
+	note.AttachNum += addNum
+	if note.AttachNum < 0 {
+		note.AttachNum = 0
+	}
+	Log(note.AttachNum)
+	*/
+	return db.UpdateByQField(db.Notes, bson.M{"_id": noteId}, "AttachNum", num)
+}
+
+// list attachs
+func (this *AttachService) ListAttachs(noteId, userId string) []info.Attach {
+	attachs := []info.Attach{}
+	// 判断是否有权限为笔记添加附件
+	if !shareService.HasUpdateNotePerm(noteId, userId) {
+		return attachs
+	}
+
+	db.ListByQ(db.Attachs, bson.M{"NoteId": bson.ObjectIdHex(noteId)}, &attachs)
+
+	return attachs
+}
+
+// api调用, 通过noteIds得到note's attachs, 通过noteId归类返回
+func (this *AttachService) getAttachsByNoteIds(noteIds []bson.ObjectId) map[string][]info.Attach {
+	attachs := []info.Attach{}
+	db.ListByQ(db.Attachs, bson.M{"NoteId": bson.M{"$in": noteIds}}, &attachs)
+	noteAttchs := make(map[string][]info.Attach)
+	for _, attach := range attachs {
+		noteId := attach.NoteId.Hex()
+		if itAttachs, ok := noteAttchs[noteId]; ok {
+			noteAttchs[noteId] = append(itAttachs, attach)
+		} else {
+			noteAttchs[noteId] = []info.Attach{attach}
+		}
+	}
+	return noteAttchs
+}
+
+func (this *AttachService) UpdateImageTitle(userId, fileId, title string) bool {
+	return db.UpdateByIdAndUserIdField(db.Files, fileId, userId, "Title", title)
+}
+
+// Delete note to delete attas firstly
+func (this *AttachService) DeleteAllAttachs(noteId, userId string) bool {
+	note := noteService.GetNoteById(noteId)
+	if note.UserId.Hex() == userId {
+		attachs := []info.Attach{}
+		db.ListByQ(db.Attachs, bson.M{"NoteId": bson.ObjectIdHex(noteId)}, &attachs)
+		for _, attach := range attachs {
+			attach.Path = strings.TrimLeft(attach.Path, "/")
+			os.Remove(revel.BasePath + "/" + attach.Path)
+		}
+		return true
+	}
+
+	return false
+}
+
+// delete attach
+func (this *AttachService) DeleteAttach(attachId, userId string) (bool, string) {
+	attach := info.Attach{}
+	db.Get(db.Attachs, attachId, &attach)
+	
+	if(attach.AttachId != "") {
+		// 判断是否有权限为笔记添加附件
+		if !shareService.HasUpdateNotePerm(attach.NoteId.Hex(), userId) {
+			return false, "No Perm"
+		}
+		
+		if db.Delete(db.Attachs, bson.M{"_id": bson.ObjectIdHex(attachId)}) {
+			this.updateNoteAttachNum(attach.NoteId, -1)
+			attach.Path = strings.TrimLeft(attach.Path, "/")
+			err := os.Remove(revel.BasePath + "/" + attach.Path)
+			if err == nil {
+				// userService.UpdateAttachSize(note.UserId.Hex(), -attach.Size)
+				// 修改note Usn
+				noteService.IncrNoteUsn(attach.NoteId.Hex(), userId)
+				
+				return true, "delete file success"
+			}
+			return false, "delete file error"
+		}
+		return false, "db error"
+	}
+	return false, "no such item"
+}
+
+// 获取文件路径
+// 要判断是否具有权限
+// userId是否具有attach的访问权限
+func (this *AttachService) GetAttach(attachId, userId string) (attach info.Attach) {
+	if attachId == "" {
+		return
+	}
+
+	attach = info.Attach{}
+	db.Get(db.Attachs, attachId, &attach)
+	path := attach.Path
+	if path == "" {
+		return
+	}
+
+	note := noteService.GetNoteById(attach.NoteId.Hex())
+
+	// 判断权限
+
+	// 笔记是否是公开的
+	if note.IsBlog {
+		return
+	}
+
+	// 笔记是否是我的
+	if note.UserId.Hex() == userId {
+		return
+	}
+
+	// 我是否有权限查看或协作
+	if shareService.HasReadNotePerm(attach.NoteId.Hex(), userId) {
+		return
+	}
+
+	attach = info.Attach{}
+	return
+}
+
+// 复制笔记时需要复制附件
+// noteService调用, 权限已判断
+func (this *AttachService) CopyAttachs(noteId, toNoteId, toUserId string) bool {
+	attachs := []info.Attach{}
+	db.ListByQ(db.Attachs, bson.M{"NoteId": bson.ObjectIdHex(noteId)}, &attachs)
+
+	// 复制之
+	toNoteIdO := bson.ObjectIdHex(toNoteId)
+	for _, attach := range attachs {
+		attach.AttachId = ""
+		attach.NoteId = toNoteIdO
+
+		// 文件复制一份
+		_, ext := SplitFilename(attach.Name)
+		newFilename := NewGuid() + ext
+		dir := "files/" + toUserId + "/attachs"
+		filePath := dir + "/" + newFilename
+		err := os.MkdirAll(revel.BasePath+"/"+dir, 0755)
+		if err != nil {
+			return false
+		}
+		_, err = CopyFile(revel.BasePath+"/"+attach.Path, revel.BasePath+"/"+filePath)
+		if err != nil {
+			return false
+		}
+		attach.Name = newFilename
+		attach.Path = filePath
+
+		this.AddAttach(attach, false)
+	}
+
+	return true
+}
+
+// 只留下files的数据, 其它的都删除
+func (this *AttachService) UpdateOrDeleteAttachApi(noteId, userId string, files []info.NoteFile) bool {
+	// 现在数据库内的
+	attachs := this.ListAttachs(noteId, userId)
+
+	nowAttachs := map[string]bool{}
+	if files != nil {
+		for _, file := range files {
+			if file.IsAttach && file.FileId != "" {
+				nowAttachs[file.FileId] = true
+			}
+		}
+	}
+
+	for _, attach := range attachs {
+		fileId := attach.AttachId.Hex()
+		if !nowAttachs[fileId] {
+			// 需要删除的
+			// TODO 权限验证去掉
+			this.DeleteAttach(fileId, userId)
+		}
+	}
+
+	return false
+
+}

app/service/AuthService.go

@@ -1,12 +1,14 @@
 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"
+//	"github.com/revel/revel"
+	"strings"
 	. "github.com/leanote/leanote/app/lea"
 	"fmt"
+	"strconv"
 )
 
 // 登录与权限
@@ -16,7 +18,10 @@ type AuthService struct {
 
 // pwd已md5了
 func (this *AuthService) Login(emailOrUsername, pwd string) info.User {
-	return userService.LoginGetUserInfo(emailOrUsername, Md5(pwd))
+	emailOrUsername = strings.Trim(emailOrUsername, " ")
+//	pwd = strings.Trim(pwd, " ")
+	userInfo := userService.LoginGetUserInfo(emailOrUsername, Md5(pwd))
+	return userInfo
 }
 
 // 注册
@@ -30,18 +35,23 @@ func (this *AuthService) Login(emailOrUsername, pwd string) info.User {
 // 1. 添加用户
 // 2. 将leanote共享给我
 // [ok]
-func (this *AuthService) Register(email, pwd string) (bool, string) {
+func (this *AuthService) Register(email, pwd, fromUserId string) (bool, string) {
 	// 用户是否已存在
 	if userService.IsExistsUser(email) {
-		return false, email + " 已被注册"
+		return false, "userHasBeenRegistered-" + email
 	}
 	user := info.User{UserId: bson.NewObjectId(), Email: email, Username: email, Pwd: Md5(pwd)}
+	if fromUserId != "" && IsObjectId(fromUserId) {
+		user.FromUserId = bson.ObjectIdHex(fromUserId)
+	}
+	LogJ(user)
 	return this.register(user)
 }
 
 func (this *AuthService) register(user info.User) (bool, string) {
 	if userService.AddUser(user) {
 		// 添加笔记本, 生活, 学习, 工作
+		userId := user.UserId.Hex();
 		notebook := info.Notebook{
 			Seq: -1,
 			UserId: user.UserId}
@@ -53,32 +63,46 @@ func (this *AuthService) register(user info.User) (bool, string) {
 			notebookService.AddNotebook(notebook);
 		}
 		
-		email := user.Email
-		
 		// 添加leanote -> 该用户的共享
-		leanoteUserId, _ := revel.Config.String("register.sharedUserId"); // "5368c1aa99c37b029d000001";
+		registerSharedUserId := configService.GetGlobalStringConfig("registerSharedUserId")
-		nk1, _ := revel.Config.String("register.sharedUserShareNotebookId"); // 5368c1aa99c37b029d000002" // leanote
+		if(registerSharedUserId != "") {
-		welcomeNoteId, _ := revel.Config.String("register.welcomeNoteId") // "5368c1b919807a6f95000000" // 欢迎来到leanote
+			registerSharedNotebooks := configService.GetGlobalArrMapConfig("registerSharedNotebooks")
+			registerSharedNotes := configService.GetGlobalArrMapConfig("registerSharedNotes")
+			registerCopyNoteIds := configService.GetGlobalArrayConfig("registerCopyNoteIds")
 			
-		if leanoteUserId != "" && nk1 != "" && welcomeNoteId != "" {
+			// 添加共享笔记本
-			shareService.AddShareNotebook(nk1, 0, leanoteUserId, email);
+			for _, notebook := range registerSharedNotebooks {
-			shareService.AddShareNote(welcomeNoteId, 0, leanoteUserId, email);
+				perm, _ := strconv.Atoi(notebook["perm"])
+				shareService.AddShareNotebookToUserId(notebook["notebookId"], perm, registerSharedUserId, userId);
+			}
 			
-			// 将welcome copy给我
+			// 添加共享笔记
-			note := noteService.CopySharedNote(welcomeNoteId, title2Id["life"].Hex(), leanoteUserId, user.UserId.Hex());
+			for _, note := range registerSharedNotes {
+				perm, _ := strconv.Atoi(note["perm"])
+				shareService.AddShareNoteToUserId(note["noteId"], perm, registerSharedUserId, userId);
+			}
 			
-			// 公开为博客
+			// 复制笔记
-			noteUpdate := bson.M{"IsBlog": true}
+			for _, noteId := range registerCopyNoteIds {
-			noteService.UpdateNote(user.UserId.Hex(), user.UserId.Hex(), note.NoteId.Hex(), noteUpdate)
+				note := noteService.CopySharedNote(noteId, title2Id["life"].Hex(), registerSharedUserId, user.UserId.Hex());
+//				Log(noteId)
+//				Log("Copy")
+//				LogJ(note)
+				noteUpdate := bson.M{"IsBlog": false} // 不要是博客
+				noteService.UpdateNote(user.UserId.Hex(), note.NoteId.Hex(), noteUpdate, -1)
+			}
 		}
 		
 		//---------------
 		// 添加一条userBlog
 		blogService.UpdateUserBlog(info.UserBlog{UserId: user.UserId, 
 			Title: user.Username + " 's Blog", 
-			SubTitle: "love leanote!",
+			SubTitle: "Love Leanote!",
 			AboutMe: "Hello, I am (^_^)",
+			CanComment: true,
 			})
+		// 添加一个单页面
+		blogService.AddOrUpdateSingle(user.UserId.Hex(), "", "About Me", "Hello, I am (^_^)")
 	}
 	
 	return true, ""

app/service/ConfigService.go

@@ -0,0 +1,598 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/db"
+	"gopkg.in/mgo.v2/bson"
+	"github.com/revel/revel"
+	"time"
+	"os"
+	"os/exec"
+	"fmt"
+	"strings"
+	"strconv"
+)
+
+// 配置服务
+// 只是全局的, 用户的配置没有
+type ConfigService struct {
+	adminUserId string
+	siteUrl string
+	adminUsername string
+	// 全局的
+	GlobalAllConfigs map[string]interface{}
+	GlobalStringConfigs map[string]string
+	GlobalArrayConfigs map[string][]string
+	GlobalMapConfigs map[string]map[string]string
+	GlobalArrMapConfigs map[string][]map[string]string
+}
+// appStart时 将全局的配置从数据库中得到作为全局
+func (this *ConfigService) InitGlobalConfigs() bool {
+	this.GlobalAllConfigs = map[string]interface{}{}
+	this.GlobalStringConfigs = map[string]string{}
+	this.GlobalArrayConfigs = map[string][]string{}
+	this.GlobalMapConfigs = map[string]map[string]string{}
+	this.GlobalArrMapConfigs = map[string][]map[string]string{}
+	
+	this.adminUsername, _ = revel.Config.String("adminUsername")
+	if this.adminUsername == "" {
+		this.adminUsername = "admin"
+	}
+	this.siteUrl, _ = revel.Config.String("site.url")
+	
+	userInfo := userService.GetUserInfoByAny(this.adminUsername)
+	if userInfo.UserId == "" {
+		return false
+	}
+	this.adminUserId = userInfo.UserId.Hex()
+	
+	configs := []info.Config{}
+	db.ListByQ(db.Configs, bson.M{"UserId": userInfo.UserId}, &configs)
+	
+	for _, config := range configs {
+		if config.IsArr {
+			this.GlobalArrayConfigs[config.Key] = config.ValueArr
+			this.GlobalAllConfigs[config.Key] = config.ValueArr
+		} else if config.IsMap {
+			this.GlobalMapConfigs[config.Key] = config.ValueMap
+			this.GlobalAllConfigs[config.Key] = config.ValueMap
+		} else if config.IsArrMap {
+			this.GlobalArrMapConfigs[config.Key] = config.ValueArrMap
+			this.GlobalAllConfigs[config.Key] = config.ValueArrMap
+		} else {
+			this.GlobalStringConfigs[config.Key] = config.ValueStr
+			this.GlobalAllConfigs[config.Key] = config.ValueStr
+		}
+	}
+	
+	return true
+}
+
+func (this *ConfigService) GetSiteUrl() string {
+	return this.siteUrl;
+}
+func (this *ConfigService) GetAdminUsername() string {
+	return this.adminUsername
+}
+func (this *ConfigService) GetAdminUserId() string {
+	return this.adminUserId
+}
+
+// 通用方法
+func (this *ConfigService) updateGlobalConfig(userId, key string, value interface{}, isArr, isMap, isArrMap bool) bool {
+	// 判断是否存在
+	if _, ok := this.GlobalAllConfigs[key]; !ok {
+		// 需要添加
+		config := info.Config{ConfigId: bson.NewObjectId(), 
+			UserId: bson.ObjectIdHex(userId),
+			Key: key,
+			IsArr: isArr,
+			IsMap: isMap,
+			IsArrMap: isArrMap,
+			UpdatedTime: time.Now(),
+		}
+		if(isArr) {
+			v, _ := value.([]string)
+			config.ValueArr = v
+			this.GlobalArrayConfigs[key] = v
+		} else if isMap {
+			v, _ := value.(map[string]string)
+			config.ValueMap = v
+			this.GlobalMapConfigs[key] = v
+		} else if isArrMap {
+			v, _ := value.([]map[string]string)
+			config.ValueArrMap = v
+			this.GlobalArrMapConfigs[key] = v
+		} else {
+			v, _ := value.(string)
+			config.ValueStr = v
+			this.GlobalStringConfigs[key] = v
+		}
+		return db.Insert(db.Configs, config)
+	} else {
+		i := bson.M{"UpdatedTime": time.Now()}
+		this.GlobalAllConfigs[key] = value
+		if(isArr) {
+			v, _ := value.([]string)
+			i["ValueArr"] = v
+			this.GlobalArrayConfigs[key] = v
+		} else if isMap {
+			v, _ := value.(map[string]string)
+			i["ValueMap"] = v
+			this.GlobalMapConfigs[key] = v
+		} else if isArrMap {
+			v, _ := value.([]map[string]string)
+			i["ValueArrMap"] = v
+			this.GlobalArrMapConfigs[key] = v
+		} else {
+			v, _ := value.(string)
+			i["ValueStr"] = v
+			this.GlobalStringConfigs[key] = v
+		}
+		return db.UpdateByQMap(db.Configs, bson.M{"UserId": bson.ObjectIdHex(userId), "Key": key}, i)
+	}
+}
+
+// 更新用户配置
+func (this *ConfigService) UpdateGlobalStringConfig(userId, key string, value string) bool {
+	return this.updateGlobalConfig(userId, key, value, false, false, false)
+}
+func (this *ConfigService) UpdateGlobalArrayConfig(userId, key string, value []string) bool {
+	return this.updateGlobalConfig(userId, key, value, true, false, false)
+}
+func (this *ConfigService) UpdateGlobalMapConfig(userId, key string, value map[string]string) bool {
+	return this.updateGlobalConfig(userId, key, value, false, true, false)
+}
+func (this *ConfigService) UpdateGlobalArrMapConfig(userId, key string, value []map[string]string) bool {
+	return this.updateGlobalConfig(userId, key, value, false, false, true)
+}
+
+// 获取全局配置, 博客平台使用
+func (this *ConfigService) GetGlobalStringConfig(key string) string {
+	return this.GlobalStringConfigs[key]
+}
+func (this *ConfigService) GetGlobalArrayConfig(key string) []string {
+	arr := this.GlobalArrayConfigs[key]
+	if arr == nil {
+		return []string{}
+	}
+	return arr
+}
+func (this *ConfigService) GetGlobalMapConfig(key string) map[string]string {
+	m := this.GlobalMapConfigs[key]
+	if m == nil {
+		return map[string]string{}
+	}
+	return m
+}
+func (this *ConfigService) GetGlobalArrMapConfig(key string) []map[string]string {
+	m := this.GlobalArrMapConfigs[key]
+	if m == nil {
+		return []map[string]string{}
+	}
+	return m
+}
+
+func (this *ConfigService) IsOpenRegister() bool {
+	return this.GetGlobalStringConfig("openRegister") != ""
+}
+//-------
+// 修改共享笔记的配置
+func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string, 
+	registerSharedNotebookPerms, registerSharedNotePerms []int, 
+	registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds []string) (ok bool, msg string) {
+	
+	defer func() { 
+		if err := recover(); err != nil {
+			ok = false
+			msg = fmt.Sprint(err)
+		}
+	}();
+	
+	// 用户是否存在?
+	if registerSharedUserId == "" {
+		ok = true
+		msg = "share userId is blank, So it share nothing to register"
+		this.UpdateGlobalStringConfig(this.adminUserId, "registerSharedUserId", "")
+		return 
+	} else {
+		user := userService.GetUserInfo(registerSharedUserId)
+		if user.UserId == "" {
+			ok = false
+			msg = "no such user: " + registerSharedUserId
+			return
+		} else {
+			this.UpdateGlobalStringConfig(this.adminUserId, "registerSharedUserId", registerSharedUserId)
+		}
+	}
+	
+	notebooks := []map[string]string{}
+	// 共享笔记本
+	if len(registerSharedNotebookIds) > 0 {
+		for i := 0; i < len(registerSharedNotebookIds); i++ {
+			// 判断笔记本是否存在
+			notebookId := registerSharedNotebookIds[i]
+			if notebookId == "" {
+				continue
+			}
+			notebook := notebookService.GetNotebook(notebookId, registerSharedUserId)
+			if notebook.NotebookId == "" {
+				ok = false
+				msg = "The user has no such notebook: " + notebookId
+				return
+			} else {
+				perm := "0";
+				if registerSharedNotebookPerms[i] == 1 {
+					perm = "1"
+				}
+				notebooks = append(notebooks, map[string]string{"notebookId": notebookId, "perm": perm})
+			}
+		}
+	}
+	this.UpdateGlobalArrMapConfig(this.adminUserId, "registerSharedNotebooks", notebooks)
+	
+	notes := []map[string]string{}
+	// 共享笔记
+	if len(registerSharedNoteIds) > 0 {
+		for i := 0; i < len(registerSharedNoteIds); i++ {
+			// 判断笔记本是否存在
+			noteId := registerSharedNoteIds[i]
+			if noteId == "" {
+				continue
+			}
+			note := noteService.GetNote(noteId, registerSharedUserId)
+			if note.NoteId == "" {
+				ok = false
+				msg = "The user has no such note: " + noteId
+				return
+			} else {
+				perm := "0";
+				if registerSharedNotePerms[i] == 1 {
+					perm = "1"
+				}
+				notes = append(notes, map[string]string{"noteId": noteId, "perm": perm})
+			}
+		}
+	}
+	this.UpdateGlobalArrMapConfig(this.adminUserId, "registerSharedNotes", notes)
+	
+	// 复制
+	noteIds := []string{}
+	if len(registerCopyNoteIds) > 0 {
+		for i := 0; i < len(registerCopyNoteIds); i++ {
+			// 判断笔记本是否存在
+			noteId := registerCopyNoteIds[i]
+			if noteId == "" {
+				continue
+			}
+			note := noteService.GetNote(noteId, registerSharedUserId)
+			if note.NoteId == "" {
+				ok = false
+				msg = "The user has no such note: " + noteId
+				return
+			} else {
+				noteIds = append(noteIds, noteId)
+			}
+		}
+	}
+	this.UpdateGlobalArrayConfig(this.adminUserId, "registerCopyNoteIds", noteIds)
+	
+	ok = true
+	return
+}
+
+// 添加备份
+func (this *ConfigService) AddBackup(path, remark string) bool {
+	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+	n := time.Now().Unix()
+	nstr := fmt.Sprintf("%v", n)
+	backups = append(backups, map[string]string{"createdTime": nstr, "path": path, "remark": remark})
+	return this.UpdateGlobalArrMapConfig(this.adminUserId, "backups", backups)
+}
+
+func (this *ConfigService) getBackupDirname() string {
+	n := time.Now()
+	y, m, d := n.Date()
+	return strconv.Itoa(y) + "_" + m.String() + "_" + strconv.Itoa(d) + "_" + fmt.Sprintf("%v", n.Unix())
+}
+func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
+	binPath := configService.GetGlobalStringConfig("mongodumpPath")
+	config := revel.Config;
+	dbname, _ := config.String("db.dbname")
+	host, _ := revel.Config.String("db.host")
+	port, _ := revel.Config.String("db.port")
+	username, _ := revel.Config.String("db.username")
+	password, _ := revel.Config.String("db.password")
+	// mongodump -h localhost -d leanote -o /root/mongodb_backup/leanote-9-22/ -u leanote -p nKFAkxKnWkEQy8Vv2LlM
+	binPath = binPath + " -h " + host + " -d " + dbname + " --port " + port
+	if username != "" {
+		binPath += " -u " + username + " -p " + password
+	}
+	// 保存的路径
+	dir := revel.BasePath + "/mongodb_backup/" + this.getBackupDirname()
+	binPath += " -o " + dir
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		ok = false
+		msg = fmt.Sprintf("%v", err)
+		return
+	}
+	
+	cmd := exec.Command("/bin/sh", "-c", binPath)
+	Log(binPath);
+	b, err := cmd.Output()
+    if err != nil {
+    	msg = fmt.Sprintf("%v", err)
+		ok = false
+    	Log("error:......")
+    	Log(string(b))
+    	return
+    }
+	ok = configService.AddBackup(dir, remark)
+    return ok, msg
+}
+// 还原
+func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
+	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+	var i int
+	var backup map[string]string
+	for i, backup = range backups {
+		if backup["createdTime"] == createdTime {
+			break;
+		}
+	}
+	if i == len(backups) {
+		return false, "Backup Not Found"
+	}
+	
+	// 先备份当前
+	ok, msg = this.Backup("Auto backup when restore from " + backup["createdTime"] )
+	if !ok {
+		return
+	}
+	
+	// mongorestore -h localhost -d leanote --directoryperdb /home/user1/gopackage/src/github.com/leanote/leanote/mongodb_backup/leanote_install_data/
+	binPath := configService.GetGlobalStringConfig("mongorestorePath")
+	config := revel.Config;
+	dbname, _ := config.String("db.dbname")
+	host, _ := revel.Config.String("db.host")
+	port, _ := revel.Config.String("db.port")
+	username, _ := revel.Config.String("db.username")
+	password, _ := revel.Config.String("db.password")
+	// mongorestore -h localhost -d leanote -o /root/mongodb_backup/leanote-9-22/ -u leanote -p nKFAkxKnWkEQy8Vv2LlM
+	binPath = binPath + " --drop -h " + host + " -d " + dbname + " --port " + port
+	if username != "" {
+		binPath += " -u " + username + " -p " + password
+	}
+	
+	path := backup["path"] + "/" + dbname
+	// 判断路径是否存在
+	if !IsDirExists(path) {
+		return false, path + " Is Not Exists"
+	}
+	
+	binPath += " " + path
+	
+	cmd := exec.Command("/bin/sh", "-c", binPath)
+	Log(binPath);
+	b, err := cmd.Output()
+    if err != nil {
+    	msg = fmt.Sprintf("%v", err)
+		ok = false
+    	Log("error:......")
+    	Log(string(b))
+    	return
+    }
+	
+	return true, ""
+}
+func (this *ConfigService) DeleteBackup(createdTime string) (bool, string) {
+	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+	var i int
+	var backup map[string]string
+	for i, backup = range backups {
+		if backup["createdTime"] == createdTime {
+			break;
+		}
+	}
+	if i == len(backups) {
+		return false, "Backup Not Found"
+	}
+	
+	// 删除文件夹之
+	err := os.RemoveAll(backups[i]["path"])
+	if err != nil {
+		return false, fmt.Sprintf("%v", err)
+	}
+	
+	// 删除之
+	backups = append(backups[0:i], backups[i+1:]...)
+	
+	ok := this.UpdateGlobalArrMapConfig(this.adminUserId, "backups", backups)
+	return ok, ""
+}
+
+func (this *ConfigService) UpdateBackupRemark(createdTime, remark string) (bool, string) {
+	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+	var i int
+	var backup map[string]string
+	for i, backup = range backups {
+		if backup["createdTime"] == createdTime {
+			break;
+		}
+	}
+	if i == len(backups) {
+		return false, "Backup Not Found"
+	}
+	backup["remark"] = remark;
+	
+	ok := this.UpdateGlobalArrMapConfig(this.adminUserId, "backups", backups)
+	return ok, ""
+}
+
+// 得到备份
+func (this *ConfigService) GetBackup(createdTime string) (map[string]string, bool) {
+	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+	var i int
+	var backup map[string]string
+	for i, backup = range backups {
+		if backup["createdTime"] == createdTime {
+			break;
+		}
+	}
+	if i == len(backups) {
+		return map[string]string{}, false
+	}
+	return backup, true
+}
+
+//--------------
+// sub domain
+var defaultDomain string
+var schema = "http://"
+var port string
+
+func init() {
+	revel.OnAppStart(func() {
+		/*
+		不用配置的, 因为最终通过命令可以改, 而且有的使用nginx代理
+		port  = strconv.Itoa(revel.HttpPort)
+		if port != "80" {
+			port = ":" + port
+		} else {
+			port = "";
+		}
+		*/
+		
+		siteUrl, _ := revel.Config.String("site.url") // 已包含:9000, http, 去掉成 leanote.com
+		if strings.HasPrefix(siteUrl, "http://") {
+			defaultDomain = siteUrl[len("http://"):]
+		} else if strings.HasPrefix(siteUrl, "https://") {
+			defaultDomain = siteUrl[len("https://"):]
+			schema = "https://"
+		}
+		
+		// port localhost:9000
+		ports := strings.Split(defaultDomain, ":")
+		if len(ports) == 2 {
+			port = ports[1]
+		}
+		if port == "80" {
+			port = ""
+		} else {
+			port = ":" + port
+		}
+	})
+}
+
+func (this *ConfigService) GetSchema() string {
+	return schema;
+}
+// 默认
+func (this *ConfigService) GetDefaultDomain() string {
+	return defaultDomain
+}
+// 包含http://
+func (this *ConfigService) GetDefaultUrl() string {
+	return schema + defaultDomain
+}
+// note
+func (this *ConfigService) GetNoteDomain() string {
+	subDomain := this.GetGlobalStringConfig("noteSubDomain");
+	if subDomain != "" {
+		return subDomain + port
+	}
+	return this.GetDefaultDomain() + "/note"
+}
+func (this *ConfigService) GetNoteUrl() string {
+	return schema + this.GetNoteDomain();
+}
+
+// blog
+func (this *ConfigService) GetBlogDomain() string {
+	subDomain := this.GetGlobalStringConfig("blogSubDomain");
+	if subDomain != "" {
+		return subDomain + port
+	}
+	return this.GetDefaultDomain() + "/blog"
+}
+func (this *ConfigService) GetBlogUrl() string {
+	return schema + this.GetBlogDomain();
+}
+// lea
+func (this *ConfigService) GetLeaDomain() string {
+	subDomain := this.GetGlobalStringConfig("leaSubDomain");
+	if subDomain != "" {
+		return subDomain + port
+	}
+	return this.GetDefaultDomain() + "/lea"
+}
+func (this *ConfigService) GetLeaUrl() string {
+	return schema + this.GetLeaDomain();
+}
+
+func (this *ConfigService) GetUserUrl(domain string) string {
+	return schema + domain + port
+}
+func (this *ConfigService) GetUserSubUrl(subDomain string) string {
+	return schema + subDomain + "." + this.GetDefaultDomain()
+}
+
+// 是否允许自定义域名
+func (this *ConfigService) AllowCustomDomain() bool {
+	return configService.GetGlobalStringConfig("allowCustomDomain") != ""
+}
+// 是否是好的自定义域名
+func (this *ConfigService) IsGoodCustomDomain(domain string) bool {
+	blacks := this.GetGlobalArrayConfig("blackCustomDomains")
+	for _, black := range blacks {
+		if strings.Contains(domain, black) {
+			return false
+		}
+	}
+	return true
+}
+func (this *ConfigService) IsGoodSubDomain(domain string) bool {
+	blacks := this.GetGlobalArrayConfig("blackSubDomains")
+	LogJ(blacks)
+	for _, black := range blacks {
+		if domain == black {
+			return false
+		}
+	}
+	return true
+}
+
+// 上传大小
+func (this *ConfigService) GetUploadSize(key string) float64 {
+	f, _ := strconv.ParseFloat(this.GetGlobalStringConfig(key), 64)
+	return f;
+}
+func (this *ConfigService) GetUploadSizeLimit() map[string]float64 {
+	return map[string]float64{
+		"uploadImageSize": this.GetUploadSize("uploadImageSize"),
+		"uploadBlogLogoSize":this.GetUploadSize("uploadBlogLogoSize"),
+		"uploadAttachSize":this.GetUploadSize("uploadAttachSize"),
+		"uploadAvatarSize":this.GetUploadSize("uploadAvatarSize"),
+	}
+}
+// 为用户得到全局的配置
+// NoteController调用
+func (this *ConfigService) GetGlobalConfigForUser() map[string]interface{} {
+	uploadSizeConfigs := this.GetUploadSizeLimit();
+	config := map[string]interface{}{}
+	for k, v := range uploadSizeConfigs {
+		config[k] = v
+	}
+	return config
+}
+
+// 主页是否是管理员的博客页
+func (this *ConfigService) HomePageIsAdminsBlog() bool {
+	return this.GetGlobalStringConfig("homePage") == ""
+}
+
+func (this *ConfigService) GetVersion() string {
+	return "1.0-beta.4"
+}

app/service/EmailService.go

@@ -0,0 +1,474 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/db"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+	"strings"
+	"net/smtp"
+	"strconv"
+	"fmt"
+	"html/template"
+	"bytes"
+)
+
+// 发送邮件
+
+type EmailService struct {
+	tpls map[string]*template.Template
+}
+
+func NewEmailService() (*EmailService) {
+	return &EmailService{tpls: map[string]*template.Template{}}
+}
+
+// 发送邮件
+var host = ""
+var emailPort = ""
+var username = ""
+var password = ""
+
+func InitEmailFromDb() {
+	host = configService.GetGlobalStringConfig("emailHost")
+	emailPort = configService.GetGlobalStringConfig("emailPort")
+	username = configService.GetGlobalStringConfig("emailUsername")
+	password = configService.GetGlobalStringConfig("emailPassword")
+}
+
+func (this *EmailService) SendEmail(to, subject, body string) (ok bool, e string) {
+	InitEmailFromDb()
+	
+	if host == "" || emailPort == "" || username == "" || password == "" {
+		return 
+	}
+	hp := strings.Split(host, ":")
+	auth := smtp.PlainAuth("", username, password, hp[0])
+	
+	var content_type string
+	
+	mailtype := "html"
+	if mailtype == "html" {
+		content_type = "Content-Type: text/"+ mailtype + "; charset=UTF-8"
+	} else{
+		content_type = "Content-Type: text/plain" + "; charset=UTF-8"
+	}
+	
+	msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
+	send_to := strings.Split(to, ";")
+	err := smtp.SendMail(host+":"+emailPort, auth, username, send_to, msg)
+	
+	if err != nil {
+		e = fmt.Sprint(err)
+		return 
+	}
+	ok = true
+	return 
+}
+
+// AddUser调用
+// 可以使用一个goroutine
+func (this *EmailService) RegisterSendActiveEmail(userInfo info.User, email string) bool {
+	token := tokenService.NewToken(userInfo.UserId.Hex(), email, info.TokenActiveEmail)
+	if token == "" {
+		return false
+	}
+	
+	subject := configService.GetGlobalStringConfig("emailTemplateRegisterSubject");
+	tpl := configService.GetGlobalStringConfig("emailTemplateRegister");
+	
+	if(tpl == "") {
+		return false
+	}
+	
+	tokenUrl := configService.GetSiteUrl() + "/user/activeEmail?token=" + token
+	// {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.id} {user.email} {user.username}
+	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(), "tokenUrl": tokenUrl, "token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail))),
+		"user": map[string]interface{}{
+			"userId": userInfo.UserId.Hex(),
+			"email": userInfo.Email,
+			"username": userInfo.Username,
+		},
+	}
+
+	var ok bool
+	ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+	if !ok {
+		return false
+	}
+	
+	// 发送邮件
+	ok, _ = this.SendEmail(email, subject, tpl)
+	return ok
+}
+
+// 修改邮箱
+func (this *EmailService) UpdateEmailSendActiveEmail(userInfo info.User, email string) (ok bool, msg string) {
+	// 先验证该email是否被注册了
+	if userService.IsExistsUser(email) {
+		ok = false
+		msg = "该邮箱已注册"
+		return
+	}
+
+	token := tokenService.NewToken(userInfo.UserId.Hex(), email, info.TokenUpdateEmail)
+	
+	if token == "" {
+		return
+	}
+	
+	subject := configService.GetGlobalStringConfig("emailTemplateUpdateEmailSubject");
+	tpl := configService.GetGlobalStringConfig("emailTemplateUpdateEmail");
+	
+	// 发送邮件
+	tokenUrl := configService.GetSiteUrl() + "/user/updateEmail?token=" + token
+	// {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.userId} {user.email} {user.username}
+	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(), "tokenUrl": tokenUrl, "token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail))),
+		"newEmail": email,
+		"user": map[string]interface{}{
+			"userId": userInfo.UserId.Hex(),
+			"email": userInfo.Email,
+			"username": userInfo.Username,
+		},
+	}
+
+	ok, msg, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+	if !ok {
+		return 
+	}
+	
+	// 发送邮件
+	ok, msg = this.SendEmail(email, subject, tpl)
+	return
+}
+
+func (this *EmailService) FindPwdSendEmail(token, email string) (ok bool, msg string) {
+	subject := configService.GetGlobalStringConfig("emailTemplateFindPasswordSubject");
+	tpl := configService.GetGlobalStringConfig("emailTemplateFindPassword");
+	
+	// 发送邮件
+	tokenUrl := configService.GetSiteUrl() + "/findPassword/" + token
+	// {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.id} {user.email} {user.username}
+	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(), "tokenUrl": tokenUrl, 
+		"token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail)))}
+		
+	ok, msg, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+	if !ok {
+		return 
+	}
+	// 发送邮件
+	ok, msg = this.SendEmail(email, subject, tpl)
+	return 
+}
+
+// 发送邀请链接
+func (this *EmailService) SendInviteEmail(userInfo info.User, email, content string) bool {
+	subject := configService.GetGlobalStringConfig("emailTemplateInviteSubject");
+	tpl := configService.GetGlobalStringConfig("emailTemplateInvite");
+	
+	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(),
+		"registerUrl": configService.GetSiteUrl() + "/register?from=" + userInfo.Username,
+		"content": content,
+		"user": map[string]interface{}{
+			"username": userInfo.Username,
+			"email": userInfo.Email,
+		},
+	}
+	var ok bool
+	ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+	if !ok {
+		return false
+	}
+	// 发送邮件
+	ok, _ = this.SendEmail(email, subject, tpl)
+	return ok
+}
+
+// 发送评论
+func (this *EmailService) SendCommentEmail(note info.Note, comment info.BlogComment, userId, content string) bool {
+	subject := configService.GetGlobalStringConfig("emailTemplateCommentSubject");
+	tpl := configService.GetGlobalStringConfig("emailTemplateComment");
+	
+	// title := "评论提醒"
+	
+	/*
+	toUserId := note.UserId.Hex()
+	// title := "评论提醒"
+	
+	// 表示回复回复的内容, 那么发送给之前回复的
+	if comment.CommentId != "" {
+		toUserId = comment.UserId.Hex()
+	}
+	toUserInfo := userService.GetUserInfo(toUserId)
+	sendUserInfo := userService.GetUserInfo(userId)
+	
+	subject := note.Title + " 收到 " + sendUserInfo.Username + " 的评论";
+	if comment.CommentId != "" {
+		subject = "您在 " + note.Title + " 发表的评论收到 " + sendUserInfo.Username;
+		if userId == note.UserId.Hex() {
+			subject += "(作者)";
+		}
+		subject += " 的评论";
+	}
+	*/
+	
+	toUserId := note.UserId.Hex()
+	// 表示回复回复的内容, 那么发送给之前回复的
+	if comment.CommentId != "" {
+		toUserId = comment.UserId.Hex()
+	}
+	toUserInfo := userService.GetUserInfo(toUserId) // 被评论者
+	sendUserInfo := userService.GetUserInfo(userId) // 评论者
+	
+	// {siteUrl} {blogUrl} 
+	// {blog.id} {blog.title} {blog.url}
+	// {commentUser.userId} {commentUser.username} {commentUser.email} 
+	// {commentedUser.userId} {commentedUser.username} {commentedUser.email}
+	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(), "blogUrl": configService.GetBlogUrl(),
+		"blog": map[string]string{
+			"id": note.NoteId.Hex(),
+			"title": note.Title,
+			"url": configService.GetBlogUrl() + "/view/" + note.NoteId.Hex(),
+		},
+		"commentContent": content,
+		// 评论者信息
+		"commentUser": map[string]interface{}{"userId": sendUserInfo.UserId.Hex(), 
+			"username": sendUserInfo.Username,
+			"email": sendUserInfo.Email,
+			"isBlogAuthor": userId == note.UserId.Hex(),
+		},
+		// 被评论者信息
+		"commentedUser": map[string]interface{}{"userId": toUserId,
+			"username": toUserInfo.Username,
+			"email": toUserInfo.Email,
+			"isBlogAuthor": toUserId == note.UserId.Hex(),
+		},
+	}
+
+	ok := false
+	ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+	if !ok {
+		return false
+	}
+	
+	// 发送邮件
+	ok, _ = this.SendEmail(toUserInfo.Email, subject, tpl)
+	return ok
+}
+
+
+// 验证模板是否正确
+func (this *EmailService) ValidTpl(str string) (ok bool, msg string){
+	defer func() { 
+		if err := recover(); err != nil {
+			ok = false
+			msg = fmt.Sprint(err)
+		}
+	}();
+	header := configService.GetGlobalStringConfig("emailTemplateHeader");
+	footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+	str = strings.Replace(str, "{{header}}", header, -1)
+	str = strings.Replace(str, "{{footer}}", footer, -1)
+	_, err := template.New("tpl name").Parse(str)
+    if err != nil {
+		msg = fmt.Sprint(err)
+    	return
+    }
+    ok = true
+	return
+}
+
+// ok, msg, subject, tpl
+func (this *EmailService) getTpl(str string) (ok bool, msg string, tpl *template.Template){
+	defer func() { 
+		if err := recover(); err != nil {
+			ok = false
+			msg = fmt.Sprint(err)
+		}
+	}();
+	
+	var err error
+	var has bool
+	
+	if tpl, has = this.tpls[str]; !has {
+	    tpl, err = template.New("tpl name").Parse(str)
+	    if err != nil {
+			msg = fmt.Sprint(err)
+	    	return
+	    }
+	    this.tpls[str] = tpl
+	}
+	ok = true
+	return
+}
+
+// 通过subject, body和值得到内容
+func (this *EmailService) renderEmail(subject, body string, values map[string]interface{}) (ok bool, msg string, o string, b string) {
+	ok = false
+	msg = ""
+	defer func() { // 必须要先声明defer，否则不能捕获到panic异常
+		if err := recover(); err != nil {
+			ok = false
+			msg = fmt.Sprint(err)    // 这里的err其实就是panic传入的内容，
+		}
+	}();
+	
+	var tpl *template.Template
+	
+	values["siteUrl"] = configService.GetSiteUrl();
+	
+	// subject
+	if subject != "" {
+		ok, msg, tpl = this.getTpl(subject)
+		if(!ok) {
+			return
+		}
+		var buffer bytes.Buffer
+	    err := tpl.Execute(&buffer, values)
+	    if err != nil {
+			msg = fmt.Sprint(err)
+			return
+	    }
+	    o = buffer.String()
+    } else {
+    	o = ""
+    }
+    
+    // content
+    header := configService.GetGlobalStringConfig("emailTemplateHeader");
+	footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+	body = strings.Replace(body, "{{header}}", header, -1)
+	body = strings.Replace(body, "{{footer}}", footer, -1)
+	values["subject"] = o
+	ok, msg, tpl = this.getTpl(body)
+	if(!ok) {
+		return
+	}
+	var buffer2 bytes.Buffer
+    err := tpl.Execute(&buffer2, values)
+    if err != nil {
+		msg = fmt.Sprint(err)
+		return
+    }
+    b = buffer2.String()
+    
+    return
+}
+
+// 发送email给用户
+// 需要记录
+func (this *EmailService) SendEmailToUsers(users []info.User, subject, body string) (ok bool, msg string) {
+	if(users == nil || len(users) == 0) {
+		msg = "no users"
+		return 
+	}
+	
+	// 尝试renderHtml
+	ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
+	if(!ok) {
+		Log(msg)
+		return 
+	}
+	
+	go func() {
+		for _, user := range users {
+			LogJ(user)
+			m := map[string]interface{}{}
+			m["userId"] = user.UserId.Hex()
+			m["username"] = user.Username
+			m["email"] = user.Email
+			ok2, msg2, subject2, body2 := this.renderEmail(subject, body, m)
+			ok = ok2
+			msg = msg2
+			if(ok2) {
+				sendOk, msg := this.SendEmail(user.Email, subject2, body2);
+				this.AddEmailLog(user.Email, subject, body, sendOk, msg) // 把模板记录下
+				// 记录到Email Log
+				if sendOk {
+					// Log("ok " + user.Email)
+				} else {
+					// Log("no " + user.Email)
+				}
+			} else {
+				// Log(msg);
+			}
+		}
+	}()
+	
+	return 
+}
+
+func (this *EmailService) SendEmailToEmails(emails []string, subject, body string) (ok bool, msg string) {
+	if(emails == nil || len(emails) == 0) {
+		msg = "no emails"
+		return 
+	}
+	
+	// 尝试renderHtml
+	ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
+	if(!ok) {
+		Log(msg)
+		return 
+	}
+	
+//	go func() {
+		for _, email := range emails {
+			if email == "" {
+				continue
+			}
+			m := map[string]interface{}{}
+			m["email"] = email
+			ok, msg, subject, body = this.renderEmail(subject, body, m)
+			if(ok) {
+				sendOk, msg := this.SendEmail(email, subject, body);
+				this.AddEmailLog(email, subject, body, sendOk, msg)
+				// 记录到Email Log
+				if sendOk {
+					Log("ok " + email)
+				} else {
+					Log("no " + email)
+				}
+			} else {
+				Log(msg);
+			}
+		}
+//	}()
+	
+	return 
+}
+
+// 添加邮件日志
+func (this *EmailService) AddEmailLog(email, subject, body string, ok bool, msg string) {
+	log := info.EmailLog{LogId: bson.NewObjectId(), Email: email, Subject: subject, Body: body, Ok: ok, Msg: msg, CreatedTime: time.Now()}
+	db.Insert(db.EmailLogs, log)
+}
+// 展示邮件日志
+
+func (this *EmailService) DeleteEmails(ids []string) bool {
+	idsO := make([]bson.ObjectId, len(ids))
+	for i, id := range ids {
+		idsO[i] = bson.ObjectIdHex(id)
+	}
+	db.DeleteAll(db.EmailLogs, bson.M{"_id": bson.M{"$in": idsO}})
+	
+	return true
+}
+func (this *EmailService) ListEmailLogs(pageNumber, pageSize int, sortField string, isAsc bool, email string) (page info.Page, emailLogs []info.EmailLog) {
+	emailLogs = []info.EmailLog{}
+	skipNum, sortFieldR := parsePageAndSort(pageNumber, pageSize, sortField, isAsc)
+	query := bson.M{}
+	if email != "" {
+		query["Email"] = bson.M{"$regex": bson.RegEx{".*?" + email + ".*", "i"}}
+	}
+	q := db.EmailLogs.Find(query);
+	// 总记录数
+	count, _ := q.Count()
+	// 列表
+	q.Sort(sortFieldR).
+		Skip(skipNum).
+		Limit(pageSize).
+		All(&emailLogs)
+	page = info.NewPage(pageNumber, pageSize, count, nil)
+	return
+}

app/service/FileService.go

@@ -0,0 +1,251 @@
+package service
+
+import (
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
+	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/db"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+	"os"
+	"strings"
+)
+
+const DEFAULT_ALBUM_ID = "52d3e8ac99c37b7f0d000001"
+
+type FileService struct {
+}
+
+// add Image
+func (this *FileService) AddImage(image info.File, albumId, userId string, needCheckSize bool) (ok bool, msg string) {
+	image.CreatedTime = time.Now()
+	if albumId != "" {
+		image.AlbumId = bson.ObjectIdHex(albumId)
+	} else {
+		image.AlbumId = bson.ObjectIdHex(DEFAULT_ALBUM_ID)
+		image.IsDefaultAlbum = true
+	}
+	image.UserId = bson.ObjectIdHex(userId)
+	
+	ok = db.Insert(db.Files, image)
+	return
+}
+
+// list images
+// if albumId == "" get default album images
+func (this *FileService) ListImagesWithPage(userId, albumId, key string, pageNumber, pageSize int) info.Page {
+	skipNum, sortFieldR := parsePageAndSort(pageNumber, pageSize, "CreatedTime", false)
+	files := []info.File{}
+	
+	q := bson.M{"UserId": bson.ObjectIdHex(userId), "Type": ""} // life
+	if albumId != "" {
+		q["AlbumId"] = bson.ObjectIdHex(albumId);
+	} else {
+		q["IsDefaultAlbum"] = true
+	}
+	if key != "" {
+		q["Title"] =  bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}
+	}
+	
+//	LogJ(q)
+	
+	count := db.Count(db.Files, q);
+	
+	db.Files.
+		Find(q).
+		Sort(sortFieldR).
+		Skip(skipNum).
+		Limit(pageSize).
+		All(&files)
+		
+	return info.Page{Count: count, List: files}
+}
+
+func (this *FileService) UpdateImageTitle(userId, fileId, title string) bool {
+	return db.UpdateByIdAndUserIdField(db.Files, fileId, userId, "Title", title)
+}
+
+// get all images names
+// for upgrade
+func (this *FileService) GetAllImageNamesMap(userId string) (m map[string]bool) {
+	q := bson.M{"UserId": bson.ObjectIdHex(userId)}
+	files := []info.File{}
+	db.ListByQWithFields(db.Files, q, []string{"Name"}, &files)
+	
+	m = make(map[string]bool)
+	if len(files) == 0 {
+		return
+	}
+	
+	for _, file := range files {
+		m[file.Name] = true
+	}
+	return
+}
+
+// delete image
+func (this *FileService) DeleteImage(userId, fileId string) (bool, string) {
+	file := info.File{}
+	db.GetByIdAndUserId(db.Files, fileId, userId, &file)
+	
+	if(file.FileId != "") {
+		if db.DeleteByIdAndUserId(db.Files, fileId, userId) {
+			// delete image
+			// TODO
+			file.Path = strings.TrimLeft(file.Path, "/")
+			var err error
+			if strings.HasPrefix(file.Path, "upload") {
+				Log(file.Path)
+				err = os.Remove(revel.BasePath + "/public/" + file.Path)
+			} else {
+				err = os.Remove(revel.BasePath + "/" + file.Path)
+			}
+			if err == nil {
+				return true, ""
+			}
+			return false, "delete file error!"
+		}
+		return false, "db error"
+	}
+	return false, "no such item"
+}
+
+// update image title
+func (this *FileService) UpdateImage(userId, fileId, title string) bool {
+	return db.UpdateByIdAndUserIdField(db.Files, fileId, userId, "Title", title)
+}
+
+// 获取文件路径
+// 要判断是否具有权限
+// userId是否具有fileId的访问权限
+func (this *FileService) GetFile(userId, fileId string) string {
+	if fileId == "" {
+		return ""
+	}
+	
+	file := info.File{}
+	db.Get(db.Files, fileId, &file)
+	path := file.Path
+	if path == "" {
+		return ""
+	}
+	
+	// 1. 判断权限
+	
+	// 是否是我的文件
+	if userId != "" && file.UserId.Hex() == userId {
+		return path
+	}
+	
+	// 得到使用过该fileId的所有笔记NoteId
+	// 这些笔记是否有public的, 若有则ok
+	// 这些笔记(笔记本)是否有共享给我的, 若有则ok
+	
+	noteIds := noteImageService.GetNoteIds(fileId)
+	if noteIds != nil && len(noteIds) > 0 {
+		// 这些笔记是否有public的
+		if db.Has(db.Notes, bson.M{"_id": bson.M{"$in": noteIds}, "IsBlog": true}) {
+			return path
+		}
+		
+		// 2014/12/28 修复, 如果是分享给用户组, 那就不行, 这里可以实现
+		for _, noteId := range noteIds {
+			note := noteService.GetNoteById(noteId.Hex())
+			if shareService.HasReadPerm(note.UserId.Hex(), userId, noteId.Hex()) {
+				return path;
+			}
+		}
+		/*
+		// 若有共享给我的笔记?
+		// 对该笔记可读?
+		if db.Has(db.ShareNotes, bson.M{"ToUserId": bson.ObjectIdHex(userId), "NoteId": bson.M{"$in": noteIds}}) {
+			return path
+		}
+		
+		// 笔记本是否共享给我?
+		// 通过笔记得到笔记本
+		notes := []info.Note{}
+		db.ListByQWithFields(db.Notes, bson.M{"_id": bson.M{"$in": noteIds}}, []string{"NotebookId"}, &notes)	
+		if notes != nil && len(notes) > 0 {
+			notebookIds := make([]bson.ObjectId, len(notes))
+			for i := 0; i < len(notes); i++ {
+				notebookIds[i] = notes[i].NotebookId
+			}
+			
+			if db.Has(db.ShareNotebooks, bson.M{"ToUserId": bson.ObjectIdHex(userId), "NotebookId": bson.M{"$in": notebookIds}}) {
+				return path
+			}
+		}
+		*/
+	}
+	
+	// 可能是刚复制到owner上, 但内容又没有保存, 所以没有note->imageId的映射, 此时看是否有fromFileId
+	if file.FromFileId != "" {
+		fromFile := info.File{}
+		db.Get2(db.Files, file.FromFileId, &fromFile)
+		if fromFile.UserId.Hex() == userId {
+			return fromFile.Path
+		}
+	}
+	
+	return ""
+}
+
+// 复制图片
+func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, string) {
+	// 是否已经复制过了
+	file2 := info.File{}
+	db.GetByQ(db.Files, bson.M{"UserId": bson.ObjectIdHex(toUserId), "FromFileId": bson.ObjectIdHex(fileId)}, &file2)
+	if file2.FileId != "" {
+		return true, file2.FileId.Hex();
+	}
+
+	// 复制之
+	
+	file := info.File{}
+	db.GetByIdAndUserId(db.Files, fileId, userId, &file)
+	
+	if file.FileId == "" || file.UserId.Hex() != userId {
+		return false, ""
+	}
+		
+	_, ext := SplitFilename(file.Name)
+	newFilename := NewGuid() + ext
+	
+	dir := "files/" + toUserId + "/images"
+	filePath := dir + "/" + newFilename
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		return false, ""
+	}
+	
+	_, err = CopyFile(revel.BasePath + "/" + file.Path, revel.BasePath + "/" + filePath)
+	if err != nil {
+		Log(err)
+		return false, ""
+	}
+	
+	fileInfo := info.File{Name: newFilename,
+		Title: file.Title,
+		Path: filePath,
+		Size: file.Size, 
+		FromFileId: file.FileId}
+	id := bson.NewObjectId();
+	fileInfo.FileId = id
+	fileId = id.Hex()
+	Ok, _ := this.AddImage(fileInfo, "", toUserId, false)
+	
+	if Ok {
+		return Ok, id.Hex()
+	}
+	return false, ""
+}
+
+// 是否是我的文件
+func (this *FileService) IsMyFile(userId, fileId string) bool {
+	// 如果有问题会panic
+	if !bson.IsObjectIdHex(fileId) || !bson.IsObjectIdHex(userId) {
+		return false;
+	}
+	return db.Has(db.Files, bson.M{"UserId": bson.ObjectIdHex(userId), "_id": bson.ObjectIdHex(fileId)})
+}

app/service/GroupService.go

@@ -0,0 +1,169 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/db"
+//	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+//	"strings"
+)
+
+// 用户组, 用户组用户管理
+
+type GroupService struct {
+}
+
+// 添加分组
+func (this *GroupService) AddGroup(userId, title string) (bool, info.Group) {
+	group := info.Group {
+		GroupId: bson.NewObjectId(),
+		UserId: bson.ObjectIdHex(userId),
+		Title: title,
+		CreatedTime: time.Now(),
+	}
+	return db.Insert(db.Groups, group), group
+}
+// 删除分组
+// 判断是否有好友
+func (this *GroupService) DeleteGroup(userId, groupId string) (ok bool, msg string) {
+	/*
+	if db.Has(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId)}) {
+		return false, "groupHasUsers"
+	}
+	*/
+	db.DeleteAll(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId)})
+	return db.DeleteByIdAndUserId(db.Groups, groupId, userId), ""
+	
+	// TODO 删除分组后, 在shareNote, shareNotebook中也要删除
+}
+// 修改group标题
+func (this *GroupService) UpdateGroupTitle(userId, groupId, title string) (ok bool) {
+	return db.UpdateByIdAndUserIdField(db.Groups, groupId, userId, "Title", title)
+}
+
+// 得到用户的所有分组(包括下的所有用户)
+func (this *GroupService) GetGroupsAndUsers(userId string) ([]info.Group) {
+	// 得到分组s
+	groups := []info.Group{}
+	db.ListByQ(db.Groups, bson.M{"UserId": bson.ObjectIdHex(userId)}, &groups)
+	// 得到其下的用户
+	for i, group := range groups {
+		group.Users = this.GetUsers(group.GroupId.Hex())
+		groups[i] = group
+	}
+	return groups
+}
+// 仅仅得到所有分组
+func (this *GroupService) GetGroups(userId string) ([]info.Group) {
+	// 得到分组s
+	groups := []info.Group{}
+	db.ListByQ(db.Groups, bson.M{"UserId": bson.ObjectIdHex(userId)}, &groups)
+	return groups
+}
+
+// 获取包含此用户的组对象数组
+// 获取该用户所属组, 和我的组
+func (this *GroupService) GetGroupsContainOf(userId string) []info.Group {
+	// 我的组
+	myGroups := this.GetGroups(userId)
+	myGroupMap := map[bson.ObjectId]bool{}
+	
+	for _, group := range myGroups {
+		myGroupMap[group.GroupId] = true
+	}
+	
+	// 所属组
+	groupIds := this.GetBelongToGroupIds(userId)
+
+	groups := []info.Group{}
+	db.ListByQ(db.Groups, bson.M{"_id": bson.M{"$in": groupIds}}, &groups)
+	
+	for _, group := range groups {
+		if !myGroupMap[group.GroupId] {
+			myGroups = append(myGroups, group)
+		}
+	}
+	
+	return myGroups
+}
+
+// 得到分组, shareService用
+func (this *GroupService) GetGroup(userId, groupId string) (info.Group) {
+	// 得到分组s
+	group := info.Group{}
+	db.GetByIdAndUserId(db.Groups, groupId, userId, &group)
+	return group
+}
+
+// 得到某分组下的用户
+func (this *GroupService) GetUsers(groupId string) ([]info.User) {
+	// 得到UserIds
+	groupUsers := []info.GroupUser{}
+	db.ListByQWithFields(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId)}, []string{"UserId"}, &groupUsers)
+	if len(groupUsers) == 0 {
+		return nil
+	}
+	userIds := make([]bson.ObjectId, len(groupUsers))
+	for i, each := range groupUsers {
+		userIds[i] = each.UserId
+	}
+	// 得到userInfos
+	return userService.ListUserInfosByUserIds(userIds)
+}
+
+// 得到我所属的所有分组ids
+func (this *GroupService) GetBelongToGroupIds(userId string) ([]bson.ObjectId) {
+	// 得到UserIds
+	groupUsers := []info.GroupUser{}
+	db.ListByQWithFields(db.GroupUsers, bson.M{"UserId": bson.ObjectIdHex(userId)}, []string{"GroupId"}, &groupUsers)
+	if len(groupUsers) == 0 {
+		return nil
+	}
+	groupIds := make([]bson.ObjectId, len(groupUsers))
+	for i, each := range groupUsers {
+		groupIds[i] = each.GroupId
+	}
+	return groupIds
+}
+
+func (this *GroupService) isMyGroup(ownUserId, groupId string) (ok bool) {
+	return db.Has(db.Groups, bson.M{"_id": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(ownUserId)})
+}	
+// 为group添加用户
+// 用户是否已存在?
+func (this *GroupService) AddUser(ownUserId, groupId, userId string) (ok bool, msg string) {
+	// groupId是否是ownUserId的?
+	if !this.isMyGroup(ownUserId, groupId) {
+		return false, "forbidden"
+	}
+	
+	// 是否已存在
+	if db.Has(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(userId)}) {
+		return false, "hasUsers"
+	}
+	
+	return db.Insert(db.GroupUsers, info.GroupUser{
+		GroupUserId: bson.NewObjectId(),
+		GroupId: bson.ObjectIdHex(groupId),
+		UserId: bson.ObjectIdHex(userId),
+		CreatedTime: time.Now(),
+	}), ""
+}
+// 删除用户
+func (this *GroupService) DeleteUser(ownUserId, groupId, userId string) (ok bool, msg string) {
+	// groupId是否是ownUserId的?
+	if !this.isMyGroup(ownUserId, groupId) {
+		return false, "forbidden"
+	}
+	return db.Delete(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(userId)}), ""
+}
+
+// 判断组中是否包含指定用户
+func (this *GroupService) IsExistsGroupUser(userId, groupId string) (ok bool) {
+	// 如果我拥有这个组, 那也行
+	if this.isMyGroup(userId, groupId) {
+		return true
+	}
+	return db.Has(db.GroupUsers, bson.M{"UserId": bson.ObjectIdHex(userId), "GroupId": bson.ObjectIdHex(groupId)})
+}

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"
 )
 
@@ -33,7 +33,8 @@ func (this *NoteContentHistoryService) AddHistory(noteId, userId string, eachHis
 		// TODO
 		l := len(history.Histories)
 		if l >= maxSize {
-			history.Histories = history.Histories[l-maxSize:]
+			// history.Histories = history.Histories[l-maxSize:] // BUG, 致使都是以前的
+			history.Histories = history.Histories[:maxSize]
 		}
 		newHistory := []info.EachHistory{eachHistory}
 		newHistory = append(newHistory, history.Histories...) // 在开头加了, 最近的在最前

app/service/NoteImageService.go

@@ -0,0 +1,154 @@
+package service
+
+import (
+	"github.com/leanote/leanote/app/info"
+	"github.com/leanote/leanote/app/db"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"regexp"
+//	"time"
+)
+
+type NoteImageService struct {
+}
+
+// 通过id, userId得到noteIds
+func (this *NoteImageService) GetNoteIds(imageId string) ([]bson.ObjectId) {
+	noteImages := []info.NoteImage{}
+	db.ListByQWithFields(db.NoteImages, bson.M{"ImageId": bson.ObjectIdHex(imageId)}, []string{"NoteId"}, &noteImages)	
+	
+	if noteImages != nil && len(noteImages) > 0 {
+		noteIds := make([]bson.ObjectId, len(noteImages))
+		cnt := len(noteImages)
+		for i := 0; i < cnt; i++ {
+			noteIds[i] = noteImages[i].NoteId
+		}
+		return noteIds
+	}
+	
+	return nil
+}
+
+// TODO 这个web可以用, 但api会传来, 不用用了
+// 解析内容中的图片, 建立图片与note的关系
+// <img src="/file/outputImage?fileId=12323232" />
+// 图片必须是我的, 不然不添加
+// imgSrc 防止博客修改了, 但内容删除了
+func (this *NoteImageService) UpdateNoteImages(userId, noteId, imgSrc, content string) bool {
+	// 让主图成为内容的一员
+	if imgSrc != "" {
+		content = "<img src=\"" + imgSrc + "\" >" + content
+	}
+	// life 添加getImage
+	reg, _ := regexp.Compile("(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})")
+	find := reg.FindAllStringSubmatch(content, -1) // 查找所有的
+
+	// 删除旧的
+	db.DeleteAll(db.NoteImages, bson.M{"NoteId": bson.ObjectIdHex(noteId)})
+
+	// 添加新的
+	var fileId string
+	noteImage := info.NoteImage{NoteId: bson.ObjectIdHex(noteId)}
+	hasAdded := make(map[string]bool)
+	if find != nil && len(find) > 0 {
+		for _, each := range find {
+			if each != nil && len(each) == 3 {
+				fileId = each[2] // 现在有两个子表达式了
+				// 之前没能添加过的
+				if _, ok := hasAdded[fileId]; !ok {
+					Log(fileId)
+					// 判断是否是我的文件
+					if fileService.IsMyFile(userId, fileId) {
+						noteImage.ImageId = bson.ObjectIdHex(fileId)
+						db.Insert(db.NoteImages, noteImage)
+					}
+					hasAdded[fileId] = true
+				}
+			}
+		}
+	}
+	
+	return true
+}
+
+// 复制图片, 把note的图片都copy给我, 且修改noteContent图片路径
+func (this *NoteImageService) CopyNoteImages(fromNoteId, fromUserId, newNoteId, content, toUserId string) string {
+	// 得到fromNoteId的noteImages, 如果为空, 则直接返回content
+	noteImages := []info.NoteImage{}
+	db.ListByQWithFields(db.NoteImages, bson.M{"NoteId": bson.ObjectIdHex(fromNoteId)}, []string{"ImageId"}, &noteImages)
+	
+	if len(noteImages) == 0 {
+		return content;
+	}
+	
+	// <img src="/file/outputImage?fileId=12323232" />
+	// 把fileId=1232替换成新的
+	replaceMap := map[string]string{}
+	for _, noteImage := range noteImages {
+		imageId := noteImage.ImageId.Hex()
+		ok, newImageId := fileService.CopyImage(fromUserId, imageId, toUserId)
+		if ok {
+			replaceMap[imageId] = newImageId
+		}
+	}
+	
+	if len(replaceMap) > 0 {
+		// 替换之
+		reg, _ := regexp.Compile("outputImage\\?fileId=([a-z0-9A-Z]{24})")
+		content = reg.ReplaceAllStringFunc(content, func(each string) string {
+			// each=outputImage?fileId=541bd2f599c37b4f3r000003
+			fileId := each[len(each)-24:] // 得到后24位, 也即id
+			if replaceFileId, ok := replaceMap[fileId]; ok {
+				return "outputImage?fileId=" + replaceFileId
+			}
+			return each
+		});
+	}
+	
+	return content;
+}
+
+// 
+func (this *NoteImageService) getImagesByNoteIds(noteIds []bson.ObjectId) map[string][]info.File {
+	noteNoteImages := []info.NoteImage{}
+	db.ListByQ(db.NoteImages, bson.M{"NoteId": bson.M{"$in": noteIds}}, &noteNoteImages)
+	
+	// 得到imageId, 再去files表查所有的Files
+	imageIds := []bson.ObjectId{}
+	
+	// 图片1 => N notes
+	imageIdNotes := map[string][]string{} // imageId => [noteId1, noteId2, ...]
+	for _, noteImage := range noteNoteImages {
+		imageId := noteImage.ImageId
+		imageIds = append(imageIds, imageId)
+		
+		imageIdHex := imageId.Hex()
+		noteId := noteImage.NoteId.Hex()
+		if notes, ok := imageIdNotes[imageIdHex]; ok {
+			imageIdNotes[imageIdHex] = append(notes, noteId)
+		} else {
+			imageIdNotes[imageIdHex] = []string{noteId}
+		}
+	}
+	
+	// 得到所有files
+	files := []info.File{}
+	db.ListByQ(db.Files, bson.M{"_id": bson.M{"$in": imageIds}}, &files)
+	
+	// 建立note->file关联
+	noteImages := make(map[string][]info.File)
+	for _, file := range files {
+		fileIdHex := file.FileId.Hex() // == imageId
+		// 这个fileIdHex有哪些notes呢?
+		if notes, ok := imageIdNotes[fileIdHex]; ok {
+			for _, noteId := range notes {
+				if files, ok2 := noteImages[noteId]; ok2 {
+					noteImages[noteId] = append(files, file)
+				} else {
+					noteImages[noteId] = []info.File{file}
+				}
+			}
+		}
+	}
+	return noteImages
+}

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"
 )
 
@@ -17,6 +17,13 @@ func (this *NoteService) GetNote(noteId, userId string) (note info.Note) {
 	db.GetByIdAndUserId(db.Notes, noteId, userId, &note)
 	return
 }
+// fileService调用
+// 不能是已经删除了的, life bug, 客户端删除后, 竟然还能在web上打开
+func (this *NoteService) GetNoteById(noteId string) (note info.Note) {
+	note = info.Note{}
+	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsDeleted": false}, &note)
+	return
+}
 // 得到blog, blogService用
 // 不要传userId, 因为是公开的
 func (this *NoteService) GetBlogNote(noteId string) (note info.Note) {
@@ -31,14 +38,122 @@ func (this *NoteService) GetNoteContent(noteContentId, userId string) (noteConte
 	return
 }
 
+// 得到笔记和内容
+func (this *NoteService) GetNoteAndContent(noteId, userId string) (noteAndContent info.NoteAndContent) {
+	note := this.GetNote(noteId, userId)
+	noteContent := this.GetNoteContent(noteId, userId)
+	return info.NoteAndContent{note, noteContent}
+}
+
+// 获取同步的笔记
+// > afterUsn的笔记
+func (this *NoteService) GetSyncNotes(userId string, afterUsn, maxEntry int) []info.ApiNote {
+	notes := []info.Note{}
+	q := db.Notes.Find(bson.M{
+		"UserId": bson.ObjectIdHex(userId), 
+		"Usn": bson.M{"$gt": afterUsn},
+		});
+	q.Sort("Usn").Limit(maxEntry).All(&notes)
+	
+	return this.ToApiNotes(notes)
+}
+
+// note与apiNote的转换
+func (this *NoteService) ToApiNotes(notes []info.Note) []info.ApiNote {
+	// 2, 得到所有图片, 附件信息
+	// 查images表, attachs表
+	if len(notes) > 0 {
+		noteIds := make([]bson.ObjectId, len(notes));
+		for i, note := range notes {
+			noteIds[i] = note.NoteId
+		}
+		noteFilesMap := this.getFiles(noteIds)
+		// 生成info.ApiNote
+		apiNotes := make([]info.ApiNote, len(notes))
+		for i, note := range notes {
+			noteId := note.NoteId.Hex()
+			apiNotes[i] = this.ToApiNote(&note, noteFilesMap[noteId])
+		}
+		return apiNotes
+	}
+	// 返回空的
+	return []info.ApiNote{}
+}
+
+
+// note与apiNote的转换
+func (this *NoteService) ToApiNote(note *info.Note, files []info.NoteFile) info.ApiNote {
+	apiNote := info.ApiNote{
+		NoteId: note.NoteId.Hex(),
+		NotebookId: note.NotebookId.Hex(),
+		UserId     : note.UserId.Hex(),
+		Title      : note.Title,
+		Tags       : note.Tags,
+		IsMarkdown : note.IsMarkdown,
+		IsBlog    : note.IsBlog,
+		IsTrash : note.IsTrash,
+		IsDeleted : note.IsDeleted,
+		Usn : note.Usn,
+		CreatedTime : note.CreatedTime,
+		UpdatedTime : note.UpdatedTime,
+		PublicTime : note.PublicTime,
+		Files: files,
+	}
+	return apiNote
+}
+
+// getDirtyNotes, 把note的图片, 附件信息都发送给客户端
+// 客户端保存到本地, 再获取图片, 附件
+
+// 得到所有图片, 附件信息
+// 查images表, attachs表
+// [待测]
+func (this *NoteService) getFiles(noteIds []bson.ObjectId) map[string][]info.NoteFile {
+	noteImages := noteImageService.getImagesByNoteIds(noteIds);
+	noteAttachs := attachService.getAttachsByNoteIds(noteIds)
+	
+	noteFilesMap := map[string][]info.NoteFile{}
+	
+	for _, noteId := range noteIds {
+		noteIdHex := noteId.Hex()
+		noteFiles := []info.NoteFile{}
+		// images
+		if images, ok := noteImages[noteIdHex]; ok {
+			for _, image := range images {
+				noteFiles = append(noteFiles, info.NoteFile{
+					FileId: image.FileId.Hex(),
+					Type: image.Type,
+				});
+			}
+		}
+		
+		// attach
+		if attachs, ok := noteAttachs[noteIdHex]; ok {
+			for _, attach := range attachs {
+				noteFiles = append(noteFiles, info.NoteFile{
+					FileId: attach.AttachId.Hex(),
+					Type: attach.Type,
+					Title: attach.Title,
+					IsAttach: true,
+				});
+			}
+		}
+		
+		noteFilesMap[noteIdHex] = noteFiles
+	}
+	
+	return noteFilesMap
+}
+
 // 列出note, 排序规则, 还有分页
 // CreatedTime, UpdatedTime, title 来排序
 func (this *NoteService) ListNotes(userId, notebookId string,
 		isTrash bool, pageNumber, pageSize int, sortField string, isAsc bool, isBlog bool) (count int, notes []info.Note) {
 	notes = []info.Note{}
 	skipNum, sortFieldR := parsePageAndSort(pageNumber, pageSize, sortField, isAsc)
+	
 	// 不是trash的
-	query := bson.M{"UserId": bson.ObjectIdHex(userId), "IsTrash": isTrash}
+	query := bson.M{"UserId": bson.ObjectIdHex(userId), "IsTrash": isTrash, "IsDeleted": false}
 	if isBlog {
 		query["IsBlog"] = true
 	}
@@ -98,11 +213,17 @@ func (this *NoteService) ListNoteAbstractsByNoteIds(noteIds []bson.ObjectId) (no
 	db.ListByQWithFields(db.NoteContents, bson.M{"_id": bson.M{"$in": noteIds}}, []string{"_id", "Abstract"}, &notes)
 	return
 }
+func (this *NoteService) ListNoteContentByNoteIds(noteIds []bson.ObjectId) (notes []info.NoteContent) {
+	notes = []info.NoteContent{}
+	db.ListByQWithFields(db.NoteContents, bson.M{"_id": bson.M{"$in": noteIds}}, []string{"_id", "Abstract", "Content"}, &notes)
+	return
+}
 
 // 添加笔记
 // 首先要判断Notebook是否是Blog, 是的话设为blog
 // [ok]
-func (this *NoteService) AddNote(note info.Note) info.Note {
+
+func (this *NoteService) AddNote(note info.Note, fromApi bool) info.Note {
 	if(note.NoteId.Hex() == "") {
 		noteId := bson.NewObjectId();
 		note.NoteId = noteId;
@@ -111,15 +232,28 @@ func (this *NoteService) AddNote(note info.Note) info.Note {
 	note.UpdatedTime = note.CreatedTime
 	note.IsTrash = false
 	note.UpdatedUserId = note.UserId
+	note.UrlTitle = GetUrTitle(note.UserId.Hex(), note.Title, "note")
+	note.Usn = userService.IncrUsn(note.UserId.Hex())
 	
-	// 设为blog
+	notebookId := note.NotebookId.Hex()
-	note.IsBlog = notebookService.IsBlog(note.NotebookId.Hex())
+	
+	// api会传IsBlog, web不会传
+	if !fromApi {
+		// 设为blog
+		note.IsBlog = notebookService.IsBlog(notebookId)
+	}
+//	if note.IsBlog {
+	note.PublicTime = note.UpdatedTime
+//	}
 	
 	db.Insert(db.Notes, note)
 	
 	// tag1
 	tagService.AddTags(note.UserId.Hex(), note.Tags)
 	
+	// recount notebooks' notes number
+	notebookService.ReCountNotebookNumberNotes(notebookId)
+	
 	return note
 }
 
@@ -128,7 +262,7 @@ func (this *NoteService) AddSharedNote(note info.Note, myUserId bson.ObjectId) i
 	// 判断我是否有权限添加
 	if shareService.HasUpdateNotebookPerm(note.UserId.Hex(), myUserId.Hex(), note.NotebookId.Hex()) {
 		note.CreatedUserId = myUserId // 是我给共享我的人创建的
-		return this.AddNote(note)
+		return this.AddNote(note, false)
 	}
 	return info.Note{}
 }
@@ -141,11 +275,69 @@ func (this *NoteService) AddNoteContent(noteContent info.NoteContent) info.NoteC
 	noteContent.UpdatedTime = noteContent.CreatedTime 
 	noteContent.UpdatedUserId = noteContent.UserId
 	db.Insert(db.NoteContents, noteContent)
+	
+	// 更新笔记图片
+	noteImageService.UpdateNoteImages(noteContent.UserId.Hex(), noteContent.NoteId.Hex(), "", noteContent.Content)
+	
 	return noteContent;
 }
 
+// API, abstract, desc需要这里获取
+// 不需要
+/*
+func (this *NoteService) AddNoteAndContentApi(note info.Note, noteContent info.NoteContent, myUserId bson.ObjectId) info.Note {
+	if(note.NoteId.Hex() == "") {
+		noteId := bson.NewObjectId();
+		note.NoteId = noteId;
+	}
+	note.CreatedTime = time.Now()
+	note.UpdatedTime = note.CreatedTime
+	note.IsTrash = false
+	note.UpdatedUserId = note.UserId
+	note.UrlTitle = GetUrTitle(note.UserId.Hex(), note.Title, "note")
+	note.Usn = userService.IncrUsn(note.UserId.Hex())
+	
+	// desc这里获取
+	desc := SubStringHTMLToRaw(noteContent.Content, 50)
+	note.Desc = desc;
+
+	// 设为blog
+	notebookId := note.NotebookId.Hex()
+	note.IsBlog = notebookService.IsBlog(notebookId)
+	
+	if note.IsBlog {
+		note.PublicTime = note.UpdatedTime
+	}
+	
+	db.Insert(db.Notes, note)
+	
+	// tag1, 不需要了
+//	tagService.AddTags(note.UserId.Hex(), note.Tags)
+	
+	// recount notebooks' notes number
+	notebookService.ReCountNotebookNumberNotes(notebookId)
+	
+	// 这里, 添加到内容中
+	abstract := SubStringHTML(noteContent.Content, 200, "")
+	noteContent.Abstract = abstract
+	this.AddNoteContent(noteContent)
+	
+	return note
+}*/
+
 // 添加笔记和内容
 // 这里使用 info.NoteAndContent 接收?
+func (this *NoteService) AddNoteAndContentForController(note info.Note, noteContent info.NoteContent, updatedUserId string) info.Note {
+	if note.UserId.Hex() != updatedUserId {
+		if !shareService.HasUpdateNotebookPerm(note.UserId.Hex(), updatedUserId, note.NotebookId.Hex()) {
+			Log("NO AUTH11")
+			return info.Note{}
+		} else {
+			Log("HAS AUTH -----------")
+		}
+	}
+	return this.AddNoteAndContent(note, noteContent, bson.ObjectIdHex(updatedUserId));
+}
 func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.NoteContent, myUserId bson.ObjectId) info.Note {
 	if(note.NoteId.Hex() == "") {
 		noteId := bson.NewObjectId()
@@ -155,7 +347,24 @@ func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.Note
 	if note.UserId != myUserId	{
 		note = this.AddSharedNote(note, myUserId)
 	} else {
-		note = this.AddNote(note)
+		note = this.AddNote(note, false)
+	}
+	if note.NoteId != "" {
+		this.AddNoteContent(noteContent)
+	}
+	return note
+}
+
+func (this *NoteService) AddNoteAndContentApi(note info.Note, noteContent info.NoteContent, myUserId bson.ObjectId) info.Note {
+	if(note.NoteId.Hex() == "") {
+		noteId := bson.NewObjectId()
+		note.NoteId = noteId
+	}
+	noteContent.NoteId = note.NoteId
+	if note.UserId != myUserId	{
+		note = this.AddSharedNote(note, myUserId)
+	} else {
+		note = this.AddNote(note, true)
 	}
 	if note.NoteId != "" {
 		this.AddNoteContent(noteContent)
@@ -164,22 +373,42 @@ func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.Note
 }
 
 // 修改笔记
-// [ok] TODO perm还没测
+// 这里没有判断usn
-func (this *NoteService) UpdateNote(userId, updatedUserId, noteId string, needUpdate bson.M) bool {
+func (this *NoteService) UpdateNote(updatedUserId, noteId string, needUpdate bson.M, usn int) (bool, string, int) {
+	// 是否存在
+	note := this.GetNoteById(noteId)
+	if note.NoteId == "" {
+		return false, "notExists", 0
+	}
+	
+	userId := note.UserId.Hex()
 	// updatedUserId 要修改userId的note, 此时需要判断是否有修改权限
 	if userId != updatedUserId {
 		if !shareService.HasUpdatePerm(userId, updatedUserId, noteId) {
-			Log("NO AUTH")
+			Log("NO AUTH2")
-			return false
+			return false, "noAuth", 0
 		} else {
 			Log("HAS AUTH -----------")
 		}
 	}
 	
+	if usn > 0 &&  note.Usn != usn {
+		return false, "conflict", 0
+	}
+	
+	// 是否已自定义
+	if note.IsBlog && note.HasSelfDefined {
+		delete(needUpdate, "ImgSrc")
+		delete(needUpdate, "Desc")
+	}
+	
 	needUpdate["UpdatedUserId"] = bson.ObjectIdHex(updatedUserId);
 	needUpdate["UpdatedTime"] = time.Now();
+	afterUsn := userService.IncrUsn(userId);
+	needUpdate["Usn"] = afterUsn
 	
 	// 添加tag2
+	// TODO 这个tag去掉, 添加tag另外添加, 不要这个
 	if tags, ok := needUpdate["Tags"]; ok {
 		tagService.AddTagsI(userId, tags)
 	}
@@ -187,10 +416,55 @@ func (this *NoteService) UpdateNote(userId, updatedUserId, noteId string, needUp
 	// 是否修改了isBlog
 	// 也要修改noteContents的IsBlog
 	if isBlog, ok := needUpdate["IsBlog"]; ok {
-		db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, bson.M{"IsBlog": isBlog})
+		isBlog2 := isBlog.(bool)
+		if note.IsBlog != isBlog2 {
+			db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, bson.M{"IsBlog": isBlog2})
+
+			// 重新发布成博客
+			if !note.IsBlog {
+				needUpdate["PublicTime"] = needUpdate["UpdatedTime"]
+			}
+		}
 	}
 	
-	return db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, needUpdate)
+	ok := db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, needUpdate)
+	if !ok {
+		return ok, "", 0
+	}
+	
+	// 重新获取之
+	note = this.GetNoteById(noteId)
+	
+	hasRecount := false
+	
+	// 如果修改了notebookId, 则更新notebookId'count
+	// 两方的notebook也要修改
+	notebookIdI := needUpdate["NotebookId"]
+	if notebookIdI != nil {
+		notebookId := notebookIdI.(bson.ObjectId)
+		if notebookId != "" {
+			notebookService.ReCountNotebookNumberNotes(note.NotebookId.Hex())
+			hasRecount = true
+			notebookService.ReCountNotebookNumberNotes(notebookId.Hex())
+		}
+	}
+	
+	// 不要多次更新, isTrash = false, = true都要重新统计
+	if !hasRecount {
+		if _, ok := needUpdate["IsTrash"]; ok {
+			notebookService.ReCountNotebookNumberNotes(note.NotebookId.Hex())
+		}
+	}
+	
+	return true, "", afterUsn
+}
+
+// 附件修改, 增加noteIncr
+func (this *NoteService) IncrNoteUsn(noteId, userId string) int {
+	afterUsn := userService.IncrUsn(userId)
+	db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, 
+		bson.M{"UpdatedTime": time.Now(), "Usn": afterUsn})
+	return afterUsn
 }
 
 // 这里要判断权限, 如果userId != updatedUserId, 那么需要判断权限
@@ -205,40 +479,102 @@ func (this *NoteService) UpdateNoteTitle(userId, updatedUserId, noteId, title st
 	}
 
 	return db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, 
-		bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId), "Title": title, "UpdatedTime": time.Now()})
+		bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId), "Title": title, "UpdatedTime": time.Now(), "Usn": userService.IncrUsn(userId)})
 }
 
 // 修改笔记本内容
 // [ok] TODO perm未测
-func (this *NoteService) UpdateNoteContent(userId, updatedUserId, noteId, content, abstract string) bool {
+// hasBeforeUpdateNote 之前是否更新过note其它信息, 如果有更新, usn不用更新
+// TODO abstract这里生成
+func (this *NoteService) UpdateNoteContent(updatedUserId, noteId, content, abstract string, hasBeforeUpdateNote bool, usn int) (bool, string, int) {
+	// 是否已自定义
+	note := this.GetNoteById(noteId)
+	if note.NoteId == "" {
+		return false, "notExists", 0
+	}
+	userId := note.UserId.Hex()
 	// updatedUserId 要修改userId的note, 此时需要判断是否有修改权限
 	if userId != updatedUserId {
 		if !shareService.HasUpdatePerm(userId, updatedUserId, noteId) {
 			Log("NO AUTH")
-			return false
+			return false, "noAuth", 0
 		}
 	}
 	
-	if db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, 
+	// abstract重置
-		bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId), 
+	data := bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId), 
 		"Content": content, 
 		"Abstract": abstract, 
-		"UpdatedTime": time.Now()}) {
+		"UpdatedTime": time.Now()}
 	
+	if note.IsBlog && note.HasSelfDefined {
+		delete(data, "Abstract")
+	}
+	
+	// usn, 修改笔记不可能单独修改内容
+	afterUsn := 0
+	// 如果之前没有修改note其它信息, 那么usn++
+	if !hasBeforeUpdateNote {
+		// 需要验证
+		if usn >= 0 && note.Usn != usn {
+			return false, "conflict", 0
+		}
+		afterUsn = userService.IncrUsn(userId)
+		db.UpdateByIdAndUserIdField(db.Notes, noteId, userId, "Usn", usn)
+	}
+
+	if db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, data) {
 		// 这里, 添加历史记录
 		noteContentHistoryService.AddHistory(noteId, userId, info.EachHistory{UpdatedUserId: bson.ObjectIdHex(updatedUserId), 
 			Content: content,
 			UpdatedTime: time.Now(),
 		})
-		return true
+		
+		// 更新笔记图片
+		noteImageService.UpdateNoteImages(userId, noteId, note.ImgSrc, content)
+		
+		return true, "", afterUsn
 	}
-	return false
+	return false, "", 0
+}
+
+// ?????
+// 这种方式太恶心, 改动很大
+// 通过content修改笔记的imageIds列表
+// src="http://localhost:9000/file/outputImage?fileId=541ae75499c37b6b79000005&noteId=541ae63c19807a4bb9000000"
+func (this *NoteService) updateNoteImages(noteId string, content string) bool {
+	return true
 }
 
 // 更新tags
 // [ok] [del]
 func (this *NoteService) UpdateTags(noteId string, userId string, tags []string) bool {
-	return db.UpdateByIdAndUserIdField(db.Notes, noteId, userId, "Tags", tags)
+	return db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, bson.M{"Tags": tags, "Usn": userService.IncrUsn(userId)})
+}
+
+func (this *NoteService) ToBlog(userId, noteId string, isBlog, isTop bool) bool {
+	noteUpdate := bson.M{}
+	if isTop {
+		isBlog = true
+	}
+	if !isBlog {
+		isTop = false
+	}
+	noteUpdate["IsBlog"] = isBlog
+	noteUpdate["IsTop"] = isTop
+	if isBlog {
+		noteUpdate["PublicTime"] = time.Now()
+	} else {
+		noteUpdate["HasSelfDefined"] = false
+	}
+	noteUpdate["Usn"] = userService.IncrUsn(userId)
+	
+	ok := db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, noteUpdate)
+	// 重新计算tags
+	go (func() {
+		blogService.ReCountBlogTags(userId)
+	})()
+	return ok
 }
 
 // 移动note
@@ -247,13 +583,25 @@ func (this *NoteService) UpdateTags(noteId string, userId string, tags []string)
 // 2. 要判断之前是否是blog, 如果不是, 那么notebook是否是blog?
 func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
 	if notebookService.IsMyNotebook(notebookId, userId) {
+		note := this.GetNote(noteId, userId)
+		preNotebookId := note.NotebookId.Hex()
+		
 		re := db.UpdateByIdAndUserId(db.Notes, noteId, userId, 
 			bson.M{"$set": bson.M{"IsTrash": false, 
-				"NotebookId": bson.ObjectIdHex(notebookId)}})
+				"NotebookId": bson.ObjectIdHex(notebookId),
+				"Usn": userService.IncrUsn(userId),
+				}})
 				
 		if re {
 			// 更新blog状态
 			this.updateToNotebookBlog(noteId, notebookId, userId)
+			
+			// recount notebooks' notes number
+			notebookService.ReCountNotebookNumberNotes(notebookId)
+			// 之前不是trash才统计, trash本不在统计中的
+			if !note.IsTrash && preNotebookId != notebookId {
+				notebookService.ReCountNotebookNumberNotes(preNotebookId)
+			}
 		}
 		
 		return this.GetNote(noteId, userId);
@@ -264,13 +612,14 @@ func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
 // 如果自己的blog状态是true, 不用改变, 
 // 否则, 如果notebookId的blog是true, 则改为true之
 // 返回blog状态
+// move, copy时用
 func (this *NoteService) updateToNotebookBlog(noteId, notebookId, userId string) bool {
 	if this.IsBlog(noteId) {
 		return true
 	}
 	if notebookService.IsBlog(notebookId) {
 		db.UpdateByIdAndUserId(db.Notes, noteId, userId, 
-			bson.M{"$set": bson.M{"IsBlog": true}})
+			bson.M{"$set": bson.M{"IsBlog": true, "PublicTime": time.Now()}}) // life
 		return true
 	}
 	return false
@@ -301,7 +650,11 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
 		// 更新blog状态
 		isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, userId)
 		
+		// recount
+		notebookService.ReCountNotebookNumberNotes(notebookId)
+		
 		note.IsBlog = isBlog
+		
 		return note
 	}
 	
@@ -309,9 +662,12 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
 }
 
 // 复制别人的共享笔记给我
-// TODO 判断是否共享了给我
+// 将别人可用的图片转为我的图片, 复制图片
 func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId string) info.Note {
-	if notebookService.IsMyNotebook(notebookId, myUserId) {
+	// Log(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId))
+	// 判断是否共享了给我
+	if notebookService.IsMyNotebook(notebookId, myUserId) && 
+		(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId)) {
 		note := this.GetNote(noteId, fromUserId)
 		if note.NoteId == "" {
 			return info.Note{}
@@ -325,16 +681,27 @@ func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId
 		note.IsTop = false
 		note.IsBlog = false // 别人的可能是blog
 		
+		note.ImgSrc = "" // 为什么清空, 因为图片需要复制, 先清空
+		
 		// content
 		noteContent.NoteId = note.NoteId
 		noteContent.UserId = note.UserId
 		
+		// 复制图片, 把note的图片都copy给我, 且修改noteContent图片路径
+		noteContent.Content = noteImageService.CopyNoteImages(noteId, fromUserId, note.NoteId.Hex(), noteContent.Content, myUserId)
+		
+		// 复制附件
+		attachService.CopyAttachs(noteId, note.NoteId.Hex(), myUserId)
+		
 		// 添加之
 		note = this.AddNoteAndContent(note, noteContent, note.UserId);
 		
 		// 更新blog状态
 		isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, myUserId)
 		
+		// recount
+		notebookService.ReCountNotebookNumberNotes(notebookId)
+		
 		note.IsBlog = isBlog
 		return note
 	}
@@ -346,21 +713,28 @@ func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId
 // shareService call
 // [ok]
 func (this *NoteService) GetNotebookId(noteId string) bson.ObjectId {
-	note := &info.Note{}
+	note := info.Note{}
-	db.Get(db.Notes, noteId, note)
+	// db.Get(db.Notes, noteId, &note)
+	// LogJ(note)
+	db.GetByQWithFields(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, []string{"NotebookId"}, &note)
 	return note.NotebookId
 }
 
 //------------------
-// 搜索Note
+// 搜索Note, 博客使用了
 func (this *NoteService) SearchNote(key, userId string, pageNumber, pageSize int, sortField string, isAsc, isBlog bool) (count int, notes []info.Note) {
 	notes = []info.Note{}
 	skipNum, sortFieldR := parsePageAndSort(pageNumber, pageSize, sortField, isAsc)
 	
+	// 利用标题和desc, 不用content
+	orQ := []bson.M{
+		bson.M{"Title": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}},
+		bson.M{"Desc": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}},
+	}
 	// 不是trash的
 	query := bson.M{"UserId": bson.ObjectIdHex(userId), 
 		"IsTrash": false, 
-		"Title": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}},
+		"$or": orQ,
 	}
 	if isBlog {
 		query["IsBlog"] = true
@@ -389,7 +763,6 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 	for i, note := range notes {
 		noteIds[i] = note.NoteId
 	}
-	LogJ(noteIds)
 	noteContents := []info.NoteContent{}
 	query := bson.M{"_id": bson.M{"$nin": noteIds}, "UserId": bson.ObjectIdHex(userId), "Content": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}}
 	if isBlog {
@@ -412,9 +785,6 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 		noteIds2[i] = content.NoteId
 	}
 	
-//	Log(" content search ")
-//	Log(lenContent)
-	
 	// 得到notes
 	notes2 := this.ListNotesByNoteIds(noteIds2)
 	
@@ -439,11 +809,65 @@ func (this *NoteService) SearchNoteByTags(tags []string, userId string, pageNumb
 	// 总记录数
 	count, _ = q.Count()
 	
-	Log(count)
-		
 	q.Sort(sortFieldR).
 		Skip(skipNum).
 		Limit(pageSize).
 		All(&notes)
 	return
 }
+
+//------------
+// 统计
+func (this *NoteService) CountNote(userId string) int {
+	q := bson.M{"IsTrash": false}
+	if userId != "" {
+		q["UserId"] = bson.ObjectIdHex(userId)
+	}
+	return db.Count(db.Notes, q)
+}
+func (this *NoteService) CountBlog(userId string) int {
+	q := bson.M{"IsBlog": true, "IsTrash": false}
+	if userId != "" {
+		q["UserId"] = bson.ObjectIdHex(userId)
+	}
+	return db.Count(db.Notes, q)
+}
+
+// 通过标签来查询
+func (this *NoteService) CountNoteByTag(userId string, tag string) int {
+	if tag == "" {
+		return 0
+	}
+	query := bson.M{"UserId": bson.ObjectIdHex(userId), 
+//		"IsTrash": false, 
+		"IsDeleted": false,
+		"Tags": bson.M{"$in": []string{tag}}}	
+	return db.Count(db.Notes, query)
+}
+
+// 删除tag
+// 返回所有note的Usn
+func (this *NoteService) UpdateNoteToDeleteTag(userId string, targetTag string) map[string]int {
+	query := bson.M{"UserId": bson.ObjectIdHex(userId), 
+		"Tags": bson.M{"$in": []string{targetTag}}}
+	notes := []info.Note{}
+	db.ListByQ(db.Notes, query, &notes)
+	ret := map[string]int{}
+	for _, note := range notes {
+		tags := note.Tags
+		if tags == nil {
+			continue
+		}
+		for i, tag := range tags {
+			if tag == targetTag {
+				tags = tags
+				tags = append(tags[:i], tags[i+1:]...)
+				break;
+			}
+		}
+		usn := userService.IncrUsn(userId)
+		db.UpdateByQMap(db.Notes, bson.M{"_id": note.NoteId}, bson.M{"Usn": usn, "Tags": tags})
+		ret[note.NoteId.Hex()] = usn
+	}
+	return ret
+}

app/service/NotebookService.go

@@ -2,10 +2,10 @@ 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"
+	. "github.com/leanote/leanote/app/lea"
 	"sort"
 	"time"
 )
@@ -47,31 +47,40 @@ func ParseAndSortNotebooks(userNotebooks []info.Notebook, noParentDelete, needSo
 		newNotebooks.NumberNotes = each.NumberNotes
 		newNotebooks.IsTrash = each.IsTrash
 		newNotebooks.IsBlog = each.IsBlog
+		
+		// 存地址
 		userNotebooksMap[each.NotebookId] = &newNotebooks
 	}
 
 	// 第二遍, 追加到父下
-	//	nilObjectId := bson.ObjectIdHex("")
+	
+	// 需要删除的id
+	needDeleteNotebookId := map[bson.ObjectId]bool{}
 	for id, each := range userNotebooksMap {
 		// 如果有父, 那么追加到父下, 并剪掉当前, 那么最后就只有根的元素
 		if each.ParentNotebookId.Hex() != "" {
 			if userNotebooksMap[each.ParentNotebookId] != nil {
-				userNotebooksMap[each.ParentNotebookId].Subs = append(userNotebooksMap[each.ParentNotebookId].Subs, *each)
+				userNotebooksMap[each.ParentNotebookId].Subs = append(userNotebooksMap[each.ParentNotebookId].Subs, each) // Subs是存地址
 				// 并剪掉
-				delete(userNotebooksMap, id)
+				// bug
+				needDeleteNotebookId[id] = true
+				// delete(userNotebooksMap, id)
 			} else if noParentDelete {
 				// 没有父, 且设置了要删除	
-				delete(userNotebooksMap, id)
+				needDeleteNotebookId[id] = true
+				// delete(userNotebooksMap, id)
 			}
 		}
 	}
 
 	// 第三遍, 得到所有根
-	final := make(info.SubNotebooks, len(userNotebooksMap))
+	final := make(info.SubNotebooks, len(userNotebooksMap)-len(needDeleteNotebookId))
 	i := 0
-	for _, each := range userNotebooksMap {
+	for id, each := range userNotebooksMap {
-		final[i] = *each
+		if !needDeleteNotebookId[id] {
-		i++
+			final[i] = each
+			i++
+		}
 	}
 
 	// 最后排序
@@ -87,13 +96,39 @@ func (this *NotebookService) GetNotebook(notebookId, userId string) info.Noteboo
 	db.GetByIdAndUserId(db.Notebooks, notebookId, userId, &notebook)
 	return notebook
 }
+func (this *NotebookService) GetNotebookById(notebookId string) info.Notebook {
+	notebook := info.Notebook{}
+	db.Get(db.Notebooks, notebookId, &notebook)
+	return notebook
+}
+func (this *NotebookService) GetNotebookByUserIdAndUrlTitle(userId, notebookIdOrUrlTitle string) info.Notebook {
+	notebook := info.Notebook{}
+	if IsObjectId(notebookIdOrUrlTitle) {
+		db.Get(db.Notebooks, notebookIdOrUrlTitle, &notebook)
+	} else {
+		db.GetByQ(db.Notebooks, bson.M{"UserId": bson.ObjectIdHex(userId), "UrlTitle": encodeValue(notebookIdOrUrlTitle)}, &notebook)
+	}
+	return notebook
+}
+
+// 同步的方法
+func (this *NotebookService) GeSyncNotebooks(userId string, afterUsn, maxEntry int) ([]info.Notebook) {
+	notebooks := []info.Notebook{}
+	q := db.Notebooks.Find(bson.M{"UserId": bson.ObjectIdHex(userId), "Usn": bson.M{"$gt": afterUsn}});
+	q.Sort("Usn").Limit(maxEntry).All(&notebooks)
+	return notebooks
+}
 
 // 得到用户下所有的notebook
 // 排序好之后返回
 // [ok]
 func (this *NotebookService) GetNotebooks(userId string) info.SubNotebooks {
 	userNotebooks := []info.Notebook{}
-	db.Notebooks.Find(bson.M{"UserId": bson.ObjectIdHex(userId)}).All(&userNotebooks)
+	orQ := []bson.M{
+		bson.M{"IsDeleted": false},
+		bson.M{"IsDeleted": bson.M{"$exists": false}},
+	}
+	db.Notebooks.Find(bson.M{"UserId": bson.ObjectIdHex(userId), "$or": orQ}).All(&userNotebooks)
 
 	if len(userNotebooks) == 0 {
 		return nil
@@ -118,13 +153,46 @@ func (this *NotebookService) GetNotebooksByNotebookIds(notebookIds []bson.Object
 
 // 添加
 // [ok]
-func (this *NotebookService) AddNotebook(notebook info.Notebook) bool {
+func (this *NotebookService) AddNotebook(notebook info.Notebook) (bool, info.Notebook) {
+	notebook.UrlTitle = GetUrTitle(notebook.UserId.Hex(), notebook.Title, "notebook")
+	notebook.Usn = userService.IncrUsn(notebook.UserId.Hex())
+	now := time.Now()
+	notebook.CreatedTime = now
+	notebook.UpdatedTime = now
 	err := db.Notebooks.Insert(notebook)
 	if err != nil {
-		panic(err)
+		return false, notebook
-	} else {
 	}
-	return true
+	return true, notebook
+}
+// 更新笔记, api
+func (this *NotebookService) UpdateNotebookApi(userId, notebookId, title, parentNotebookId string, seq, usn int) (bool, string, info.Notebook) {
+	if notebookId == "" {
+		return false, "notebookIdNotExists", info.Notebook{}
+	}
+	
+	// 先判断usn是否和数据库的一样, 如果不一样, 则冲突, 不保存
+	notebook := this.GetNotebookById(notebookId)
+	// 不存在
+	if notebook.NotebookId == "" {
+		return false, "notExists", notebook
+	} else if notebook.Usn != usn {
+		return false, "conflict", notebook
+	}
+	notebook.Usn = userService.IncrUsn(userId);
+	notebook.Title = title;
+	
+	updates := bson.M{"Title": title, "Usn": notebook.Usn, "Seq": seq, "UpdatedTime": time.Now()};
+	if(parentNotebookId != "" && bson.IsObjectIdHex(parentNotebookId)) {
+		updates["ParentNotebookId"] = bson.ObjectIdHex(parentNotebookId);
+	} else {
+		updates["ParentNotebookId"] = "";
+	}
+	ok := db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates);
+	if ok {
+		return ok, "", this.GetNotebookById(notebookId)
+	}
+	return false, "", notebook
 }
 
 // 判断是否是blog
@@ -150,46 +218,85 @@ func (this *NotebookService) UpdateNotebook(notebook info.Notebook) bool {
 // 更新笔记本标题
 // [ok]
 func (this *NotebookService) UpdateNotebookTitle(notebookId, userId, title string) bool {
-	return db.UpdateByIdAndUserIdField(db.Notebooks, notebookId, userId, "Title", title)
+	usn := userService.IncrUsn(userId)
+	return db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, bson.M{"Title": title, "Usn": usn})
 }
 
 // 更新notebook
 func (this *NotebookService) UpdateNotebook(userId, notebookId string, needUpdate bson.M) bool {
 	needUpdate["UpdatedTime"] = time.Now();
-	
+	needUpdate["Usn"] = userService.IncrUsn(userId)
-	// 如果有IsBlog之类的, 需要特殊处理
-	if isBlog, ok := needUpdate["IsBlog"]; ok {
-		// 设为blog/取消
-		if is, ok2 := isBlog.(bool); ok2 {
-			q := bson.M{"UserId": bson.ObjectIdHex(userId), 
-				"NotebookId": bson.ObjectIdHex(notebookId)}
-			db.UpdateByQMap(db.Notes, q, bson.M{"IsBlog": is})
-				
-			// noteContents也更新, 这个就麻烦了, noteContents表没有NotebookId
-			// 先查该notebook下所有notes, 得到id
-			notes := []info.Note{}
-			db.ListByQWithFields(db.Notes, q, []string{"_id"}, &notes)
-			if len(notes) > 0 {
-				noteIds := make([]bson.ObjectId, len(notes))
-				for i, each := range notes {
-					noteIds[i] = each.NoteId
-				}
-				db.UpdateByQMap(db.NoteContents, bson.M{"_id": bson.M{"$in": noteIds}}, bson.M{"IsBlog": isBlog})
-			}
-		}
-	}
-	
 	return db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, needUpdate)
 }
 
+// ToBlog or Not
+func (this *NotebookService) ToBlog(userId, notebookId string, isBlog bool) (bool) {
+	updates := bson.M{"IsBlog": isBlog, "Usn": userService.IncrUsn(userId)}
+	// 笔记本
+	db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates)
+	
+	// 更新笔记
+	q := bson.M{"UserId": bson.ObjectIdHex(userId), 
+				"NotebookId": bson.ObjectIdHex(notebookId)}
+	data := bson.M{"IsBlog": isBlog}
+	if isBlog {
+		data["PublicTime"] = time.Now()
+	} else {
+		data["HasSelfDefined"] = false
+	}
+	// usn
+	data["Usn"] = userService.IncrUsn(userId)
+	db.UpdateByQMap(db.Notes, q, data)
+	
+	// noteContents也更新, 这个就麻烦了, noteContents表没有NotebookId
+	// 先查该notebook下所有notes, 得到id
+	notes := []info.Note{}
+	db.ListByQWithFields(db.Notes, q, []string{"_id"}, &notes)
+	if len(notes) > 0 {
+		noteIds := make([]bson.ObjectId, len(notes))
+		for i, each := range notes {
+			noteIds[i] = each.NoteId
+		}
+		db.UpdateByQMap(db.NoteContents, bson.M{"_id": bson.M{"$in": noteIds}}, bson.M{"IsBlog": isBlog})
+	}
+	
+	// 重新计算tags
+	go (func() {
+		blogService.ReCountBlogTags(userId)
+	})()
+	
+	return true
+}
+
+// 查看是否有子notebook
 // 先查看该notebookId下是否有notes, 没有则删除
 func (this *NotebookService) DeleteNotebook(userId, notebookId string) (bool, string) {
-	if db.Count(db.Notes, bson.M{"NotebookId": bson.ObjectIdHex(notebookId), 
+	if db.Count(db.Notebooks, bson.M{"ParentNotebookId": bson.ObjectIdHex(notebookId), 
-		"UserId": bson.ObjectIdHex(userId),
+		"UserId": bson.ObjectIdHex(userId)}) == 0 { // 无
-		"IsTrash": false}) == 0 { // 不包含trash
+		if db.Count(db.Notes, bson.M{"NotebookId": bson.ObjectIdHex(notebookId), 
-		return db.DeleteByIdAndUserId(db.Notebooks, notebookId, userId), ""
+			"UserId": bson.ObjectIdHex(userId),
+			"IsTrash": false}) == 0 { // 不包含trash
+			// 不是真删除 1/20, 为了同步笔记本
+			ok := db.UpdateByQMap(db.Notebooks, bson.M{"_id": bson.ObjectIdHex(notebookId)}, bson.M{"IsDeleted": true, "Usn": userService.IncrUsn(userId)})
+			return ok, ""
+//			return db.DeleteByIdAndUserId(db.Notebooks, notebookId, userId), ""
+		}
+		return false, "笔记本下有笔记"
+	} else {
+		return false, "笔记本下有子笔记本"
 	}
-	return false, "笔记本下有笔记"
+}
+
+// API调用, 删除笔记本, 不作笔记控制
+func (this *NotebookService) DeleteNotebookForce(userId, notebookId string, usn int) (bool, string) {
+	notebook := this.GetNotebookById(notebookId)
+	// 不存在
+	if notebook.NotebookId == "" {
+		return false, "notExists"
+	} else if notebook.Usn != usn {
+		return false, "conflict"
+	}
+	return db.DeleteByIdAndUserId(db.Notebooks, notebookId, userId), ""
 }
 
 // 排序
@@ -202,10 +309,57 @@ func (this *NotebookService) SortNotebooks(userId string, notebookId2Seqs map[st
 	}
 
 	for notebookId, seq := range notebookId2Seqs {
-		if !db.UpdateByIdAndUserIdField2(db.Notebooks, bson.ObjectIdHex(notebookId), bson.ObjectIdHex(userId), "Seq", seq) {
+		if !db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, bson.M{"Seq": seq, "Usn": userService.IncrUsn(userId)}) {
 			return false
 		}
 	}
 	
 	return true
 }
+
+// 排序和设置父
+func (this *NotebookService) DragNotebooks(userId string, curNotebookId string, parentNotebookId string, siblings []string) bool {
+	ok := false
+	// 如果没parentNotebookId, 则parentNotebookId设空
+	if(parentNotebookId == "") {
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": "",  "Usn": userService.IncrUsn(userId)});
+	} else {
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": bson.ObjectIdHex(parentNotebookId), "Usn": userService.IncrUsn(userId)});
+	}
+	
+	if !ok {
+		return false
+	}
+
+	// 排序
+	for seq, notebookId := range siblings {
+		if !db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, bson.M{"Seq": seq, "Usn": userService.IncrUsn(userId)}) {
+			return false
+		}
+	}
+	
+	return true
+}
+
+// 重新统计笔记本下的笔记数目
+// noteSevice: AddNote, CopyNote, CopySharedNote, MoveNote
+// trashService: DeleteNote (recove不用, 都统一在MoveNote里了)
+func (this *NotebookService) ReCountNotebookNumberNotes(notebookId string) bool {
+	notebookIdO := bson.ObjectIdHex(notebookId)
+	count := db.Count(db.Notes, bson.M{"NotebookId": notebookIdO, "IsTrash": false, "IsDeleted": false})
+	Log(count)
+	Log(notebookId)
+	return db.UpdateByQField(db.Notebooks, bson.M{"_id": notebookIdO}, "NumberNotes", count)
+}
+
+func (this *NotebookService) ReCountAll() {
+	/*
+	// 得到所有笔记本
+	notebooks := []info.Notebook{}
+	db.ListByQWithFields(db.Notebooks, bson.M{}, []string{"NotebookId"}, &notebooks)
+	
+	for _, each := range notebooks {
+		this.ReCountNotebookNumberNotes(each.NotebookId.Hex())
+	}
+	*/
+}