add adminUsername on app.conf

https://github.com/leanote/leanote/issues/207

.gitignore

@@ -2,9 +2,9 @@
 pkg
 bin2
 bin/i18n
-bin/leanote-linux
+bin/leanote*
-bin/leanote-mac
 bin/release
+bin/test.sh
 bin/tmp
 bin/test
 bin/src
@@ -16,4 +16,4 @@ app/tmp/main.go
 .project
 public/config.codekit
 files
-conf/app.conf
+/node_modules

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>leanote-public</name>
+	<comment>leanote, your own cloud note!</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.googlecode.goclipse.goBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>goclipse.goNature</nature>
+	</natures>
+</projectDescription>

.travis.yml

@@ -0,0 +1,19 @@
+language: go
+go: 1.3
+
+services:
+  - mongodb # 2.4.12
+
+install:
+  - export PATH=$PATH:$HOME/gopath/bin
+  - go get -v github.com/leanote/leanote/app
+  # - go get github.com/revel/cmd/revel
+  # - go install github.com/revel/cmd/revel
+
+script:
+  - mongo --version
+  - mongorestore -h localhost -d leanote --directoryperdb ./mongodb_backup/leanote_install_data/
+  - go test github.com/leanote/leanote/app/tests
+  - go build -ldflags -X github.com/leanote/leanote/app
+  # - revel build github.com/leanote/leanote tmp
+  # OK

Gulpfile.js

@@ -0,0 +1,138 @@
+var gulp = require('gulp');
+var clean = require('gulp-clean');
+var uglify = require('gulp-uglify');
+var rename = require('gulp-rename');
+var minifyHtml = require("gulp-minify-html");
+var concat = require('gulp-concat');
+var replace = require('gulp-replace');
+var inject = require('gulp-inject');
+var gulpSequence = require('gulp-sequence');
+
+var fs = require('fs');
+
+var leanoteBase = './';
+var base = leanoteBase + '/public'; // public base
+var noteDev = leanoteBase + '/app/views/note/note-dev.html';
+var noteProBase = leanoteBase + '/app/views/note';
+
+// 合并Js, 这些js都是不怎么修改, 且是依赖
+// 840kb, 非常耗时!!
+gulp.task('concatDepJs', function() {
+    var jss = [
+        'js/jquery-1.9.0.min.js',
+        'js/jquery.ztree.all-3.5-min.js',
+        'tinymce/tinymce.full.min.js', // 使用打成的包, 加载速度快
+        // 'libs/ace/ace.js',
+        'js/jQuery-slimScroll-1.3.0/jquery.slimscroll-min.js',
+        'js/contextmenu/jquery.contextmenu-min.js',
+        'js/bootstrap-min.js',
+        'js/object_id-min.js',
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/' + jss[i];
+    }
+
+    return gulp
+        .src(jss)
+        // .pipe(uglify()) // 压缩
+        .pipe(concat('dep.min.js'))
+        .pipe(gulp.dest(base + '/js'));
+});
+
+// 合并app js 这些js会经常变化 90kb
+gulp.task('concatAppJs', function() {
+    var jss = [
+        'js/common.js',
+        'js/app/note.js',
+        'js/app/page.js', // 写作模式下, page依赖note
+        'js/app/tag.js',
+        'js/app/notebook.js',
+        'js/app/share.js',
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/' + jss[i];
+    }
+
+    return gulp
+        .src(jss)
+        .pipe(uglify()) // 压缩
+        .pipe(concat('app.min.js'))
+        .pipe(gulp.dest(base + '/js'));
+});
+
+// 合并requirejs和markdown为一个文件
+gulp.task('concatMarkdownJs', function() {
+    var jss = [
+        'js/require.js',
+        'dist/main.min.js',
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/' + jss[i];
+    }
+
+    return gulp
+        .src(jss)
+        .pipe(uglify()) // 压缩
+        .pipe(concat('markdown.min.js'))
+        .pipe(gulp.dest(base + '/js'));
+});
+
+// note-dev.html -> note.html, 替换css, js
+// TODO 加?t=2323232, 强制浏览器更新, 一般只需要把app.min.js上加
+gulp.task('devToProHtml', function() {
+    return gulp
+        .src(noteDev)
+        .pipe(replace(/<!-- dev -->[.\s\S]+?<!-- \/dev -->/g, '')) // 把dev 去掉
+        .pipe(replace(/<!-- pro_dep_js -->/, '<script src="/js/dep.min.js"></script>')) // 替换
+        .pipe(replace(/<!-- pro_app_js -->/, '<script src="/js/app.min.js"></script>')) // 替换
+        .pipe(replace(/<!-- pro_markdown_js -->/, '<script src="/js/markdown.min.js"></script>')) // 替换
+        .pipe(replace(/<!-- pro_tinymce_init_js -->/, "var tinyMCEPreInit = {base: '/public/tinymce', suffix: '.min'};")) // 替换
+        // 连续两个空行换成一个空行, 没用
+        .pipe(replace(/\n\n/g, '\n'))
+        .pipe(replace(/\n\n/g, '\n'))
+        .pipe(replace('console.log(o);', ''))
+        // .pipe(minifyHtml()) // 不行, 压缩后golang报错
+        .pipe(rename('note.html'))
+        .pipe(gulp.dest(noteProBase));
+});
+
+// tinymce
+
+var tinymceBase = base + '/tinymce_4.1.9';
+gulp.task('tinymce', function() {
+    // 先清理
+    fs.unlink(tinymceBase + '/js/tinymce/tinymce.dev.js');
+    fs.unlink(tinymceBase + '/js/tinymce/tinymce.jquery.dev.js');
+    fs.unlink(tinymceBase + '/js/tinymce/tinymce.full.js');
+    fs.unlink(tinymceBase + '/js/tinymce/tinymce.full.min.js');
+
+    var cp = require('child_process');
+
+    var bundleCmd = 'grunt bundle --themes leanote --plugins autolink,link,leaui_image,leaui_mind,lists,hr,paste,searchreplace,leanote_nav,leanote_code,tabfocus,table,directionality,textcolor';
+    // build
+    cp.exec('grunt minify', {cwd: tinymceBase}, function(err, stdout, stderr) {
+        console.log('stdout: ' + stdout);
+        console.log('stderr: ' + stderr);
+
+        // 将所有都合并成一起
+        cp.exec(bundleCmd, {cwd: tinymceBase}, function(err, stdout, stderr) {
+            console.log('stdout: ' + stdout);
+            console.log('stderr: ' + stderr);
+        });
+    });
+});
+
+// 合并css, 无用
+gulp.task('concatCss', function() {
+    return gulp
+        .src([markdownRaw + '/css/default.css', markdownRaw + '/css/md.css'])
+        .pipe(concat('all.css'))
+        .pipe(gulp.dest(markdownMin));
+});
+
+gulp.task('concat', ['concatDepJs', 'concatAppJs', 'concatMarkdownJs']);
+gulp.task('html', ['devToProHtml']);
+gulp.task('default', ['concat', 'html']);

LICENSE

@@ -1,6 +1,6 @@
-leanote - you own cloud note!
+LEANOTE - NOT JUST A NOTEPAD!
 
-Copyright 2014 by the contributors
+Copyright 2014-2015 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
@@ -12,7 +12,7 @@ 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.
+Leanote is licensed under the GPL v2.
 
                        life(life@leanote.com, lifephp@gmail.com)
 

README.md

@@ -1,9 +1,10 @@
 
 # Leanote
-
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/leanote/leanote?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://travis-ci.org/leanote/leanote.svg)](https://travis-ci.org/leanote/leanote)
 ## 1. Introduction
 
-Leanote, not just a notebook!
+Leanote, not just a notepad!
 ![leanote.png](leanote.png "")
 
 **Some Features**
@@ -26,86 +27,46 @@ More information about how to install leanote please see:
 * [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)
 
-### 3.1. Download leanote
-
-Leanote V1.0.2-beta has been released. Binaries:
-
-* Linux: [leanote-linux-x86_64.v1.0-beta.2.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta/leanote-linux-x86_64.v1.0-beta.2.bin.tar.gz)
-* MacOS X: [leanote-mac-x86_64.v1.0-beta.2.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta/leanote-mac-x86_64.v1.0-beta.bin.2.tar.gz)
-
-Or you can clone [Leanote bin repository](https://github.com/leanote/leanote-bin) (Recommend)
-
-### 3.2. Install MongoDB
-
-Leanote is written in go using [revel](https://revel.github.io/) and [MongoDB](https://www.mongodb.org). Thus, you need to first install MongoDB.
-
-For more tips please have a look at [our wiki](https://github.com/leanote/leanote/wiki/Install-Mongodb)
-
-### 3.3. Import initial MongoDB data
-
-The mongodb data is in `[PATH_TO_LEANOTE]/mongodb_backup/leanote_install_data`
-
-```
-$> mongorestore -h localhost -d leanote --directoryperdb PATH_TO_LEANOTE/mongodb_backup/leanote_install_data
-```
-
-The initial database contains two users:
-
-```
-user2 username: admin, password: abc123 (administrator)
-user3 username: demo, password: demo@leanote.com (this user is for demo)
-```
-
-### 3.4. Configuration
-
-Modify `[PATH_TO_LEANOTE]/conf/app.conf`. Available configuration options are:
-
-``mongodb``  **required**
-
-```Shell
-db.host=localhost
-db.port=27017
-db.dbname=leanote
-db.username=
-db.password=
-```
-
-``app.secret`` **required** **important**
-The secret key used for cryptographic operations (revel.Sign).
-
-FOR SECURITY, YOU MUST CHANGE IT!!
-
-For more infomation please see `app/app.conf` and the [revel manuals](https://revel.github.io/)
-
-### 3.5. Run leanote
-
-```
-$> cd PATH_TO_LEANOTE/bin
-$> sudo sh run.sh
-```
-
 ## 4. How to develop leanote
 
 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)
 
 
-## 5. Contributors
+## 5. Docs
-Thank you to all the [contributors](https://github.com/leanote/leanote/graphs/contributors) on
-this project. Your help is much appreciated.
-
-## 6. Contributing
-
-Please fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
-
-## Docs
 * [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)
 
-## Discussion
+More docs please see [wiki](https://github.com/leanote/leanote/wiki).
-* [leanote bbs](http://bbs.leanote.com)
+
-* [leanote google group](https://groups.google.com/forum/#!forum/leanote)
+## 6. Contributors
-* QQ Group: 158716820
+Thank you to all the [contributors](https://github.com/leanote/leanote/graphs/contributors) on
+this project. Your help is much appreciated.
+
+## 7.Join us
+Please fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
+
+If you find some problems or has some good ideas, please submit [issues](https://github.com/leanote/leanote/issues).
+
+You are always welcomed!
+
+## 8. Donation
+Support us, [donate us](http://leanote.org/#donate). And thanks [donators](http://leanote.leanote.com/post/leanote-donation-list).
+
+## 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), [Download From App Store](https://itunes.apple.com/en/app/leanote/id1022302858?mt=8)
+* [Leanote Android](https://github.com/Dminter/leanote-android-client), development phase
+
+And also, you are welcome to join us.
+
+## 9. Support & Join us
+
+* Email: leanote@leanote.com
+* [Leanote BBS](http://bbs.leanote.com)
+* [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
+* QQ Group: 158716820, 256076853
+
 
 -----------------------------------------------------------------------
 [中文](README_zh.md)

README_zh.md

@@ -1,113 +1,73 @@
+# Leanote
 
-# Leanote产品
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/leanote/leanote?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://travis-ci.org/leanote/leanote.svg)](https://travis-ci.org/leanote/leanote)
+## 1. 介绍
 
-## 1. 介绍
+Leanote, 不只是笔记!
-
-Leanote, 不只是笔记!
 ![leanote.png](leanote.png "")
 
-**特性**
+**特性**
 
-* 知识管理: 通过leanote来管理知识, leanote有易操作的界面, 包含两款编辑器tinymce和markdown. 在leanote, 你可以尽情享受写作.
+* 知识管理: 通过leanote来管理知识, leanote有易操作的界面, 包含两款编辑器tinymce和markdown. 在leanote, 你可以尽情享受写作.
-* 分享: 你也可以通过分享知识给好友, 让好友拥有你的知识.
+* 分享: 你也可以通过分享知识给好友, 让好友拥有你的知识.
-* 协作: 在分享的同时也可以与好友一起协作知识.
+* 协作: 在分享的同时也可以与好友一起协作知识.
-* 博客: leanote也可以作为你的博客, 将知识公开成博客, 让leanote把你的知识传播的更远!
+* 博客: leanote也可以作为你的博客, 将知识公开成博客, 让leanote把你的知识传播的更远!
 
-## 2. 为什么我们要创建leanote?
+## 2. 为什么我们要创建leanote?
-说实话, 我们曾是evernote的忠实粉丝, 但是我们也发现evernote的不足:
+说实话, 我们曾是evernote的忠实粉丝, 但是我们也发现evernote的不足:
-* evernote的编辑器不能满足我们的需求, 不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放.
+* evernote的编辑器不能满足我们的需求, 不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放.
-* 我们是markdown的爱好者, 可是evernote竟然没有.
+* 我们是markdown的爱好者, 可是evernote竟然没有.
-* 我们也想将知识公开, 所以我们有自己的博客, 如wordpress, 但为什么这两者不能合二为一呢?
+* 我们也想将知识公开, 所以我们有自己的博客, 如wordpress, 但为什么这两者不能合二为一呢?
-* 还有...
+* 还有...
 
-## 3.安装leanote
+## 3.安装leanote
-leanote是一款私有云笔记, 你可以下载它安装在自己的服务器上, 当然也可以在 http://leanote.com 上注册.
+leanote是一款私有云笔记, 你可以下载它安装在自己的服务器上, 当然也可以在 http://leanote.com 上注册.
 
-这里详细整理了leanote二进版和leanote开发版的安装教程, 请移步至:
+这里详细整理了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)
 
-### 3.1. 下载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)
 
-Leanote V1.0-beta.2 已发布, 二进制文件(暂时没有windows版的):
+## 4. 如何对leanote进行二次开发
 
-* Linux: [leanote-linux-x86_64.v1.0-beta.2.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta/leanote-linux-x86_64.v1.0-beta.2.bin.tar.gz)
+请查看 [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)
-* MacOS X: [leanote-mac-x86_64.v1.0-beta.2.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta/leanote-mac-x86_64.v1.0-beta.2.bin.tar.gz)
 
-或者直接检出[Leanote bin repository](https://github.com/leanote/leanote-bin) (推荐, 因为为最新版本)
+## 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)
 
-### 3.2. 安装 MongodbDB
+更多文档请查看 [wiki](https://github.com/leanote/leanote/wiki).
 
-Leanote是由golang(使用[revel](https://revel.github.io/)框架 和 [MongoDB](https://www.mongodb.org)数据库), 你需要先安装Mongodb.
+## 6. 贡献者
+多谢 [贡献者](https://github.com/leanote/leanote/graphs/contributors) 的贡献, leanote因有你们而更完美!
 
-安装MongodbDB, 导入数据更多细节请查看: [wiki](https://github.com/leanote/leanote/wiki/Install-Mongodb)
+## 7. 加入我们
 
-### 3.3. 导入初始数据
+欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到leanote.
 
-MongodbDB初始数据在 `[PATH_TO_LEANOTE]/mongodb_backup/leanote_install_data`
+有任何问题或建议, 欢迎提交[issue](https://github.com/leanote/leanote/issues).
 
-```
+Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善leanote.
-$> mongorestore -h localhost -d leanote --directoryperdb PATH_TO_LEANOTE/mongodb_backup/leanote_install_data
-```
 
-初始数据包含两个用户:
+## 8. 捐赠
+支持我们, [捐赠Leanote](http://leanote.org/#donate). 感谢[捐赠者](http://leanote.leanote.com/post/leanote-donation-list), 谢谢你们的鼓励, Leanote会一直坚持!
 
-```
+## 9. 其它相关项目
-user2 username: admin, password: abc123 (管理员, 重要!)
+* [Leanote Desktop App](https://github.com/leanote/desktop-app), [下载地址](http://app.leanote.com)
-user3 username: demo@leanote.com, password: demo@leanote.com (为体验使用)
+* [Leanote IOS](https://github.com/leanote/leanote-ios), [从App Store下载](https://itunes.apple.com/zn/app/leanote/id1022302858?mt=8)
-```
+* [Leanote Android](https://github.com/Dminter/leanote-android-client), 开发阶段
 
-### 3.4. 配置
+欢迎加入我们!
 
-修改 `[PATH_TO_LEANOTE]/conf/app.conf`. 有以下选项:
+## 联系&加入我们
-
+* Email: leanote@leanote.com
-``mongodb``  **必须配置!**
+* [leanote 社区](http://bbs.leanote.com)
-
+* QQ群: 158716820, 256076853
-```Shell
+* [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
-db.host=localhost
-db.port=27017
-db.dbname=leanote
-db.username=
-db.password=
-```
-
-``app.secret`` **重要**
-请随意修改一个, app的密钥, 不能使用默认的, 不然会有安全问题
-
-更多配置请查看 `app/app.conf` 和 [revel 手册](https://revel.github.io/)
-
-### 3.5. 运行leanote
-
-```
-$> cd PATH_TO_LEANOTE/bin
-$> sudo sh run.sh
-```
-
-## 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. 贡献者
-多谢 [贡献者](https://github.com/leanote/leanote/graphs/contributors) 的贡献, leanote因有你们而更完美!
-
-## 6. 加入我们
-
-欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到leanote.
-
-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)
-* [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)
-
-
-## 讨论
-* [leanote 社区](http://bbs.leanote.com)
-* QQ群: 158716820
-* [leanote google group](https://groups.google.com/forum/#!forum/leanote)
 
 ----------------------------------------------------------------
 [English](README.md)

app/controllers/AttachController.go

@@ -100,7 +100,7 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 	id := bson.NewObjectId();
 	fileInfo.AttachId = id
 	fileId = id.Hex()
-	Ok, resultMsg = attachService.AddAttach(fileInfo)
+	Ok, resultMsg = attachService.AddAttach(fileInfo, false)
 	if resultMsg != "" {
 		resultMsg = c.Message(resultMsg)
 	}
@@ -129,18 +129,9 @@ func (c Attach) GetAttachs(noteId string) revel.Result {
 
 // 下载附件
 // 权限判断
-func (c Attach) Download(attachId, token string) revel.Result {
+func (c Attach) Download(attachId string) revel.Result {
-	if c.GetUserId() == "" && token == "" {
+	attach := attachService.GetAttach(attachId, c.GetUserId()); // 得到路径
-		return c.RenderText("你需要从分享页面下载附件！")
-	}
-	
-	sessionId := c.Session.Id()
-	attach := attachService.GetAttach(attachId, c.GetUserId(), token, sessionId); // 得到路径
 	path := attach.Path
-	
-	if token != "" && attach.Path == "" {
-		return c.RenderText("该下载链接已经失效，请重新刷新原分享笔记页面下载")
-	}
 	if path == "" {
 		return c.RenderText("")
 	}

app/controllers/AuthController.go

@@ -5,7 +5,6 @@ import (
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 //	"strconv"
-	"fmt"
 )
 
 // 用户登录/注销/找回密码
@@ -41,36 +40,36 @@ func (c Auth) Login(email, from string) revel.Result {
 func (c Auth) doLogin(email, pwd string) revel.Result {
 	sessionId := c.Session.Id()
 	var msg = ""
-	fmt.Println(sessionId)
+
-	userInfo := authService.Login(email, pwd)
+	userInfo, err := authService.Login(email, pwd)
-	if userInfo.Email != "" {
+	if err != nil {
+		// 登录错误, 则错误次数++
+		msg = "wrongUsernameOrPassword"
+	} else {
 		c.SetSession(userInfo)
 		sessionService.ClearLoginTimes(sessionId)
 		return c.RenderJson(info.Re{Ok: true})
-	} else {
-		// 登录错误, 则错误次数++
-		msg = "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)
+		userInfo, err := authService.Login(email, pwd)
-		if userInfo.Email != "" {
+		if err != nil {
-			c.SetSession(userInfo)
-			sessionService.ClearLoginTimes(sessionId)
-			return c.RenderJson(info.Re{Ok: true})
-		} else {
 			// 登录错误, 则错误次数++
 			msg = "wrongUsernameOrPassword"
 			sessionService.IncrLoginTimes(sessionId)
+	  } else {
+			c.SetSession(userInfo)
+			sessionService.ClearLoginTimes(sessionId)
+			return c.RenderJson(info.Re{Ok: true})
 		} 
 	}
 	
@@ -86,8 +85,16 @@ func (c Auth) Logout() revel.Result {
 
 // 体验一下
 func (c Auth) Demo() revel.Result {
-	c.doLogin(configService.GetGlobalStringConfig("demoUsername"), configService.GetGlobalStringConfig("demoPassword"))
+	email := configService.GetGlobalStringConfig("demoUsername")
-	return c.Redirect("/note")
+	pwd := configService.GetGlobalStringConfig("demoPassword");
+	userInfo, err := authService.Login(email, pwd)
+	if err != nil {
+		  return c.RenderJson(info.Re{Ok: false})
+	  } else {
+		c.SetSession(userInfo)
+		return c.Redirect("/note")
+	}
+	return nil
 }
 
 //--------

app/controllers/BlogController.go

@@ -200,29 +200,77 @@ func (c Blog) getCates(userBlog info.UserBlog) {
 	}
 
 	var i = 0
-	cates := make([]map[string]string, len(notebooks))
+	cates := make([]*info.Cate, len(notebooks))
 
 	// 先要保证已有的是正确的排序
 	cateIds := userBlog.CateIds
 	has := map[string]bool{} // cateIds中有的
+	cateMap := map[string]*info.Cate{}
 	if cateIds != nil && len(cateIds) > 0 {
 		for _, cateId := range cateIds {
 			if n, ok := notebooksMap[cateId]; ok {
-				cates[i] = map[string]string{"Title": n.Title, "UrlTitle": c.getCateUrlTitle(&n), "CateId": n.NotebookId.Hex()}
+				parentNotebookId := ""
+				if n.ParentNotebookId != "" {
+					parentNotebookId = n.ParentNotebookId.Hex()
+				}
+				cates[i] = &info.Cate{Title: n.Title, UrlTitle: c.getCateUrlTitle(&n), CateId: n.NotebookId.Hex(), ParentCateId: parentNotebookId}
+				cateMap[cates[i].CateId] = cates[i]
 				i++
 				has[cateId] = true
 			}
 		}
 	}
-	// 之后
+	
+	// 之后添加没有排序的
 	for _, n := range notebooks {
 		id := n.NotebookId.Hex()
 		if !has[id] {
-			cates[i] = map[string]string{"Title": n.Title, "UrlTitle": c.getCateUrlTitle(&n), "CateId": id}
+			parentNotebookId := ""
+			if n.ParentNotebookId != "" {
+				parentNotebookId = n.ParentNotebookId.Hex()
+			}
+			cates[i] = &info.Cate{Title: n.Title, UrlTitle: c.getCateUrlTitle(&n), CateId: id, ParentCateId: parentNotebookId}
+			cateMap[cates[i].CateId] = cates[i]
 			i++
 		}
 	}
+	
+//	LogJ(">>")
+//	LogJ(cates)
+	
+	// 建立层级
+	hasParent := map[string]bool{} // 有父的cate
+	for _, cate := range cates {
+		parentCateId := cate.ParentCateId
+		if parentCateId != "" {
+			if parentCate, ok := cateMap[parentCateId]; ok {
+//				Log("________")
+//				LogJ(parentCate)
+//				LogJ(cate)
+				if parentCate.Children == nil {
+					parentCate.Children = []*info.Cate{cate}
+				} else {
+					parentCate.Children = append(parentCate.Children, cate)
+				}
+				hasParent[cate.CateId] = true
+			}
+		}
+	}
+	
+	// 得到没有父的cate, 作为第一级cate
+	catesTree := []*info.Cate{}
+	for _, cate := range cates {
+		if !hasParent[cate.CateId] {
+			catesTree = append(catesTree, cate)
+		}
+	}
+	
+	Log("cates")
+	LogJ(cates)
+	LogJ(catesTree);
+	
 	c.RenderArgs["cates"] = cates
+	c.RenderArgs["catesTree"] = catesTree
 }
 
 // 单页
@@ -540,19 +588,14 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
 	}
 	userId, userInfo := c.userIdOrEmail(hasDomain, userBlog, userIdOrEmail)
 	var ok = false
-	fmt.Println("before test...");
 	if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
-		fmt.Println("404 occur");
 		return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
 	}
-	fmt.Println("after test0...");
+
 	// 分页的话, 需要分页信息, totalPage, curPage
 	page := c.GetPage()
-	
 	pageInfo, blogs := blogService.ListBlogs(userId, "", page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
-	
 	blogs2 := blogService.FixBlogs(blogs)
-	
 	c.RenderArgs["posts"] = blogs2
 
 	c.setPaging(pageInfo)
@@ -560,7 +603,6 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
 
 	c.RenderArgs["curIsIndex"] = true
 
-	
 	return c.render("index.html", userBlog.ThemePath)
 }
 
@@ -782,7 +824,7 @@ func (c Blog) LikePost(noteId string, callback string) revel.Result {
 	re.Ok, re.Item = blogService.LikeBlog(noteId, userId)
 	return c.RenderJsonP(callback, re)
 }
-func (c Blog) GetComments(noteId string) revel.Result {
+func (c Blog) GetComments(noteId string, callback string) revel.Result {
 	// 评论
 	userId := c.GetUserId()
 	page := c.GetPage()
@@ -795,6 +837,10 @@ func (c Blog) GetComments(noteId string) revel.Result {
 	result["commentUserInfo"] = commentUserInfo
 	re.Item = result
 	
+	if callback != "" {
+		return c.RenderJsonP(callback, result)
+	}
+
 	return c.RenderJson(re)
 }
 

app/controllers/FileController.go

@@ -9,9 +9,9 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"io/ioutil"
 	"os"
+	"fmt"
 //	"strconv"
 	"strings"
-	"fmt"
 )
 
 // 首页
@@ -208,9 +208,8 @@ func (c File) DeleteImage(fileId string) revel.Result {
 
 // 输出image
 // 权限判断
-func (c File) OutputImage(noteId, fileId , token string) revel.Result {
+func (c File) OutputImage(noteId, fileId string) revel.Result {
-	sessionId := c.Session.Id()
+	path := fileService.GetFile(c.GetUserId(), fileId); // 得到路径
-	path := fileService.GetFile(c.GetUserId(), fileId, sessionId, token); // 得到路径
 	if path == "" {
 		return c.RenderText("")
 	}

app/controllers/NoteController.go

@@ -6,7 +6,7 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
-	"os/exec"
+	"strings"
 //	"time"
 //	"github.com/leanote/leanote/app/types"
 //	"io/ioutil"
@@ -49,10 +49,11 @@ func (c Note) Index(noteId string) revel.Result {
 		hasRightNoteId := false
 		if IsObjectId(noteId) {
 			note := noteService.GetNoteById(noteId)
-			var noteOwner = note.UserId.Hex()
-			noteContent = noteService.GetNoteContent(noteId, noteOwner)
 			
 			if note.NoteId != "" {
+				var noteOwner = note.UserId.Hex()
+				noteContent = noteService.GetNoteContent(noteId, noteOwner)
+				
 				hasRightNoteId = true
 				c.RenderArgs["curNoteId"] = noteId
 				c.RenderArgs["curNotebookId"] = note.NotebookId.Hex()
@@ -124,8 +125,7 @@ func (c Note) Index(noteId string) revel.Result {
 	
 	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
 	
-	
+	// return c.RenderTemplate("note/note.html")
-//	return c.RenderTemplate("note/note.html")
 		
 	if isDev, _ := revel.Config.Bool("mode.dev"); isDev {
 		return c.RenderTemplate("note/note-dev.html")
@@ -169,7 +169,7 @@ type NoteOrContent struct {
 	Title string
 	Desc string
 	ImgSrc string
-	Tags []string
+	Tags string
 	Content string
 	Abstract string
 	IsNew bool
@@ -192,7 +192,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,
@@ -225,23 +225,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)
 }
 
@@ -284,135 +293,6 @@ func (c Note) SearchNoteByTags(tags []string) revel.Result {
 	return c.RenderJson(blogs)
 }
 
-//------------------
-// html2image
-// 判断是否有权限生成
-// 博客也可以调用
-// 这是脚本调用, 没有cookie, 不执行权限控制, 通过传来的appKey判断
-func (c Note) ToImage(noteId, appKey string) revel.Result {
-	// 虽然传了cookie但是这里还是不能得到userId, 所以还是通过appKey来验证之
-	appKeyTrue, _ := revel.Config.String("app.secret")
-	if appKeyTrue != appKey {
-		 return c.RenderText("")
-	}
-	note := noteService.GetNoteById(noteId)
-	if note.NoteId == "" {
-		return c.RenderText("")
-	}
-	
-	c.SetLocale()
-	
-	noteUserId := note.UserId.Hex()
-	content := noteService.GetNoteContent(noteId, noteUserId)
-	userInfo := userService.GetUserInfo(noteUserId);
-	
-	c.RenderArgs["blog"] = note
-	c.RenderArgs["content"] = content.Content
-	c.RenderArgs["userInfo"] = userInfo
-	userBlog := blogService.GetUserBlog(noteUserId)
-	c.RenderArgs["userBlog"] = userBlog
-	
-	return c.RenderTemplate("html2Image/index.html")
-}
-
-func (c Note) Html2Image(noteId string) revel.Result {
-	re := info.NewRe()
-	userId := c.GetUserId()
-	note := noteService.GetNoteById(noteId)
-	if note.NoteId == "" {
-		re.Msg = "No Note"
-		return c.RenderJson(re)
-	}
-	
-	noteUserId := note.UserId.Hex()
-	// 是否有权限
-	if noteUserId != userId {
-		// 是否是有权限协作的
-		if !note.IsBlog && !shareService.HasReadPerm(noteUserId, userId, noteId) {
-			re.Msg = "No Perm"
-			return c.RenderJson(re)
-		}
-	}
-
-	// path 判断是否需要重新生成之
-	fileUrlPath := "/upload/" + noteUserId + "/images/weibo"
-	dir := revel.BasePath + "/public/" + fileUrlPath
-	if !ClearDir(dir) {
-		re.Msg = "No Dir"
-		return c.RenderJson(re)
-	}
-	
-	filename := note.NoteId.Hex() + ".png";
-	path := dir + "/" + filename
-	
-	// cookie
-	cookieName := revel.CookiePrefix + "_SESSION"
-	cookie, err := c.Request.Cookie(cookieName)
-	cookieStr := cookie.String()
-	cookieValue := ""
-	if err == nil && len(cookieStr) > len(cookieName) {
-		cookieValue = cookieStr[len(cookieName)+1:]
-	}
-	
-	appKey, _ := revel.Config.String("app.secret")
-	cookieDomain, _ := revel.Config.String("cookie.domain")
-	// 生成之
-	url := configService.GetSiteUrl() + "/note/toImage?noteId=" + noteId + "&appKey=" + appKey;
-	// /Users/life/Documents/bin/phantomjs/bin/phantomjs /Users/life/Desktop/test/b.js
-	binPath := configService.GetGlobalStringConfig("toImageBinPath")
-	if binPath == "" {
-		return c.RenderJson(re);
-	}
-	cc := binPath + " \"" + url + "\"  \"" + path + "\" \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
-	cmd := exec.Command("/bin/sh", "-c", cc)
-	Log(cc);
-	b, err := cmd.Output()
-    if err == nil {
-    	re.Ok = true
-		re.Id = fileUrlPath + "/" + filename
-    } else {
-    	re.Msg = string(b)
-    	Log("error:......")
-    	Log(string(b))
-    }
-    
-	return c.RenderJson(re)
-	
-    /*
-    // 这里速度慢, 生成不完全(图片和内容都不全)
-	content := noteService.GetNoteContent(noteId, noteUserId)
-	userInfo := userService.GetUserInfo(noteUserId);
-	
-	c.SetLocale()	
-    
-	c.RenderArgs["blog"] = note
-	c.RenderArgs["content"] = content.Content
-	c.RenderArgs["userInfo"] = userInfo
-	userBlog := blogService.GetUserBlog(noteUserId)
-	c.RenderArgs["userBlog"] = userBlog
-	
-	html := c.RenderTemplateStr("html2Image/index.html") // Result类型的
-	contentFile := dir + "/html";
-	fout, err := os.Create(contentFile)
-    if err != nil {
-		return c.RenderJson(re)
-    }
-    fout.WriteString(html);
-    fout.Close()
-    
-    cc := "/Users/life/Documents/bin/phantomjs/bin/phantomjs /Users/life/Desktop/test/c.js \"" + contentFile + "\"  \"" + path + "\""
-	cmd := exec.Command("/bin/sh", "-c", cc)
-	b, err := cmd.Output()
-    if err == nil {
-    	re.Ok = true
-		re.Id = fileUrlPath + "/" + filename
-    } else {
-    	Log(string(b))
-    }
-	*/
-	
-}
-
 // 设置/取消Blog; 置顶
 func (c Note) SetNote2Blog(noteId string, isBlog, isTop bool) revel.Result {
 	re := noteService.ToBlog(c.GetUserId(), noteId, isBlog, isTop)

app/controllers/NotebookController.go

@@ -37,7 +37,8 @@ func (c Notebook) AddNotebook(notebookId, title, parentNotebookId string) revel.
 	if(parentNotebookId != "") {
 		notebook.ParentNotebookId = bson.ObjectIdHex(parentNotebookId)
 	}
-	re := notebookService.AddNotebook(notebook)
+
+	re, notebook := notebookService.AddNotebook(notebook)
 	
 	if(re) {
 		return c.RenderJson(notebook)

app/controllers/OauthController.go

@@ -1,70 +0,0 @@
-package controllers
-
-import (
-	"code.google.com/p/goauth2/oauth"
-	"github.com/revel/revel"
-	"github.com/leanote/leanote/app/lea/netutil"
-	. "github.com/leanote/leanote/app/lea"
-	"encoding/json"
-	"fmt"
-)
-
-type Oauth struct {
-	BaseController
-}
-
-var oauthCfg = &oauth.Config{
-	ClientId:     "3790fbf1fc14bc6c5d85",
-	ClientSecret: "e9dadfe601c7caa6df9b33db3e7539945c60dfa2",
-	AuthURL:      "https://github.com/login/oauth/authorize",
-	TokenURL:     "https://github.com/login/oauth/access_token",
-	RedirectURL:  "http://leanote.com/oauth/githubCallback",
-	Scope: "user",
-}
-
-// 用户允许后, github返回到leanote
-// 通过code得到token
-// https://github.com/login/oauth/authorize?access_type=&approval_prompt=&client_id=3790fbf1fc14bc6c5d85&redirect_uri=http%3A%2F%2F127.0.0.1%3A8080%2Foauth2callback&response_type=code&scope=user&state=
-func (c Oauth) GithubCallback(code string) revel.Result {
-	t := &oauth.Transport{Config: oauthCfg}
-
-	// Exchange the received code for a token
-	tok, err := t.Exchange(code)
-	token := tok.AccessToken
-	if err != nil || token == "" {
-		c.RenderArgs["title"] = "error"
-		return c.RenderTemplate("oauth/oauth_callback_error.html")
-	}
-
-	// 得到用户信息
-	profileInfoURL := "https://api.github.com/user"
-	url := fmt.Sprintf("%s?access_token=%s", profileInfoURL, token)
-	content, err2 := netutil.GetContent(url)
-	if err2 != nil {
-		c.RenderArgs["title"] = "error"
-		return c.RenderTemplate("oauth/oauth_callback_error.html")
-	}
-	// 转成map
-	profileInfo := map[string]interface{}{}
-	Log(string(content))
-	err2 = json.Unmarshal(content, &profileInfo)
-	if err2 != nil {
-		c.RenderArgs["title"] = "error"
-		return c.RenderTemplate("oauth/oauth_callback_error.html")
-	}
-
-	usernameI := profileInfo["login"]
-
-	username, _ := usernameI.(string)
-	userId := username
-
-	// 注册
-	isExists, userInfo := authService.ThirdRegister("github", userId, username)
-	c.RenderArgs["isExists"] = isExists
-	c.RenderArgs["userInfo"] = userInfo
-
-	// 登录之
-	c.SetSession(userInfo)
-
-	return c.Redirect("/note")
-}

app/controllers/ShareController.go

@@ -9,15 +9,12 @@ import (
 //	"github.com/leanote/leanote/app/types"
 //	"io/ioutil"
 //	"fmt"
-//	"time"
 )
 
 type Share struct {
 	BaseController
 }
 
-const AttachToken = 2
-
 // 添加共享note
 func (c Share) AddShareNote(noteId string, emails []string, perm int) revel.Result {
 	status := make(map[string]info.Re, len(emails))
@@ -39,8 +36,6 @@ func (c Share) AddShareNote(noteId string, emails []string, perm int) revel.Resu
 	return c.RenderJson(status)
 }
 
-
-
 // 添加共享notebook
 func (c Share) AddShareNotebook(notebookId string, emails []string, perm int) revel.Result {
 	status := make(map[string]info.Re, len(emails))
@@ -191,63 +186,3 @@ func (c Share) DeleteShareNotebookGroup(notebookId, groupId string) revel.Result
 func (c Share) UpdateShareNotebookGroupPerm(notebookId, groupId string, perm int) revel.Result {
 	return c.AddShareNotebookGroup(notebookId, groupId, perm)
 }
-
-//生成笔记分享密码及更新到db
-func (c Share) GenShareLinkPass(noteId string) revel.Result {
-	pass, ok := shareService.GenSharePass(noteId)
-	re := info.Re{Ok : true, Item : pass, List: ok}
-	return c.RenderJson(re);
-}
-
-func (c Share) QuerySharePass(noteId string) revel.Result {
-	pass := shareService.QuerySharePass(noteId)
-	re := info.Re{Ok : true, Item : pass}
-	return c.RenderJson(re);
-}
-
-//展示分享笔记
-func (c Share) ShowShareNote(noteId string) revel.Result {
-	note := noteService.GetNoteById(noteId)
-//	
-	c.RenderArgs["noteId"] = noteId
-	username := userService.GetUsernameById(note.UserId)
-	
-	c.RenderArgs["userName"] = username
-	c.RenderArgs["isMarkDown"] = note.IsMarkdown
-//	c.RenderArgs["timestamp"] = time.Now().Unix()
-	c.SetLocale()
-	return c.RenderTemplate("share/show_share_note.html")
-}
-
-//验证分享密码
-func (c Share) Verify4ShareNote(noteId string, sharePass int) revel.Result {
-	ok, note, noteContent := shareService.Verify4ShareNote(noteId, sharePass)
-	
-	attaches := []info.Attach{}
-	if ok && note.AttachNum > 0 {
-		attaches = attachService.ListAttachs(noteId, "")
-	}
-	
-	
-	token := tokenService.NewToken(noteId, noteId, AttachToken)
-	
-	//插入笔记作为链接中的附件
-	noteAttachIds := map[string]bool{}
-	noteContent.Content, noteAttachIds = shareService.AppendToken4URL(token, noteContent.Content)
-	//过滤掉插入笔记的附件
-	filteredAttaches := []info.Attach{}
-	if len(noteAttachIds) > 0 && len(attaches) > 0 {
-		for _, attach := range attaches {
-			if !noteAttachIds[attach.AttachId.Hex()] {
-				filteredAttaches = append(filteredAttaches, attach)
-			}
-		}
-	} else {
-		filteredAttaches = attaches
-	}
-	
-	sessionId := c.Session.Id()
-	sessionService.SetToken(sessionId, token)
-	re := info.Re{Ok : ok, Item: note, List: filteredAttaches, Id: token, Msg: noteContent.Content}
-	return c.RenderJson(re)
-}

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/admin/AdminEmailController.go

@@ -46,7 +46,10 @@ func (c AdminEmail) Demo() revel.Result {
 func (c AdminEmail) DoDemo(demoUsername, demoPassword string) revel.Result {
 	re := info.NewRe()
 	
-	userInfo := authService.Login(demoUsername, demoPassword)
+	userInfo, err := authService.Login(demoUsername, demoPassword)
+	if err != nil {
+		return c.RenderJson(info.Re{Ok: false})
+	}
 	if userInfo.UserId == "" {
 		re.Msg = "The User is Not Exists";
 		return c.RenderJson(re)

app/controllers/admin/AdminSettingController.go

@@ -56,7 +56,11 @@ func (c AdminSetting) Demo() revel.Result {
 func (c AdminSetting) DoDemo(demoUsername, demoPassword string) revel.Result {
 	re := info.NewRe()
 	
-	userInfo := authService.Login(demoUsername, demoPassword)
+	userInfo, err := authService.Login(demoUsername, demoPassword)
+	if err != nil {
+		fmt.Println(err)
+		return c.RenderJson(info.Re{Ok: false})
+	}
 	if userInfo.UserId == "" {
 		re.Msg = "The User is Not Exists";
 		return c.RenderJson(re)

app/controllers/admin/AdminUpgradeController.go

@@ -22,3 +22,9 @@ func (c AdminUpgrade) UpgradeBetaToBeta2() revel.Result {
 	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/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, err := authService.Login(email, pwd)
+	if err != nil {
+		// 登录错误, 则错误次数++
+		msg = "wrongUsernameOrPassword"
+	} else {
+		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})
+	} 
+	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,581 @@
+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
+	if noteOrContent.Abstract == "" {
+		note.Desc = SubStringHTMLToRaw(noteContent.Content, 200)
+		noteContent.Abstract = SubStringHTML(noteContent.Content, 200, "")
+	} else {
+		note.Desc = SubStringHTMLToRaw(noteContent.Abstract, 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
+	// 删除一些不要返回的, 删除Desc?
+	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, 则用Abstract生成Desc
+		if noteOrContent.Abstract == "" {
+			noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Content, 200)
+		} else {
+			noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Abstract, 200)
+		}
+	}
+
+	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/UserController.go

@@ -1,27 +0,0 @@
-package api
-
-import (
-	"github.com/revel/revel"
-//	"encoding/json"
-//	"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"
-//	"math"
-//	"os"
-//	"path"
-//	"strconv"
-)
-
-type ApiUser struct {
-	*revel.Controller
-}
-
-// 修改用户名, 需要重置session
-func (c ApiUser) Info() revel.Result {
-	Log("APIUser");
-	return c.RenderTemplate("home/index.html");
-//	return nil;
-}

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

@@ -49,7 +49,6 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	"Suggestion":         true,
 },
 	"Note": map[string]bool{"ToImage": true},
-	"Share": map[string]bool{"ShowShareNote": true, "Verify4ShareNote": true},
 	"Blog": map[string]bool{"Index": true,
 		"View":               true,
 		"AboutMe":            true,

app/controllers/member/MemberBlogController.go

@@ -460,7 +460,7 @@ func (c MemberBlog) ImportTheme() revel.Result {
 	var ext string
 	_, ext = SplitFilename(filename)
 	if ext != ".zip" {
-		re.Msg = "请上传zip文件"
+		re.Msg = "Please upload zip file"
 		return c.RenderJson(re)
 	}
 
@@ -472,7 +472,7 @@ func (c MemberBlog) ImportTheme() revel.Result {
 
 	// > 10M?
 	if len(data) > 10*1024*1024 {
-		re.Msg = "文件大于10M"
+		re.Msg = "File is big than 10M"
 		return c.RenderJson(re)
 	}
 

app/db/Mgo.go

@@ -6,6 +6,7 @@ import (
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
+	"strings"
 )
 
 // Init mgo and the common DAO
@@ -28,7 +29,7 @@ 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
@@ -62,6 +63,14 @@ func Init(url, dbname string) {
 	config := revel.Config
 	if url == "" { 
 		url, ok = config.String("db.url")
+		if !ok {
+			url, ok = config.String("db.urlEnv")
+		}
+		if ok {
+			// get dbname from url
+			urls := strings.Split(url, "/")
+			dbname = urls[len(urls)-1]
+		}
 	}
 	if dbname == "" {
 		dbname, _ = config.String("db.dbname")
@@ -116,7 +125,7 @@ func Init(url, dbname string) {
 
 	// 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

app/i18n/i18n.go

@@ -10,8 +10,8 @@ import (
 
 // convert revel msg to js msg
 
-var msgBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/messages/"
+var msgBasePath = "/Users/life/Documents/Go/package2/src/github.com/leanote/leanote/messages/"
-var targetBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/public/js/i18n/"
+var targetBasePath = "/Users/life/Documents/Go/package2/src/github.com/leanote/leanote/public/js/i18n/"
 func parse(filename string) {
 	file, err := os.Open(msgBasePath + filename)
 	reader := bufio.NewReader(file)
@@ -84,6 +84,8 @@ function getMsg(key, data) {
 func main() {
 	parse("msg.en")
 	parse("msg.zh")
+	parse("msg.fr")
 	parse("blog.zh")
 	parse("blog.en")
+	parse("blog.fr")
 }

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/BlogCustom.go

@@ -47,3 +47,11 @@ type Archive struct {
 	MonthAchives []ArchiveMonth
 	Posts []*Post
 }
+
+type Cate struct {
+	CateId string
+	ParentCateId string
+	Title string
+	UrlTitle string
+	Children []*Cate
+}

app/info/NoteInfo.go

@@ -41,7 +41,10 @@ type Note struct {
 	PublicTime    time.Time     `PublicTime,omitempty`    // 发表时间, 公开为博客则设置
 	UpdatedUserId bson.ObjectId `bson:"UpdatedUserId"`    // 如果共享了, 并可写, 那么可能是其它他修改了
 	
-	SharePass int `SharePass`  //分享笔记的密码
+	// 2015/1/15, 更新序号
+	Usn int `Usn` // UpdateSequenceNum 
+
+	IsDeleted bool `IsDeleted` // 删除位
 }
 
 // 内容

app/info/NotebookInfo.go

@@ -19,6 +19,10 @@ type Notebook struct {
 	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`
 }
 
 // 仅仅是为了返回前台

app/info/SessionInfo.go

@@ -13,8 +13,9 @@ type Session struct {
 
 	LoginTimes int    `LoginTimes` // 登录错误时间
 	Captcha    string `Captcha`    // 验证码
-	Token 	   string `Token`     //attach token
+	
-	TokenTime   time.Time  `TokenTime`   //token生成时间
+	UserId     string `UserId`     // API时有值UserId
+
 	CreatedTime time.Time `CreatedTime`
 	UpdatedTime time.Time `UpdatedTime` // 更新时间, expire这个时间会自动清空
 }

app/info/ShareNotebookNoteInfo.go

@@ -78,7 +78,7 @@ type ShareNotebook struct {
 	UserId          bson.ObjectId `bson:"UserId"`
 	ToUserId        bson.ObjectId `bson:"ToUserId,omitempty"`
 	ToGroupId       bson.ObjectId `bson:"ToGroupId,omitempty"` // 分享给的用户组
-	ToGroup     Group         `ToGroup,omitempty`            // 仅仅为了显示, 不存储, 分组信息
+	ToGroup         Group         `ToGroup,omitempty`          // 仅仅为了显示, 不存储, 分组信息
 	NotebookId      bson.ObjectId `bson:"NotebookId"`
 	Seq             int           `bson:"Seq"`  // 排序
 	Perm            int           `bson:"Perm"` // 权限, 其下所有notes 0只读, 1可修改
@@ -138,7 +138,7 @@ type ShareNote struct {
 	UserId      bson.ObjectId `bson:"UserId"`
 	ToUserId    bson.ObjectId `bson:"ToUserId,omitempty"`
 	ToGroupId   bson.ObjectId `bson:"ToGroupId,omitempty"` // 分享给的用户组
-	ToGroup     Group         `ToGroup,omitempty`            // 仅仅为了显示, 不存储, 分组信息
+	ToGroup     Group         `ToGroup,omitempty`          // 仅仅为了显示, 不存储, 分组信息
 	NoteId      bson.ObjectId `bson:"NoteId"`
 	Perm        int           `bson:"Perm"` // 权限, 0只读, 1可修改
 	CreatedTime time.Time     `CreatedTime`

app/info/TagInfo.go

@@ -2,6 +2,7 @@ package info
 
 import (
 	"gopkg.in/mgo.v2/bson"
+	"time"
 )
 
 // 这里主要是为了统计每个tag的note数目
@@ -21,6 +22,18 @@ type Tag struct {
 	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` // 谁的
@@ -28,6 +41,7 @@ type TagCount struct {
 	IsBlog bool `IsBlog` // 是否是博客的tag统计
 	Count int `Count` // 统计数量
 }
+
 /*
 type TagsCounts []TagCount
 func (this TagsCounts) Len() int {

app/info/ThemeInfo.go

@@ -14,7 +14,7 @@ type Theme struct {
 	Version   string                 `Version`
 	Author    string                 `Author`
 	AuthorUrl string                 `AuthorUrl`
-	Path      string                 `Path`     // 文件夹路径
+	Path      string                 `Path`     // 文件夹路径, public/upload/54d7620d99c37b030600002c/themes/54d867c799c37b533e000001
 	Info      map[string]interface{} `Info`     // 所有信息
 	IsActive  bool                   `IsActive` // 是否在用
 

app/info/UserInfo.go

@@ -37,21 +37,25 @@ type User struct {
 
 	// 用户的帐户类型
 
-	ImageNum         int       `bson:"ImageNum" json:"-"`        // 图片数量
+	ImageNum   int           `bson:"ImageNum" json:"-"`   // 图片数量
-	ImageSize        int       `bson:"ImageSize" json:"-"`        // 图片大小
+	ImageSize  int           `bson:"ImageSize" json:"-"`  // 图片大小
-	AttachNum        int       `bson:"AttachNum" json:"-"`        // 附件数量
+	AttachNum  int           `bson:"AttachNum" json:"-"`  // 附件数量
-	AttachSize       int       `bson:"AttachSize" json:"-"`       // 附件大小
+	AttachSize int           `bson:"AttachSize" json:"-"` // 附件大小
-	FromUserId bson.ObjectId `FromUserId,omitempty` // 邀请的用户
+	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:"-"`        // 图片数量
+	MaxImageNum      int `bson:"MaxImageNums" json:"-"`     // 图片数量
-	MaxImageSize        int       `bson:"MaxImageSize" json:"-"`        // 图片大小
+	MaxImageSize     int `bson:"MaxImageSize" json:"-"`     // 图片大小
-	MaxAttachNum        int       `bson:"MaxAttachNum" json:"-"`        // 图片数量
+	MaxAttachNum     int `bson:"MaxAttachNum" json:"-"`     // 图片数量
-	MaxAttachSize       int       `bson:"MaxAttachSize" json:"-"`       // 图片大小
+	MaxAttachSize    int `bson:"MaxAttachSize" json:"-"`    // 图片大小
-	MaxPerAttachSize    int       `bson:"MaxPerAttachSize" json:"-"`    // 单个附件大小
+	MaxPerAttachSize int `bson:"MaxPerAttachSize" json:"-"` // 单个附件大小
+
+	// 2015/1/15, 更新序号
+	Usn            int       `Usn`                   // UpdateSequenceNum , 全局的
+	FullSyncBefore time.Time `bson:"FullSyncBefore"` // 需要全量同步的时间, 如果 > 客户端的LastSyncTime, 则需要全量更新
 }
 
 type UserAccount struct {
@@ -59,11 +63,11 @@ type UserAccount struct {
 	AccountStartTime time.Time `bson:"AccountStartTime" json:"-"` // 开始日期
 	AccountEndTime   time.Time `bson:"AccountEndTime" json:"-"`   // 结束日期
 	// 阈值
-	MaxImageNum         int       `bson:"MaxImageNums" json:"-"`        // 图片数量
+	MaxImageNum      int `bson:"MaxImageNums" json:"-"`     // 图片数量
-	MaxImageSize        int       `bson:"MaxImageSize" json:"-"`        // 图片大小
+	MaxImageSize     int `bson:"MaxImageSize" json:"-"`     // 图片大小
-	MaxAttachNum        int       `bson:"MaxAttachNum" json:"-"`        // 图片数量
+	MaxAttachNum     int `bson:"MaxAttachNum" json:"-"`     // 图片数量
-	MaxAttachSize       int       `bson:"MaxAttachSize" json:"-"`       // 图片大小
+	MaxAttachSize    int `bson:"MaxAttachSize" json:"-"`    // 图片大小
-	MaxPerAttachSize    int       `bson:"MaxPerAttachSize" json:"-"`    // 单个附件大小
+	MaxPerAttachSize int `bson:"MaxPerAttachSize" json:"-"` // 单个附件大小
 }
 
 // 用户与博客信息结合, 公开

app/init.go

@@ -6,11 +6,12 @@ import (
 	"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/session"
-	"github.com/leanote/leanote/app/lea/memcache"
+//	"github.com/leanote/leanote/app/lea/memcache"
 	"github.com/leanote/leanote/app/lea/route"
 	"reflect"
 	"fmt"
@@ -32,11 +33,11 @@ func init() {
 		// 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.
+		revel.SessionFilter,           // Restore and write the session cookie.
 		
 		// 使用SessionFilter标准版从cookie中得到sessionID, 然后通过MssessionFilter从Memcache中得到
 		// session, 之后MSessionFilter将session只存sessionID然后返回给SessionFilter返回到web
-		session.SessionFilter,         // leanote session 
+		// session.SessionFilter,         // leanote session 
 		// session.MSessionFilter,         // leanote memcache session 
 		
 		revel.FlashFilter,             // Restore and write the flash cookie.
@@ -50,6 +51,18 @@ func init() {
 	revel.TemplateFuncs["raw"] = func(str string) template.HTML {
 		return template.HTML(str)
 	}
+	revel.TemplateFuncs["trim"] = func(str string) string {
+		str = strings.Trim(str, " ")
+		str = strings.Trim(str, " ")
+		
+		str = strings.Trim(str, "\n")
+		str = strings.Trim(str, " ")
+		
+		// 以下两个空格不一样
+		str = strings.Trim(str, " ")
+		str = strings.Trim(str, " ")
+		return str
+	}
 	revel.TemplateFuncs["add"] = func(i int) string {
 		i = i + 1;
 		return fmt.Sprintf("%v", i)
@@ -144,8 +157,33 @@ func init() {
 		return template.HTML(tagStr)
 	}
 	
+	revel.TemplateFuncs["blogTagsForExport"] = func(renderArgs map[string]interface{}, tags []string) template.HTML {
+		if tags == nil || len(tags) == 0 {
+			return ""
+		}
+		tagStr := ""
+		lenTags := len(tags)
+		
+		for i, tag := range tags {
+			str := tag
+			var classes = "label"
+			if InArray([]string{"red", "blue", "yellow", "green"}, tag) {
+				classes += " label-" + tag
+			} else {
+				classes += " label-default"
+			}
+			
+			classes += " label-post"
+			tagStr += "<span class=\"" + classes + "\" >" + str + "</span>";
+			if i != lenTags - 1 {
+				tagStr += " "
+			}
+		}
+		return template.HTML(tagStr)
+	}
+	
 	// lea++
-	revel.TemplateFuncs["blogTagsLea"] = func(renderArgs map[string]interface{}, tags []string, isRecommend bool) template.HTML {
+	revel.TemplateFuncs["blogTagsLea"] = func(renderArgs map[string]interface{}, tags []string, typeStr string) template.HTML {
 		if tags == nil || len(tags) == 0 {
 			return ""
 		}
@@ -154,10 +192,12 @@ func init() {
 		lenTags := len(tags)
 		
 		tagPostUrl := "http://lea.leanote.com/"
-		if isRecommend {
+		if typeStr == "recommend" {
 			tagPostUrl += "?tag=";
-		} else {
+		} else if typeStr == "latest" {
 			tagPostUrl += "latest?tag=";
+		} else {
+			tagPostUrl += "subscription?tag=";
 		}
 		
 		for i, tag := range tags {
@@ -366,12 +406,13 @@ func init() {
 		// email配置
 		InitEmail()
 		InitVd()
-		memcache.InitMemcache() // session服务
+		// memcache.InitMemcache() // session服务
 		// 其它service
 		service.InitService()
 		controllers.InitService()
 		admin.InitService()
 		member.InitService()
 		service.ConfigS.InitGlobalConfigs()
-	});
+		api.InitService()
+	})
 }

app/lea/File.go

@@ -56,6 +56,14 @@ func ClearDir(dir string) bool {
 	return true
 }
 
+func MkdirAll(dir string) bool {
+	err := os.MkdirAll(dir, 0777)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
 // list dir's all file, return filenames
 func ListDir(dir string) []string {
 	f, err := os.Open(dir)

app/lea/Pwd.go

@@ -0,0 +1,22 @@
+package lea
+
+// 对比密码是否一致
+// 因为之前密码是用md5加密的, 所以通过密码长度来判断
+// rawPwd 原始, 用户输入的密码
+func ComparePwd(rawPwd, dbPwd string) bool {
+	if len(dbPwd) == 32 {
+		return Md5(rawPwd) == dbPwd
+	}
+	
+	hex := []byte(dbPwd)
+	return CompareHash(hex, rawPwd)
+}
+
+// 加密
+func GenPwd(rawPwd string) string {
+	digest, err := GenerateHash(rawPwd)
+	if err != nil {
+		return ""
+	}
+	return string(digest)
+}

app/lea/Util.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"gopkg.in/mgo.v2/bson"
 	"time"
+	"strings"
 	math_rand "math/rand" 
 )
 
@@ -122,9 +123,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 +232,7 @@ func SubStringHTML(param string, length int, end string) string {
 	
 	return result
 }
+
 // 是否是合格的密码
 func IsGoodPwd(pwd string) (bool, string) {
 	if pwd == "" {
@@ -212,7 +249,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
 }
 
@@ -279,3 +316,23 @@ func InArray(arr []string, str string) bool {
 	}
 	return false
 }
+
+// 将名称的特殊字符去掉
+func FixFilename(filename string) string {
+	if filename != "" {
+		// 把特殊字段给替换掉
+//		str := `life "%&()+,/:;<>=?@\|`
+		// . == \\.
+		// $ === \\$
+		reg, _ := regexp.Compile("\\.|/|#|\\$|!|\\^|\\*|'| |\"|%|&|\\(|\\)|\\+|\\,|/|:|;|<|>|=|\\?|@|\\||\\\\")
+		filename = reg.ReplaceAllString(filename, "-")
+		filename = strings.Trim(filename, "-") // 左右单独的-去掉
+		// 把空格替换成-
+//		filename = strings.Replace(filename, " ", "-", -1)
+		for strings.Index(filename, "--") >= 0 { // 防止出现连续的--
+			filename = strings.Replace(filename, "--", "-", -1)
+		}
+		return filename
+	}
+	return filename
+}

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

@@ -179,8 +179,6 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 
 		// 将该basePath下的所有文件提出
 		files := ListDir(basePath)
-		Log(basePath)
-		LogJ(files);
 		for _, t := range files {
 			if !strings.Contains(t, ".html") {
 				continue;
@@ -215,7 +213,8 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 
 
 ////////////////////
-// 错误显示
+//
+
 
 type ErrorResult struct {
 	RenderArgs map[string]interface{}
@@ -290,13 +289,12 @@ func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) {
 	r.RenderArgs["Router"] = revel.MainRouter
 
 	// 不是preview就不要显示错误了
-	LogJ(revelError)
+	if r.IsPreview {
-//	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/crypto.go

@@ -0,0 +1,26 @@
+// contains two cryptographic functions for both storing and comparing passwords.
+package lea
+
+import (
+	"golang.org/x/crypto/bcrypt"
+)
+
+// GenerateHash generates bcrypt hash from plaintext password
+func GenerateHash(password string) ([]byte, error) {
+	hex := []byte(password)
+	hashedPassword, err := bcrypt.GenerateFromPassword(hex, 10)
+	if err != nil {
+		return hashedPassword, err
+	}
+	return hashedPassword, nil
+}
+
+// CompareHash compares bcrypt password with a plaintext one. Returns true if passwords match
+// and false if they do not.
+func CompareHash(digest []byte, password string) bool {
+	hex := []byte(password)
+	if err := bcrypt.CompareHashAndPassword(digest, hex); err == nil {
+		return true
+	}
+	return false
+}

app/lea/session/session.go

@@ -51,7 +51,6 @@ func init() {
 // 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
 	}
@@ -158,7 +157,6 @@ func SessionFilter(c *revel.Controller, fc []revel.Filter) {
 	// c.Session, 重新生成一个revel.Session给controller!!!
 //	Log("sessoin--------")
 //	LogJ(session)
-
 	revelSession := revel.Session(session) // 强制转换 还是同一个对象, 但有个问题, 这样Session.Id()方法是用revel的了
 	c.Session = revelSession
 	// 生成sessionId

app/release/release.go

@@ -6,6 +6,7 @@ import (
 	"os/exec"
 	"io/ioutil"
 	"strings"
+//	"time"
 )
 
 /*
@@ -32,7 +33,7 @@ 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/object_id", "js/ZeroClipboard/ZeroClipboard"}
 	
 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/"
@@ -91,7 +92,6 @@ func dev() {
 		"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",
@@ -107,6 +107,13 @@ func dev() {
 	for key, value := range m {
 		content = strings.Replace(content, key, value, -1)
 	}
+	
+//	var time = time.Now().Unix() % 1000
+	
+//	content = strings.Replace(content, "-min.js", fmt.Sprintf("-min.js?r=%d", time), -1)
+//	content = strings.Replace(content, "default{{end}}.css", fmt.Sprintf("default{{end}}.css?r=%d", time), 1)
+//	content = strings.Replace(content, "writting-overwrite.css", fmt.Sprintf("writting-overwrite.css?r=%d", time), 1)
+	
 	ioutil.WriteFile(target, []byte(content), os.ModeAppend)
 }
 
@@ -114,8 +121,10 @@ func dev() {
 func tinymce() {
 //	cmdStr := "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", "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 := exec.Command("/bin/sh", "-c", "grunt minify");
-	cmd.Dir = "/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master"
+	cmd.Dir = base + "/tinymce_4.1.9"
+	
+	fmt.Println("正在build tinymce");
 	
 	// 必须要先删除
 	cmd2 := exec.Command("/bin/sh", "-c", "rm " + cmd.Dir + "/js/tinymce/tinymce.dev.js")
@@ -123,32 +132,19 @@ func tinymce() {
 	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()
+	// tinymce()
 	
 	dev();
 	
 	// 其它零散的需要压缩的js
-	otherJss := []string{"tinymce/tinymce", "js/main", "js/app/page", "js/contextmenu/jquery.contextmenu", 
+	otherJss := []string{"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",
-		"mdeditor/editor/Markdown.Extra",
-		"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",
 		}

app/service/AttachService.go

@@ -1,29 +1,46 @@
 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"
-	"github.com/leanote/leanote/app/info"
-	"github.com/leanote/leanote/app/db"
 	"gopkg.in/mgo.v2/bson"
-	"time"
 	"os"
 	"strings"
+	"time"
 )
 
 type AttachService struct {
 }
 
 // add attach
-func (this *AttachService) AddAttach(attach info.Attach) (ok bool, msg string) {
+// 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 
 }
 
@@ -46,8 +63,8 @@ func (this *AttachService) updateNoteAttachNum(noteId bson.ObjectId, addNum int)
 // list attachs
 func (this *AttachService) ListAttachs(noteId, userId string) []info.Attach {
 	attachs := []info.Attach{}
-	// 判断是否有权限为笔记添加附件, userId为空时表示是分享笔记的附件
+	// 判断是否有权限为笔记添加附件
-	if userId != "" && !shareService.HasUpdateNotePerm(noteId, userId) {
+	if !shareService.HasUpdateNotePerm(noteId, userId) {
 		return attachs
 	}
 
@@ -56,12 +73,26 @@ func (this *AttachService) ListAttachs(noteId, userId string) []info.Attach {
 	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)
@@ -94,7 +125,11 @@ func (this *AttachService) DeleteAttach(attachId, userId string) (bool, string)
 			attach.Path = strings.TrimLeft(attach.Path, "/")
 			err := os.Remove(revel.BasePath + "/" + attach.Path)
 			if err == nil {
-				return true, "delete file error"
+				// 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"
 		}
@@ -106,7 +141,7 @@ func (this *AttachService) DeleteAttach(attachId, userId string) (bool, string)
 // 获取文件路径
 // 要判断是否具有权限
 // userId是否具有attach的访问权限
-func (this *AttachService) GetAttach(attachId, userId, token, sessionId string) (attach info.Attach) {
+func (this *AttachService) GetAttach(attachId, userId string) (attach info.Attach) {
 	if attachId == "" {
 		return
 	}
@@ -137,17 +172,6 @@ func (this *AttachService) GetAttach(attachId, userId, token, sessionId string)
 		return
 	}
 
-	//userId为空则是分享笔记的附件
-	if userId == "" && sessionId != "" {
-		if token != "" {
-			realToken := sessionService.GetToken(sessionId)
-			if token == realToken {
-				Log("attach token is equal!")
-				return 
-			}
-		} 
-	}
-	
 	attach = info.Attach{}
 	return
 }
@@ -169,19 +193,46 @@ func (this *AttachService) CopyAttachs(noteId, toNoteId, toUserId string) bool {
 		newFilename := NewGuid() + ext
 		dir := "files/" + toUserId + "/attachs"
 		filePath := dir + "/" + newFilename
-		err := os.MkdirAll(revel.BasePath + "/" + dir, 0755)
+		err := os.MkdirAll(revel.BasePath+"/"+dir, 0755)
 		if err != nil {
 			return false
 		}
-		_, err = CopyFile(revel.BasePath + "/" + attach.Path, revel.BasePath + "/" + filePath)
+		_, err = CopyFile(revel.BasePath+"/"+attach.Path, revel.BasePath+"/"+filePath)
 		if err != nil {
 			return false
 		}
 		attach.Name = newFilename
 		attach.Path = filePath
 
-		this.AddAttach(attach)
+		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

@@ -2,26 +2,31 @@ package service
 
 import (
 	"gopkg.in/mgo.v2/bson"
-//	"github.com/leanote/leanote/app/db"
+	//	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
-//	"github.com/revel/revel"
+	//	"github.com/revel/revel"
-	"strings"
+	"errors"
-	. "github.com/leanote/leanote/app/lea"
 	"fmt"
+	. "github.com/leanote/leanote/app/lea"
 	"strconv"
+	"strings"
 )
 
-// 登录与权限
+// 登录与权限 Login & Register
 
 type AuthService struct {
 }
 
-// pwd已md5了
+// 使用bcrypt认证或者Md5认证
-func (this *AuthService) Login(emailOrUsername, pwd string) info.User {
+// Use bcrypt (Md5 depreciated)
+func (this *AuthService) Login(emailOrUsername, pwd string) (info.User, error) {
 	emailOrUsername = strings.Trim(emailOrUsername, " ")
-//	pwd = strings.Trim(pwd, " ")
+	//	pwd = strings.Trim(pwd, " ")
-	userInfo := userService.LoginGetUserInfo(emailOrUsername, Md5(pwd))
+	userInfo := userService.GetUserInfoByName(emailOrUsername)
-	return userInfo
+	if userInfo.UserId == "" || !ComparePwd(pwd, userInfo.Pwd) {
+		return userInfo, errors.New("wrong username or password")
+	}
+	return userInfo, nil
 }
 
 // 注册
@@ -40,33 +45,35 @@ func (this *AuthService) Register(email, pwd, fromUserId string) (bool, string)
 	if userService.IsExistsUser(email) {
 		return false, "userHasBeenRegistered-" + email
 	}
-	user := info.User{UserId: bson.NewObjectId(), Email: email, Username: email, Pwd: Md5(pwd)}
+	passwd := GenPwd(pwd)
+	if passwd == "" {
+		return false, "GenerateHash error"
+	}
+	user := info.User{UserId: bson.NewObjectId(), Email: email, Username: email, Pwd: passwd}
 	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,
+			Seq:    -1,
 			UserId: user.UserId}
 		title2Id := map[string]bson.ObjectId{"life": bson.NewObjectId(), "study": bson.NewObjectId(), "work": bson.NewObjectId()}
 		for title, objectId := range title2Id {
 			notebook.Title = title
 			notebook.NotebookId = objectId
 			notebook.UserId = user.UserId
-			notebookService.AddNotebook(notebook);
+			notebookService.AddNotebook(notebook)
 		}
 
-		email := user.Email
-		
 		// 添加leanote -> 该用户的共享
 		registerSharedUserId := configService.GetGlobalStringConfig("registerSharedUserId")
-		if(registerSharedUserId != "") {
+		if registerSharedUserId != "" {
 			registerSharedNotebooks := configService.GetGlobalArrMapConfig("registerSharedNotebooks")
 			registerSharedNotes := configService.GetGlobalArrMapConfig("registerSharedNotes")
 			registerCopyNoteIds := configService.GetGlobalArrayConfig("registerCopyNoteIds")
@@ -74,31 +81,34 @@ func (this *AuthService) register(user info.User) (bool, string) {
 			// 添加共享笔记本
 			for _, notebook := range registerSharedNotebooks {
 				perm, _ := strconv.Atoi(notebook["perm"])
-				shareService.AddShareNotebook(notebook["notebookId"], perm, registerSharedUserId, email);
+				shareService.AddShareNotebookToUserId(notebook["notebookId"], perm, registerSharedUserId, userId)
 			}
 
 			// 添加共享笔记
 			for _, note := range registerSharedNotes {
 				perm, _ := strconv.Atoi(note["perm"])
-				shareService.AddShareNote(note["noteId"], perm, registerSharedUserId, email);
+				shareService.AddShareNoteToUserId(note["noteId"], perm, registerSharedUserId, userId)
 			}
 
 			// 复制笔记
 			for _, noteId := range registerCopyNoteIds {
-				note := noteService.CopySharedNote(noteId, title2Id["life"].Hex(), registerSharedUserId, user.UserId.Hex());
+				note := noteService.CopySharedNote(noteId, title2Id["life"].Hex(), registerSharedUserId, user.UserId.Hex())
-				noteUpdate := bson.M{"IsBlog": true}
+				//				Log(noteId)
-				noteService.UpdateNote(user.UserId.Hex(), user.UserId.Hex(), note.NoteId.Hex(), noteUpdate)
+				//				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", 
+			Title:      user.Username + " 's Blog",
-			SubTitle: "love leanote!",
+			SubTitle:   "Love Leanote!",
-			AboutMe: "Hello, I am (^_^)",
+			AboutMe:    "Hello, I am (^_^)",
 			CanComment: true,
-			})
+		})
 		// 添加一个单页面
 		blogService.AddOrUpdateSingle(user.UserId.Hex(), "", "About Me", "Hello, I am (^_^)")
 	}
@@ -113,7 +123,7 @@ func (this *AuthService) register(user info.User) (bool, string) {
 func (this *AuthService) getUsername(thirdType, thirdUsername string) (username string) {
 	username = thirdType + "-" + thirdUsername
 	i := 1
-	for ;; {
+	for {
 		if !userService.IsExistsUserByUsername(username) {
 			return
 		}
@@ -130,10 +140,10 @@ func (this *AuthService) ThirdRegister(thirdType, thirdUserId, thirdUsername str
 
 	username := this.getUsername(thirdType, thirdUsername)
 	userInfo = info.User{UserId: bson.NewObjectId(),
-		Username: username, 
+		Username:      username,
-		ThirdUserId: thirdUserId,
+		ThirdUserId:   thirdUserId,
 		ThirdUsername: thirdUsername,
-		}
+	}
 	_, _ = this.register(userInfo)
 	return
 }

app/service/BlogService.go

@@ -69,9 +69,14 @@ func (this *BlogService) GetBlogItem(note info.Note) (blog info.BlogItem) {
 }
 
 // 得到用户共享的notebooks
+// 3/19 博客不是deleted
 func (this *BlogService) ListBlogNotebooks(userId string) []info.Notebook {
 	notebooks := []info.Notebook{}
-	db.ListByQ(db.Notebooks, bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true}, &notebooks)
+	orQ := []bson.M{
+		bson.M{"IsDeleted": false},
+		bson.M{"IsDeleted": bson.M{"$exists": false}},
+	}
+	db.ListByQ(db.Notebooks, bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true, "$or": orQ}, &notebooks)
 	return notebooks
 }
 
@@ -1094,13 +1099,15 @@ func (this *BlogService) SortSingles(userId string, singleIds []string) (ok bool
 
 // 得到用户的博客url
 func (this *BlogService) GetUserBlogUrl(userBlog *info.UserBlog, username string) string {
-	if userBlog.Domain != "" && configService.AllowCustomDomain() {
+	if userBlog != nil {
-		return configService.GetUserUrl(userBlog.Domain)
+		if userBlog.Domain != "" && configService.AllowCustomDomain() {
-	} else if userBlog.SubDomain != "" {
+			return configService.GetUserUrl(userBlog.Domain)
-		return configService.GetUserSubUrl(userBlog.SubDomain)
+		} else if userBlog.SubDomain != "" {
-	}
+			return configService.GetUserSubUrl(userBlog.SubDomain)
-	if username == "" {
+		}
-		username = userBlog.UserId.Hex()
+		if username == "" {
+			username = userBlog.UserId.Hex()
+		}
 	}
 	return configService.GetBlogUrl() + "/" + username
 }
@@ -1190,6 +1197,10 @@ func (this *BlogService) FixBlog(blog info.BlogItem) info.Post {
 		LikeNum:     blog.LikeNum,
 		IsMarkdown:  blog.IsMarkdown,
 	}
+	if blog2.Tags != nil && len(blog2.Tags) > 0 && blog2.Tags[0] != "" {
+	} else {
+		blog2.Tags = nil
+	}
 	return blog2
 }
 

app/service/ConfigService.go

@@ -305,7 +305,7 @@ func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
 	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
+	binPath = binPath + " -h " + host + " -d " + dbname + " --port " + port
 	if username != "" {
 		binPath += " -u " + username + " -p " + password
 	}
@@ -361,7 +361,7 @@ func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 	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
+	binPath = binPath + " --drop -h " + host + " -d " + dbname + " --port " + port
 	if username != "" {
 		binPath += " -u " + username + " -p " + password
 	}
@@ -372,7 +372,7 @@ func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 		return false, path + " Is Not Exists"
 	}
 	
-	binPath += " --directoryperdb " + path
+	binPath += " " + path
 	
 	cmd := exec.Command("/bin/sh", "-c", binPath)
 	Log(binPath);
@@ -455,12 +455,15 @@ 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://") {
@@ -469,6 +472,17 @@ func init() {
 			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
+		}
 	})
 }
 
@@ -580,5 +594,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "1.0-beta2"
+	return "1.0-beta.4"
 }

app/service/FileService.go

@@ -9,7 +9,6 @@ import (
 	"time"
 	"os"
 	"strings"
-//	"fmt"
 )
 
 const DEFAULT_ALBUM_ID = "52d3e8ac99c37b7f0d000001"
@@ -119,8 +118,7 @@ func (this *FileService) UpdateImage(userId, fileId, title string) bool {
 // 获取文件路径
 // 要判断是否具有权限
 // userId是否具有fileId的访问权限
-
+func (this *FileService) GetFile(userId, fileId string) string {
-func (this *FileService) GetFile(userId, fileId , sessionId , token string) string {
 	if fileId == "" {
 		return ""
 	}
@@ -133,8 +131,7 @@ func (this *FileService) GetFile(userId, fileId , sessionId , token string) stri
 	}
 	
 	// 1. 判断权限
-	//未登录用户，判断token
+	
-	noteIds := noteImageService.GetNoteIds(fileId)
 	// 是否是我的文件
 	if userId != "" && file.UserId.Hex() == userId {
 		return path
@@ -144,30 +141,13 @@ func (this *FileService) GetFile(userId, fileId , sessionId , token string) stri
 	// 这些笔记是否有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
 		}
 		
-		//分享给未注册用户
-		if userId == "" && sessionId != "" {
-			if token != "" {
-				realToken := sessionService.GetToken(sessionId)
-				if token == realToken {
-					Log("image token is equal!")
-					return path
-				} else {
-					Log("image token is different!")
-					return ""
-				}	
-			} else {
-				return ""
-			}
-							
-		}
-		
 		// 2014/12/28 修复, 如果是分享给用户组, 那就不行, 这里可以实现
 		for _, noteId := range noteIds {
 			note := noteService.GetNoteById(noteId.Hex())
@@ -175,7 +155,6 @@ func (this *FileService) GetFile(userId, fileId , sessionId , token string) stri
 				return path;
 			}
 		}
-		
 		/*
 		// 若有共享给我的笔记?
 		// 对该笔记可读?
@@ -212,7 +191,6 @@ func (this *FileService) GetFile(userId, fileId , sessionId , token string) stri
 	return ""
 }
 
-
 // 复制图片
 func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, string) {
 	// 是否已经复制过了
@@ -265,5 +243,9 @@ func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, strin
 
 // 是否是我的文件
 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

@@ -32,11 +32,21 @@ func (this *GroupService) DeleteGroup(userId, groupId string) (ok bool, msg stri
 		return false, "groupHasUsers"
 	}
 	*/
+	if !this.isMyGroup(userId, groupId) {
+		return false, "notMyGroup"
+	}
+	
+	// 删除分组后, 需要删除所有用户分享到该组的笔记本, 笔记
+	
+	shareService.DeleteAllShareNotebookGroup(groupId);
+	shareService.DeleteAllShareNoteGroup(groupId);
+	
 	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)
@@ -44,9 +54,14 @@ func (this *GroupService) UpdateGroupTitle(userId, groupId, title string) (ok bo
 
 // 得到用户的所有分组(包括下的所有用户)
 func (this *GroupService) GetGroupsAndUsers(userId string) ([]info.Group) {
-	// 得到分组s
+/*
+	// 得到我的分组
 	groups := []info.Group{}
 	db.ListByQ(db.Groups, bson.M{"UserId": bson.ObjectIdHex(userId)}, &groups)
+*/
+	// 我的分组, 及我所属的分组
+	groups := this.GetGroupsContainOf(userId);
+	
 	// 得到其下的用户
 	for i, group := range groups {
 		group.Users = this.GetUsers(group.GroupId.Hex())
@@ -61,6 +76,55 @@ func (this *GroupService) GetGroups(userId string) ([]info.Group) {
 	db.ListByQ(db.Groups, bson.M{"UserId": bson.ObjectIdHex(userId)}, &groups)
 	return groups
 }
+
+// 得到我的和我所属组的ids
+func (this *GroupService) GetMineAndBelongToGroupIds(userId string)  ([]bson.ObjectId) {
+	// 所属组
+	groupIds := this.GetBelongToGroupIds(userId)
+	
+	m := map[bson.ObjectId]bool{}
+	for _, groupId := range groupIds {
+		m[groupId] = true
+	}
+	
+	// 我的组
+	myGroups := this.GetGroups(userId)
+	
+	for _, group := range myGroups {
+		if !m[group.GroupId] {
+			groupIds = append(groupIds, group.GroupId)
+		}
+	}
+	
+	return groupIds
+}
+
+// 获取包含此用户的组对象数组
+// 获取该用户所属组, 和我的组
+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
@@ -103,10 +167,25 @@ func (this *GroupService) GetBelongToGroupIds(userId string) ([]bson.ObjectId) {
 func (this *GroupService) isMyGroup(ownUserId, groupId string) (ok bool) {
 	return db.Has(db.Groups, bson.M{"_id": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(ownUserId)})
 }
+
+// 判断组中是否包含指定用户
+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)})
+}
+
 // 为group添加用户
 // 用户是否已存在?
 func (this *GroupService) AddUser(ownUserId, groupId, userId string) (ok bool, msg string) {
 	// groupId是否是ownUserId的?
+	/*
+	if !this.IsExistsGroupUser(ownUserId, groupId) {
+		return false, "forbidden"
+	}
+	*/
 	if !this.isMyGroup(ownUserId, groupId) {
 		return false, "forbidden"
 	}
@@ -123,11 +202,22 @@ func (this *GroupService) AddUser(ownUserId, groupId, userId string) (ok bool, m
 		CreatedTime: time.Now(),
 	}), ""
 }
+
 // 删除用户
 func (this *GroupService) DeleteUser(ownUserId, groupId, userId string) (ok bool, msg string) {
 	// groupId是否是ownUserId的?
+	/*
+	if !this.IsExistsGroupUser(ownUserId, groupId) {
+		return false, "forbidden"
+	}
+	*/
 	if !this.isMyGroup(ownUserId, groupId) {
 		return false, "forbidden"
 	}
+	
+	// 删除该用户分享到本组的笔记本, 笔记
+	shareService.DeleteShareNotebookGroupWhenDeleteGroupUser(userId, groupId);
+	shareService.DeleteShareNoteGroupWhenDeleteGroupUser(userId, groupId);
+	
 	return db.Delete(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(userId)}), ""
 }

app/service/NoteImageService.go

@@ -29,6 +29,7 @@ func (this *NoteImageService) GetNoteIds(imageId string) ([]bson.ObjectId) {
 	return nil
 }
 
+// TODO 这个web可以用, 但api会传来, 不用用了
 // 解析内容中的图片, 建立图片与note的关系
 // <img src="/file/outputImage?fileId=12323232" />
 // 图片必须是我的, 不然不添加
@@ -38,7 +39,8 @@ func (this *NoteImageService) UpdateNoteImages(userId, noteId, imgSrc, content s
 	if imgSrc != "" {
 		content = "<img src=\"" + imgSrc + "\" >" + content
 	}
-	reg, _ := regexp.Compile("outputImage\\?fileId=([a-z0-9A-Z]{24})")
+	// life 添加getImage
+	reg, _ := regexp.Compile("(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})")
 	find := reg.FindAllStringSubmatch(content, -1) // 查找所有的
 
 	// 删除旧的
@@ -50,8 +52,8 @@ func (this *NoteImageService) UpdateNoteImages(userId, noteId, imgSrc, content s
 	hasAdded := make(map[string]bool)
 	if find != nil && len(find) > 0 {
 		for _, each := range find {
-			if each != nil && len(each) == 2 {
+			if each != nil && len(each) == 3 {
-				fileId = each[1]
+				fileId = each[2] // 现在有两个子表达式了
 				// 之前没能添加过的
 				if _, ok := hasAdded[fileId]; !ok {
 					Log(fileId)
@@ -105,3 +107,48 @@ func (this *NoteImageService) CopyNoteImages(fromNoteId, fromUserId, newNoteId,
 	
 	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

@@ -17,21 +17,11 @@ func (this *NoteService) GetNote(noteId, userId string) (note info.Note) {
 	db.GetByIdAndUserId(db.Notes, noteId, userId, &note)
 	return
 }
-
-//通过附件id得到note
-func (this *NoteService) GetNoteByAttachId(attachId string) (note info.Note) {
-	attach := info.Attach{}
-	db.Get(db.Attachs, attachId, &attach)
-	note = info.Note{}
-	noteId := attach.NoteId
-	db.Get(db.Notes, noteId.Hex(), &note)
-	return
-}
-
 // fileService调用
+// 不能是已经删除了的, life bug, 客户端删除后, 竟然还能在web上打开
 func (this *NoteService) GetNoteById(noteId string) (note info.Note) {
 	note = info.Note{}
-	db.Get(db.Notes, noteId, &note)
+	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsDeleted": false}, &note)
 	return
 }
 // 得到blog, blogService用
@@ -55,14 +45,115 @@ func (this *NoteService) GetNoteAndContent(noteId, userId string) (noteAndConten
 	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
 	}
@@ -132,7 +223,7 @@ func (this *NoteService) ListNoteContentByNoteIds(noteIds []bson.ObjectId) (note
 // 首先要判断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;
@@ -142,14 +233,18 @@ func (this *NoteService) AddNote(note info.Note) info.Note {
 	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(notebookId)
 	
-	if note.IsBlog {
+	// api会传IsBlog, web不会传
-		note.PublicTime = note.UpdatedTime
+	if !fromApi {
+		// 设为blog
+		note.IsBlog = notebookService.IsBlog(notebookId)
 	}
+//	if note.IsBlog {
+	note.PublicTime = note.UpdatedTime
+//	}
 	
 	db.Insert(db.Notes, note)
 	
@@ -167,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{}
 }
@@ -187,6 +282,49 @@ func (this *NoteService) AddNoteContent(noteContent info.NoteContent) info.NoteC
 	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 {
@@ -209,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)
@@ -218,19 +373,30 @@ func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.Note
 }
 
 // 修改笔记
-func (this *NoteService) UpdateNote(userId, updatedUserId, noteId string, needUpdate bson.M) bool {
+// 这里没有判断usn
+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 AUTH2")
-			return false
+			return false, "noAuth", 0
 		} else {
 			Log("HAS AUTH -----------")
 		}
 	}
 	
+	if usn > 0 &&  note.Usn != usn {
+		return false, "conflict", 0
+	}
+	
 	// 是否已自定义
-	note := this.GetNoteById(noteId)
 	if note.IsBlog && note.HasSelfDefined {
 		delete(needUpdate, "ImgSrc")
 		delete(needUpdate, "Desc")
@@ -238,8 +404,11 @@ func (this *NoteService) UpdateNote(userId, updatedUserId, noteId string, needUp
 	
 	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)
 	}
@@ -247,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, 那么需要判断权限
@@ -265,31 +479,50 @@ 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
 		}
 	}
 	
+	// abstract重置
 	data := bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId), 
 		"Content": content, 
 		"Abstract": abstract, 
 		"UpdatedTime": time.Now()}
 	
-	// 是否已自定义
-	note := this.GetNoteById(noteId)
 	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), 
@@ -300,9 +533,9 @@ func (this *NoteService) UpdateNoteContent(userId, updatedUserId, noteId, conten
 		// 更新笔记图片
 		noteImageService.UpdateNoteImages(userId, noteId, note.ImgSrc, content)
 		
-		return true
+		return true, "", afterUsn
 	}
-	return false
+	return false, "", 0
 }
 
 // ?????
@@ -316,7 +549,7 @@ func (this *NoteService) updateNoteImages(noteId string, content string) bool {
 // 更新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 {
@@ -334,6 +567,8 @@ func (this *NoteService) ToBlog(userId, noteId string, isBlog, isTop bool) bool
 	} else {
 		noteUpdate["HasSelfDefined"] = false
 	}
+	noteUpdate["Usn"] = userService.IncrUsn(userId)
+	
 	ok := db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, noteUpdate)
 	// 重新计算tags
 	go (func() {
@@ -353,7 +588,9 @@ func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
 		
 		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状态
@@ -375,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
@@ -578,7 +816,6 @@ func (this *NoteService) SearchNoteByTags(tags []string, userId string, pageNumb
 	return
 }
 
-
 //------------
 // 统计
 func (this *NoteService) CountNote(userId string) int {
@@ -595,3 +832,42 @@ func (this *NoteService) CountBlog(userId string) int {
 	}
 	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

@@ -8,6 +8,8 @@ import (
 	. "github.com/leanote/leanote/app/lea"
 	"sort"
 	"time"
+	"strings"
+//	"html"
 )
 
 // 笔记本
@@ -40,7 +42,9 @@ func ParseAndSortNotebooks(userNotebooks []info.Notebook, noParentDelete, needSo
 	for _, each := range userNotebooks {
 		newNotebooks := info.Notebooks{Subs: info.SubNotebooks{}}
 		newNotebooks.NotebookId = each.NotebookId
-		newNotebooks.Title = each.Title
+		newNotebooks.Title = each.Title;
+//		newNotebooks.Title = html.EscapeString(each.Title)
+		newNotebooks.Title = strings.Replace(strings.Replace(each.Title, "<script>", "", -1), "</script", "", -1)
 		newNotebooks.Seq = each.Seq
 		newNotebooks.UserId = each.UserId
 		newNotebooks.ParentNotebookId = each.ParentNotebookId
@@ -111,12 +115,24 @@ func (this *NotebookService) GetNotebookByUserIdAndUrlTitle(userId, notebookIdOr
 	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
@@ -141,14 +157,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
@@ -174,19 +222,22 @@ 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)
 	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, bson.M{"IsBlog": isBlog})
+	db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates)
 	
 	// 更新笔记
 	q := bson.M{"UserId": bson.ObjectIdHex(userId), 
@@ -197,6 +248,8 @@ func (this *NotebookService) ToBlog(userId, notebookId string, isBlog bool) (boo
 	} else {
 		data["HasSelfDefined"] = false
 	}
+	// usn
+	data["Usn"] = userService.IncrUsn(userId)
 	db.UpdateByQMap(db.Notes, q, data)
 	
 	// noteContents也更新, 这个就麻烦了, noteContents表没有NotebookId
@@ -222,12 +275,19 @@ func (this *NotebookService) ToBlog(userId, notebookId string, isBlog bool) (boo
 // 查看是否有子notebook
 // 先查看该notebookId下是否有notes, 没有则删除
 func (this *NotebookService) DeleteNotebook(userId, notebookId string) (bool, string) {
-	if db.Count(db.Notebooks, bson.M{"ParentNotebookId": bson.ObjectIdHex(notebookId), 
+	if db.Count(db.Notebooks, bson.M{
-		"UserId": bson.ObjectIdHex(userId)}) == 0 { // 无
+			"ParentNotebookId": bson.ObjectIdHex(notebookId), 
+			"UserId": bson.ObjectIdHex(userId),
+			"IsDeleted": false,
+		}) == 0 { // 无
 		if db.Count(db.Notes, bson.M{"NotebookId": bson.ObjectIdHex(notebookId), 
 			"UserId": bson.ObjectIdHex(userId),
-			"IsTrash": false}) == 0 { // 不包含trash
+			"IsTrash": false,
-			return db.DeleteByIdAndUserId(db.Notebooks, notebookId, userId), ""
+			"IsDeleted": 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 {
@@ -235,6 +295,18 @@ func (this *NotebookService) DeleteNotebook(userId, notebookId string) (bool, st
 	}
 }
 
+// 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), ""
+}
+
 // 排序
 // 传入 notebookId => Seq
 // 为什么要传入userId, 防止修改其它用户的信息 (恶意)
@@ -245,7 +317,7 @@ 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
 		}
 	}
@@ -253,15 +325,14 @@ func (this *NotebookService) SortNotebooks(userId string, notebookId2Seqs map[st
 	return true
 }
 
+// 排序和设置父
 func (this *NotebookService) DragNotebooks(userId string, curNotebookId string, parentNotebookId string, siblings []string) bool {
-	userIdO := bson.ObjectIdHex(userId)
-	
 	ok := false
 	// 如果没parentNotebookId, 则parentNotebookId设空
 	if(parentNotebookId == "") {
-		ok = db.UpdateByIdAndUserIdField2(db.Notebooks, bson.ObjectIdHex(curNotebookId), userIdO, "ParentNotebookId", "");
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": "",  "Usn": userService.IncrUsn(userId)});
 	} else {
-		ok = db.UpdateByIdAndUserIdField2(db.Notebooks, bson.ObjectIdHex(curNotebookId), userIdO, "ParentNotebookId", bson.ObjectIdHex(parentNotebookId));
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": bson.ObjectIdHex(parentNotebookId), "Usn": userService.IncrUsn(userId)});
 	}
 	
 	if !ok {
@@ -270,7 +341,7 @@ func (this *NotebookService) DragNotebooks(userId string, curNotebookId string,
 
 	// 排序
 	for seq, notebookId := range siblings {
-		if !db.UpdateByIdAndUserIdField2(db.Notebooks, bson.ObjectIdHex(notebookId), userIdO, "Seq", seq) {
+		if !db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, bson.M{"Seq": seq, "Usn": userService.IncrUsn(userId)}) {
 			return false
 		}
 	}
@@ -283,7 +354,7 @@ func (this *NotebookService) DragNotebooks(userId string, curNotebookId string,
 // 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})
+	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)

app/service/PwdService.go

@@ -45,9 +45,13 @@ func (this *PwdService) UpdatePwd(token, pwd string) (bool, string) {
 	if ok, msg, tokenInfo = tokenService.VerifyToken(token, info.TokenPwd); !ok {
 		return ok, msg
 	}
-	
+	digest, err := GenerateHash(pwd)
+	if err != nil {
+		return false,"GenerateHash error"
+	}
+  passwd := string(digest)
 	// 修改密码之
-	ok = db.UpdateByQField(db.Users, bson.M{"_id": tokenInfo.UserId}, "Pwd", Md5(pwd))
+	ok = db.UpdateByQField(db.Users, bson.M{"_id": tokenInfo.UserId}, "Pwd", passwd)
 	
 	// 删除token
 	tokenService.DeleteToken(tokenInfo.UserId.Hex(), info.TokenPwd)

app/service/SessionService.go

@@ -17,13 +17,6 @@ func (this *SessionService) Update(sessionId, key string, value interface{}) boo
 	return db.UpdateByQMap(db.Sessions, bson.M{"SessionId": sessionId}, 
 		bson.M{key: value, "UpdatedTime": time.Now()})
 }
-
-func (this *SessionService) UpdateToken(sessionId, key string, value interface{}) bool {
-	return db.UpdateByQMap(db.Sessions, bson.M{"SessionId": sessionId}, 
-		bson.M{key: value, "UpdatedTime": time.Now(), "TokenTime": time.Now()})
-}
-
-
 // 注销时清空session
 func (this *SessionService) Clear(sessionId string) bool {
 	return db.Delete(db.Sessions, bson.M{"SessionId": sessionId})
@@ -77,18 +70,19 @@ func (this *SessionService) SetCaptcha(sessionId, captcha string) bool {
 	return ok
 }
 
-
+//-----------
-// 附件token
+// API
-func (this *SessionService) GetToken(sessionId string) string {
+func (this *SessionService) GetUserId(sessionId string) string {
 	session := this.Get(sessionId)
-	return session.Token
+	// 更新updateTime, 避免过期
+	db.UpdateByQMap(db.Sessions, bson.M{"SessionId": sessionId}, 
+		bson.M{"UpdatedTime": time.Now()})
+	return session.UserId
 }
 
-func (this *SessionService) SetToken(sessionId, token string) bool {
+// 登录成功后设置userId
+func (this *SessionService) SetUserId(sessionId, userId string) bool {
 	this.Get(sessionId)
-	Log(sessionId)
+	ok := this.Update(sessionId, "UserId", userId)
-	Log(token)
-	ok := this.UpdateToken(sessionId, "Token", token)
-	Log(ok)
 	return ok
 }

app/service/ShareService.go

@@ -7,9 +7,6 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	"time"
 	"sort"
-	"math/rand"
-	"regexp"
-	"strings"
 )
 
 // 共享Notebook, Note服务
@@ -36,8 +33,9 @@ type ShareService struct {
 
 // 谁共享给了我的Query
 func (this *ShareService) getOrQ(userId string) bson.M {
-	// 得到我参与的组织
+	// 得到我和和我参与的组织
-	groupIds := groupService.GetBelongToGroupIds(userId)
+	groupIds := groupService.GetMineAndBelongToGroupIds(userId)
+	
 	q := bson.M{}
 	if len(groupIds) > 0 {
 		orQ := []bson.M{
@@ -54,6 +52,8 @@ func (this *ShareService) getOrQ(userId string) bson.M {
 
 // 得到共享给我的笔记本和用户(谁共享给了我)
 func (this *ShareService) GetShareNotebooks(userId string) (info.ShareNotebooksByUser, []info.User) {
+	myUserId := userId
+	
 	// 得到共享给我的用户s信息
 	// 得到我参与的组织
 	q := this.getOrQ(userId)
@@ -67,7 +67,15 @@ func (this *ShareService) GetShareNotebooks(userId string) (info.ShareNotebooksB
 	db.Distinct(db.ShareNotebooks, q, "UserId", &userIds2) // BUG之前是userId1, 2014/12/29
 	
 	userIds := append(userIds1, userIds2...)
+	
 	userInfos := userService.GetUserInfosOrderBySeq(userIds);
+	// 不要我的id
+	for i, userInfo := range userInfos {
+		if userInfo.UserId.Hex() == myUserId {
+			userInfos = append(userInfos[:i], userInfos[i+1:]...)
+			break;
+		}
+	}
 	
 	//--------------------
 	// 得到他们共享给我的notebooks
@@ -105,6 +113,11 @@ func (this *ShareService) GetShareNotebooks(userId string) (info.ShareNotebooksB
 	// 先建立userId => []
 	for _, eachSub := range subShareNotebooks {
 		userId := eachSub.Notebook.UserId
+		// 我自己的, 算了
+		if userId.Hex() == myUserId {
+			continue;
+		}
+		
 		if _, ok := shareNotebooksByUsersMap[userId]; ok {
 			shareNotebooksByUsersMap[userId] = append(shareNotebooksByUsersMap[userId], eachSub)
 		} else {
@@ -297,7 +310,11 @@ func (this *ShareService) AddShareNotebook(notebookId string, perm int, userId,
 	if toUserId == "" {
 		return false, "无该用户", ""
 	}
+	return this.AddShareNotebookToUserId(notebookId, perm, userId, toUserId)
+}
 		
+// 第三方注册时没有email
+func (this *ShareService) AddShareNotebookToUserId(notebookId string, perm int, userId, toUserId string) (bool, string, string) {
 	// 添加一条记录说明两者存在关系
 	this.AddHasShareNote(userId, toUserId);
 	
@@ -330,7 +347,11 @@ func (this *ShareService) AddShareNote(noteId string, perm int, userId, email st
 	if toUserId == "" {
 		return false, "无该用户", ""
 	}
+	return this.AddShareNoteToUserId(noteId, perm, userId, toUserId)
+}
 
+// 第三方测试没有userId		
+func (this *ShareService) AddShareNoteToUserId(noteId string, perm int, userId, toUserId string) (bool, string, string) {
 	// 添加一条记录说明两者存在关系
 	this.AddHasShareNote(userId, toUserId);
 	
@@ -340,14 +361,12 @@ func (this *ShareService) AddShareNote(noteId string, perm int, userId, email st
 		"ToUserId": bson.ObjectIdHex(toUserId),
 	});
 	
-	
 	shareNote := info.ShareNote{NoteId: bson.ObjectIdHex(noteId), 
 		UserId: bson.ObjectIdHex(userId), 
 		ToUserId: bson.ObjectIdHex(toUserId),
 		Perm: perm,
 		CreatedTime: time.Now(),
 	}
-	
 	return db.Insert(db.ShareNotes, shareNote), "", toUserId
 }
 
@@ -671,8 +690,7 @@ func (this *ShareService) HasReadNotePerm(noteId, userId string) bool {
 
 // 得到笔记分享给的groups
 func (this *ShareService) GetNoteShareGroups(noteId, userId string) []info.ShareNote {
-	// 得到分组s
+	groups := groupService.GetGroupsContainOf(userId)
-	groups := groupService.GetGroups(userId)
 	
 	// 得到有分享的分组
 	shares := []info.ShareNote{}
@@ -699,9 +717,7 @@ func (this *ShareService) GetNoteShareGroups(noteId, userId string) []info.Share
 
 // 共享笔记给分组
 func (this *ShareService) AddShareNoteGroup(userId, noteId, groupId string, perm int) (bool) {
-	// 得到group, 是否是我的group
+	if !groupService.IsExistsGroupUser(userId, groupId) {
-	group := groupService.GetGroup(userId, groupId)
-	if group.GroupId == "" {
 		return false
 	}
 	
@@ -729,8 +745,7 @@ func (this *ShareService) DeleteShareNoteGroup(userId, noteId, groupId string) b
 	
 // 得到笔记本分享给的groups
 func (this *ShareService) GetNotebookShareGroups(notebookId, userId string) []info.ShareNotebook {
-	// 得到分组s
+	groups := groupService.GetGroupsContainOf(userId)
-	groups := groupService.GetGroups(userId)
 	
 	// 得到有分享的分组
 	shares := []info.ShareNotebook{}
@@ -757,9 +772,7 @@ func (this *ShareService) GetNotebookShareGroups(notebookId, userId string) []in
 }
 // 共享笔记给分组
 func (this *ShareService) AddShareNotebookGroup(userId, notebookId, groupId string, perm int) (bool) {
-	// 得到group, 是否是我的group
+	if !groupService.IsExistsGroupUser(userId, groupId) {
-	group := groupService.GetGroup(userId, groupId)
-	if group.GroupId == "" {
 		return false
 	}
 	
@@ -783,58 +796,35 @@ func (this *ShareService) DeleteShareNotebookGroup(userId, notebookId, groupId s
 	});
 }
 
+//--------------------
+// 删除组时, 删除所有的
+//--------------------
 
-func (this *ShareService) GenSharePass(noteId string) (int, bool) {
+func (this *ShareService) DeleteAllShareNotebookGroup(groupId string) bool {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	return db.Delete(db.ShareNotebooks, bson.M{
-    pass := 1000 + r.Intn(9000)
+		"ToGroupId": bson.ObjectIdHex(groupId),
-    
+	});
-    ok := db.Update(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, bson.M{"$set": bson.M{"SharePass": pass}})
+}
-	return pass, ok
+func (this *ShareService) DeleteAllShareNoteGroup(groupId string) bool {
+	return db.Delete(db.ShareNotes, bson.M{
+		"ToGroupId": bson.ObjectIdHex(groupId),
+	});
 }
 
-func (this *ShareService) QuerySharePass(noteId string) int {
+//--------------------
-    note := &info.Note{}
+// 删除组内用户时, 删除其分享的
-    db.Get(db.Notes, noteId, note)
+//--------------------
 
-	return note.SharePass
+func (this *ShareService) DeleteShareNotebookGroupWhenDeleteGroupUser(userId, groupId string) bool {
+	return db.Delete(db.ShareNotebooks, bson.M{
+		"UserId": bson.ObjectIdHex(userId), 
+		"ToGroupId": bson.ObjectIdHex(groupId),
+	});
 }
 
-func (this *ShareService) Verify4ShareNote(noteId string, sharePass int) (flag bool, note info.Note, noteContent info.NoteContent) {
+func (this *ShareService) DeleteShareNoteGroupWhenDeleteGroupUser(userId, groupId string) bool {
-	note = info.Note{}
+	return db.Delete(db.ShareNotes, bson.M{
-	db.Get(db.Notes, noteId, &note)
+		"UserId": bson.ObjectIdHex(userId), 
-	if note.SharePass == sharePass {
+		"ToGroupId": bson.ObjectIdHex(groupId),
-		note = noteService.GetNoteById(noteId)
+	});
-		noteContent = noteService.GetNoteContent(noteId, note.UserId.Hex())
-		flag = true
-	} else {
-		note = info.Note{}
-		noteContent = info.NoteContent{}
-		flag = false
-	}
-	return
 }
-
-//把笔记中含有attachID的url后加上token，返回笔记中含有的attachids
-func (this *ShareService) AppendToken4URL(token, content string) (c string, attachIds map[string]bool) {
-	re := regexp.MustCompile(`href=\"(.*?attachId.*?)\".*?data-mce-href=\"(.*?attachId.*?)\"`)
-	re2 := regexp.MustCompile(`\"(.*?attachId.*?)\"`)
-	
-	attachIds = map[string]bool{}
-	s := re.ReplaceAllStringFunc(content, func(m string) string {
-		idx := strings.Index(m, "attachId=") + len("attachId=")
-		var ss []byte = []byte(m)
-		attachId := string(ss[idx: idx + 24])
-		attachIds[attachId] = true
-		return re2.ReplaceAllString(m, `"${1}&token=` + token + `"`)
-	})
-	
-	re3 := regexp.MustCompile(`<img\s+src=\"(.*?fileId.*?)\".*?data-mce-src=\"(.*?fileId.*?)\"`)
-	re4 := regexp.MustCompile(`\"(.*?fileId.*?)\"`)
-	
-	c = re3.ReplaceAllStringFunc(s, func(m string) string {
-		return re4.ReplaceAllString(m, `"${1}&token=` + token + `"`)
-	})
-	return
-}
-
-

app/service/TagService.go

@@ -3,9 +3,9 @@ package service
 import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
-	. "github.com/leanote/leanote/app/lea"
+//	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-//	"time"
+	"time"
 )
 
 /*
@@ -14,12 +14,14 @@ import (
 type TagService struct {
 }
 
+/*
 func (this *TagService) GetTags(userId string) []string {
 	tag := info.Tag{}
 	db.Get(db.Tags, userId, &tag)
 	LogJ(tag)
 	return tag.Tags
 }
+*/
 
 func (this *TagService) AddTagsI(userId string, tags interface{}) bool {
 	if ts, ok2 := tags.([]string); ok2 {
@@ -37,3 +39,99 @@ func (this *TagService) AddTags(userId string, tags []string) bool {
 	}
 	return true
 }
+
+//---------------------------
+// v2
+// 第二版标签, 单独一张表, 每一个tag一条记录
+
+// 添加或更新标签, 先查下是否存在, 不存在则添加, 存在则更新
+// 都要统计下tag的note数
+// 什么时候调用? 笔记添加Tag, 删除Tag时
+// 删除note时, 都可以调用
+// 万能
+func (this *TagService) AddOrUpdateTag(userId string, tag string) info.NoteTag {
+	userIdO := bson.ObjectIdHex(userId)
+	noteTag := info.NoteTag{}
+	db.GetByQ(db.NoteTags, bson.M{"UserId": userIdO, "Tag": tag}, &noteTag)
+	
+	// 存在, 则更新之
+	if noteTag.TagId != "" {
+		// 统计note数
+		count := noteService.CountNoteByTag(userId, tag)
+		noteTag.Count = count
+		noteTag.UpdatedTime = time.Now()
+//		noteTag.Usn = userService.IncrUsn(userId), 更新count而已
+		db.UpdateByIdAndUserId(db.NoteTags, noteTag.TagId.Hex(), userId, noteTag)
+		return noteTag
+	}
+	
+	// 不存在, 则创建之
+	noteTag.TagId = bson.NewObjectId()
+	noteTag.Count = 1
+	noteTag.Tag = tag
+	noteTag.UserId = bson.ObjectIdHex(userId)
+	noteTag.CreatedTime = time.Now()
+	noteTag.UpdatedTime = noteTag.CreatedTime
+	noteTag.Usn = userService.IncrUsn(userId)
+	noteTag.IsDeleted = false
+	db.Insert(db.NoteTags, noteTag)
+	
+	return noteTag
+}
+
+// 得到标签, 按更新时间来排序
+func (this *TagService) GetTags(userId string) []info.NoteTag {
+	tags := []info.NoteTag{}
+	query := bson.M{"UserId": bson.ObjectIdHex(userId), "IsDeleted": false}
+	q := db.NoteTags.Find(query);
+	sortFieldR := "-UpdatedTime"
+	q.Sort(sortFieldR).All(&tags)
+	return tags
+}
+
+// 删除标签
+// 也删除所有的笔记含该标签的
+// 返回noteId => usn
+func (this *TagService) DeleteTag(userId string, tag string) map[string]int {
+	usn := userService.IncrUsn(userId)
+	if db.UpdateByQMap(db.NoteTags, bson.M{"UserId": bson.ObjectIdHex(userId), "Tag": tag}, bson.M{"Usn": usn, "IsDeleted": true}) {
+		return noteService.UpdateNoteToDeleteTag(userId, tag);
+	}
+	return map[string]int{}
+}
+
+// 删除标签, 供API调用
+func (this *TagService) DeleteTagApi(userId string, tag string, usn int) (ok bool, msg string, toUsn int) {
+	noteTag := info.NoteTag{}
+	db.GetByQ(db.NoteTags, bson.M{"UserId": bson.ObjectIdHex(userId), "Tag": tag}, &noteTag)
+	
+	if noteTag.TagId == "" {
+		return false, "notExists", 0
+	}
+	if noteTag.Usn > usn {
+		return false, "conflict", 0
+	}
+	toUsn = userService.IncrUsn(userId)
+	if db.UpdateByQMap(db.NoteTags, bson.M{"UserId": bson.ObjectIdHex(userId), "Tag": tag}, bson.M{"Usn": usn, "IsDeleted": true}) {
+		return true, "", toUsn
+	}
+	return false, "", 0
+}
+
+// 重新统计标签的count
+func (this *TagService) reCountTagCount(userId string, tags []string) {
+	if tags == nil {
+		return
+	}
+	for _, tag := range tags {
+		this.AddOrUpdateTag(userId, tag);
+	}
+}
+
+// 同步用
+func (this *TagService) GeSyncTags(userId string, afterUsn, maxEntry int) ([]info.NoteTag) {
+	noteTags := []info.NoteTag{}
+	q := db.NoteTags.Find(bson.M{"UserId": bson.ObjectIdHex(userId), "Usn": bson.M{"$gt": afterUsn}});
+	q.Sort("Usn").Limit(maxEntry).All(&noteTags)
+	return noteTags
+}

app/service/TrashService.go

@@ -28,7 +28,7 @@ func (this *TrashService) DeleteNote(noteId, userId string) bool {
 	// 首先删除其共享
 	if shareService.DeleteShareNoteAll(noteId, userId) {
 		// 更新note isTrash = true
-		if db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true}}) {
+		if db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true, "Usn": userService.IncrUsn(userId)}}) {
 			// recount notebooks' notes number
 			notebookIdO := noteService.GetNotebookId(noteId)
 			notebookId := notebookIdO.Hex()
@@ -44,7 +44,7 @@ func (this *TrashService) DeleteNote(noteId, userId string) bool {
 func (this *TrashService) DeleteSharedNote(noteId, userId, myUserId string) bool {
 	note := noteService.GetNote(noteId, userId)
 	if shareService.HasUpdatePerm(userId, myUserId, noteId) && note.CreatedUserId.Hex() == myUserId {
-		return db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true}})
+		return db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true, "Usn": userService.IncrUsn(userId)}})
 	}
 	return false
 }
@@ -53,23 +53,63 @@ func (this *TrashService) DeleteSharedNote(noteId, userId, myUserId string) bool
 func (this *TrashService) recoverNote(noteId, notebookId, userId string) bool {
 	re := db.UpdateByIdAndUserId(db.Notes, noteId, userId, 
 		bson.M{"$set": bson.M{"IsTrash": false, 
+			"Usn": userService.IncrUsn(userId),
 			"NotebookId": bson.ObjectIdHex(notebookId)}})
 	return re;
 }
 
 // 删除trash
 func (this *TrashService) DeleteTrash(noteId, userId string) bool {
+	note := noteService.GetNote(noteId, userId);
+	if note.NoteId == "" {
+		return false
+	}
 	// delete note's attachs
 	ok := attachService.DeleteAllAttachs(noteId, userId)
 
+	// 设置删除位
+	ok = db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, 
+		bson.M{"IsDeleted": true, 
+			"Usn": userService.IncrUsn(userId)})
 	// delete note
-	ok = db.DeleteByIdAndUserId(db.Notes, noteId, userId)
+//	ok = db.DeleteByIdAndUserId(db.Notes, noteId, userId)
+	
 	// delete content
 	ok = db.DeleteByIdAndUserId(db.NoteContents, noteId, userId)
 	
+	// 重新统计tag's count
+	// TODO 这里会改变tag's Usn
+	tagService.reCountTagCount(userId, note.Tags)
+	
 	return ok
 }
 
+func (this *TrashService) DeleteTrashApi(noteId, userId string, usn int) (bool, string, int) {
+	note := noteService.GetNote(noteId, userId)
+	
+	if note.NoteId == "" || note.IsDeleted {
+		return false, "notExists", 0
+	}
+	
+	if note.Usn != usn {
+		return false, "conflict", 0
+	}
+	
+	// delete note's attachs
+	ok := attachService.DeleteAllAttachs(noteId, userId)
+
+	// 设置删除位
+	afterUsn := userService.IncrUsn(userId)
+	ok = db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, 
+		bson.M{"IsDeleted": true, 
+			"Usn": afterUsn})
+	
+	// delete content
+	ok = db.DeleteByIdAndUserId(db.NoteContents, noteId, userId)
+	
+	return ok, "", afterUsn
+}
+
 // 列出note, 排序规则, 还有分页
 // CreatedTime, UpdatedTime, title 来排序
 func (this *TrashService) ListNotes(userId string, 

app/service/UpgradeService.go

@@ -5,7 +5,7 @@ import (
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/db"
 	"gopkg.in/mgo.v2/bson"
-//	"time"
+	"time"
 )
 
 
@@ -38,7 +38,7 @@ func (this *UpgradeService) UpgradeBlog() bool {
 */
 func (this *UpgradeService) UpgradeBetaToBeta2(userId string) (ok bool, msg string) {
 	if configService.GetGlobalStringConfig("UpgradeBetaToBeta2") != "" {
-		return false, "已升级"
+		return false, "Leanote have been upgraded"
 	}
 	
 	// 1. aboutMe -> page
@@ -102,3 +102,81 @@ func (this *UpgradeService) UpgradeBetaToBeta2(userId string) (ok bool, msg stri
 	
 	return
 }
+
+// Usn设置
+// 客户端 api
+
+func (this *UpgradeService) moveTag() {
+	usnI := 1
+	tags := []info.Tag{}
+	db.ListByQ(db.Tags, bson.M{}, &tags)
+	for _, eachTag := range tags {
+		tagTitles := eachTag.Tags
+		now := time.Now()
+		if tagTitles != nil && len(tagTitles) > 0 {
+			for _, tagTitle := range tagTitles {
+				noteTag := info.NoteTag{}
+				noteTag.TagId = bson.NewObjectId()
+				noteTag.Count = 1
+				noteTag.Tag = tagTitle
+				noteTag.UserId = eachTag.UserId
+				noteTag.CreatedTime = now
+				noteTag.UpdatedTime = now
+				noteTag.Usn = usnI
+				noteTag.IsDeleted = false
+				db.Insert(db.NoteTags, noteTag)
+				usnI++
+			}
+		}
+	}
+}
+
+func (this *UpgradeService) setNotebookUsn() {
+	usnI := 1
+	notebooks := []info.Notebook{}
+	db.ListByQWithFields(db.Notebooks, bson.M{}, []string{"UserId"},  &notebooks)
+	
+	for _, notebook := range notebooks {
+		db.UpdateByQField(db.Notebooks, bson.M{"_id": notebook.NotebookId}, "Usn", usnI)
+		usnI++
+	}
+}
+
+func (this *UpgradeService) setNoteUsn() {
+	usnI := 1
+	notes := []info.Note{}
+	db.ListByQWithFields(db.Notes, bson.M{}, []string{"UserId"},  &notes)
+	
+	for _, note := range notes {
+		db.UpdateByQField(db.Notes, bson.M{"_id": note.NoteId}, "Usn", usnI)
+		usnI++
+	}
+}
+
+// 升级为Api, beta.4
+func (this *UpgradeService) Api(userId string) (ok bool, msg string) {
+	if configService.GetGlobalStringConfig("UpgradeBetaToBeta4") != "" {
+		return false, "Leanote have been upgraded"
+	}
+	
+	// user
+	db.UpdateByQField(db.Users, bson.M{}, "Usn", 200000)
+
+	// notebook
+	db.UpdateByQField(db.Notebooks, bson.M{}, "IsDeleted", false)
+	this.setNotebookUsn();
+	
+	// note
+	// 1-N
+	db.UpdateByQField(db.Notes, bson.M{}, "IsDeleted", false)
+	this.setNoteUsn();
+	
+	// tag
+	// 1-N
+	/// tag, 要重新插入, 将之前的Tag表迁移到NoteTag中
+	this.moveTag();
+	
+	configService.UpdateGlobalStringConfig(userId, "UpgradeBetaToBeta4", "1")
+	
+	return true, ""
+}

app/service/UserService.go

@@ -12,6 +12,27 @@ import (
 type UserService struct {
 }
 
+// 自增Usn
+// 每次notebook,note添加, 修改, 删除, 都要修改
+func (this *UserService) IncrUsn(userId string) int {
+	user := info.User{}
+	query := bson.M{"_id": bson.ObjectIdHex(userId)}
+	db.GetByQWithFields(db.Users, query, []string{"Usn"}, &user)
+	usn := user.Usn
+	usn += 1
+	Log("inc Usn")
+	db.UpdateByQField(db.Users, query, "Usn", usn)
+	return usn
+//	return db.Update(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, bson.M{"$inc": bson.M{"ReadNum": 1}})
+}
+
+func (this *UserService) GetUsn(userId string) int {
+	user := info.User{}
+	query := bson.M{"_id": bson.ObjectIdHex(userId)}
+	db.GetByQWithFields(db.Users, query, []string{"Usn"}, &user)
+	return user.Usn
+}
+
 // 添加用户
 func (this *UserService) AddUser(user info.User) bool {
 	if user.UserId == "" {
@@ -48,13 +69,6 @@ func (this *UserService) GetUsername(userId string) string {
 	return user.Username
 }
 
-// 得到用户名
-func (this *UserService) GetUsernameById(userId bson.ObjectId) string {
-	user := info.User{}
-	db.GetByQWithFields(db.Users, bson.M{"_id": userId}, []string{"Username"}, &user)
-	return user.Username
-}
-
 // 是否存在该用户 email
 func (this *UserService) IsExistsUser(email string) bool {
 	if this.GetUserId(email) == "" {
@@ -105,6 +119,8 @@ func (this *UserService) GetUserInfo(userId string) info.User {
 func (this *UserService) GetUserInfoByEmail(email string) info.User {
 	user := info.User{}
 	db.GetByQ(db.Users, bson.M{"Email": email}, &user)
+	// Logo路径问题, 有些有http: 有些没有
+	this.setUserLogo(&user)
 	return user
 }
 // 得到用户信息 username
@@ -112,12 +128,15 @@ func (this *UserService) GetUserInfoByUsername(username string) info.User {
 	user := info.User{}
 	username = strings.ToLower(username)
 	db.GetByQ(db.Users, bson.M{"Username": username}, &user)
+	// Logo路径问题, 有些有http: 有些没有
+	this.setUserLogo(&user)
 	return user
 }
 
 func (this *UserService) GetUserInfoByThirdUserId(thirdUserId string) info.User {
 	user := info.User{}
 	db.GetByQ(db.Users, bson.M{"ThirdUserId": thirdUserId}, &user)
+	this.setUserLogo(&user)
 	return user
 }
 func (this *UserService) ListUserInfosByUserIds(userIds []bson.ObjectId) []info.User {
@@ -220,17 +239,17 @@ func (this *UserService) GetUserInfosOrderBySeq(userIds []bson.ObjectId) []info.
 	return users2
 }
 
-// 使用email(username), pwd得到用户信息
+// 使用email(username), 得到用户信息
-func (this *UserService) LoginGetUserInfo(emailOrUsername, md5Pwd string) info.User {
+func (this *UserService) GetUserInfoByName(emailOrUsername string) info.User {
 	emailOrUsername = strings.ToLower(emailOrUsername)
 	
 	user := info.User{}
 	if strings.Contains(emailOrUsername, "@") {
-		db.GetByQ(db.Users, bson.M{"Email": emailOrUsername, "Pwd": md5Pwd}, &user)
+		db.GetByQ(db.Users, bson.M{"Email": emailOrUsername}, &user)
 	} else {
-		db.GetByQ(db.Users, bson.M{"Username": emailOrUsername, "Pwd": md5Pwd}, &user)
+		db.GetByQ(db.Users, bson.M{"Username": emailOrUsername}, &user)
 	}
-	
+	this.setUserLogo(&user)
 	return user
 }
 
@@ -262,10 +281,16 @@ func (this *UserService) UpdateAvatar(userId, avatarPath string) (bool) {
 // 已经登录了的用户修改密码
 func (this *UserService) UpdatePwd(userId, oldPwd, pwd string) (bool, string) {
 	userInfo := this.GetUserInfo(userId)
-	if userInfo.Pwd != Md5(oldPwd) {
+	if !ComparePwd(oldPwd, userInfo.Pwd) {
 		return false, "oldPasswordError"
 	}
-	ok := db.UpdateByQField(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, "Pwd", Md5(pwd))
+
+	passwd := GenPwd(pwd)
+	if passwd == "" {
+		return false, "GenerateHash error"
+	}
+
+	ok := db.UpdateByQField(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, "Pwd", passwd)
 	return ok, ""
 }
 
@@ -274,7 +299,12 @@ func (this *UserService) ResetPwd(adminUserId, userId, pwd string) (ok bool, msg
 	if configService.GetAdminUserId() != adminUserId {
 		return
 	}
-	ok = db.UpdateByQField(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, "Pwd", Md5(pwd))
+	
+	passwd := GenPwd(pwd)
+	if passwd == "" {
+		return false, "GenerateHash error"
+	}
+	ok = db.UpdateByQField(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, "Pwd", passwd)
 	return
 }
 

app/test/TestNoteService.go

@@ -1,237 +0,0 @@
-package main
-
-import (
-	"github.com/robfig/revel"
-	
-	"github.com/leanote/leanote/app/service"
-	"github.com/leanote/leanote/app/info"
-	. "github.com/leanote/leanote/app/lea"
-//	"github.com/leanote/leanote/app/lea/memcache"
-//	"github.com/leanote/leanote/app/lea/netutil"
-	"github.com/leanote/leanote/app/lea/html2image"
-	"time"
-	"fmt"
-	"gopkg.in/mgo.v2/bson"
-//	"gopkg.in/mgo.v2"
-//	"encoding/json"
-//	"strings"
-)
-
-var userId = "5295d4c95b1dd58edb4a7f4f"
-var userIdO = bson.ObjectIdHex(userId)
-
-var userId3 = "52b43ae4cfeeae33ef073b2b"
-var userId3O = bson.ObjectIdHex(userId3)
-
-var toUserId = "52b4376bcfeeae33ef073b21"
-var toUserIdO = bson.ObjectIdHex(toUserId)
-
-var notebookId = "52b2d051ea3ba3d3fb35910c"
-var notebookIdO = bson.ObjectIdHex(notebookId)
-var notebookId2O = bson.ObjectIdHex("52b2d051ea3ba3d3fb35910b")
-
-var noteId = "52b2dd34ea3ba3d3fb35910d"
-var noteIdO = bson.ObjectIdHex(noteId)
-
-func testNoteService() {
-	println("testNoteService")
-	noteService := &service.NoteService{}
-	note := noteService.GetBlogNote("535f9e6b19807a4c8d000000")
-	LogJ(note)
-	/*
-	_, notes := noteService.SearchNote("go", "52d3e8ac99c37b7f0d000001", 1, 30, "", false, true);
-	LogJ(notes)
-	*/
-	return;
-	
-	/*
-	noteService.AddNote(info.Note{UserId: userIdO, 
-		NotebookId: notebookIdO, 
-		Title: "life you", Tags: []string{"red", "yellow"}})
-	*/
-		
-	noteService.AddNoteContent(info.NoteContent{UserId: userIdO, 
-		NoteId: bson.ObjectIdHex("52b4531dcfeeae33ef073b33"), 
-		Content:"xxxxxxxxxxxxxxxxxxxxlifeyou can m<div><p></p></div>"})
-		
-//	noteService.UpdateNoteContent(userId, userId, "52b2dd34ea3ba3d3fb35910d", "life2---------")
-	
-//    noteService.AddNote(info.Note{Title: "life", Tags: []string{"life", "life2"}})
-    
-//	println(bson.IsObjectIdHex(id))
-	
-//	note := noteService.Get(id)
-//	fmt.Println(note) 
-	
-//	noteService.UpdateTags(id, []string{"lifedd", "life2"});
-}
-
-func testNotebookService() { 
-	service := &service.NotebookService{}
-	Log(service.IsBlog("52ccb959bcbf21610d000001"))
-	
-	return;
-	
-	notebooks := service.GetNotebooks(userId3)
-	LogJ(notebooks) 
-	
-//	b, _ := json.MarshalIndent(notebooks, "", "	") 
-//	fmt.Println(string(b))
-	
-	// service.UpdateNotebookTitle("52b2cf9eea3ba3d3fb359108", userId, "JS")
-	
-//	service.SortNotebooks(userId, map[string]int{"52b2d051ea3ba3d3fb35910c": 4, "52b2d051ea3ba3d3fb35910b": 3})
- 
- /*
-	service.AddNotebook(info.Notebook{UserId: userId3O, 
-		ParentNotebookId: bson.ObjectIdHex("52b43c1fcfeeae33ef073b2e"),
-		Title: "Mac-life",
-		Seq: 0})
-		*/
-		
-	println("xxx")
-}
-
-func testShareService() {
-	service := &service.ShareService{}
-	
-//	service.AddShareNote("52bd127dbcbf216d0b000000", 1, "5295d4c95b1dd58edb4a7f4f", "c@a.com")
-	LogJ(service.ListNoteShareUserInfo("52cd11a1bcbf215680000000", "5295d4c95b1dd58edb4a7f4f"))
-	return;
-	
-/*
-	service.AddShareNotebook(info.ShareNotebook{UserId: userId3O, ToUserId: userIdO, 
-		NotebookId: bson.ObjectIdHex("52b43c38cfeeae33ef073b30")})
-		*/
-	
-	notebooks,_ := service.GetShareNotebooks(userId)
-	LogJ(notebooks)
-	
-//	noteService.AddNoteContent(info.NoteContent{UserId: userIdO, 
-//		NoteId: bson.ObjectIdHex("52b2dd34ea3ba3d3fb35910d"), Content:"xxxxxxxxxxxxxxxxxxxxlifeyou can m<div><p></p></div>"})
-
-	
-//    noteService.AddNote(info.Note{Title: "life", Tags: []string{"life", "life2"}})
-    
-//	println(bson.IsObjectIdHex(id))
-	
-//	note := noteService.Get(id)
-//	fmt.Println(note) 
-	
-//	noteService.UpdateTags(id, []string{"lifedd", "life2"});
-}
-
-
-func testAuthService() {
-	userService := &service.UserService{}
-	LogJ(userService.GetUserInfo("52d26b4e99c37b609a000001"))
-	// userService.AddUser(info.User{UserId: bson.ObjectIdHex("52d26b4e99c37b609a000001"), Email: "leanote@leanote.com", Pwd:"abc"})
-	return;
-	
-	authService := &service.AuthService{}
-	authService.Register("f@a.com", "abc")
-	
-//	fmt.Println(authService.LogonGetUserInfo("a@a.com", "abc"))
-	
-//	noteService.AddNoteContent(info.NoteContent{UserId: userIdO, 
-//		NoteId: bson.ObjectIdHex("52b2dd34ea3ba3d3fb35910d"), Content:"xxxxxxxxxxxxxxxxxxxxlifeyou can m<div><p></p></div>"})
-	
-//    noteService.AddNote(info.Note{Title: "life", Tags: []string{"life", "life2"}})
-    
-//	println(bson.IsObjectIdHex(id))
-	
-//	note := noteService.Get(id)
-//	fmt.Println(note) 
-	
-//	noteService.UpdateTags(id, []string{"lifedd", "life2"});
-}
-
-func testTagService() {
-	service := &service.TagService{}
-//	service.AddTags("5295d4c95b1dd58edb4a7f4f", []string{"life", "blue", "yellow"})
-//	service.AddTags("5295d4c95b1dd58edb4a7f4f", []string{"what", "can", "make"})
-	LogJ(service.GetTags("5295d4c95b1dd58edb4a7f4f"))
-}
-
-func testHtml2Image() {
-	start := time.Now()
-	Log("start...")
-//	TestFillString()
-
-
-	html2image.ToImage("uid", "username", "noteId", "开发一款属于自己的编程语言，开发一款属于自己的编程语言听起来是不是很酷？", `
-		<div class="each-post">
-			<p>
-			一个合格的 Techspace 需要有足够专业的器材、场地和资源，你可以和你的团队在里面进行激光切割、快速贴片甚至加工木材等操作，在相对独立的空间内又能同周围的同道友人互相激发切磋。国内现有的 Techspace 没几家，不久前我去深圳特地拜访了当地的 Techspace，很喜欢那里的氛围，希望国内其他地方也能有更多这类空间供创客发挥。
-假如你有一个比较成型的想法，想在硬件领域做点事情，核心团队也基本组好，硬件软件交互基本都有专人了。</p>
-			<p><a>这时候你的首要目标</a>，就是找个地方，按照你的计划，尽早做出一个可用的原型。Techspace可能是一个合适的地方。
-	一个合格的 Techspace 需要有足够专业的器材、场地和资源，你可以和你的团队在里面进行激光切割、快速贴片甚至加工木材等操作，在相对独立的空间内又能同周围的同道友人互相激发切磋。国内现有的 Techspace 没几家，不久前我去深圳特地拜访了当地的 Techspace，很喜欢那里的氛围，希望国内其他地方也能有更多这类空间供创客发挥。
-	深圳 Techspace 位于工业区，园区内有奥迪、BMW 等企业的厂房，在大门口我停下来问保安，M10 栋在哪里？保安答，去 Techspace？最里面靠右手那栋。惊叹于保安的机智，我也在想，莫非有许多朋友都慕名来到这巨大园区寻访 Techspace？
-穿过一片工业区里的高楼和各种建筑材料
-			</p>
-			<!--
-			<pre class="">cd jpeg-9a/<br>./configure --enable-shared --enable-static
-make<br>make --- install</pre>
-			<p>
-			life you can, !!@kk
-			</p>
-			
-			-->
-		</div>
-	`, "/Users/life/Desktop/a.png")
-	fmt.Printf("time cost %v\n", time.Now().Sub(start))
-}
-
-func testLea() {
-	names := ListDir("/Users/life/Documents/Go/package/src/leanote")
-	fmt.Println(names);
-}
-
-func main() {
-	revel.BasePath = "/Users/life/Documents/Go/package/src/leanote"
-	// testLea();
-	
-//	a, b := SplitFilename("http://ab/c/a.gif#??")
-//	println(a)
-//	println(b)
-	
-//	path, ok := netutil.WriteUrl("http://a.36krcnd.com/photo/2014/9bd1a07c0973d79ca05ad13c3c2e16b8.png!slider", "/tmp")
-//	println(path)
-//	testHtml2Image();
-
-//	println(IsObjectId("52d26b4e99c37b609a000001"))
-
-//	b := `请点击链接验证邮箱: <a href="">http://leanote.com/user/activeEmail?token=d8ca086cce5550a6227f9dc84dbac09d</a>. 48小时后过期.`
-//	SendEmail("lifephp@gmail.com", "leanote-验证邮箱", "验证邮", b)
-	
-	//_, err := mgo.Dial("mongodb://leanote:nKFAkxKnWkEQy8Vv2LlM@115.28.133.226:27017/leanote")
-	
-//	testNotebookService();
-	// testNoteService();
-//	testShareService()
-//	testAuthService()
-	
-//	testTagService();
-	/*
-	filename := "你好59.26.png"
-	ext := SubstringByte(filename, strings.LastIndex(filename, "."))
-	ext = strings.ToLower(ext)
-	print(ext)
-	52d26ab199c37b5f80000001
-	
-	Log(bson.NewObjectId())
-	Log(bson.NewObjectId())
-	Log(bson.NewObjectId())
-	
-	*/
-//	Log(TransferExt("/你好a/b/a.gif", ".jpg"))
-//	TransToGif("/Users/life/Desktop/a2.png", 0, false)
-
-//	Log(IsUsername("xx**x"))
-
-/*
-	memcache.Set("xx", map[string]string{"A":"you"}, 0)
-	a := memcache.Get("xx")
-	Log(a)
-*/
-}

app/tests/auth_test.go

@@ -0,0 +1,23 @@
+package tests
+
+import (
+	"testing"
+	"github.com/leanote/leanote/app/db"
+//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/service"
+//	"gopkg.in/mgo.v2"
+//	"fmt"
+)
+
+func init() {
+	db.Init("mongodb://localhost:27017/leanote", "leanote")
+	service.InitService()
+}
+
+// 测试登录
+func TestAuth(t *testing.T) {
+	_, err := service.AuthS.Login("admin", "abc123")
+	if err != nil {
+		t.Error("Admin User Auth Error")
+	}
+}

app/tests/db_test.go

@@ -0,0 +1,14 @@
+package tests
+
+import (
+	"testing"
+	"github.com/leanote/leanote/app/db"
+//	. "github.com/leanote/leanote/app/lea"
+//	"github.com/leanote/leanote/app/service"
+//	"gopkg.in/mgo.v2"
+//	"fmt"
+)
+
+func TestDBConnect(t *testing.T) {
+    db.Init("mongodb://localhost:27017/leanote", "leanote")
+}

app/tests/tmp.go

@@ -0,0 +1,3 @@
+package tests
+func a() {
+}

app/views/admin/footer.html

@@ -11,20 +11,3 @@
 <script src="/public/admin/js/artDialog/jquery.artDialog.js?skin=default"></script>
 <script src="/public/js/common.js"></script>
 <script src="/public/admin/js/admin.js"></script>
-<script>
-$(function() { 
-	var pathname = location.pathname; // admin/t
-	var search = location.search; // ?t=xxx, 如果有?page呢
-	var fullPath = pathname;
-	if(search.indexOf("?t=") >= 0) {
-		var fullPath = pathname + search; // /admin/t?t=xxx
-	}
-	
-	$("#nav > li").removeClass("active");
-	// 自己
-	var $thisLi = $('#nav a[href^="' + fullPath + '"]').parent();
-	$thisLi.addClass("active");
-	// 父也active
-	$thisLi.parent().parent().addClass('active');
-});
-</script>

app/views/admin/nav.html

@@ -229,7 +229,14 @@
 				<li>
 					<a href="/admin/t?t=upgrade/beta2">
 						<span>
-							v1.0-beta to v1.0-beta2
+							v1.0-beta to v1.0-beta.2
+						</span>
+					</a>
+				</li>
+				<li>
+					<a href="/admin/t?t=upgrade/beta3">
+						<span>
+							v1.0-beta.2/3 to v1.0-beta.4
 						</span>
 					</a>
 				</li>

app/views/admin/top.html

@@ -46,7 +46,7 @@
 					</a>
 				</li>
 				<li class="hidden-xs">
-					<a href="/blog/admin" class="dk" target="_blank">
+					<a href="/blog" class="dk" target="_blank">
 						My Blog
 					</a>
 				</li>

app/views/admin/upgrade/beta2.html

@@ -1,5 +1,5 @@
 {{template "admin/top.html" .}}
-<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta2</h3></div>
+<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta.2</h3></div>
 
 <div class="row">
 
@@ -17,7 +17,7 @@
 				</ul>
 			</div>
 			<footer class="panel-footer text-right bg-light lter">
-				<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade</button>
+				<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.2</button>
 			</footer>
 		</section>
 	</form>
@@ -31,14 +31,16 @@ $(function() {
 $("#submit").click(function(e){
 	e.preventDefault();
 	var t = this;
-	$(t).button('loading');
+	art.confirm("Are you sure to upgrade to v1.0-beta.2", function() {
-	ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
+		$(t).button('loading');
-		$(t).button('reset')
+		ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
-		if(!ret.Ok) {
+			$(t).button('reset')
-			art.alert(ret.Msg)
+			if(!ret.Ok) {
-		} else {
+				art.alert(ret.Msg)
-			art.tips("Success");
+			} else {
-		}
+				art.tips("Success");
+			}
+		});
 	});
 });
 });

app/views/admin/upgrade/beta3.html

@@ -0,0 +1,46 @@
+{{template "admin/top.html" .}}
+<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta.2/3 to v1.0-beta.4</h3></div>
+
+<div class="row">
+
+<div class="col-sm-6">
+	<form id="add_user_form">
+		<section class="panel panel-default">
+			<div class="panel-body">
+				Current Version: <span class="label label-success">leanote v{{.version}}</span>
+				<ul>
+					<li>Api support (Enable Leanote Desktop App to connect server))</li>
+					<li>Update tags</li>
+				</ul>
+			</div>
+			<footer class="panel-footer text-right bg-light lter">
+				<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.4</button>
+			</footer>
+		</section>
+	</form>
+</div>
+
+</div>
+
+{{template "admin/footer.html" .}}
+<script>
+$(function() {
+$("#submit").click(function(e) {
+	e.preventDefault();
+	var t = this;
+	art.confirm("Are you sure to upgrade to v1.0-beta.4 ? Please don't try to upgrade twice.", function() {
+		$(t).button('loading');
+		ajaxPost("/adminUpgrade/UpgradeBeta3ToBeta4", {}, function(ret){
+			$(t).button('reset')
+			if(!ret.Ok) {
+				art.alert(ret.Msg)
+			} else {
+				art.tips("Success");
+			}
+		});
+	});
+});
+});
+</script>
+
+{{template "admin/end.html" .}}

app/views/home/find_password.html

@@ -27,7 +27,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="/index">leanote</a> © 2014
+		<a href="/index">leanote</a> © 2014-2015
 	</p>
 </div>
 

app/views/home/find_password2.html

@@ -36,7 +36,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="/index">leanote</a> © 2014
+		<a href="/index">leanote</a> © 2014-2015
 	</p>
 </div>
 

app/views/home/find_password2_timeout.html

@@ -21,7 +21,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="/index">leanote</a> © 2014
+		<a href="/index">leanote</a> © 2014-2015
 	</p>
 </div>
 

app/views/home/footer.html

@@ -7,9 +7,8 @@
 				<a href="http://weibo.com/leanotecom" target="_blank"><i class="fa fa-weibo"></i></a>
 				<br />
 				leanote@leanote.com
-				<div id="beian">
+				<br />
-					<a href="http://www.miibeian.gov.cn" target="_blank">沪ICP备14006011号</a>
+				Copyright © 2014-2015 <a href="http://leanote.com">Leanote</a>
-				</div>
 			</div>
 			<div class="col-md-6">
 				<i class="fa fa-globe fa-3x icon-muted"></i>

app/views/home/header.html

@@ -5,7 +5,8 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="keywords" content="leanote,leanote.com">
-<meta name="description" content="leanote, {{msg $ "moto"}}">
+<meta name="description" content="Leanote, {{msg $ "moto"}}">
+<meta property="qc:admins" content="2451332115167456375" />
 <meta name="author" content="leanote">
 <title>{{.title}}</title>
 
@@ -37,30 +38,33 @@ function log(o) {
 		</div>
 		
 		<div id="navbar" class="navbar-collapse collapse">
+			<div id="lang">
+				<a data-lang="en-us">English</a>
+				<a data-lang="fr-fr">Français</a>
+				<a data-lang="zh-cn">简体中文</a>
+			</div>
+
 			<ul class="nav navbar-nav navbar-left">
-				<li><a href="/index#" target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
+				<li><a href="/index#" data-target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
-				<!--
+				<li style="position: relative;">
-				<li><a href="/index#aboutLeanote" target="#aboutLeanote" class="smooth-scroll">{{msg . "aboutLeanote"}}</a> </li>
+					<a id="" href="http://leanote.com/service" title="" class="">{{msg . "service"}}</a>
-				-->
-				<li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
-				<li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
-				<li style="position: relative; margin-right: 3px;">
-					<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
 					<div class="red-circle" style=""></div>
 				</li>
 				
-				<li id="loginBtns">
+				<li style="position: relative; margin-right: 3px;">
-					{{if .userInfo.Email}}
+					<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
-						{{msg . "hi"}}, {{.userInfo.Username}}
-						<a href="{{$.noteUrl}}">{{msg . "myNote"}}</a>
-						<a href="/logout">{{msg . "logout"}}</a>
-					{{else}}
-					<a href="/login">{{msg . "login"}}</a>
-						{{if .openRegister}}
-						<a href="/register" class="btn-register">{{msg . "register"}}</a>
-						{{end}}
-					{{end}}
 				</li>
+				<li><a id="leanoteBlog" href="http://lea.leanote.com" target="_blank" title="lea++, leanote blog platform" class="">lea++</a></li>
+				<li><a id="leanoteApp" href="http://app.leanote.com" target="_blank" title="Leanote App" class="">{{msg . "desktopApp"}}</a></li>
+				<li><a href="http://leanote.org" target="_blank" title="leanote.org" class="">leanote.org</a></li>
+			
+				{{if .userInfo.Email}}
+				<li id="loginBtns">
+					{{msg . "hi"}}, {{.userInfo.Username}}
+					<a href="{{$.noteUrl}}">{{msg . "myNote"}}</a>
+					<a href="/logout">{{msg . "logout"}}</a>
+				</li>
+				{{end}}
 			</ul>
 		</div>
 	</div>
@@ -90,10 +94,11 @@ function log(o) {
 		</div>
 			
 		<ul id="blogNav" class="pull-right">
-			<li><a href="/index#" target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
+			<li><a href="#" target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
-			<li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
+			<li><a href="#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
-			<li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
+			<li><a href="#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
 			<li><a id="leanoteBlog" href="{{.leaUrl}}/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li>
+			
 			<li style="position: relative; margin-right: 3px;">
 				<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
 				<div style="position: absolute;

app/views/home/index_en.html

@@ -4,23 +4,22 @@
 </style>
 <section>
 	<div class="header">
-		<h2>leanote, {{msg . "moto"}}</h2>
+		<h2>Leanote, {{msg . "moto"}}</h2>
 		<p>{{msg . "moto3"}}</p>
 		<p>
 		Knowledge, Blog, Sharing, Cooperation... all in leanote
 		</p>
-		
 		<div>
 			<a class="btn btn-primary" href="https://github.com/leanote/leanote">{{msg . "fork github"}}</a> 
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>
@@ -66,20 +65,6 @@
 
 <hr />
 
-<div class="container" id="download">
-	<h2 style="margin: 20px 0;text-align: center;">{{msg . "download"}}</h2>
-     <div class="row">
-     	<div style="width:300px; margin:auto; padding: 10px;">
-			Linux : <a href="https://github.com/leanote/leanote/releases/download/0.4/leanote-linux-v0.4.bin.tar.gz">leanote-linux-v0.4.bin.tar.gz</a> <br />
-			MacOS X : <a href="https://github.com/leanote/leanote/releases/download/0.4/leanote-mac-v0.4.bin.tar.gz">leanote-mac-v0.4.bin.tar.gz</a> <br />
-			<br />
-			<a href="https://github.com/leanote/leanote#3-how-to-install-leanote">{{msg . "howToInstallLeanote"}}</a>
-		</div>
-     </div>
-</div>
-
-<hr />
-
 <div class="container" id="donate">
 	<h2 style="margin: 20px 0;text-align: center;">{{msg . "donate"}}</h2>
      <div class="row">
@@ -134,6 +119,19 @@ $(function() {
 		var targetOffset = $(t).offset().top - 80;
 		$('html,body').animate({scrollTop: targetOffset}, 300);
 	});
+	
+	function setCookie(name, value) {
+        var Days = 10*365;  
+        var exp  = new Date();  
+        exp.setTime(exp.getTime() + Days*24*60*60*1000);  
+        document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString();  
+    }
+	
+	$('#lang a').click(function() {
+		var lang = $(this).data('lang');
+		setCookie('LEANOTE_LANG', lang);
+		location.reload();
+	});
 });
 </script>
 </body>

app/views/home/index_zh.html

@@ -4,7 +4,7 @@
 </style>
 <section>
 	<div class="header">
-		<h2>leanote, {{msg . "moto"}}</h2>
+		<h2>Leanote, {{msg . "moto"}}</h2>
 		<p>{{msg . "moto3"}}</p>
 		<p>{{msg . "moto2"}}</p>
 		
@@ -13,12 +13,12 @@
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>
@@ -64,20 +64,6 @@
 
 <hr />
 
-<div class="container" id="download">
-	<h2 style="margin: 20px 0;text-align: center;">{{msg . "download"}}</h2>
-     <div class="row">
-     	<div style="width:300px; margin:auto; padding: 10px;">
-			Linux : <a href="https://github.com/leanote/leanote/releases/download/0.4/leanote-linux-v0.4.bin.tar.gz">leanote-linux-v0.4.bin.tar.gz</a> <br />
-			MacOS X : <a href="https://github.com/leanote/leanote/releases/download/0.4/leanote-mac-v0.4.bin.tar.gz">leanote-mac-v0.4.bin.tar.gz</a> <br />
-			<br />
-			<a href="https://github.com/leanote/leanote#3-how-to-install-leanote">{{msg . "howToInstallLeanote"}}</a>
-		</div>
-     </div>
-</div>
-
-<hr />
-
 <div class="container" id="donate">
 	<h2 style="margin: 20px 0;text-align: center;">{{msg . "donate"}}</h2>
      <div class="row">
@@ -133,6 +119,19 @@ $(function() {
 		var targetOffset = $(t).offset().top - 80;
 		$('html,body').animate({scrollTop: targetOffset}, 300);
 	});
+	
+	function setCookie(name, value) {
+        var Days = 10*365;  
+        var exp  = new Date();  
+        exp.setTime(exp.getTime() + Days*24*60*60*1000);  
+        document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString();  
+    }
+	
+	$('#lang a').click(function() {
+		var lang = $(this).data('lang');
+		setCookie('LEANOTE_LANG', lang);
+		location.reload();
+	});
 });
 </script>
 </body>

app/views/home/login.html

@@ -64,7 +64,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="/index">leanote</a> © 2014
+		<a href="/index">leanote</a> © 2014-2015
 	</p>
 </div>
 

app/views/home/register.html

@@ -43,7 +43,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="/index">leanote</a> © 2014
+		<a href="/index">leanote</a> © 2014-2015
 	</p>
 </div>
 

app/views/html2Image/index.html

@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="keywords" content="leanote,leanote.com">
-<meta name="description" content="leanote, {{msg $ "moto"}}">
-<meta name="author" content="leanote">
-
-<title>{{.title}}</title>
-<link href="{{.siteUrl}}/css/bootstrap.css" rel="stylesheet">
-<link id="styleLink" href="{{.siteUrl}}/css/toImage.css" rel="stylesheet">
-</head>
-<body>
-<div id="content">
-	<h1 class="title">
-		{{.blog.Title}}
-	</h1>
-	<div class="created-time">
-		{{ if .userBlog.Logo}}
-			<img src="{{.userBlog.Logo}}" id="logo">
-		{{else}}
-			<img src="{{$.siteUrl}}/images/blog/default_avatar.png" id="logo">
-		{{end}}
-		{{.userInfo.Username}}
-
-		{{if .blog.Tags}}
-			<img src="{{$.siteUrl}}/images/blog/tag.png" id="tag">
-			{{blogTags .blog.Tags}}
-		{{end}}
-	</div>
-	
-	<div class="desc">
-		{{if .blog.IsMarkdown }}
-			<div id="markdownContent" style="display: none">
-				<!-- 用textarea装html, 防止得到的值失真 -->
-				<textarea>
-				{{.content | raw}}
-				</textarea>
-			</div>
-			<div id="parsedContent">
-			</div>
-		{{else}}
-				{{.content | raw}}
-		{{end}}
-	</div>
-</div>
-
-<div id="footer">
-	<p>
-		{{ if .userBlog.Logo}}
-			<img src="{{.userBlog.Logo}}" id="logo">
-		{{else}}
-			<img src="{{$.siteUrl}}/images/blog/default_avatar.png" id="logo">
-		{{end}}
-		(<a href="#">http://blog.leanote.com/{{.userInfo.Username}}</a>)
-	</p>
-	
-	<img src="{{.siteUrl}}/images/logo/leanote_white.png" id="leanote_logo"/>
-	<p>
-		leanote, {{msg $ "moto"}}
-	</p>
-</div>
-
-<script src="{{.siteUrl}}/js/jquery-1.9.0.min.js"></script>
-<script src="{{.siteUrl}}/js/bootstrap-min.js"></script>
-
-<link href="{{.siteUrl}}/public/mdeditor/editor/google-code-prettify/prettify.css" type="text/css" rel="stylesheet">
-<script src="{{.siteUrl}}/public/mdeditor/editor/google-code-prettify/prettify.js"></script>
-<script>
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-</script>
-
-{{if .blog.IsMarkdown }}
-<script src="{{.siteUrl}}/public/mdeditor/editor/google-code-prettify/prettify.js"></script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="{{.siteUrl}}/public/mdeditor/editor/mathJax.js"></script>
-<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-<script>
-var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#parsedContent").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-</script>
-{{end}}
-</body>
-</html>

app/views/html2Image/test.html

@@ -1,4 +0,0 @@
-lif------------
-e
-
-you can 

app/views/member/blog/add_single.html

@@ -40,23 +40,32 @@
 </div>
 
 </div>
+<style>
+.mce-btn.mce-active, .mce-btn.mce-active:hover {
+  background-color: #FFFFFF;
+}
+.mce-btn {
+  background-color: #FFFFFF;
+}
+</style>
 {{template "member/footer.html" .}}
 <script type="text/javascript" src="/tinymce/tinymce.js"></script>
 <script>
 var urlPrefix = "{{.siteUrl}}";
+var LeaAce = {nowIsInAce: function() {return false;}};
 $(function() {
 	tinymce.init({
 		selector : "#content1",
-		content_css : [ "/css/bootstrap.css", "/css/editor/editor.css" ],
+		content_css : ["/css/editor/editor.css" ],
-		skin : "custom",
+		theme : "leanote",
 		language : "{{.locale}}",
 		height : 300,
 		width : "100%",
-		skin : "custom",
+		// skin : "custom",
 		plugins : [
-				"advlist autolink link leanote_image lists charmap hr ",
+				"advlist autolink link lists charmap hr ",
 				"searchreplace visualblocks visualchars tabfocus",
-				"table contextmenu directionality textcolor paste fullpage textcolor"],
+				"table contextmenu directionality textcolor fullpage textcolor"],
 		toolbar1 : "formatselect |fontselect fontsizeselect| forecolor backcolor | bold italic underline strikethrough | bullist numlist |",
 		menubar : false,
 		statusbar : false,

app/views/member/blog/update_theme.html

@@ -55,7 +55,7 @@
 		{{range .myTpls}}
 		<a href="#" class="list-group-item " data-file="{{.}}"> 
 			<i class="fa fa-remove icon-muted remove-file" title="delete file" ></i> 
-			{{.}}
+			<span class="filename" data-filename="{{.}}">{{.}}</span>
 			<span class="badge"></span>
 		</a>
 		{{end}}
@@ -123,7 +123,7 @@ var theme = {
 	saveBtnO: $("#saveBtn"),
 	newFileO: $("#newFile"),
 	curTpl: "",
-	tplInfos: {"header.html": "{{msg . "header"}}", "footer.html": "{{msg . "footer"}}", "index.html": "{{msg . "header"}}", "cate.html": "{{msg . "cate"}}", "search.html": "{{msg . "search"}}", "single.html": "{{msg . "single"}}", "archive.html": "{{msg . "archive"}}", "post.html": "{{msg . "post"}}", "tags.html": "{{msg . "tags"}}", "tag_posts.html": "{{msg . "tag_posts"}}", "share_comment.html": "{{msg . "share_comment"}}", "404.html":"404", "theme.json": "{{msg . "themeJson"}}", "paging.html": "{{msg . "paging"}}", "highlight.html": "{{msg . "highlight"}}"},
+	tplInfos: {"header.html": "{{msg . "header"}}", "footer.html": "{{msg . "footer"}}", "index.html": "{{msg . "index"}}", "cate.html": "{{msg . "cate"}}", "search.html": "{{msg . "search"}}", "single.html": "{{msg . "single"}}", "archive.html": "{{msg . "archive"}}", "post.html": "{{msg . "post"}}", "tags.html": "{{msg . "tags"}}", "tag_posts.html": "{{msg . "tag_posts"}}", "share_comment.html": "{{msg . "share_comment"}}", "404.html":"404", "theme.json": "{{msg . "themeJson"}}", "paging.html": "{{msg . "paging"}}", "highlight.html": "{{msg . "highlight"}}"},
 	init: function() {
 		var self = this;
 		self.showTplInfo();
@@ -171,12 +171,22 @@ var theme = {
 	newFile: function() {
 		var self = this;
 		self.newFileO.click(function() {
-			art.prompt("文件名", function(file){ 
+			// 文件是否存在?
+			
+			
+			art.prompt("Filename", function(file) { 
 				if(!file) {
 					return;
 				}
-				var t = '<a href="#" class="list-group-item " data-file="' + file + '"> <i class="fa fa-remove icon-muted remove-file" title="delete file" ></i> ' + file + '<span class="badge"></span></a>';
+				if($('[data-filename="' + file + '"]').length > 0) {
+					art.alert('File exists');
+					return;
+				}
+				var t = $('<a href="#" class="list-group-item " data-file="' + file + '"> <i class="fa fa-remove icon-muted remove-file" title="delete file" ></i> <span class="filename" data-filename="' + file + '">' + file + '</span><span class="badge"></span></a>');
 				$(".file-list").append(t);
+				self.cache[file] = "";
+				// trigger click, 选中之
+				t.click();
 			});
 		});
 	},
@@ -206,6 +216,9 @@ var theme = {
 		var content = editor.getValue()
 		
 		var filename = self.curTpl;
+		if(!filename) {
+			return;
+		}
 		// 之前的内容是否有改动
 		if(self.cache[filename] == content) {
 			return;
@@ -234,7 +247,7 @@ var theme = {
 	renderContent: function(name, content) {
 		var self = this;
 		self.curTplO.html(name);
-		self.curTpl = name; // 这里设计
+		self.curTpl = name; // 这里才设置
 		var lang = "html";
 		if(name.indexOf(".js") > 0 || name.indexOf(".json") > 0) {
 			lang = "javascript";
@@ -251,8 +264,8 @@ var theme = {
 	renderTpl: function(name) {
 		var self = this;
 		var content = "";
-		self.curTpl = name; // 这里设置
+		self.curTpl = ""; // 这里设置为空
-		if(self.cache[name]) {
+		if(self.cache[name] != undefined) {
 			content = self.cache[name];
 			self.renderContent(name, content);
 			return;
@@ -264,6 +277,7 @@ var theme = {
 			}
 		});
 	},
+	
 	//-----------------
 	// theme images
 	imageListO: $("#imageList"),

app/views/note/note-dev.html

@@ -7,8 +7,8 @@
 <meta name="apple-touch-fullscreen" content="yes">
 <meta name=”apple-mobile-web-app-capable” content=”yes” />
 <meta name="keywords" content="leanote,leanote.com">
-<meta name="description" content="leanote, Not Just A Notebook">
+<meta name="description" content="Leanote, {{msg $ "moto"}}">
-<title>leanote, Not Just A Notebook</title>
+<title>Leanote, {{msg $ "moto"}}</title>
 
 <link href="/css/bootstrap.css" rel="stylesheet" />
 <!-- 先加载, 没有样式, 宽度不定 -->
@@ -18,13 +18,15 @@
 <link href="/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
 <!-- mdeditor -->
 <link href="/public/dist/themes/default.css" rel="stylesheet" />
+<!-- context-menu -->
+<link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
 
 <script>
 var hash = location.hash;
 if(hash.indexOf("writing") >= 0) {
 	var files = '<link rel="stylesheet" href="/css/theme/writting-overwrite.css" type="text/css" id="themeLink" />';
 } else {
-	var files ='<link rel="stylesheet" href="/css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css" type="text/css" id="themeLink" />';
+	var files ='<link rel="stylesheet" href="/css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css?t=3" type="text/css" id="themeLink" />';
 }
 document.write(files);
 </script>
@@ -60,7 +62,7 @@ function log(o) {
 				<!-- search -->
 				<div class="pull-left" id="searchWrap">
 					<form class="navbar-form form-inline col-lg-2" id="searchNote">
-						<input class="form-control" placeholder="Search" type="text" id="searchNoteInput">
+						<input class="form-control" placeholder="{{msg . "SearchNote"}}" type="text" id="searchNoteInput">
 					</form>
 				</div>
 
@@ -68,14 +70,15 @@ function log(o) {
 				<div class="pull-left" style="" id="newNoteWrap">
 					<!-- 新建笔记 -->
 					<div id="newMyNote">
-						<a id="newNoteBtn" title="{{msg . "newNote"}}">
+						<a class="new-note" id="newNoteBtn" title="{{msg . "newNote"}}">
-							<i class="fa fa-file-o"></i>
+							<!--<i class="fa fa-file-o"></i>-->
 							<span class="new-note-text">{{msg . "newNote"}}</span>
 							<span class="new-note-text-abbr">{{msg . "new"}}</span>
 						</a>
 						<span class="new-split">|</span>
-						<a id="newNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
+						<a class="new-note new-markdown" id="newNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
-							<span class="new-markdown-text">Markdown</span>
+							<!-- <i class="lea-icon icon-markdown"></i> -->
+							<span class="new-markdown-text">{{msg . "newMarkdown"}}</span>
 							<span class="new-markdown-text-abbr">Md</span>
 						</a>
 						<span class="for-split"> - </span>
@@ -86,7 +89,7 @@ function log(o) {
 								<i class="fa fa-angle-down"></i>
 							</a>
 							<div class="dropdown-menu dropdown-list" id="searchNotebookForAddDropdownList">
-								<input type="text" placeholder="Search notebook" class="form-control" id="searchNotebookForAdd"/>
+								<input type="text" placeholder="{{msg . "SearchNotebook"}}" class="form-control" id="searchNotebookForAdd"/>
 								<ul class="clearfix" role="menu" aria-labelledby="listNotebookDropdownMenu" id="notebookNavForNewNote">
 								</ul>
 							</div>
@@ -95,14 +98,14 @@ function log(o) {
 					
 					<!-- 只为新建别人的笔记 -->
 					<div id="newSharedNote" style="display: none">
-						<a id="newSharedNoteBtn">
+						<a id="newSharedNoteBtn" class="new-note">
-							<i class="fa fa-file-o"></i>
+							<!--<i class="fa fa-file-o"></i> -->
 							<span class="new-note-text">{{msg . "newNote"}}</span>
 							<span class="new-note-text-abbr">{{msg . "new"}}</span>
 						</a>
 						<span class="new-split">|</span>
-						<a id="newShareNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
+						<a id="newShareNoteMarkdownBtn" class="new-note" title="{{msg . "newMarkdown"}}">
-							<span class="new-markdown-text">Markdown</span>
+							<span class="new-markdown-text">{{msg . "newMarkdown"}}</span>
 							<span class="new-markdown-text-abbr">Md</span>
 						</a>
 						<span class="for-split"> - </span>
@@ -186,13 +189,11 @@ function log(o) {
 					</div>
 				</div>
 
-				<!--
 				<div class="pull-right top-nav writting-hide lea-blog">
 					<a target="_blank" href="http://lea.leanote.com"> 
 						lea++
 					</a>
 				</div>
-				-->
 				
 				<div class="pull-right top-nav writting-hide" id="myBlog">
 					<a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}"> 
@@ -269,7 +270,7 @@ function log(o) {
 							</div>
 							
 							<div class="folderBody">
-								<input type="text" class="form-control" id="searchNotebookForList" placeholder="Search notebook"/>							
+								<input type="text" class="form-control" id="searchNotebookForList" placeholder="{{msg . "SearchNotebook"}}"/>							
 								<ul class="ztree" id="notebookList"></ul>
 								<ul class="ztree" id="notebookListForSearch"></ul>
 							</div>
@@ -416,29 +417,7 @@ function log(o) {
 					<div class="noteSplit" id="noteSplitter"></div>
 					
 					<div id="note">
-					<!-- 只读模式 -->
-					<div id="noteRead">
-						<div id="noteReadContainer">
-							<div id="noteReadTop">
-								<h2 id="noteReadTitle"></h2>
-								<div class="clearfix" id="noteReadInfo">
-									<i class="fa fa-bookmark-o"></i>												
-									<span id="noteReadTags"></span>
 					
-									<!-- 修改时间 -->
-									<i class="fa fa-clock-o"></i>{{msg . "update"}} 
-									<span id="noteReadUpdatedTime"></span>  
-									
-									<!-- 修改时间 -->
-									<i class="fa fa-clock-o"></i>{{msg . "create"}} 										
-									<span id="noteReadCreatedTime"></span>
-								</div>
-							</div>
-							
-							<div id="noteReadContent">
-							</div>
-						</div>
-					</div>
 					<!-- 遮罩, 为了resize3Columns用 -->
 					<div id="noteMask" class="note-mask"></div>
 					<div id="noteMaskForLoading" class="note-mask">
@@ -546,17 +525,38 @@ function log(o) {
 						<div id="noteTitleDiv">
 							<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}" tabindex="1" />
 						</div>
+						
+						<!-- 只读时 -->
+						<div id="noteReadTop">
+							<h2 id="noteReadTitle"></h2>
+							<div class="clearfix" id="noteReadInfo">
+								<i class="fa fa-bookmark-o"></i>												
+								<span id="noteReadTags"></span>
+								
+								<!-- 修改时间 -->
+								<i class="fa fa-clock-o"></i> {{msg . "update"}} 
+								<span id="noteReadUpdatedTime"></span>  
+								
+								<!-- 修改时间 -->
+								<i class="fa fa-clock-o"></i> {{msg . "create"}} 										
+								<span id="noteReadCreatedTime"></span>
+							</div>
+						</div>
 					</div>
 
-					<div id="editor">
+					<div id="editor" class="read-only">
 						<!-- 编辑器 -->
 						<div id="mceToolbar">
-							<div id="popularToolbar"
+							<div id="mceToolbarContainer">
-								style="position: absolute; right: 30px; left: 0"></div>
+								<div id="popularToolbar" style="position: absolute; right: 30px; left: 0"></div>
-							<a
+								<a id="moreBtn"> <i class="fa more-fa"></i></a>
-								style="dispaly: block; position: absolute; cursor: pointer; right: 10px; padding: 3px 10px"
+							</div>
-								id="moreBtn"> <i class="fa fa-angle-down"></i>
+							<!-- 查看信息 -->
-							</a>
+							<div id="infoToolbar" class="info-toolbar invisible">
+				              <a class="toolbar-update"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
+				              <span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
+				              <span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
+				            </div>
 						</div>
 						<div class="editorBg"></div>
 						<div id="leanoteNav" class="leanoteNav">
@@ -584,50 +584,56 @@ function log(o) {
 				       </div>
 					</div>
 					
-					<div id="mdEditor">
+					<div id="mdEditor" class="read-only">
-					
-											
 						<div class="layout-wrapper-l1">
 						    <div class="layout-wrapper-l2">
 						        <div class="navbar navbar-default">
 						            <div class="navbar-inner" id="wmd-button-bar">
-						                <ul class="nav left-buttons">
+						            	<div id="mdInfoToolbar" class="info-toolbar invisible">
-						                    <li class="wmd-button-group1 btn-group"></li>
+							              <a class="toolbar-update"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
-						                </ul>
+							              <span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
-						                <ul class="nav left-buttons">
+							              <span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
-						                    <li class="wmd-button-group2 btn-group"></li>
+							            </div>
-						                </ul>
-						                <ul class="nav left-buttons">
-						                    <li class="wmd-button-group3 btn-group"></li>
-						                </ul>
-						                <ul class="nav left-buttons">
-						                    <li class="wmd-button-group5 btn-group"></li>
-						                </ul>
-						                <!-- 帮助 -->
-						                 <ul class="nav left-buttons">
-						                    <li class="wmd-button-group6 btn-group">
-						                    	<li class="wmd-button btn btn-success" id="wmd-help-button" title="Markdown syntax" style="left: 0px; display: none;"><span style="display: none; background-position: 0px 0px;"></span><i class="fa fa-question-circle"></i></li>
-						                    </li>
-						                </ul>
 						            	
-						               <!--
+						            	<div class="wmd-button-bar-inner">
-						                <ul class="nav pull-right right-buttons">
+							                <ul class="nav left-buttons">
-						                    <li class="offline-status hide">
+							                    <li class="wmd-button-group1 btn-group"></li>
-						                        <div class="text-danger">
+							                </ul>
-						                            <i class="icon-attention-circled"></i>offline
+							                <ul class="nav left-buttons">
-						                        </div>
+							                    <li class="wmd-button-group2 btn-group"></li>
-						                    </li>
+							                </ul>
-						                    <li class="extension-buttons"></li>
+							                <ul class="nav left-buttons">
-						                </ul>
+							                    <li class="wmd-button-group3 btn-group"></li>
-						                <ul class="nav pull-right title-container">
+							                </ul>
-						                    <li><div class="working-indicator"></div></li>
+							                <ul class="nav left-buttons">
-						                    <li><a class="btn btn-success file-title-navbar" href="#"
+							                    <li class="wmd-button-group5 btn-group"></li>
-						                        title="Rename document"> </a></li>
+							                </ul>
-						                    <li><div class="input-file-title-container"><input type="text"
+							                <!-- 帮助 -->
-						                        class="col-sm-4 form-control hide input-file-title"
+							                 <ul class="nav left-buttons">
-						                        placeholder="Document title" /></div></li>
+							                    <li class="wmd-button-group6 btn-group">
-						                </ul>
+							                    	<li class="wmd-button btn btn-success" id="wmd-help-button" title="Markdown syntax" style="left: 0px; display: none;"><span style="display: none; background-position: 0px 0px;"></span><i class="fa fa-question-circle"></i></li>
-						                -->
+							                    </li>
+							                </ul>
+							               
+							               <!--
+							                <ul class="nav pull-right right-buttons">
+							                    <li class="offline-status hide">
+							                        <div class="text-danger">
+							                            <i class="icon-attention-circled"></i>offline
+							                        </div>
+							                    </li>
+							                    <li class="extension-buttons"></li>
+							                </ul>
+							                <ul class="nav pull-right title-container">
+							                    <li><div class="working-indicator"></div></li>
+							                    <li><a class="btn btn-success file-title-navbar" href="#"
+							                        title="Rename document"> </a></li>
+							                    <li><div class="input-file-title-container"><input type="text"
+							                        class="col-sm-4 form-control hide input-file-title"
+							                        placeholder="Document title" /></div></li>
+							                </ul>
+							                -->
+						                </div>
 						            </div>
 						            <div class="editorBg"></div>
 						        </div>
@@ -713,7 +719,7 @@ function log(o) {
 			
 			<!-- 插入图片 -->
 			<div class="modal fade modal-insert-image">
-			    <div class="modal-dialog"  style="width: 840px">
+			    <div class="modal-dialog"  style="width: 840px;max-width:100%;">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <button type="button" class="close" data-dismiss="modal"
@@ -876,12 +882,12 @@ function log(o) {
 		</div>
 	</div>
 </div>
-<script src="/js/jquery-1.9.0.min.js"></script>
+
-<script src="/js/jquery.ztree.all-3.5.js"></script>
-<script src="/js/i18n/msg.{{.locale}}.js"></script>
-<script src="/js/common.js"></script>
 <script>
-var UrlPrefix = '{{.siteUrl}}'; // 为了发weibo
+var LEA = {};
+LEA.s1 = new Date();
+LEA.locale = "{{.locale}}";
+var UrlPrefix = '{{.siteUrl}}';
 var UserInfo = {{.userInfo|jsonJs}};
 var notebooks = {{.notebooks|jsonJs}};
 var shareNotebooks = {{.shareNotebooks|jsonJs}};
@@ -894,38 +900,53 @@ var notes = {{.notes|jsonJs}};
 var latestNotes = {{if .latestNotes}}{{.latestNotes|jsonJs}}{{else}}[]{{end}};
 var noteContentJson = {{.noteContentJson|jsonJs}};
 var tagsJson = {{.tags|jsonJs}};
-LEA.locale = "{{.locale}}";
+var GlobalConfigs = {{.globalConfigs|jsonJs}};
-var GlobalConfigs = {{.globalConfigs|jsonJs}}; // 2014/11/9 beta2
+<!-- pro_tinymce_init_js -->
 </script>
 
-<!-- 渲染view -->
+<script src="/js/i18n/msg.{{.locale}}.js"></script>
-<script src="/tinymce/tinymce.js"></script>
+
+<!-- pro_dep_js -->
+
+<!-- dev -->
+<script src="/js/jquery-1.9.0.min.js"></script>
+<script src="/js/jquery.ztree.all-3.5.js"></script>
+<script src="/js/object_id-min.js"></script>
+<script src="/public/tinymce/tinymce.js"></script>
+<!-- /dev -->
+
 <script src="/public/libs/ace/ace.js"></script>
-<script src="/js/app/page.js"></script>
+
+<!-- dev -->
 <script src="/js/jQuery-slimScroll-1.3.0/jquery.slimscroll.js"></script>
 <script src="/js/contextmenu/jquery.contextmenu.js"></script>
+<script src="/js/common.js"></script>
 <script src="/js/bootstrap-min.js"></script>
 <script src="/js/app/note.js"></script>
 <script src="/js/app/tag.js"></script>
 <script src="/js/app/notebook.js"></script>
 <script src="/js/app/share.js"></script>
-<script src="/js/object_id-min.js"></script>
+<script src="/js/app/page.js?t=1"></script>
+<!-- /dev -->
+
+<!-- pro_app_js -->
+
 <script>
 initPage();
-</script>
+// 当tinymce.dev.js时, 请注释require
-
-<!-- context-menu -->
-<link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
-
-<!-- v2 use require.js, mdeditor -->
-<script>
-window.baseDir = '/public/dist';
 window.require = {
-    baseUrl: window.baseDir,
+    baseUrl: '/public',
-    deps: ['main']
 };
 </script>
+
+<!-- pro_markdown_js -->
+
+<!-- dev -->
 <script src="/js/require.js"></script>
-</script>
+<script src="/public/dist/main.min.js"></script>
+<!-- /dev -->
+
+<script src="/public/js/upload_paste/main.js"></script>
+
 </body>
 </html>

app/views/note/note.html

@@ -7,8 +7,8 @@
 <meta name="apple-touch-fullscreen" content="yes">
 <meta name=”apple-mobile-web-app-capable” content=”yes” />
 <meta name="keywords" content="leanote,leanote.com">
-<meta name="description" content="leanote, Not Just A Notebook">
+<meta name="description" content="Leanote, {{msg $ "moto"}}">
-<title>leanote, Not Just A Notebook</title>
+<title>Leanote, {{msg $ "moto"}}</title>
 
 <link href="/css/bootstrap.css" rel="stylesheet" />
 <!-- 先加载, 没有样式, 宽度不定 -->
@@ -18,13 +18,15 @@
 <link href="/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
 <!-- mdeditor -->
 <link href="/public/dist/themes/default.css" rel="stylesheet" />
+<!-- context-menu -->
+<link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
 
 <script>
 var hash = location.hash;
 if(hash.indexOf("writing") >= 0) {
 	var files = '<link rel="stylesheet" href="/css/theme/writting-overwrite.css" type="text/css" id="themeLink" />';
 } else {
-	var files ='<link rel="stylesheet" href="/css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css" type="text/css" id="themeLink" />';
+	var files ='<link rel="stylesheet" href="/css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css?t=3" type="text/css" id="themeLink" />';
 }
 document.write(files);
 </script>
@@ -60,7 +62,7 @@ function log(o) {
 				<!-- search -->
 				<div class="pull-left" id="searchWrap">
 					<form class="navbar-form form-inline col-lg-2" id="searchNote">
-						<input class="form-control" placeholder="Search" type="text" id="searchNoteInput">
+						<input class="form-control" placeholder="{{msg . "SearchNote"}}" type="text" id="searchNoteInput">
 					</form>
 				</div>
 
@@ -68,14 +70,15 @@ function log(o) {
 				<div class="pull-left" style="" id="newNoteWrap">
 					<!-- 新建笔记 -->
 					<div id="newMyNote">
-						<a id="newNoteBtn" title="{{msg . "newNote"}}">
+						<a class="new-note" id="newNoteBtn" title="{{msg . "newNote"}}">
-							<i class="fa fa-file-o"></i>
+							<!--<i class="fa fa-file-o"></i>-->
 							<span class="new-note-text">{{msg . "newNote"}}</span>
 							<span class="new-note-text-abbr">{{msg . "new"}}</span>
 						</a>
 						<span class="new-split">|</span>
-						<a id="newNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
+						<a class="new-note new-markdown" id="newNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
-							<span class="new-markdown-text">Markdown</span>
+							<!-- <i class="lea-icon icon-markdown"></i> -->
+							<span class="new-markdown-text">{{msg . "newMarkdown"}}</span>
 							<span class="new-markdown-text-abbr">Md</span>
 						</a>
 						<span class="for-split"> - </span>
@@ -86,7 +89,7 @@ function log(o) {
 								<i class="fa fa-angle-down"></i>
 							</a>
 							<div class="dropdown-menu dropdown-list" id="searchNotebookForAddDropdownList">
-								<input type="text" placeholder="Search notebook" class="form-control" id="searchNotebookForAdd"/>
+								<input type="text" placeholder="{{msg . "SearchNotebook"}}" class="form-control" id="searchNotebookForAdd"/>
 								<ul class="clearfix" role="menu" aria-labelledby="listNotebookDropdownMenu" id="notebookNavForNewNote">
 								</ul>
 							</div>
@@ -95,14 +98,14 @@ function log(o) {
 					
 					<!-- 只为新建别人的笔记 -->
 					<div id="newSharedNote" style="display: none">
-						<a id="newSharedNoteBtn">
+						<a id="newSharedNoteBtn" class="new-note">
-							<i class="fa fa-file-o"></i>
+							<!--<i class="fa fa-file-o"></i> -->
 							<span class="new-note-text">{{msg . "newNote"}}</span>
 							<span class="new-note-text-abbr">{{msg . "new"}}</span>
 						</a>
 						<span class="new-split">|</span>
-						<a id="newShareNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
+						<a id="newShareNoteMarkdownBtn" class="new-note" title="{{msg . "newMarkdown"}}">
-							<span class="new-markdown-text">Markdown</span>
+							<span class="new-markdown-text">{{msg . "newMarkdown"}}</span>
 							<span class="new-markdown-text-abbr">Md</span>
 						</a>
 						<span class="for-split"> - </span>
@@ -186,13 +189,11 @@ function log(o) {
 					</div>
 				</div>
 
-				<!--
 				<div class="pull-right top-nav writting-hide lea-blog">
 					<a target="_blank" href="http://lea.leanote.com"> 
 						lea++
 					</a>
 				</div>
-				-->
 				
 				<div class="pull-right top-nav writting-hide" id="myBlog">
 					<a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}"> 
@@ -269,7 +270,7 @@ function log(o) {
 							</div>
 							
 							<div class="folderBody">
-								<input type="text" class="form-control" id="searchNotebookForList" placeholder="Search notebook"/>							
+								<input type="text" class="form-control" id="searchNotebookForList" placeholder="{{msg . "SearchNotebook"}}"/>							
 								<ul class="ztree" id="notebookList"></ul>
 								<ul class="ztree" id="notebookListForSearch"></ul>
 							</div>
@@ -416,29 +417,7 @@ function log(o) {
 					<div class="noteSplit" id="noteSplitter"></div>
 					
 					<div id="note">
-					<!-- 只读模式 -->
-					<div id="noteRead">
-						<div id="noteReadContainer">
-							<div id="noteReadTop">
-								<h2 id="noteReadTitle"></h2>
-								<div class="clearfix" id="noteReadInfo">
-									<i class="fa fa-bookmark-o"></i>												
-									<span id="noteReadTags"></span>
 					
-									<!-- 修改时间 -->
-									<i class="fa fa-clock-o"></i>{{msg . "update"}} 
-									<span id="noteReadUpdatedTime"></span>  
-									
-									<!-- 修改时间 -->
-									<i class="fa fa-clock-o"></i>{{msg . "create"}} 										
-									<span id="noteReadCreatedTime"></span>
-								</div>
-							</div>
-							
-							<div id="noteReadContent">
-							</div>
-						</div>
-					</div>
 					<!-- 遮罩, 为了resize3Columns用 -->
 					<div id="noteMask" class="note-mask"></div>
 					<div id="noteMaskForLoading" class="note-mask">
@@ -546,17 +525,38 @@ function log(o) {
 						<div id="noteTitleDiv">
 							<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}" tabindex="1" />
 						</div>
+						
+						<!-- 只读时 -->
+						<div id="noteReadTop">
+							<h2 id="noteReadTitle"></h2>
+							<div class="clearfix" id="noteReadInfo">
+								<i class="fa fa-bookmark-o"></i>												
+								<span id="noteReadTags"></span>
+								
+								<!-- 修改时间 -->
+								<i class="fa fa-clock-o"></i> {{msg . "update"}} 
+								<span id="noteReadUpdatedTime"></span>  
+								
+								<!-- 修改时间 -->
+								<i class="fa fa-clock-o"></i> {{msg . "create"}} 										
+								<span id="noteReadCreatedTime"></span>
+							</div>
+						</div>
 					</div>
 
-					<div id="editor">
+					<div id="editor" class="read-only">
 						<!-- 编辑器 -->
 						<div id="mceToolbar">
-							<div id="popularToolbar"
+							<div id="mceToolbarContainer">
-								style="position: absolute; right: 30px; left: 0"></div>
+								<div id="popularToolbar" style="position: absolute; right: 30px; left: 0"></div>
-							<a
+								<a id="moreBtn"> <i class="fa more-fa"></i></a>
-								style="dispaly: block; position: absolute; cursor: pointer; right: 10px; padding: 3px 10px"
+							</div>
-								id="moreBtn"> <i class="fa fa-angle-down"></i>
+							<!-- 查看信息 -->
-							</a>
+							<div id="infoToolbar" class="info-toolbar invisible">
+				              <a class="toolbar-update"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
+				              <span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
+				              <span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
+				            </div>
 						</div>
 						<div class="editorBg"></div>
 						<div id="leanoteNav" class="leanoteNav">
@@ -584,50 +584,56 @@ function log(o) {
 				       </div>
 					</div>
 					
-					<div id="mdEditor">
+					<div id="mdEditor" class="read-only">
-					
-											
 						<div class="layout-wrapper-l1">
 						    <div class="layout-wrapper-l2">
 						        <div class="navbar navbar-default">
 						            <div class="navbar-inner" id="wmd-button-bar">
-						                <ul class="nav left-buttons">
+						            	<div id="mdInfoToolbar" class="info-toolbar invisible">
-						                    <li class="wmd-button-group1 btn-group"></li>
+							              <a class="toolbar-update"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
-						                </ul>
+							              <span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
-						                <ul class="nav left-buttons">
+							              <span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
-						                    <li class="wmd-button-group2 btn-group"></li>
+							            </div>
-						                </ul>
-						                <ul class="nav left-buttons">
-						                    <li class="wmd-button-group3 btn-group"></li>
-						                </ul>
-						                <ul class="nav left-buttons">
-						                    <li class="wmd-button-group5 btn-group"></li>
-						                </ul>
-						                <!-- 帮助 -->
-						                 <ul class="nav left-buttons">
-						                    <li class="wmd-button-group6 btn-group">
-						                    	<li class="wmd-button btn btn-success" id="wmd-help-button" title="Markdown syntax" style="left: 0px; display: none;"><span style="display: none; background-position: 0px 0px;"></span><i class="fa fa-question-circle"></i></li>
-						                    </li>
-						                </ul>
 						            	
-						               <!--
+						            	<div class="wmd-button-bar-inner">
-						                <ul class="nav pull-right right-buttons">
+							                <ul class="nav left-buttons">
-						                    <li class="offline-status hide">
+							                    <li class="wmd-button-group1 btn-group"></li>
-						                        <div class="text-danger">
+							                </ul>
-						                            <i class="icon-attention-circled"></i>offline
+							                <ul class="nav left-buttons">
-						                        </div>
+							                    <li class="wmd-button-group2 btn-group"></li>
-						                    </li>
+							                </ul>
-						                    <li class="extension-buttons"></li>
+							                <ul class="nav left-buttons">
-						                </ul>
+							                    <li class="wmd-button-group3 btn-group"></li>
-						                <ul class="nav pull-right title-container">
+							                </ul>
-						                    <li><div class="working-indicator"></div></li>
+							                <ul class="nav left-buttons">
-						                    <li><a class="btn btn-success file-title-navbar" href="#"
+							                    <li class="wmd-button-group5 btn-group"></li>
-						                        title="Rename document"> </a></li>
+							                </ul>
-						                    <li><div class="input-file-title-container"><input type="text"
+							                <!-- 帮助 -->
-						                        class="col-sm-4 form-control hide input-file-title"
+							                 <ul class="nav left-buttons">
-						                        placeholder="Document title" /></div></li>
+							                    <li class="wmd-button-group6 btn-group">
-						                </ul>
+							                    	<li class="wmd-button btn btn-success" id="wmd-help-button" title="Markdown syntax" style="left: 0px; display: none;"><span style="display: none; background-position: 0px 0px;"></span><i class="fa fa-question-circle"></i></li>
-						                -->
+							                    </li>
+							                </ul>
+							               
+							               <!--
+							                <ul class="nav pull-right right-buttons">
+							                    <li class="offline-status hide">
+							                        <div class="text-danger">
+							                            <i class="icon-attention-circled"></i>offline
+							                        </div>
+							                    </li>
+							                    <li class="extension-buttons"></li>
+							                </ul>
+							                <ul class="nav pull-right title-container">
+							                    <li><div class="working-indicator"></div></li>
+							                    <li><a class="btn btn-success file-title-navbar" href="#"
+							                        title="Rename document"> </a></li>
+							                    <li><div class="input-file-title-container"><input type="text"
+							                        class="col-sm-4 form-control hide input-file-title"
+							                        placeholder="Document title" /></div></li>
+							                </ul>
+							                -->
+						                </div>
 						            </div>
 						            <div class="editorBg"></div>
 						        </div>
@@ -713,7 +719,7 @@ function log(o) {
 			
 			<!-- 插入图片 -->
 			<div class="modal fade modal-insert-image">
-			    <div class="modal-dialog"  style="width: 840px">
+			    <div class="modal-dialog"  style="width: 840px;max-width:100%;">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <button type="button" class="close" data-dismiss="modal"
@@ -876,12 +882,12 @@ function log(o) {
 		</div>
 	</div>
 </div>
-<script src="/js/jquery-1.9.0.min.js"></script>
+
-<script src="/js/jquery.ztree.all-3.5-min.js"></script>
-<script src="/js/i18n/msg.{{.locale}}.js"></script>
-<script src="/js/common-min.js"></script>
 <script>
-var UrlPrefix = '{{.siteUrl}}'; // 为了发weibo
+var LEA = {};
+LEA.s1 = new Date();
+LEA.locale = "{{.locale}}";
+var UrlPrefix = '{{.siteUrl}}';
 var UserInfo = {{.userInfo|jsonJs}};
 var notebooks = {{.notebooks|jsonJs}};
 var shareNotebooks = {{.shareNotebooks|jsonJs}};
@@ -894,38 +900,35 @@ var notes = {{.notes|jsonJs}};
 var latestNotes = {{if .latestNotes}}{{.latestNotes|jsonJs}}{{else}}[]{{end}};
 var noteContentJson = {{.noteContentJson|jsonJs}};
 var tagsJson = {{.tags|jsonJs}};
-LEA.locale = "{{.locale}}";
+var GlobalConfigs = {{.globalConfigs|jsonJs}};
-var GlobalConfigs = {{.globalConfigs|jsonJs}}; // 2014/11/9 beta2
+var tinyMCEPreInit = {base: '/public/tinymce', suffix: '.min'};
 </script>
 
-<!-- 渲染view -->
+<script src="/js/i18n/msg.{{.locale}}.js"></script>
-<script src="/tinymce/tinymce.min.js"></script>
+
+<script src="/js/dep.min.js"></script>
+
+
+
 <script src="/public/libs/ace/ace.js"></script>
-<script src="/js/app/page-min.js"></script>
+
-<script src="/js/jQuery-slimScroll-1.3.0/jquery.slimscroll-min.js"></script>
+
-<script src="/js/contextmenu/jquery.contextmenu-min.js"></script>
+
-<script src="/js/bootstrap-min.js"></script>
+<script src="/js/app.min.js"></script>
-<script src="/js/app/note-min.js"></script>
+
-<script src="/js/app/tag-min.js"></script>
-<script src="/js/app/notebook-min.js"></script>
-<script src="/js/app/share-min.js"></script>
-<script src="/js/object_id-min.js"></script>
 <script>
 initPage();
-</script>
+// 当tinymce.dev.js时, 请注释require
-
-<!-- context-menu -->
-<link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
-
-<!-- v2 use require.js, mdeditor -->
-<script>
-window.baseDir = '/public/dist';
 window.require = {
-    baseUrl: window.baseDir,
+    baseUrl: '/public',
-    deps: ['main']
 };
 </script>
-<script src="/js/require.js"></script>
+
-</script>
+<script src="/js/markdown.min.js"></script>
+
+
+
+<script src="/public/js/upload_paste/main.js"></script>
+
 </body>
 </html>

app/views/oauth/oauth_callback_error.html

@@ -1,32 +0,0 @@
-{{template "home/header_box.html" .}}
-
-<section id="box" class="animated fadeInUp">
-	<div>
-		<h1 id="logo">leanote</h1>
-		<div id="boxForm">
-			<div id="boxHeader">We got a error</div>
-			<form>
-				<div class="alert alert-danger" id="loginMsg" style="display: block">
-					Sorry, we can't get your infomation.
-					
-					<br />
-					Please <a href="/login">{{msg . "login"}}</a> Or <a href="/register?email={{.email}}">{{msg . "register"}}</a>
-				</div>
-			</form>	
-		</div>
-    </div>
-</section>
-
-<div id="boxFooter">
-	<p>
-		<a href="/login">{{msg . "login"}}</a>
-		&nbsp;
-		<a href="/index">{{msg . "home"}}</a>
-	</p>
-	<p>
-		<a href="/index">leanote</a> © 2014
-	</p>
-</div>
-
-</body>
-</html>

app/views/share/note_notebook_share_user_infos.html

@@ -5,14 +5,11 @@
         <h4 class="modal-title" id="modalTitle">{{msg . "share"}} <b>{{.title}}</b></h4>
       </div>
       {{$noteOrNotebookId := .noteOrNotebookId}}
-      {{$isNote := .isNote}}
+      
       <div class="modal-body">
       	<ul id="myTab" class="nav nav-tabs">
 			<li class="active"><a href="#baseInfo" data-toggle="tab">分享给好友</a></li>
 			<li class=""><a href="#groupInfo" data-toggle="tab">分享给项目组</a></li>
-			{{if $isNote}}
-			<li class=""><a href="#shareInfo" data-toggle="tab">分享给未注册好友</a></li>
-			{{end}}
 		</ul>
 	
 <div class="tab-content">
@@ -98,19 +95,6 @@
 	        {{end}}
 	    </table>
 	</div>
-	
-	<div class="tab-pane" id="shareInfo">
-		<p>
-		<button class="btn btn-default" id="genShareLink">生成该笔记的分享链接和密码</button>
-		<span id="showMsg"></span>
-		</p>
-		
-		<br>
-		
-		分享链接：<input type="text" id="shareLink" value=""  size=50> <br/><br/>
-		查看密码：<input type="text" id="sharePass" value="" />	
-	</div>
-	
 </div>
 
       </div>
@@ -124,55 +108,11 @@
 <script>
 Share.dialogIsNote = {{.isNote}};
 Share.dialogNoteOrNotebookId = '{{.noteOrNotebookId}}';
-
-var getHost = function(url) { 
-    var host = "null";
-    if(typeof url == "undefined"
-                    || null == url)
-            url = window.location.href;
-    var regex = /.*\:\/\/([^\/]*).*/;
-    var match = url.match(regex);
-    if(typeof match != "undefined"
-                    && null != match)
-            host = match[1];
-    return host;
-}
-
-
 $(function() {
 setTimeout(function() {
 	$("#tr1 #friendsEmail").focus();
 }, 500);
 	
-var host = getHost();
-if (Share.dialogIsNote) {
-	var url = "/share/querySharePass";
-	var data = {noteId: Share.dialogNoteOrNotebookId};
-	ajaxPost(url, data, function(re) {
-		if(reIsOk(re)) {
-			if (re.Item >= 1000 && re.Item < 10000) {
-				var shareLink = host + '/share/note/{{.noteOrNotebookId}}';
-				$("#shareLink").val(shareLink);
-				$("#sharePass").val(re.Item);
-			}
-		}
-	});
-}
-
-$("#shareLink").hover(function() {
-	$("#shareLink").focus(function(){
-	    $(this).css({'background-color' : '#f5f5dc'});
-	}).select();
-	
-})
-
-$("#sharePass").hover(function() {
-	$("#sharePass").focus(function(){
-	    $(this).css({'background-color' : '#f5f5dc'});
-	}).select();
-	
-})
-
 // 分享/删除给分组
 $("#groupInfo").on("click", ".btn-share-or-not", function() {
 	var $t = $(this);
@@ -215,28 +155,6 @@ $("#groupInfo").on("click", ".btn-share-or-not", function() {
 	});
 });
 
-
-//生成分享链接和密码
-$("#genShareLink").on("click", function() {
-	var sharePass = $("#sharePass").val();
-	if (sharePass != '' && sharePass > 1000 && sharePass < 10000) {
-		$("#showMsg").html("<font color='red'>不能重复生成分享链接和密码</font>");
-		return;
-	}
-	
-	var url = "/share/genShareLinkPass";
-	var shareLink = host + '/share/note/{{.noteOrNotebookId}}';
-	var data = {noteId: Share.dialogNoteOrNotebookId};
-	ajaxPost(url, data, function(re) {
-		if(reIsOk(re)) {
-			$("#shareLink").val(shareLink);
-			$("#sharePass").val(re.Item);
-		}
-	});
-});
-
-
-
 $(".group-perm").click(function() {
 	var $t = $(this);
 	var $ptr = $t.closest("tr");
@@ -261,6 +179,5 @@ $(".group-perm").click(function() {
 	});
 });
 
-
 });
 </script>

app/views/share/show_share_note.html

@@ -1,134 +0,0 @@
-{{template "home/header.html" .}}
-
-<section>
-</section>
-{{$isMarkDown := .isMarkDown}}
-
-<div id="queryNote" style="height:300px;padding-top:80px" align="center">
-	{{ .userName }}分享了笔记<br/><br>
-
-	您需要输入分享密码才能查看：<br><br>
-	<input type="password" id="sharePass" />
-	<button id="showShareNote">点击查看</button><br/><br/>
-	<span id="showMsg"></span>
-</div>
-
-<div id="noteContainer" style="display:none">
-	
-</div>
-
-
-{{template "home/footer.html"}}
-
-<script src="/js/jquery-1.9.0.min.js"></script>
-<script src="/js/bootstrap.js"></script>
-<script src="/js/common-min.js"></script>
-<script>
-
-var noteId = {{ .noteId }};
-var isMarkDown = {{ .isMarkDown}}
-
-String.prototype.format = function() {
-    var s = this,
-        i = arguments.length;
-
-    while (i--) {
-        s = s.replace(new RegExp('\\{' + i + '\\}', 'gm'), arguments[i]);
-    }
-    return s;
-};
-
-
-var getHost = function(url) { 
-    var host = "null";
-    if(typeof url == "undefined"
-                    || null == url)
-            url = window.location.href;
-    var regex = /.*\:\/\/([^\/]*).*/;
-    var match = url.match(regex);
-    if(typeof match != "undefined"
-                    && null != match)
-            host = match[1];
-    return "http://" + host;
-}
-
-$(function() {
-	
-	$("#showShareNote").on("click", function() {
-		$("#showMsg").html("");
-		var url = "/share/verify4ShareNote";
-		
-		var sharePass = $("#sharePass").val();
-		var data = {noteId: noteId, sharePass: sharePass};
-		ajaxPost(url, data, function(re) {
-			if(reIsOk(re)) {
-				$("#queryNote").css("display", "none");
-				var title = re.Item.Title;
-				var content = re.Msg;
-				var imgSrc = re.Item.ImgSrc;
-				var htmlContent = "<div><h1 height='50px'>{0}</h1></div><hr/><div style='vertical-align:center'><p height='auto'>{1}<br>{2}</p>";
-				
-				var attaches = re.List;
-				var attachesHtml = "";
-				if (attaches.length > 0) {
-					var token = re.Id;
-					for (var i=0; i<attaches.length; i++) {
-						var linkUrl = "{0}/attach/download?attachId={1}&token={2}".format(getHost(), attaches[i].AttachId, token);
-						attachesHtml += "<p><a href='{0}' target='_blank' data-mce-href='{1}' >附件{2}</a></p><br/>".format(linkUrl, linkUrl, i+1);
-					}
-				} 
-				
-				htmlContent = htmlContent.format(title, content, attachesHtml) + "</div>";
-				
-				
-				/* if (isMarkDown) {
-					var converter = Markdown.getSanitizingConverter();
-					Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-					var mdDesc = converter.makeHtml(desc);
-					$("pre").addClass("prettyprint linenums");
-					prettyPrint();
-					MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-					htmlContent = "<div><h1 height='50px'>"+title+"</h1></div><hr/><div style='vertical-align:center'><p height='auto'>"
-						+mdDesc+"</p></div>";
-				} else {
-					htmlContent = "<div><h1 height='50px'>"+title+"</h1></div><hr/><div style='vertical-align:center'><p height='auto'>"
-						+desc+"</p></div>";
-				} */
-				
-				
-				$("#noteContainer").css("display", "block").css("height", "auto")
-					.css("padding-top", "20px").css("text-align", "center")
-					.css("margin-left", "auto").css("margin-right", "auto");
-				
-				$("#noteContainer").html(htmlContent);
-			} else {
-				$("#showMsg").html("<font color='red'>密码错误</font>");
-			}
-		}); 
-	});
-	
-	// 平滑滚动
-	$(".smooth-scroll").click(function(e) {
-		e.preventDefault();
-		var t = $(this).attr("target");
-		var targetOffset = $(t).offset().top - 80;
-		$('html,body').animate({scrollTop: targetOffset}, 300);
-	});
-});
-</script>
-
-{{if $isMarkDown}}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-<script src="/public/mdeditor/editor/editor.js"></script>
-<script src="/public/js/google-code-prettify/prettify.js"></script>
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-{{end}}

bin/release.sh

@@ -2,40 +2,85 @@
 
 # release leanote
 
+# 当前路径
 SP=$(cd "$(dirname "$0")"; pwd)
 
-cd $SP
-cd ../
-
 # tmp path to store leanote release files
 tmp="/Users/life/Desktop/leanote_release"
 
-version=x86_64.v1.0-beta.2
+# version
+V="v1.0.1"
 
+##=================================
+# 1. 先build 成 3个平台, 2种bit = 6种
+##=================================
+
+# cd /Documents/Go/package2/src/github.com/leanote/leanote/bin
+# GOOS=darwin GOARCH=amd64 go build -o leanote-darwin-amd64 ../app/tmp
+
+cd $SP
+
+# $1 = darwin, linux
+# $2 = amd64
+function build()
+{
+	echo build-$1-$2
+	if [ $1 = "linux" -o $1 = "darwin" ]
+	then
+		suffix=""
+	else
+		suffix=".exe"
+	fi
+	
+	GOOS=$1 GOARCH=$2 go build -o leanote-$1-$2$suffix ../app/tmp
+}
+
+build "linux" "386";
+build "linux" "amd64";
+
+build "windows" "386";
+build "windows" "amd64";
+
+build "darwin" "386";
+build "darwin" "amd64";
+
+
+##======================
+# 2. release目录准备工作
+##======================
 rm -rf $tmp/leanote
 mkdir -p $tmp/leanote/app
 mkdir -p $tmp/leanote/conf
 mkdir -p $tmp/leanote/bin
 
+##==================
+# 3. 复制
+##==================
+
+cd $SP
+cd ../
+
 # bin
 cp -r ./bin/src $tmp/leanote/bin/
 cp  ./bin/run.sh $tmp/leanote/bin/
-
+cp  ./bin/run.bat $tmp/leanote/bin/
-# LICENSE
-cp ./LICENSE $tmp/leanote/
 
 # views
 cp -r ./app/views $tmp/leanote/app
-# 可不要
+# 可不要, 源码
-cp -r ./app/service $tmp/leanote/app/service
+#cp -r ./app/service $tmp/leanote/app/service
-cp -r ./app/controllers $tmp/leanote/app/controllers
+#cp -r ./app/controllers $tmp/leanote/app/controllers
-cp -r ./app/db $tmp/leanote/app/db
+#cp -r ./app/db $tmp/leanote/app/db
-cp -r ./app/info $tmp/leanote/app/info
+#cp -r ./app/info $tmp/leanote/app/info
-cp -r ./app/lea $tmp/leanote/app/lea
+#cp -r ./app/lea $tmp/leanote/app/lea
 
 # conf
-cp ./conf/app.conf-default $tmp/leanote/conf/app.conf
+cp ./conf/app.conf $tmp/leanote/conf/app.conf
-cp ./conf/routes-default $tmp/leanote/conf/routes
+cp ./conf/routes $tmp/leanote/conf/routes
+# 处理app.conf, 还原配置
+cat $tmp/leanote/conf/app.conf | sed 's/db.dbname=leanote.*#/db.dbname=leanote #/' > $tmp/leanote/conf/app.conf2 # 不能直接覆盖
+rm $tmp/leanote/conf/app.conf
+mv $tmp/leanote/conf/app.conf2 $tmp/leanote/conf/app.conf
 
 # others
 cp -r ./messages ./public ./mongodb_backup $tmp/leanote/
@@ -44,40 +89,57 @@ cp -r ./messages ./public ./mongodb_backup $tmp/leanote/
 rm -r $tmp/leanote/public/tinymce/classes
 rm -r $tmp/leanote/public/upload
 mkdir $tmp/leanote/public/upload
-mkdir $tmp/leanote/files
 rm -r $tmp/leanote/public/.codekit-cache
 rm $tmp/leanote/public/.DS_Store
 rm $tmp/leanote/public/config.codekit
 
 # make link
-cd $tmp/leanote/bin
+# cd $tmp/leanote/bin
-mkdir ./src/github.com/leanote
 # ln -s ../../../../ ./src/github.com/leanote/leanote
 
 # archieve
 # << 'BLOCK
-# linux
-cd $SP
-cd ../
-cp ./bin/leanote-linux $tmp/leanote/bin/
-cd $tmp
-tar -cvf $tmp/leanote-linux-$version.bin.tar leanote
-gzip $tmp/leanote-linux-$version.bin.tar
 
-# mac
+##===========
-rm $tmp/leanote/bin/leanote-linux
+# 4. 打包
-cd $SP
+##===========
-cd ../
+# $1 = linux
-cp ./bin/leanote-mac $tmp/leanote/bin/
+# $2 = 386, amd64
-cd $tmp
-tar -cvf $tmp/leanote-mac-$version.bin.tar leanote
-gzip $tmp/leanote-mac-$version.bin.tar
 
-cd $SP
+# 创建一个$V的目录存放之
-cd ../
+rm -rf $tmp/$V
-cp ./bin/leanote-linux $tmp/leanote/bin/
+mkdir $tmp/$V
 
-rm $tmp/bin/src/github.com/leanote/leanote
+function tarRelease()
-cp -r $tmp/leanote/* $tmp/leanote_release_github
+{
+	echo tar-$1-$2
+	cd $SP
+	cd ../
+	rm $tmp/leanote/bin/leanote-* # 删除之前的bin文件
+	rm $tmp/leanote/bin/run* # 删除之前的run.sh 或 run.bat
+	
+	if [ $1 = "linux" -o $1 = "darwin" ]
+	then
+		suffix=""
+		cp ./bin/run.sh $tmp/leanote/bin/
+	else
+		cp ./bin/run.bat $tmp/leanote/bin/
+		suffix=".exe"
+	fi
+	
+	cp ./bin/leanote-$1-$2$suffix $tmp/leanote/bin/
+	cd $tmp
+	tar -cf $tmp/$V/leanote-$1-$2-$V.bin.tar leanote
+	gzip $tmp/$V/leanote-$1-$2-$V.bin.tar
+}
+
+tarRelease "linux" "386";
+tarRelease "linux" "amd64";
+
+tarRelease "windows" "386";
+tarRelease "windows" "amd64";
+
+tarRelease "darwin" "386";
+tarRelease "darwin" "amd64";
 
 # BLOCK'

bin/run.bat

@@ -0,0 +1,23 @@
+@echo off
+
+cd..
+set SCRIPTPATH=%cd%
+
+: top src directory
+set path="%SCRIPTPATH%\bin\src\github.com\leanote"
+
+if not exist "%path%" mkdir "%path%"
+
+: create software link
+if exist "%path%\leanote" del /Q "%path%\leanote"
+mklink /D "%path%\leanote"  %SCRIPTPATH%
+
+: set GOPATH
+set GOPATH="%SCRIPTPATH%\bin"
+
+: run
+if %processor_architecture%==x86 (
+	"%SCRIPTPATH%\bin\leanote-windows-386.exe" -importPath github.com/leanote/leanote
+) else (
+	"%SCRIPTPATH%\bin\leanote-windows-amd64.exe" -importPath github.com/leanote/leanote
+)

bin/run.sh

@@ -7,17 +7,23 @@ path="$SCRIPTPATH/src/github.com/leanote"
 if [ ! -d "$path" ]; then
 	mkdir -p "$path"
 fi
+rm -rf $SCRIPTPATH/src/github.com/leanote/leanote # 先删除
 ln -s ../../../../ $SCRIPTPATH/src/github.com/leanote/leanote
 
 # set GOPATH
-export GOPATH=$GOPATH:$SCRIPTPATH
+export GOPATH=$SCRIPTPATH
 
 # run
-osName=`uname`
+osName=`uname` # Darwin or Linux
-if [ $osName == "Darwin" ]; then
+osName=`tr '[A-Z]' '[a-z]' <<<"$osName"` # toLowerCase
-	chmod 777 "$SCRIPTPATH/leanote-mac"
+bit=`getconf LONG_BIT` # 32, 64
-	"$SCRIPTPATH/leanote-mac" -importPath github.com/leanote/leanote
+if [ $bit = "64" ]
+then
+	bit="amd64"
 else
-	chmod 777 "$SCRIPTPATH/leanote-linux"
+	bit="386"
-	"$SCRIPTPATH/leanote-linux" -importPath github.com/leanote/leanote
 fi
+
+script="$SCRIPTPATH/leanote-$osName-$bit"
+chmod 777 $script
+$script -importPath github.com/leanote/leanote

bin/src/github.com/revel/revel/conf/mime-types.conf

@@ -0,0 +1,545 @@
+3dm=x-world/x-3dmf
+3dmf=x-world/x-3dmf
+7z=application/x-7z-compressed
+a=application/octet-stream
+aab=application/x-authorware-bin
+aam=application/x-authorware-map
+aas=application/x-authorware-seg
+abc=text/vndabc
+ace=application/x-ace-compressed
+acgi=text/html
+afl=video/animaflex
+ai=application/postscript
+aif=audio/aiff
+aifc=audio/aiff
+aiff=audio/aiff
+aim=application/x-aim
+aip=text/x-audiosoft-intra
+alz=application/x-alz-compressed
+ani=application/x-navi-animation
+aos=application/x-nokia-9000-communicator-add-on-software
+aps=application/mime
+arc=application/x-arc-compressed
+arj=application/arj
+art=image/x-jg
+asf=video/x-ms-asf
+asm=text/x-asm
+asp=text/asp
+asx=application/x-mplayer2
+au=audio/basic
+avi=video/x-msvideo
+avs=video/avs-video
+bcpio=application/x-bcpio
+bin=application/mac-binary
+bmp=image/bmp
+boo=application/book
+book=application/book
+boz=application/x-bzip2
+bsh=application/x-bsh
+bz2=application/x-bzip2
+bz=application/x-bzip
+c++=text/plain
+c=text/x-c
+cab=application/vnd.ms-cab-compressed
+cat=application/vndms-pkiseccat
+cc=text/x-c
+ccad=application/clariscad
+cco=application/x-cocoa
+cdf=application/cdf
+cer=application/pkix-cert
+cha=application/x-chat
+chat=application/x-chat
+chrt=application/vnd.kde.kchart
+class=application/java
+# ? class=application/java-vm
+com=text/plain
+conf=text/plain
+cpio=application/x-cpio
+cpp=text/x-c
+cpt=application/mac-compactpro
+crl=application/pkcs-crl
+crt=application/pkix-cert
+crx=application/x-chrome-extension
+csh=text/x-scriptcsh
+css=text/css
+csv=text/csv
+cxx=text/plain
+dar=application/x-dar
+dcr=application/x-director
+deb=application/x-debian-package
+deepv=application/x-deepv
+def=text/plain
+der=application/x-x509-ca-cert
+dif=video/x-dv
+dir=application/x-director
+divx=video/divx
+dl=video/dl
+dmg=application/x-apple-diskimage
+doc=application/msword
+dot=application/msword
+dp=application/commonground
+drw=application/drafting
+dump=application/octet-stream
+dv=video/x-dv
+dvi=application/x-dvi
+dwf=drawing/x-dwf=(old)
+dwg=application/acad
+dxf=application/dxf
+dxr=application/x-director
+el=text/x-scriptelisp
+elc=application/x-bytecodeelisp=(compiled=elisp)
+eml=message/rfc822
+env=application/x-envoy
+eps=application/postscript
+es=application/x-esrehber
+etx=text/x-setext
+evy=application/envoy
+exe=application/octet-stream
+f77=text/x-fortran
+f90=text/x-fortran
+f=text/x-fortran
+fdf=application/vndfdf
+fif=application/fractals
+fli=video/fli
+flo=image/florian
+flv=video/x-flv
+flx=text/vndfmiflexstor
+fmf=video/x-atomic3d-feature
+for=text/x-fortran
+fpx=image/vndfpx
+frl=application/freeloader
+funk=audio/make
+g3=image/g3fax
+g=text/plain
+gif=image/gif
+gl=video/gl
+gsd=audio/x-gsm
+gsm=audio/x-gsm
+gsp=application/x-gsp
+gss=application/x-gss
+gtar=application/x-gtar
+gz=application/x-compressed
+gzip=application/x-gzip
+h=text/x-h
+hdf=application/x-hdf
+help=application/x-helpfile
+hgl=application/vndhp-hpgl
+hh=text/x-h
+hlb=text/x-script
+hlp=application/hlp
+hpg=application/vndhp-hpgl
+hpgl=application/vndhp-hpgl
+hqx=application/binhex
+hta=application/hta
+htc=text/x-component
+htm=text/html
+html=text/html
+htmls=text/html
+htt=text/webviewhtml
+htx=text/html
+ice=x-conference/x-cooltalk
+ico=image/x-icon
+ics=text/calendar
+icz=text/calendar
+idc=text/plain
+ief=image/ief
+iefs=image/ief
+iges=application/iges
+igs=application/iges
+ima=application/x-ima
+imap=application/x-httpd-imap
+inf=application/inf
+ins=application/x-internett-signup
+ip=application/x-ip2
+isu=video/x-isvideo
+it=audio/it
+iv=application/x-inventor
+ivr=i-world/i-vrml
+ivy=application/x-livescreen
+jam=audio/x-jam
+jav=text/x-java-source
+java=text/x-java-source
+jcm=application/x-java-commerce
+jfif-tbnl=image/jpeg
+jfif=image/jpeg
+jnlp=application/x-java-jnlp-file
+jpe=image/jpeg
+jpeg=image/jpeg
+jpg=image/jpeg
+jps=image/x-jps
+js=application/javascript
+json=application/json
+jut=image/jutvision
+kar=audio/midi
+karbon=application/vnd.kde.karbon
+kfo=application/vnd.kde.kformula
+flw=application/vnd.kde.kivio
+kml=application/vnd.google-earth.kml+xml
+kmz=application/vnd.google-earth.kmz
+kon=application/vnd.kde.kontour
+kpr=application/vnd.kde.kpresenter
+kpt=application/vnd.kde.kpresenter
+ksp=application/vnd.kde.kspread
+kwd=application/vnd.kde.kword
+kwt=application/vnd.kde.kword
+ksh=text/x-scriptksh
+la=audio/nspaudio
+lam=audio/x-liveaudio
+latex=application/x-latex
+lha=application/lha
+lhx=application/octet-stream
+list=text/plain
+lma=audio/nspaudio
+log=text/plain
+lsp=text/x-scriptlisp
+lst=text/plain
+lsx=text/x-la-asf
+ltx=application/x-latex
+lzh=application/octet-stream
+lzx=application/lzx
+m1v=video/mpeg
+m2a=audio/mpeg
+m2v=video/mpeg
+m3u=audio/x-mpegurl
+m=text/x-m
+man=application/x-troff-man
+manifest=text/cache-manifest
+map=application/x-navimap
+mar=text/plain
+mbd=application/mbedlet
+mc$=application/x-magic-cap-package-10
+mcd=application/mcad
+mcf=text/mcf
+mcp=application/netmc
+me=application/x-troff-me
+mht=message/rfc822
+mhtml=message/rfc822
+mid=application/x-midi
+midi=application/x-midi
+mif=application/x-frame
+mime=message/rfc822
+mjf=audio/x-vndaudioexplosionmjuicemediafile
+mjpg=video/x-motion-jpeg
+mm=application/base64
+mme=application/base64
+mod=audio/mod
+moov=video/quicktime
+mov=video/quicktime
+movie=video/x-sgi-movie
+mp2=audio/mpeg
+mp3=audio/mpeg3
+mp4=video/mp4
+mpa=audio/mpeg
+mpc=application/x-project
+mpe=video/mpeg
+mpeg=video/mpeg
+mpg=video/mpeg
+mpga=audio/mpeg
+mpp=application/vndms-project
+mpt=application/x-project
+mpv=application/x-project
+mpx=application/x-project
+mrc=application/marc
+ms=application/x-troff-ms
+mv=video/x-sgi-movie
+my=audio/make
+mzz=application/x-vndaudioexplosionmzz
+nap=image/naplps
+naplps=image/naplps
+nc=application/x-netcdf
+ncm=application/vndnokiaconfiguration-message
+nif=image/x-niff
+niff=image/x-niff
+nix=application/x-mix-transfer
+nsc=application/x-conference
+nvd=application/x-navidoc
+o=application/octet-stream
+oda=application/oda
+odb=application/vnd.oasis.opendocument.database
+odc=application/vnd.oasis.opendocument.chart
+odf=application/vnd.oasis.opendocument.formula
+odg=application/vnd.oasis.opendocument.graphics
+odi=application/vnd.oasis.opendocument.image
+odm=application/vnd.oasis.opendocument.text-master
+odp=application/vnd.oasis.opendocument.presentation
+ods=application/vnd.oasis.opendocument.spreadsheet
+odt=application/vnd.oasis.opendocument.text
+oga=audio/ogg
+ogg=audio/ogg
+ogv=video/ogg
+omc=application/x-omc
+omcd=application/x-omcdatamaker
+omcr=application/x-omcregerator
+otc=application/vnd.oasis.opendocument.chart-template
+otf=application/vnd.oasis.opendocument.formula-template
+otg=application/vnd.oasis.opendocument.graphics-template
+oth=application/vnd.oasis.opendocument.text-web
+oti=application/vnd.oasis.opendocument.image-template
+otm=application/vnd.oasis.opendocument.text-master
+otp=application/vnd.oasis.opendocument.presentation-template
+ots=application/vnd.oasis.opendocument.spreadsheet-template
+ott=application/vnd.oasis.opendocument.text-template
+p10=application/pkcs10
+p12=application/pkcs-12
+p7a=application/x-pkcs7-signature
+p7c=application/pkcs7-mime
+p7m=application/pkcs7-mime
+p7r=application/x-pkcs7-certreqresp
+p7s=application/pkcs7-signature
+p=text/x-pascal
+part=application/pro_eng
+pas=text/pascal
+pbm=image/x-portable-bitmap
+pcl=application/vndhp-pcl
+pct=image/x-pict
+pcx=image/x-pcx
+pdb=chemical/x-pdb
+pdf=application/pdf
+pfunk=audio/make
+pgm=image/x-portable-graymap
+pic=image/pict
+pict=image/pict
+pkg=application/x-newton-compatible-pkg
+pko=application/vndms-pkipko
+pl=text/x-scriptperl
+plx=application/x-pixclscript
+pm4=application/x-pagemaker
+pm5=application/x-pagemaker
+pm=text/x-scriptperl-module
+png=image/png
+pnm=application/x-portable-anymap
+pot=application/mspowerpoint
+pov=model/x-pov
+ppa=application/vndms-powerpoint
+ppm=image/x-portable-pixmap
+pps=application/mspowerpoint
+ppt=application/mspowerpoint
+ppz=application/mspowerpoint
+pre=application/x-freelance
+prt=application/pro_eng
+ps=application/postscript
+psd=application/octet-stream
+pvu=paleovu/x-pv
+pwz=application/vndms-powerpoint
+py=text/x-scriptphyton
+pyc=applicaiton/x-bytecodepython
+qcp=audio/vndqcelp
+qd3=x-world/x-3dmf
+qd3d=x-world/x-3dmf
+qif=image/x-quicktime
+qt=video/quicktime
+qtc=video/x-qtc
+qti=image/x-quicktime
+qtif=image/x-quicktime
+ra=audio/x-pn-realaudio
+ram=audio/x-pn-realaudio
+rar=application/x-rar-compressed
+ras=application/x-cmu-raster
+rast=image/cmu-raster
+rexx=text/x-scriptrexx
+rf=image/vndrn-realflash
+rgb=image/x-rgb
+rm=application/vndrn-realmedia
+rmi=audio/mid
+rmm=audio/x-pn-realaudio
+rmp=audio/x-pn-realaudio
+rng=application/ringing-tones
+rnx=application/vndrn-realplayer
+roff=application/x-troff
+rp=image/vndrn-realpix
+rpm=audio/x-pn-realaudio-plugin
+rt=text/vndrn-realtext
+rtf=text/richtext
+rtx=text/richtext
+rv=video/vndrn-realvideo
+s=text/x-asm
+s3m=audio/s3m
+s7z=application/x-7z-compressed
+saveme=application/octet-stream
+sbk=application/x-tbook
+scm=text/x-scriptscheme
+sdml=text/plain
+sdp=application/sdp
+sdr=application/sounder
+sea=application/sea
+set=application/set
+sgm=text/x-sgml
+sgml=text/x-sgml
+sh=text/x-scriptsh
+shar=application/x-bsh
+shtml=text/x-server-parsed-html
+sid=audio/x-psid
+skd=application/x-koan
+skm=application/x-koan
+skp=application/x-koan
+skt=application/x-koan
+sit=application/x-stuffit
+sitx=application/x-stuffitx
+sl=application/x-seelogo
+smi=application/smil
+smil=application/smil
+snd=audio/basic
+sol=application/solids
+spc=text/x-speech
+spl=application/futuresplash
+spr=application/x-sprite
+sprite=application/x-sprite
+spx=audio/ogg
+src=application/x-wais-source
+ssi=text/x-server-parsed-html
+ssm=application/streamingmedia
+sst=application/vndms-pkicertstore
+step=application/step
+stl=application/sla
+stp=application/step
+sv4cpio=application/x-sv4cpio
+sv4crc=application/x-sv4crc
+svf=image/vnddwg
+svg=image/svg+xml
+svr=application/x-world
+swf=application/x-shockwave-flash
+t=application/x-troff
+talk=text/x-speech
+tar=application/x-tar
+tbk=application/toolbook
+tcl=text/x-scripttcl
+tcsh=text/x-scripttcsh
+tex=application/x-tex
+texi=application/x-texinfo
+texinfo=application/x-texinfo
+text=text/plain
+tgz=application/gnutar
+tif=image/tiff
+tiff=image/tiff
+tr=application/x-troff
+tsi=audio/tsp-audio
+tsp=application/dsptype
+tsv=text/tab-separated-values
+turbot=image/florian
+txt=text/plain
+uil=text/x-uil
+uni=text/uri-list
+unis=text/uri-list
+unv=application/i-deas
+uri=text/uri-list
+uris=text/uri-list
+ustar=application/x-ustar
+uu=text/x-uuencode
+uue=text/x-uuencode
+vcd=application/x-cdlink
+vcf=text/x-vcard
+vcard=text/x-vcard
+vcs=text/x-vcalendar
+vda=application/vda
+vdo=video/vdo
+vew=application/groupwise
+viv=video/vivo
+vivo=video/vivo
+vmd=application/vocaltec-media-desc
+vmf=application/vocaltec-media-file
+voc=audio/voc
+vos=video/vosaic
+vox=audio/voxware
+vqe=audio/x-twinvq-plugin
+vqf=audio/x-twinvq
+vql=audio/x-twinvq-plugin
+vrml=application/x-vrml
+vrt=x-world/x-vrt
+vsd=application/x-visio
+vst=application/x-visio
+vsw=application/x-visio
+w60=application/wordperfect60
+w61=application/wordperfect61
+w6w=application/msword
+wav=audio/wav
+wb1=application/x-qpro
+wbmp=image/vnd.wap.wbmp
+web=application/vndxara
+wiz=application/msword
+wk1=application/x-123
+wmf=windows/metafile
+wml=text/vnd.wap.wml
+wmlc=application/vnd.wap.wmlc
+wmls=text/vnd.wap.wmlscript
+wmlsc=application/vnd.wap.wmlscriptc
+word=application/msword
+wp5=application/wordperfect
+wp6=application/wordperfect
+wp=application/wordperfect
+wpd=application/wordperfect
+wq1=application/x-lotus
+wri=application/mswrite
+wrl=application/x-world
+wrz=model/vrml
+wsc=text/scriplet
+wsrc=application/x-wais-source
+wtk=application/x-wintalk
+x-png=image/png
+xbm=image/x-xbitmap
+xdr=video/x-amt-demorun
+xgz=xgl/drawing
+xif=image/vndxiff
+xl=application/excel
+xla=application/excel
+xlb=application/excel
+xlc=application/excel
+xld=application/excel
+xlk=application/excel
+xll=application/excel
+xlm=application/excel
+xls=application/excel
+xlt=application/excel
+xlv=application/excel
+xlw=application/excel
+xm=audio/xm
+xml=text/xml
+xmz=xgl/movie
+xpix=application/x-vndls-xpix
+xpm=image/x-xpixmap
+xsr=video/x-amt-showrun
+xwd=image/x-xwd
+xyz=chemical/x-pdb
+z=application/x-compress
+zip=application/zip
+zoo=application/octet-stream
+zsh=text/x-scriptzsh
+# Office 2007 mess - http://wdg.uncc.edu/Microsoft_Office_2007_MIME_Types_for_Apache_and_IIS
+docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document
+docm=application/vnd.ms-word.document.macroEnabled.12
+dotx=application/vnd.openxmlformats-officedocument.wordprocessingml.template
+dotm=application/vnd.ms-word.template.macroEnabled.12
+xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+xlsm=application/vnd.ms-excel.sheet.macroEnabled.12
+xltx=application/vnd.openxmlformats-officedocument.spreadsheetml.template
+xltm=application/vnd.ms-excel.template.macroEnabled.12
+xlsb=application/vnd.ms-excel.sheet.binary.macroEnabled.12
+xlam=application/vnd.ms-excel.addin.macroEnabled.12
+pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation
+pptm=application/vnd.ms-powerpoint.presentation.macroEnabled.12
+ppsx=application/vnd.openxmlformats-officedocument.presentationml.slideshow
+ppsm=application/vnd.ms-powerpoint.slideshow.macroEnabled.12
+potx=application/vnd.openxmlformats-officedocument.presentationml.template
+potm=application/vnd.ms-powerpoint.template.macroEnabled.12
+ppam=application/vnd.ms-powerpoint.addin.macroEnabled.12
+sldx=application/vnd.openxmlformats-officedocument.presentationml.slide
+sldm=application/vnd.ms-powerpoint.slide.macroEnabled.12
+thmx=application/vnd.ms-officetheme
+onetoc=application/onenote
+onetoc2=application/onenote
+onetmp=application/onenote
+onepkg=application/onenote
+# koffice
+
+# iWork
+key=application/x-iwork-keynote-sffkey
+kth=application/x-iwork-keynote-sffkth
+nmbtemplate=application/x-iwork-numbers-sfftemplate
+numbers=application/x-iwork-numbers-sffnumbers
+pages=application/x-iwork-pages-sffpages
+template=application/x-iwork-pages-sfftemplate
+
+# Extensions for Mozilla apps (Firefox and friends)
+xpi=application/x-xpinstall
+
+# Opera extensions
+oex=application/x-opera-extension

bin/src/github.com/revel/revel/templates/errors/403.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>Forbidden</title>
+	</head>
+	<body>
+	{{with .Error}}
+	<h1>
+		{{.Title}}
+	</h1>
+	<p>
+		{{.Description}}
+	</p>
+	{{end}}
+	</body>
+</html>