vendor

Translation to Spanish

.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,3 +16,4 @@ app/tmp/main.go
 .project
 public/config.codekit
 files
+/node_modules

.travis.yml

@@ -0,0 +1,36 @@
+language: go
+go: 1.7
+
+services:
+  - mongodb # 2.4.12
+
+install:
+  - export PATH=$PATH:$HOME/gopath/bin
+  - go get -v github.com/leanote/leanote/app
+  - go get -v github.com/leanote/leanote/cmd
+  # - go get -u github.com/revel/cmd/revel
+  # - ls $GOPATH/src/github.com/revel/
+  # - go get github.com/revel/moudle/revel
+  # - go install github.com/revel/cmd/revel
+  - pwd
+  - ls
+
+script:
+  - mongo --version
+  - mongorestore -h localhost -d leanote --directoryperdb ./mongodb_backup/leanote_install_data/
+
+  # gen tmp/main.go, routes/routes.go
+  - go run app/cmd/main.go
+  # build
+  - go build -o leanote github.com/leanote/leanote/app/tmp
+  # run with port 9000
+  - ./leanote -importPath=github.com/leanote/leanote -runMode=dev -port=9000 &
+  - sleep 10s;
+  # test
+  - curl http://localhost:9000
+  - curl http://localhost:9000/blog
+  - curl http://localhost:9000/login
+  - curl http://localhost:9000/demo
+
+  # - revel build github.com/leanote/leanote tmp
+  # OK

Gulpfile.js

@@ -0,0 +1,409 @@
+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';
+
+var messagesPath = leanoteBase + 'messages';
+
+// 合并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.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'));
+});
+
+// plugins压缩
+gulp.task('plugins', function() {
+    // gulp.src(base + '/js/plugins/libs/*.js')
+    //     .pipe(uglify()) // 压缩
+    //     // .pipe(concat('main.min.js'))
+    //     .pipe(gulp.dest(base + '/js/plugins/libs-min'));
+
+    // 所有js合并成一个
+     var jss = [
+        'note_info',
+        'tips',
+        'history',
+        'attachment_upload',
+        'editor_drop_paste',
+        'main'
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/js/plugins/' + jss[i] + '.js';
+    }
+    jss.push(base + '/js/plugins/libs-min/fileupload.js');
+
+    return gulp.src(jss)
+        .pipe(uglify()) // 压缩
+        .pipe(concat('main.min.js'))
+        .pipe(gulp.dest(base + '/js/plugins'));
+});
+
+// 合并requirejs和markdown为一个文件
+gulp.task('concatMarkdownJs', function() {
+    var jss = [
+        'js/require.js',
+        'md/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'));
+});
+
+// / 合并requirejs和markdown为一个文件
+gulp.task('concatMarkdownJsV2', function() {
+    var jss = [
+        'js/require.js',
+        'md/main-v2.min.js',
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/' + jss[i];
+    }
+
+    return gulp
+        .src(jss)
+        .pipe(uglify()) // 压缩
+        .pipe(concat('markdown-v2.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_markdown_js -->/, '<script src="/js/markdown-v2.min.js"></script>')) // 替换
+        .pipe(replace('/tinymce/tinymce.js', '/tinymce/tinymce.full.min.js')) // 替换
+        .pipe(replace(/<!-- pro_tinymce_init_js -->/, "var tinyMCEPreInit = {base: '/public/tinymce', suffix: '.min'};")) // 替换
+        .pipe(replace(/plugins\/main.js/, "plugins/main.min.js")) // 替换
+        // 连续两个空行换成一个空行
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace('console.log(o);', ''))
+        .pipe(replace('console.trace(o);', ''))
+        // .pipe(minifyHtml()) // 不行, 压缩后golang报错
+        .pipe(rename('note.html'))
+        .pipe(gulp.dest(noteProBase));
+});
+
+// 只获取需要js i18n的key
+var path = require('path');
+gulp.task('i18n', function() {
+    var keys = {};
+    var reg = /getMsg\(["']+(.+?)["']+/g;
+    // {rule: "required", msg: "inputNewPassword"},
+    var reg2 = /msg: ?"?([0-9a-zA-Z]*)"?/g;
+    function getKey(data) {
+        while(ret = reg.exec(data)) {
+            keys[ret[1]] = 1;
+        }
+
+        while(ret2 = reg2.exec(data)) {
+            keys[ret2[1]] = 1;
+        }
+    }
+    // 先获取需要的key
+    function ls(ff) { 
+        var files = fs.readdirSync(ff);  
+        for(fn in files) {  
+            var fname = ff + path.sep + files[fn];  
+            var stat = fs.lstatSync(fname);  
+            if(stat.isDirectory() == true) {
+                ls(fname);
+            } 
+            else {
+                if ((fname.indexOf('.html') > 0 || fname.indexOf('.js') > 0)) {
+                    // console.log(fname);
+                    // if (fname.indexOf('min.js') < 0) {
+                        var data = fs.readFileSync(fname, "utf-8");
+                        // 得到getMsg里的key
+                        getKey(data);
+                    // }
+                }
+            }  
+        }  
+    }
+
+    console.log('parsing used keys');
+
+    ls(base + '/admin');
+    ls(base + '/blog');
+    ls(base + '/md');
+    ls(base + '/js');
+    ls(base + '/album');
+    ls(base + '/libs');
+    ls(base + '/member');
+    ls(base + '/tinymce');
+
+    ls(leanoteBase + '/app/views');
+
+    console.log('parsed');
+    var langs = {}; // zh-cn: 1
+
+    // msg.zh
+    function getAllMsgs(fname) {
+        var msg = {};
+
+        var data = fs.readFileSync(fname, "utf-8");
+        var lines = data.split('\n');
+        for (var i = 0; i < lines.length; ++i) {
+            var line = lines[i];
+            // 忽略注释
+            if (line[0] == '#' || line[1] == '#') {
+                continue;
+            }
+            var lineArr = line.split('=');
+            if (lineArr.length >= 2) {
+               var key = lineArr[0];
+               lineArr.shift();
+               msg[key] = lineArr.join('=');
+               // msg[lineArr[0]] = lineArr[1];
+            }
+        }
+        return msg;
+    }
+
+    // 得到所有的语言的后缀
+    // 返回{en-us: 1, }
+    function getAllLangs() {
+        var langs = {};
+        var files = fs.readdirSync(messagesPath);  
+        for(fn in files) {
+            var fname = files[fn]; 
+            if (fname.indexOf('-') > 0) {
+                langs[fname] = 1;
+            }
+        }
+        return langs;
+    }
+
+    // msg.zh, msg.js
+    function genI18nJsFile(targetFilename, lang, fromFilenames, keys) {
+        var msgs = {};
+        fromFilenames.forEach(function (name) {
+            var tmpMsgs = getAllMsgs(leanoteBase + '/messages/' + lang + '/' + name + '.conf');
+            for (var i in tmpMsgs) {
+                msgs[i] = tmpMsgs[i];
+            }
+        });
+
+        var toMsgs = {};
+        for (var i in msgs) {
+            // 只要需要的
+            if (i in keys) {
+                toMsgs[i] = msgs[i];
+            }
+        }
+        var str = 'var MSG=' + JSON.stringify(toMsgs) + ';';
+        str += 'function getMsg(key, data) {var msg = MSG[key];if(msg) {if(data) {if(!isArray(data)) {data = [data];}' + 
+                        'for(var i = 0; i < data.length; ++i) {' + 
+                            'msg = msg.replace("%s", data[i]);' + 
+                        '}' + 
+                    '}' + 
+                    'return msg;' + 
+                '}' + 
+                'return key;' + 
+            '}';
+
+        // 写入到文件中
+        var toFilename = targetFilename + '.' + lang + '.js';
+        fs.writeFile(base + '/js/i18n/' + toFilename, str);
+    }
+
+    function genTinymceLang(lang) {
+        var msgs = getAllMsgs(leanoteBase + 'messages/' + lang + '/tinymce_editor.conf');
+        var str = 'tinymce.addI18n("' + lang + '",' + JSON.stringify(msgs) + ');';
+        fs.writeFile(base + '/tinymce/langs/' + lang + '.js', str);
+    }
+
+    var langs = getAllLangs();
+    for (var lang in langs) {
+        genI18nJsFile('blog', lang, ['blog'], keys);
+        genI18nJsFile('msg', lang, ['msg', 'member', 'markdown', 'album'], keys);
+
+        genTinymceLang(lang);
+    }
+    
+});
+
+// 合并album需要的js
+gulp.task('concatAlbumJs', function() {
+    /*
+    gulp.src(base + '/album/js/main.js')
+        .pipe(uglify()) // 压缩
+        .pipe(rename({suffix: '.min'}))
+        .pipe(gulp.dest(base + '/album/js/'));
+    */
+
+    gulp.src(base + '/album/css/style.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/album/css'));
+
+    var jss = [
+        'js/jquery-1.9.0.min.js',
+        'js/bootstrap-min.js',
+        'js/plugins/libs-min/fileupload.js',
+        'js/jquery.pagination.js',
+        'album/js/main.js',
+    ];
+
+    for(var i in jss) {
+        jss[i] = base + '/' + jss[i];
+    }
+
+    return gulp
+        .src(jss)
+        .pipe(uglify()) // 压缩
+        .pipe(concat('main.all.js'))
+        .pipe(gulp.dest(base + '/album/js'));
+});
+
+// tinymce
+// please set the right path on your own env
+var tinymceBase = '/Users/life/leanote/leanote-tools/tinymce_4.1.9_leanote_public';
+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_mindmap,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, 无用
+// Deprecated
+gulp.task('concatCss', function() {
+    return gulp
+        .src([markdownRaw + '/css/default.css', markdownRaw + '/css/md.css'])
+        .pipe(concat('all.css'))
+        .pipe(gulp.dest(markdownMin));
+});
+
+// mincss
+var minifycss = require('gulp-minify-css');
+gulp.task('minifycss', function() {
+    gulp.src(base + '/css/bootstrap.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/css'));
+
+    gulp.src(base + '/css/font-awesome-4.2.0/css/font-awesome.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/css/font-awesome-4.2.0/css'));
+
+    gulp.src(base + '/css/zTreeStyle/zTreeStyle.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/css/zTreeStyle'));
+
+    gulp.src(base + '/md/themes/default.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/md/themes'));
+
+    gulp.src(base + '/js/contextmenu/css/contextmenu.css')
+        .pipe(rename({suffix: '-min'}))
+        .pipe(minifycss())
+        .pipe(gulp.dest(base + '/js/contextmenu/css'));
+
+    // theme
+    // 用codekit
+    var as = ['default', 'simple', 'writting', /*'writting-overwrite', */ 'mobile'];
+    /*
+    for(var i = 0; i < as.length; ++i) {
+        gulp.src(base + '/css/theme/' + as[i] + '.css')
+            .pipe(minifycss())
+            .pipe(gulp.dest(base + '/css/theme'));
+    }
+    */
+});
+
+
+gulp.task('concat', ['concatDepJs', 'concatAppJs', /* 'concatMarkdownJs', */'concatMarkdownJsV2']);
+gulp.task('html', ['devToProHtml']);
+gulp.task('default', ['concat', 'plugins', 'minifycss', 'i18n', 'concatAlbumJs', '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,113 +1,189 @@
-
 # Leanote
 
+[![Build Status](https://travis-ci.org/leanote/leanote.svg)](https://travis-ci.org/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)
+
 ## 1. Introduction
 
-Leanote, not just a notebook!
+Leanote, not just a notepad!
 ![leanote.png](leanote.png "")
 
-**Some Features**
+**Highlighted Features**
 
-* Knowledge: Manage your knowledge in leanote. leanote contains the tinymce editor and a markdown editor, just enjoy yourself writing.
+* Note-taking made easy: Leanote incorporates a clean and intuitive interface, the `tinymce` rich-text editor and a dedicated *markdown* editor, making your writing/typing more efficient and enjoyable. For more advanced users, we even offer `Vim` and `Emacs` writing modes to help boost your writing speed to another level. 
-* Share: Share your knowledge with your friends in leanote. You can invite your friends to join your notepad in the cloud so you can share knowledge.
+* Knowledge management: The flexible and versatile notebook-note-tagging system of Leanote makes it an ideal tool for knowledge management.
-* Cooperation: Collaborate with friends to improve your skills.
+* Sharing: Share your knowledge, thoughts and experiences with friends via Leanote. Invite your friends to join your notepad in the cloud.
-* Blog: Publish your knowledge and make leanote your blog.
+* Cooperating: Collaborate with colleagues to improve skills, fertilize ideas and brainstorm on the fly.
+* Blogging: Publish your work and make Leanote your personal blog.
 
-## 2. Why we created leanote
+**Other Features**
-To be honest, our inspiration comes from Evernote. We use Evernote to manage our knowledge everyday. But we find that:
+
-* Evernote's editor can't meet our needs, it does not have document navigation, it does not render code properly (as a programmer, syntax highlighted code rendering is a basic need), it cannot resize images and so forth
+* Markdown syntax support
-* We like markdown, but Evernote does not support it.
+* Distraction-free writing mode
-* We want to share our knowledge, so all of us have our blogs (e.g. on Wordpress) and our Evernote accounts, but why can not those two be one!
+* `Vim` and `Emacs` editing mode
+* Export notes to PDFs
+* Batch note operation
+* Customizable themes for blogging
+
+## 2. Why we create Leanote
+
+We have been using the popular note-taking software/service `Evernote` as our knowledge management tool on a daily basis. Benefited from and inspired by `Evernote`, we decided to create a brand-new tool that provides everything `Evernote` has to offer, plus a bunch of new features that `Evernote` failed to deliver, such as:
+
+* A more powerful editor: `Evernote`'s editor lacks the functionalities of **document navigation**, **syntax based code rendering** (as a programmer, syntax highlighted code rendering is a necessity), **image resizing** and so forth.
+* Everybody loves *markdown*, however `Evernote` simply wouldn't add it despite of years' of requests from users. So we will do the favor and bring a *markdown* enabled editor to you, guess what, it is also rendered in real-time!
+* If you a developer and miss the `Vim` or `Emacs` ways of writing, we offer you the choice of `Vim` and `Emacs` editting modes. Equipped   with *markdown* syntax for text formatting, you will never need to touch your mouse while writing.
+* We love managing knowledge and thoughts as much as sharing them, so everybody has their own note account (`Evernote`, `Onenote`, `Google doc`, `Wiz note` etc.) and social media account (`Facebook`, `Wordpress`, blogs, etc.). But why can’t those two be one? Leanote makes this first step to bridge the private note-taking and public knowledge sharing seamlessly.
+* A complete and all-platform (sorry Windows phone) covering software suite: that includes Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). And they are all open source!
 * ......
 
-## 3. How to install leanote
+## 3. How to get Leanote
 
-More information about how to install leanote please see:
+The Leanote software suite contains: Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). 
-* [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
+Interested in our product and want to try it out from your web browser? Welcome to sign up on https://leanote.com. 
 
-Leanote V1.0.3-beta has been released. Binaries:
+Feeling suspicious about how those note-taking companies treat your personal data? You can install Leanote on your server, and use Leanote App (Desktop, iOS, Android) to sync notes with your self-hosted server.
 
-* Linux: [leanote-linux-x86_64.v1.0-beta.3.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta.3/leanote-linux-x86_64.v1.0-beta.3.bin.tar.gz)
+More information about how to install Leanote please see:
-* MacOS X: [leanote-mac-x86_64.v1.0-beta.3.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta.3/leanote-mac-x86_64.v1.0-beta.3.bin.tar.gz)
 
-Or you can clone [Leanote bin repository](https://github.com/leanote/leanote-bin) (Recommend)
+* Leanote binary installation tutorial:
+    * [Windows](https://github.com/leanote/leanote/wiki/leanote-source-installation-on-Windows-(En))
+    * [Mac and Linux](https://github.com/leanote/leanote/wiki/leanote-binary-installation-on-Mac-and-Linux-(En))
+* Leanote source installation tutorial:
+    * [Windows](https://github.com/leanote/leanote/wiki/leanote-source-installation-on-Windows-(En))
+    * [Mac and Linux](https://github.com/leanote/leanote/wiki/Leanote-source-installation-on-Mac-and-Linux-(En))
 
-### 3.2. Install MongoDB
+## 4. Documentation
 
-Leanote is written in go using [revel](https://revel.github.io/) and [MongoDB](https://www.mongodb.org). Thus, you need to first install MongoDB.
+Please see [wiki](https://github.com/leanote/leanote/wiki) for detailed instruction on how to install Leanote on various platforms, trouble shooting and configuration explanations.
-
-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. How to develop Leanote
-Thank you to all the [contributors](https://github.com/leanote/leanote/graphs/contributors) on
-this project. Your help is much appreciated.
 
-## 6. Contributing
+If you are a developer yourself and feel like to build on top of Leanote, please refer to [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).
 
-Please fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
 
-## Docs
+## 6. Contributions
-* [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
+Like or dislike Leanote, please leave your comments and suggestions to help us improve it.
-* [leanote bbs](http://bbs.leanote.com)
+If you encounter any issue, we suggest you first do a search in the issues section to see whether a solution already exists, or open up a new one otherwise.
-* [leanote google group](https://groups.google.com/forum/#!forum/leanote)
+
-* QQ Group: 158716820
+We’d like to acknowledge the contributions made by our [developers and contributors](https://github.com/leanote/leanote/graphs/contributors) to
+this project. Leanote won’t exist without your hard work. Your help is much appreciated.
+
+## 7. Join us
+
+Please feel free to fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
+
+If you find any problems or have any good ideas, feature requests, please submit here [issues](https://github.com/leanote/leanote/issues).
+
+
+## 8. Donation
+
+If you like our product, consider supporting us via [donate us](http://leanote.org/#donate).
+We acknowledge the donations make by all the [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/leanote/leanote-android), development phase
+
+You are welcome to join us.
+
+## 10. Contacts
+
+* Email: leanote@leanote.com
+* [Leanote BBS](http://bbs.leanote.com)
+* [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
+* QQ Groups: 326073529, 256076853, 158716820
 
 -----------------------------------------------------------------------
-[中文](README_zh.md)
 
+# Leanote
+
+## 1. 介绍
+
+Leanote, 不只是笔记!
+
+**特性**
+
+* 高效笔记：Leanote 有易操作的界面, 包含一款富文本编辑器和Markdown编辑器，让您的笔记记录更轻松和高效。对高阶用户，我们还提供`Vim` 和`Emacs` 编辑模式，助推你的写作速度更上层楼。
+* 知识管理:  Leanote 灵活而强大的“笔记本-笔记-标签”系统，让它成为你个人知识管理的利器。
+* 分享: 你可以通过Leanote同好友分享知识、想法和经历, 邀请好友加入你的笔记簿，通过云端交流信息。
+* 协作: Leanote协助你与同事之间相互协作，激荡新思路，随时随地头脑风暴。
+* 博客: Leanote也可以作为你的个人博客, 把你的知识传播的更远!
+
+**其它特性**
+
+* 支持Markdown编辑
+* 写作模式
+* `Vim` 及 `Emacs` 编辑模式
+* 支持PDF导出
+* 支持批量操作
+* 博客自定义主题, 实现高度定制化
+
+## 2. 为什么我们要创建Leanote?
+我们都曾是`Evernote`的忠实粉丝, 一直以来`Evernote`都是我们日常知识管理的有效工具。于是我们决定重新创造一款工具，提供`Evernote`所能提供的功能，同时弥补`Evernote`的不足，比如：
+* 功能更强的文本编辑器：`Evernote`的编辑器不能满足我们的需求, 不能实现文档导航、不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放等。
+* `Evernote` 不支持所有人都喜爱的markdown语法，于是我们为Leanote配备了一款可以实时渲染的markdown编辑器。
+* 如果你是一名开发者，觉得手指怀念`Vim` 或 `Emacs` 了，那么我们还提供给你`Vim` 和 `Emacs` 写作模式，配合*markdown*的格式编辑，写作的时候再也不用去碰鼠标了。
+* 知识积累和知识分享同样重要，因此大家都有自己的笔记账号和社交账号。但为什么这两者不能合二为一呢? Leanote 做到了将二者无缝衔接。
+* 一套完整的、全平台覆盖的软件套装，包括了web、桌面、安卓、IOS设备，而且全部开源！
+* 还有...
+
+## 3. 获取Leanote
+
+Leanote云笔记产品包括: Leanote Web & Server(即本仓库), 桌面客户端, IOS, android. 4端全部开源! 
+
+如果想试用我们的产品，欢迎在 https://leanote.com 上注册, Leanote团队为你提供稳定可靠的服务。
+担心服务厂商如何处理你的个人数据吗？你可以下载Leanote安装在自己的服务器上, 通过Leanote客户端连接与自建服务同步数据。
+
+这里详细整理了Leanote二进版和Leanote开发版的安装教程, 请移步至:
+
+* Leanote二进制详细安装教程:
+    * [Windows](https://github.com/leanote/leanote/wiki/Leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B---Windows)
+    * [Mac, Linux](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源码详细安装教程:
+    * [Windows](https://github.com/leanote/leanote/wiki/Leanote-%E6%BA%90%E7%A0%81%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B----Windows)
+    * [Mac, Linux](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+
+## 4. 相关文档
+
+更多详细的安装说明、问题处理和配置说明文档，请查看 [wiki](https://github.com/leanote/leanote/wiki)。
+
+## 5. 如何对Leanote进行二次开发
+
+如果您有兴趣基于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)。
+
+## 6. 贡献者
+
+在此对向Leanote贡献力量的[贡献者们](https://github.com/leanote/leanote/graphs/contributors) 表示感谢。Leanote因有你们而更完美!
+
+## 7. 加入我们
+
+欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到Leanote。
+
+有任何问题或建议, 请先搜索[issue](https://github.com/leanote/leanote/issues)区是否已经有解决方法。如果没有，欢迎提交新issue。
+
+Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善Leanote。
+
+## 8. 捐赠
+
+如果您喜欢我们的产品，请考虑支持我们, [捐赠Leanote](http://leanote.org/#donate)。
+
+感谢[这些捐赠者](http://leanote.leanote.com/post/leanote-donation-list), 谢谢你们的鼓励, Leanote会一直坚持!
+
+## 9. 其它相关项目
+* [Leanote Desktop App](https://github.com/leanote/desktop-app), [下载地址](http://app.leanote.com)
+* [Leanote iOS](https://github.com/leanote/leanote-ios), [从App Store下载](https://itunes.apple.com/zn/app/leanote/id1022302858?mt=8)
+* [Leanote Android](https://github.com/leanote/leanote-android), 开发阶段
+
+欢迎加入我们!
+
+## 联系&加入我们
+* Email: leanote@leanote.com
+* [Leanote 社区](http://bbs.leanote.com)
+* [QQ群](http://leanote.leanote.com/post/Leanote-groups)
+* [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
 

README_zh.md

@@ -1,113 +0,0 @@
-
-# Leanote产品
-
-## 1. 介绍
-
-Leanote, 不只是笔记!
-![leanote.png](leanote.png "")
-
-**特性**
-
-* 知识管理: 通过leanote来管理知识, leanote有易操作的界面, 包含两款编辑器tinymce和markdown. 在leanote, 你可以尽情享受写作.
-* 分享: 你也可以通过分享知识给好友, 让好友拥有你的知识.
-* 协作: 在分享的同时也可以与好友一起协作知识.
-* 博客: leanote也可以作为你的博客, 将知识公开成博客, 让leanote把你的知识传播的更远!
-
-## 2. 为什么我们要创建leanote?
-说实话, 我们曾是evernote的忠实粉丝, 但是我们也发现evernote的不足:
-* evernote的编辑器不能满足我们的需求, 不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放.
-* 我们是markdown的爱好者, 可是evernote竟然没有.
-* 我们也想将知识公开, 所以我们有自己的博客, 如wordpress, 但为什么这两者不能合二为一呢?
-* 还有...
-
-## 3.安装leanote
-leanote是一款私有云笔记, 你可以下载它安装在自己的服务器上, 当然也可以在 http://leanote.com 上注册.
-
-这里详细整理了leanote二进版和leanote开发版的安装教程, 请移步至:
-* [leanote二进制详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
-* [leanote开发版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
-
-### 3.1. 下载leanote
-
-Leanote V1.0-beta.3 已发布, 二进制文件(暂时没有windows版的):
-
-* Linux: [leanote-linux-x86_64.v1.0-beta.3.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta.3/leanote-linux-x86_64.v1.0-beta.3.bin.tar.gz)
-* MacOS X: [leanote-mac-x86_64.v1.0-beta.3.bin.tar.gz](https://github.com/leanote/leanote/releases/download/1.0-beta.3/leanote-mac-x86_64.v1.0-beta.3.bin.tar.gz)
-
-或者直接检出[Leanote bin repository](https://github.com/leanote/leanote-bin) (推荐, 因为为最新版本)
-
-### 3.2. 安装 MongodbDB
-
-Leanote是由golang(使用[revel](https://revel.github.io/)框架 和 [MongoDB](https://www.mongodb.org)数据库), 你需要先安装Mongodb.
-
-安装MongodbDB, 导入数据更多细节请查看: [wiki](https://github.com/leanote/leanote/wiki/Install-Mongodb)
-
-### 3.3. 导入初始数据
-
-MongodbDB初始数据在 `[PATH_TO_LEANOTE]/mongodb_backup/leanote_install_data`
-
-```
-$> mongorestore -h localhost -d leanote --directoryperdb PATH_TO_LEANOTE/mongodb_backup/leanote_install_data
-```
-
-初始数据包含两个用户:
-
-```
-user2 username: admin, password: abc123 (管理员, 重要!)
-user3 username: demo@leanote.com, password: demo@leanote.com (为体验使用)
-```
-
-### 3.4. 配置
-
-修改 `[PATH_TO_LEANOTE]/conf/app.conf`. 有以下选项:
-
-``mongodb``  **必须配置!**
-
-```Shell
-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)

Vendor.md

@@ -0,0 +1,20 @@
+# Modifications
+
+* revel.go
+
+```
+RevelImportPath = "github.com/leanote/leanote/vendor/github.com/revel/revel"
+```
+
+
+# RUN
+```
+go install github.com/leanote/leanote/cmd/leanote_revel
+leanote_revel run github.com/leanote/leanote
+```
+
+# build leanote, 在当前目录生成了leanote二进制文件
+go build -o ./leanote github.com/leanote/leanote/app/tmp
+ 
+# 运行leanote, 其中-importPath是必须的
+./leanote -importPath=github.com/leanote/leanote -runMode=prod -port=9000

app/cmd/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+	"github.com/revel/cmd/harness"
+	"github.com/revel/revel"
+)
+
+func main() {
+	// go run main.go
+	// 生成routes.go, main.go
+	revel.Init("", "github.com/leanote/leanote", "")
+	_, err := harness.Build() // ok, err
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println("Ok")
+	//	panicOnError(reverr, "Failed to build")
+}

app/controllers/AlbumController.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
 	"github.com/leanote/leanote/app/info"
 	"gopkg.in/mgo.v2/bson"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
-//	"io/ioutil"
+	//	"io/ioutil"
 )
 
 // Album controller
@@ -14,15 +14,20 @@ type Album struct {
 	BaseController
 }
 
+// 图片管理, iframe
+func (c Album) Index() revel.Result {
+	c.SetLocale()
+	return c.RenderTemplate("album/index.html")
+}
+
 // all albums by userId
 func (c Album) GetAlbums() revel.Result {
 	re := albumService.GetAlbums(c.GetUserId())
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
-
 func (c Album) DeleteAlbum(albumId string) revel.Result {
 	re, msg := albumService.DeleteAlbum(c.GetUserId(), albumId)
-	return c.RenderJson(info.Re{Ok: re, Msg: msg})
+	return c.RenderJSON(info.Re{Ok: re, Msg: msg})
 }
 
 // add album
@@ -34,14 +39,14 @@ func (c Album) AddAlbum(name string) revel.Result {
 		UserId:  c.GetObjectUserId()}
 	re := albumService.AddAlbum(album)
 
-	if(re) {
+	if re {
-		return c.RenderJson(album)
+		return c.RenderJSON(album)
 	} else {
-		return c.RenderJson(false)
+		return c.RenderJSON(false)
 	}
 }
 
 // update alnum name
 func (c Album) UpdateAlbum(albumId, name string) revel.Result {
-	return c.RenderJson(albumService.UpdateAlbum(albumId, c.GetUserId(), name))
+	return c.RenderJSON(albumService.UpdateAlbum(albumId, c.GetUserId(), name))
 }

app/controllers/AttachController.go

@@ -2,18 +2,18 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-	"gopkg.in/mgo.v2/bson"
+	"archive/tar"
-	. "github.com/leanote/leanote/app/lea"
+	"compress/gzip"
+	"fmt"
 	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"io"
 	"io/ioutil"
 	"os"
 	"strings"
 	"time"
-    "io"
-    "fmt"
-    "archive/tar"
-    "compress/gzip"
 )
 
 // 附件
@@ -24,7 +24,7 @@ type Attach struct {
 // 上传附件
 func (c Attach) UploadAttach(noteId string) revel.Result {
 	re := c.uploadAttach(noteId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c Attach) uploadAttach(noteId string) (re info.Re) {
 	var fileId = ""
@@ -57,17 +57,19 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 		return re
 	}
 	// > 5M?
-	maxFileSize := configService.GetUploadSize("uploadAttachSize");
+	maxFileSize := configService.GetUploadSize("uploadAttachSize")
 	if maxFileSize <= 0 {
 		maxFileSize = 1000
 	}
-	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+	if float64(len(data)) > maxFileSize*float64(1024*1024) {
 		resultMsg = fmt.Sprintf("The file's size is bigger than %vM", maxFileSize)
 		return re
 	}
 
 	// 生成上传路径
-	filePath := "files/" + c.GetUserId() + "/attachs"
+	//	filePath := "files/" + c.GetUserId() + "/attachs"
+	newGuid := NewGuid()
+	filePath := "files/" + GetRandomFilePath(c.GetUserId(), newGuid) + "/attachs"
 	dir := revel.BasePath + "/" + filePath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
@@ -76,8 +78,8 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 	// 生成新的文件名
 	filename := handel.Filename
 	_, ext := SplitFilename(filename) // .doc
-	filename = NewGuid() + ext
+	filename = newGuid + ext
-	toPath := dir + "/" + filename;
+	toPath := dir + "/" + filename
 	err = ioutil.WriteFile(toPath, data, 0777)
 	if err != nil {
 		return re
@@ -97,7 +99,7 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 		Type:         fileType,
 		Size:         filesize}
 
-	id := bson.NewObjectId();
+	id := bson.NewObjectId()
 	fileInfo.AttachId = id
 	fileId = id.Hex()
 	Ok, resultMsg = attachService.AddAttach(fileInfo, false)
@@ -105,7 +107,7 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 		resultMsg = c.Message(resultMsg)
 	}
 
-	fileInfo.Path = ""; // 不要返回
+	fileInfo.Path = "" // 不要返回
 	if Ok {
 		resultMsg = "success"
 	}
@@ -116,7 +118,7 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
 func (c Attach) DeleteAttach(attachId string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Msg = attachService.DeleteAttach(attachId, c.GetUserId())
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // get all attachs by noteId
@@ -124,13 +126,13 @@ func (c Attach) GetAttachs(noteId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = true
 	re.List = attachService.ListAttachs(noteId, c.GetUserId())
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 下载附件
 // 权限判断
 func (c Attach) Download(attachId string) revel.Result {
-	attach := attachService.GetAttach(attachId, c.GetUserId()); // 得到路径
+	attach := attachService.GetAttach(attachId, c.GetUserId()) // 得到路径
 	path := attach.Path
 	if path == "" {
 		return c.RenderText("")
@@ -165,10 +167,16 @@ func (c Attach) DownloadAll(noteId string) revel.Result {
 		filename = "all.tar.gz"
 	}
 
+	dir := revel.BasePath + "/files/attach_all"
+
+	if !MkdirAll(dir) {
+		return c.RenderText("error")
+	}
+
 	// file write
-    fw, err := os.Create(revel.BasePath + "/files/" + filename)
+	fw, err := os.Create(dir + "/" + filename)
 	if err != nil {
-		return c.RenderText("")
+		return c.RenderText("error")
 	}
 	// defer fw.Close() // 不需要关闭, 还要读取给用户下载
 
@@ -210,10 +218,10 @@ func (c Attach) DownloadAll(noteId string) revel.Result {
 		}
 	} // for
 
-//    tw.Close()
+	//    tw.Close()
-//    gw.Close()
+	//    gw.Close()
-//    fw.Close()
+	//    fw.Close()
-//    file, _ := os.Open(dir + "/" + filename)
+	//    file, _ := os.Open(dir + "/" + filename)
 	// fw.Seek(0, 0)
 	return c.RenderBinary(fw, filename, revel.Attachment, time.Now()) // revel.Attachment
 }

app/controllers/AuthController.go

@@ -1,10 +1,11 @@
 package controllers
 
 import (
-	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
-//	"strconv"
+	"github.com/revel/revel"
+	"strings"
+	//	"strconv"
 )
 
 // 用户登录/注销/找回密码
@@ -16,68 +17,69 @@ type Auth struct {
 //--------
 // 登录
 func (c Auth) Login(email, from string) revel.Result {
-	c.RenderArgs["title"] = c.Message("login")
+	c.ViewArgs["title"] = c.Message("login")
-	c.RenderArgs["subTitle"] = c.Message("login")
+	c.ViewArgs["subTitle"] = c.Message("login")
-	c.RenderArgs["email"] = email
+	c.ViewArgs["email"] = email
-	c.RenderArgs["from"] = from
+	c.ViewArgs["from"] = from
-	c.RenderArgs["openRegister"] = configService.IsOpenRegister()
+	c.ViewArgs["openRegister"] = configService.IsOpenRegister()
 
-	sessionId := c.Session.Id()
+	sessionId := c.Session.ID()
 	if sessionService.LoginTimesIsOver(sessionId) {
-		c.RenderArgs["needCaptcha"] = true
+		c.ViewArgs["needCaptcha"] = true
 	}
 
 	c.SetLocale()
 
 	if c.Has("demo") {
-		c.RenderArgs["demo"] = true
+		c.ViewArgs["demo"] = true
-		c.RenderArgs["email"] = "demo@leanote.com"
+		c.ViewArgs["email"] = "demo@leanote.com"
 	}
 	return c.RenderTemplate("home/login.html")
 }
 
 // 为了demo和register
 func (c Auth) doLogin(email, pwd string) revel.Result {
-	sessionId := c.Session.Id()
+	sessionId := c.Session.ID()
 	var msg = ""
 
-	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"
+	} else {
+		c.SetSession(userInfo)
+		sessionService.ClearLoginTimes(sessionId)
+		return c.RenderJSON(info.Re{Ok: true})
 	}
 
-	return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId) , Msg: c.Message(msg)})
+	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()
+	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})
 		}
 	}
 
-	return c.RenderJson(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId) , Msg: c.Message(msg)})
+	return c.RenderJSON(info.Re{Ok: false, Item: sessionService.LoginTimesIsOver(sessionId), Msg: c.Message(msg)})
 }
+
 // 注销
 func (c Auth) Logout() revel.Result {
-	sessionId := c.Session.Id()
+	sessionId := c.Session.ID()
 	sessionService.Clear(sessionId)
 	c.ClearSession()
 	return c.Redirect("/login")
@@ -85,8 +87,17 @@ func (c Auth) Logout() revel.Result {
 
 // 体验一下
 func (c Auth) Demo() revel.Result {
-	c.doLogin(configService.GetGlobalStringConfig("demoUsername"), configService.GetGlobalStringConfig("demoPassword"))
+	email := configService.GetGlobalStringConfig("demoUsername")
+	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
 }
 
 //--------
@@ -96,11 +107,11 @@ func (c Auth) Register(from, iu string) revel.Result {
 		return c.Redirect("/index")
 	}
 	c.SetLocale()
-	c.RenderArgs["from"] = from
+	c.ViewArgs["from"] = from
-	c.RenderArgs["iu"] = iu
+	c.ViewArgs["iu"] = iu
 
-	c.RenderArgs["title"] = c.Message("register")
+	c.ViewArgs["title"] = c.Message("register")
-	c.RenderArgs["subTitle"] = c.Message("register")
+	c.ViewArgs["subTitle"] = c.Message("register")
 	return c.RenderTemplate("home/register.html")
 }
 func (c Auth) DoRegister(email, pwd, iu string) revel.Result {
@@ -108,15 +119,17 @@ func (c Auth) DoRegister(email, pwd, iu string) revel.Result {
 		return c.Redirect("/index")
 	}
 
-	re := info.NewRe();
+	re := info.NewRe()
 
 	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 
+	email = strings.ToLower(email)
+
 	// 注册
 	re.Ok, re.Msg = authService.Register(email, pwd, iu)
 
@@ -131,40 +144,44 @@ func (c Auth) DoRegister(email, pwd, iu string) revel.Result {
 //--------
 // 找回密码
 func (c Auth) FindPassword() revel.Result {
-	c.RenderArgs["title"] = c.Message("findPassword")
+	c.SetLocale()
-	c.RenderArgs["subTitle"] = c.Message("findPassword")
+	c.ViewArgs["title"] = c.Message("findPassword")
+	c.ViewArgs["subTitle"] = c.Message("findPassword")
 	return c.RenderTemplate("home/find_password.html")
 }
 func (c Auth) DoFindPassword(email string) revel.Result {
 	pwdService.FindPwd(email)
 	re := info.NewRe()
 	re.Ok = true
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
+
 // 点击链接后, 先验证之
 func (c Auth) FindPassword2(token string) revel.Result {
-	c.RenderArgs["title"] = c.Message("findPassword")
+	c.SetLocale()
-	c.RenderArgs["subTitle"] = c.Message("findPassword")
+	c.ViewArgs["title"] = c.Message("findPassword")
+	c.ViewArgs["subTitle"] = c.Message("findPassword")
 	if token == "" {
 		return c.RenderTemplate("find_password2_timeout.html")
 	}
-	ok, _, findPwd := tokenService.VerifyToken(token, info.TokenPwd);
+	ok, _, findPwd := tokenService.VerifyToken(token, info.TokenPwd)
 	if !ok {
 		return c.RenderTemplate("home/find_password2_timeout.html")
 	}
-	c.RenderArgs["findPwd"] = findPwd
+	c.ViewArgs["findPwd"] = findPwd
 
-	c.RenderArgs["title"] = c.Message("updatePassword")
+	c.ViewArgs["title"] = c.Message("updatePassword")
-	c.RenderArgs["subTitle"] = c.Message("updatePassword")
+	c.ViewArgs["subTitle"] = c.Message("updatePassword")
 
 	return c.RenderTemplate("home/find_password2.html")
 }
+
 // 找回密码修改密码
 func (c Auth) FindPasswordUpdate(token, pwd string) revel.Result {
-	re := info.NewRe();
+	re := info.NewRe()
 
 	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 
 	// 修改之

app/controllers/BaseController.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
-	"github.com/revel/revel"
-	"gopkg.in/mgo.v2/bson"
 	"encoding/json"
 	"github.com/leanote/leanote/app/info"
-//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/lea/i18n"
-//	"io/ioutil"
+	"github.com/revel/revel"
-//	"fmt"
+	"gopkg.in/mgo.v2/bson"
+	//	. "github.com/leanote/leanote/app/lea"
+	//	"io/ioutil"
+	//	"fmt"
+	"bytes"
 	"math"
 	"strconv"
 	"strings"
-	"bytes"
 )
 
 // 公用Controller, 其它Controller继承它
@@ -19,6 +20,11 @@ type BaseController struct {
 	*revel.Controller
 }
 
+// 覆盖revel.Message
+func (c *BaseController) Message(message string, args ...interface{}) (value string) {
+	return i18n.Message(c.Request.Locale, message, args...)
+}
+
 func (c BaseController) GetUserId() string {
 	if userId, ok := c.Session["UserId"]; ok {
 		return userId
@@ -56,7 +62,7 @@ func (c BaseController) GetUsername() string {
 // 得到用户信息
 func (c BaseController) GetUserInfo() info.User {
 	if userId, ok := c.Session["UserId"]; ok && userId != "" {
-		return userService.GetUserInfo(userId);
+		return userService.GetUserInfo(userId)
 		/*
 			notebookWidth, _ := strconv.Atoi(c.Session["NotebookWidth"])
 			noteListWidth, _ := strconv.Atoi(c.Session["NoteListWidth"])
@@ -84,6 +90,13 @@ func (c BaseController) GetUserInfo() info.User {
 	return info.User{}
 }
 
+func (c BaseController) GetUserAndBlogUrl() info.UserAndBlogUrl {
+	if userId, ok := c.Session["UserId"]; ok && userId != "" {
+		return userService.GetUserAndBlogUrl(userId)
+	}
+	return info.UserAndBlogUrl{}
+}
+
 // 这里的session都是cookie中的, 与数据库session无关
 func (c BaseController) GetSession(key string) string {
 	v, ok := c.Session[key]
@@ -132,7 +145,7 @@ func (c BaseController) UpdateSession(key, value string) {
 
 // 返回json
 func (c BaseController) Json(i interface{}) string {
-//	b, _ := json.MarshalIndent(i, "", "	") 
+	//	b, _ := json.MarshalIndent(i, "", "	")
 	b, _ := json.Marshal(i)
 	return string(b)
 }
@@ -150,9 +163,9 @@ func (c BaseController) GetPage() int {
 // 判断是否含有某参数
 func (c BaseController) Has(key string) bool {
 	if _, ok := c.Params.Values[key]; ok {
-		return true;
+		return true
 	}
-	return false;
+	return false
 }
 
 /*
@@ -162,32 +175,36 @@ func (c Blog) GetPage(page, count int, list interface{}) info.Page {
 */
 
 func (c BaseController) GetTotalPage(page, count int) int {
-	return int(math.Ceil(float64(count)/float64(page)))
+	return int(math.Ceil(float64(count) / float64(page)))
 }
 
 //-------------
 func (c BaseController) E404() revel.Result {
-	c.RenderArgs["title"] = "404";
+	c.ViewArgs["title"] = "404"
 	return c.NotFound("", nil)
 }
 
 // 设置本地
 func (c BaseController) SetLocale() string {
 	locale := string(c.Request.Locale) // zh-CN
+	// lang := locale
+	// if strings.Contains(locale, "-") {
+	// 	pos := strings.Index(locale, "-")
+	// 	lang = locale[0:pos]
+	// }
+	// if lang != "zh" && lang != "en" {
+	// 	lang = "en"
+	// }
 	lang := locale
-	if strings.Contains(locale, "-") {
+	if !i18n.HasLang(locale) {
-		pos := strings.Index(locale, "-")
+		lang = i18n.GetDefaultLang()
-		lang = locale[0:pos]
 	}
-	if lang != "zh" && lang != "en" {
+	c.ViewArgs["locale"] = lang
-		lang = "en";
+	c.ViewArgs["siteUrl"] = configService.GetSiteUrl()
-	}
-	c.RenderArgs["locale"] = lang;
-	c.RenderArgs["siteUrl"] = configService.GetSiteUrl();
 
-	c.RenderArgs["blogUrl"] = configService.GetBlogUrl()
+	c.ViewArgs["blogUrl"] = configService.GetBlogUrl()
-	c.RenderArgs["leaUrl"] = configService.GetLeaUrl()
+	c.ViewArgs["leaUrl"] = configService.GetLeaUrl()
-	c.RenderArgs["noteUrl"] = configService.GetNoteUrl()
+	c.ViewArgs["noteUrl"] = configService.GetNoteUrl()
 
 	return lang
 }
@@ -195,9 +212,9 @@ func (c BaseController) SetLocale() string {
 // 设置userInfo
 func (c BaseController) SetUserInfo() info.User {
 	userInfo := c.GetUserInfo()
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
-	if(userInfo.Username == configService.GetAdminUsername()) {
+	if userInfo.Username == configService.GetAdminUsername() {
-		c.RenderArgs["isAdmin"] = true
+		c.ViewArgs["isAdmin"] = true
 	}
 	return userInfo
 }
@@ -213,12 +230,12 @@ func (c BaseController) RenderTemplateStr(templatePath string) string {
 
 	tpl := &revel.RenderTemplateResult{
 		Template:   template,
-		RenderArgs: c.RenderArgs, // 把args给它
+		ViewArgs: c.ViewArgs, // 把args给它
 	}
 
 	var buffer bytes.Buffer
-	tpl.Template.Render(&buffer, c.RenderArgs)
+	tpl.Template.Render(&buffer, c.ViewArgs)
-	return buffer.String();
+	return buffer.String()
 }
 
 // json, result
@@ -227,7 +244,7 @@ func (c BaseController) RenderTemplateStr(templatePath string) string {
 func (c BaseController) RenderRe(re info.Re) revel.Result {
 	oldMsg := re.Msg
 	if re.Msg != "" {
-		if(strings.Contains(re.Msg, "-")) {
+		if strings.Contains(re.Msg, "-") {
 			msgAndValues := strings.Split(re.Msg, "-")
 			if len(msgAndValues) == 2 {
 				re.Msg = c.Message(msgAndValues[0], msgAndValues[1])
@@ -246,5 +263,5 @@ func (c BaseController) RenderRe(re info.Re) revel.Result {
 	if strings.HasPrefix(re.Msg, "???") {
 		re.Msg = oldMsg
 	}
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

app/controllers/BlogController.go

@@ -49,8 +49,8 @@ $.bootstrapJsUrl
 
 func (c Blog) render(templateName string, themePath string) revel.Result {
 	isPreview := false
-	if c.RenderArgs["isPreview"] != nil {
+	if c.ViewArgs["isPreview"] != nil {
-		themePath2 := c.RenderArgs["themePath"]
+		themePath2 := c.ViewArgs["themePath"]
 		if themePath2 == nil {
 			return c.E404()
 		}
@@ -59,9 +59,9 @@ func (c Blog) render(templateName string, themePath string) revel.Result {
 		c.setPreviewUrl()
 
 		// 因为common的themeInfo是从UserBlog.ThemeId来取的, 所以这里要fugai下
-		c.RenderArgs["themeInfo"] = c.RenderArgs["themeInfoPreview"];
+		c.ViewArgs["themeInfo"] = c.ViewArgs["themeInfoPreview"]
 	}
-	return blog.RenderTemplate(templateName, c.RenderArgs, revel.BasePath+"/"+themePath, isPreview)
+	return blog.RenderTemplate(templateName, c.ViewArgs, revel.BasePath+"/"+themePath, isPreview)
 }
 
 // 404
@@ -113,8 +113,8 @@ func (c Blog) setPreviewUrl() {
 	themeId := c.Session["themeId"]
 	theme := themeService.GetTheme(userId, themeId)
 
-	siteUrl := configService.GetSiteUrl()
+	// siteUrl := configService.GetSiteUrl()
-	blogUrl := siteUrl + "/preview" // blog.leanote.com
+	blogUrl := "/preview" // blog.leanote.com
 
 	indexUrl = blogUrl + "/" + userIdOrEmail
 	cateUrl = blogUrl + "/cate/" + userIdOrEmail // /notebookId
@@ -125,26 +125,26 @@ func (c Blog) setPreviewUrl() {
 	archiveUrl = blogUrl + "/archives/" + userIdOrEmail // blog.leanote.com/archive/userId
 	tagsUrl = blogUrl + "/tags/" + userIdOrEmail        // blog.leanote.com/archive/userId
 
-	c.RenderArgs["indexUrl"] = indexUrl
+	c.ViewArgs["indexUrl"] = indexUrl
-	c.RenderArgs["cateUrl"] = cateUrl
+	c.ViewArgs["cateUrl"] = cateUrl
-	c.RenderArgs["postUrl"] = postUrl
+	c.ViewArgs["postUrl"] = postUrl
-	c.RenderArgs["searchUrl"] = searchUrl
+	c.ViewArgs["searchUrl"] = searchUrl
-	c.RenderArgs["singleUrl"] = singleUrl // 单页
+	c.ViewArgs["singleUrl"] = singleUrl // 单页
-	c.RenderArgs["archiveUrl"] = archiveUrl
+	c.ViewArgs["archiveUrl"] = archiveUrl
-	c.RenderArgs["archivesUrl"] = archiveUrl // 别名
+	c.ViewArgs["archivesUrl"] = archiveUrl // 别名
-	c.RenderArgs["tagsUrl"] = tagsUrl
+	c.ViewArgs["tagsUrl"] = tagsUrl
-	c.RenderArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail
+	c.ViewArgs["tagPostsUrl"] = blogUrl + "/tag/" + userIdOrEmail
-	c.RenderArgs["tagUrl"] = c.RenderArgs["tagPostsUrl"]
+	c.ViewArgs["tagUrl"] = c.ViewArgs["tagPostsUrl"]
 
 	// themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的
-	c.RenderArgs["themeBaseUrl"] = "/" + theme.Path
+	c.ViewArgs["themeBaseUrl"] = "/" + theme.Path
 }
 
 // 各种地址设置
 func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) {
 	// 主页 http://leanote.com/blog/life or http://blog.leanote.com/life or http:// xxxx.leanote.com or aa.com
-	host := c.Request.Request.Host
+	// host := c.Request.Request.Host
-	var staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
+	// var staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
 	// staticUrl == host, 为保证同源!!! 只有host, http://leanote.com, http://blog/leanote.com
 	// life.leanote.com, lealife.com
 	siteUrl := configService.GetSiteUrl()
@@ -152,36 +152,36 @@ func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) {
 	// 分类
 	// 搜索
 	// 查看
-	c.RenderArgs["siteUrl"] = siteUrl
+	c.ViewArgs["siteUrl"] = siteUrl
-	c.RenderArgs["indexUrl"] = blogUrls.IndexUrl
+	c.ViewArgs["indexUrl"] = blogUrls.IndexUrl
-	c.RenderArgs["cateUrl"] = blogUrls.CateUrl
+	c.ViewArgs["cateUrl"] = blogUrls.CateUrl
-	c.RenderArgs["postUrl"] = blogUrls.PostUrl
+	c.ViewArgs["postUrl"] = blogUrls.PostUrl
-	c.RenderArgs["searchUrl"] = blogUrls.SearchUrl
+	c.ViewArgs["searchUrl"] = blogUrls.SearchUrl
-	c.RenderArgs["singleUrl"] = blogUrls.SingleUrl // 单页
+	c.ViewArgs["singleUrl"] = blogUrls.SingleUrl // 单页
-	c.RenderArgs["archiveUrl"] = blogUrls.ArchiveUrl
+	c.ViewArgs["archiveUrl"] = blogUrls.ArchiveUrl
-	c.RenderArgs["archivesUrl"] = blogUrls.ArchiveUrl // 别名
+	c.ViewArgs["archivesUrl"] = blogUrls.ArchiveUrl // 别名
-	c.RenderArgs["tagsUrl"] = blogUrls.TagsUrl
+	c.ViewArgs["tagsUrl"] = blogUrls.TagsUrl
-	c.RenderArgs["tagPostsUrl"] = blogUrls.TagPostsUrl
+	c.ViewArgs["tagPostsUrl"] = blogUrls.TagPostsUrl
-	c.RenderArgs["tagUrl"] = blogUrls.TagPostsUrl // 别名
+	c.ViewArgs["tagUrl"] = blogUrls.TagPostsUrl // 别名
 
 	// themeBaseUrl 本theme的路径url, 可以加载js, css, images之类的
-	c.RenderArgs["themeBaseUrl"] = "/" + userBlog.ThemePath
+	c.ViewArgs["themeBaseUrl"] = "/" + userBlog.ThemePath
 
 	// 其它static js
-	c.RenderArgs["jQueryUrl"] = siteUrl + "/js/jquery-1.9.0.min.js"
+	c.ViewArgs["jQueryUrl"] = "/js/jquery-1.9.0.min.js"
 
-	c.RenderArgs["prettifyJsUrl"] = siteUrl + "/js/google-code-prettify/prettify.js"
+	c.ViewArgs["prettifyJsUrl"] = "/js/google-code-prettify/prettify.js"
-	c.RenderArgs["prettifyCssUrl"] = siteUrl + "/js/google-code-prettify/prettify.css"
+	c.ViewArgs["prettifyCssUrl"] = "/js/google-code-prettify/prettify.css"
 
-	c.RenderArgs["blogCommonJsUrl"] = siteUrl + "/public/blog/js/common.js"
+	c.ViewArgs["blogCommonJsUrl"] = "/public/blog/js/common.js"
 
-	c.RenderArgs["shareCommentCssUrl"] = siteUrl + "/public/blog/css/share_comment.css"
+	c.ViewArgs["shareCommentCssUrl"] = "/public/blog/css/share_comment.css"
-	c.RenderArgs["shareCommentJsUrl"] = siteUrl + "/public/blog/js/share_comment.js"
+	c.ViewArgs["shareCommentJsUrl"] = "/public/blog/js/share_comment.js"
 
-	c.RenderArgs["fontAwesomeUrl"] = staticUrl + "/css/font-awesome-4.2.0/css/font-awesome.css"
+	c.ViewArgs["fontAwesomeUrl"] = "/css/font-awesome-4.2.0/css/font-awesome.css"
 
-	c.RenderArgs["bootstrapCssUrl"] = siteUrl + "/css/bootstrap.css"
+	c.ViewArgs["bootstrapCssUrl"] = "/css/bootstrap.css"
-	c.RenderArgs["bootstrapJsUrl"] = siteUrl + "/js/bootstrap-min.js"
+	c.ViewArgs["bootstrapJsUrl"] = "/js/bootstrap-min.js"
 }
 
 // 笔记本分类
@@ -235,8 +235,8 @@ func (c Blog) getCates(userBlog info.UserBlog) {
 		}
 	}
 
-//	LogJ(">>")
+	//	LogJ(">>")
-//	LogJ(cates)
+	//	LogJ(cates)
 
 	// 建立层级
 	hasParent := map[string]bool{} // 有父的cate
@@ -244,9 +244,9 @@ func (c Blog) getCates(userBlog info.UserBlog) {
 		parentCateId := cate.ParentCateId
 		if parentCateId != "" {
 			if parentCate, ok := cateMap[parentCateId]; ok {
-//				Log("________")
+				//				Log("________")
-//				LogJ(parentCate)
+				//				LogJ(parentCate)
-//				LogJ(cate)
+				//				LogJ(cate)
 				if parentCate.Children == nil {
 					parentCate.Children = []*info.Cate{cate}
 				} else {
@@ -265,12 +265,8 @@ func (c Blog) getCates(userBlog info.UserBlog) {
 		}
 	}
 
-	Log("cates")
+	c.ViewArgs["cates"] = cates
-	LogJ(cates)
+	c.ViewArgs["catesTree"] = catesTree
-	LogJ(catesTree);
-	
-	c.RenderArgs["cates"] = cates
-	c.RenderArgs["catesTree"] = catesTree
 }
 
 // 单页
@@ -285,7 +281,7 @@ func (c Blog) getSingles(userId string) {
 			singles2[i] = map[string]string{"title": page["Title"], "singleId": page["SingleId"]}
 		}
 	*/
-	c.RenderArgs["singles"] = singles
+	c.ViewArgs["singles"] = singles
 }
 
 // $.blog = {userId, title, subTitle, desc, openComment, }
@@ -304,11 +300,11 @@ func (c Blog) setBlog(userBlog info.UserBlog, userInfo info.User) {
 		"SubDomain":   userBlog.SubDomain,
 		"Domain":      userBlog.Domain,
 	}
-	c.RenderArgs["blogInfo"] = blogInfo
+	c.ViewArgs["blogInfo"] = blogInfo
 }
 
 func (c Blog) setPaging(pageInfo info.Page) {
-	c.RenderArgs["paging"] = pageInfo
+	c.ViewArgs["paging"] = pageInfo
 }
 
 // 公共
@@ -319,13 +315,13 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
 			return false, userBlog
 		}
 	}
-	//	c.RenderArgs["userInfo"] = userInfo
+	//	c.ViewArgs["userInfo"] = userInfo
 
 	// 最新笔记
 	_, recentBlogs := blogService.ListBlogs(userId, "", 1, 5, userBlog.SortField, userBlog.IsAsc)
-	c.RenderArgs["recentPosts"] = blogService.FixBlogs(recentBlogs)
+	c.ViewArgs["recentPosts"] = blogService.FixBlogs(recentBlogs)
-	c.RenderArgs["latestPosts"] = c.RenderArgs["recentPosts"]
+	c.ViewArgs["latestPosts"] = c.ViewArgs["recentPosts"]
-	c.RenderArgs["tags"] = blogService.GetBlogTags(userId)
+	c.ViewArgs["tags"] = blogService.GetBlogTags(userId)
 
 	// 语言, url地址
 	c.SetLocale()
@@ -335,7 +331,7 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
 		userBlog = blogService.GetUserBlog(userId)
 	}
 	c.setBlog(userBlog, userInfo)
-	//	c.RenderArgs["userBlog"] = userBlog
+	//	c.ViewArgs["userBlog"] = userBlog
 
 	// 分类导航
 	c.getCates(userBlog)
@@ -346,15 +342,16 @@ func (c Blog) blogCommon(userId string, userBlog info.UserBlog, userInfo info.Us
 	c.setUrl(userBlog, userInfo)
 
 	// 当前分类Id, 全设为""
-	c.RenderArgs["curCateId"] = ""
+	c.ViewArgs["curCateId"] = ""
-	c.RenderArgs["curSingleId"] = ""
+	c.ViewArgs["curSingleId"] = ""
 
 	// 得到主题信息
 	themeInfo := themeService.GetThemeInfo(userBlog.ThemeId.Hex(), userBlog.Style)
-	c.RenderArgs["themeInfo"] = themeInfo
+	c.ViewArgs["themeInfo"] = themeInfo
-	Log(">>")
+
-	Log(userBlog.Style)
+	//	Log(">>")
-	Log(userBlog.ThemeId.Hex())
+	//	Log(userBlog.Style)
+	//	Log(userBlog.ThemeId.Hex())
 
 	return true, userBlog
 }
@@ -407,9 +404,9 @@ func (c Blog) Tags(userIdOrEmail string) (re revel.Result) {
 		return c.e404(userBlog.ThemePath) // 404 TODO 使用用户的404
 	}
 
-	c.RenderArgs["curIsTags"] = true
+	c.ViewArgs["curIsTags"] = true
 	tags := blogService.GetBlogTags(userId)
-	c.RenderArgs["tags"] = tags
+	c.ViewArgs["tags"] = tags
 	return c.render("tags.html", userBlog.ThemePath)
 }
 
@@ -446,15 +443,15 @@ func (c Blog) Tag(userIdOrEmail, tag string) (re revel.Result) {
 		tag = userIdOrEmail
 	}
 
-	c.RenderArgs["curIsTagPosts"] = true
+	c.ViewArgs["curIsTagPosts"] = true
-	c.RenderArgs["curTag"] = tag
+	c.ViewArgs["curTag"] = tag
 	page := c.GetPage()
 	pageInfo, blogs := blogService.SearchBlogByTags([]string{tag}, userId, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
 	c.setPaging(pageInfo)
 
-	c.RenderArgs["posts"] = blogService.FixBlogs(blogs)
+	c.ViewArgs["posts"] = blogService.FixBlogs(blogs)
-	tagPostsUrl := c.RenderArgs["tagPostsUrl"].(string)
+	tagPostsUrl := c.ViewArgs["tagPostsUrl"].(string)
-	c.RenderArgs["pagingBaseUrl"] = tagPostsUrl + "/" + tag
+	c.ViewArgs["pagingBaseUrl"] = tagPostsUrl + "/" + tag
 
 	return c.render("tag_posts.html", userBlog.ThemePath)
 }
@@ -493,16 +490,16 @@ func (c Blog) Archives(userIdOrEmail string, cateId string, year, month int) (re
 	}
 
 	arcs := blogService.ListBlogsArchive(userId, notebookId, year, month, "PublicTime", false)
-	c.RenderArgs["archives"] = arcs
+	c.ViewArgs["archives"] = arcs
 
-	c.RenderArgs["curIsArchive"] = true
+	c.ViewArgs["curIsArchive"] = true
 	if notebookId != "" {
 		notebook := notebookService.GetNotebookById(notebookId)
-		c.RenderArgs["curCateTitle"] = notebook.Title
+		c.ViewArgs["curCateTitle"] = notebook.Title
-		c.RenderArgs["curCateId"] = notebookId
+		c.ViewArgs["curCateId"] = notebookId
 	}
-	c.RenderArgs["curYear"] = year
+	c.ViewArgs["curYear"] = year
-	c.RenderArgs["curMonth"] = month
+	c.ViewArgs["curMonth"] = month
 
 	return c.render("archive.html", userBlog.ThemePath)
 }
@@ -510,6 +507,7 @@ func (c Blog) Archives(userIdOrEmail string, cateId string, year, month int) (re
 // 进入某个用户的博客
 var blogPageSize = 5
 var searchBlogPageSize = 30
+
 // 分类 /cate/xxxxxxxx?notebookId=1212
 func (c Blog) Cate(userIdOrEmail string, notebookId string) (re revel.Result) {
 	// 自定义域名
@@ -543,15 +541,15 @@ func (c Blog) Cate(userIdOrEmail string, notebookId string) (re revel.Result) {
 	page := c.GetPage()
 	pageInfo, blogs := blogService.ListBlogs(userId, notebookId2, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
 	blogs2 := blogService.FixBlogs(blogs)
-	c.RenderArgs["posts"] = blogs2
+	c.ViewArgs["posts"] = blogs2
 
 	c.setPaging(pageInfo)
 
-	c.RenderArgs["curCateTitle"] = notebook.Title
+	c.ViewArgs["curCateTitle"] = notebook.Title
-	c.RenderArgs["curCateId"] = notebookId2
+	c.ViewArgs["curCateId"] = notebookId2
-	cateUrl := c.RenderArgs["cateUrl"].(string)
+	cateUrl := c.ViewArgs["cateUrl"].(string)
-	c.RenderArgs["pagingBaseUrl"] = cateUrl + "/" + notebookId
+	c.ViewArgs["pagingBaseUrl"] = cateUrl + "/" + notebookId
-	c.RenderArgs["curIsCate"] = true
+	c.ViewArgs["curIsCate"] = true
 
 	return c.render("cate.html", userBlog.ThemePath)
 }
@@ -596,12 +594,12 @@ func (c Blog) Index(userIdOrEmail string) (re revel.Result) {
 	page := c.GetPage()
 	pageInfo, blogs := blogService.ListBlogs(userId, "", page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
 	blogs2 := blogService.FixBlogs(blogs)
-	c.RenderArgs["posts"] = blogs2
+	c.ViewArgs["posts"] = blogs2
 
 	c.setPaging(pageInfo)
-	c.RenderArgs["pagingBaseUrl"] = c.RenderArgs["indexUrl"]
+	c.ViewArgs["pagingBaseUrl"] = c.ViewArgs["indexUrl"]
 
-	c.RenderArgs["curIsIndex"] = true
+	c.ViewArgs["curIsIndex"] = true
 
 	return c.render("index.html", userBlog.ThemePath)
 }
@@ -633,9 +631,9 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) {
 	}
 
 	post := blogService.FixBlog(blogInfo)
-	c.RenderArgs["post"] = post
+	c.ViewArgs["post"] = post
-	// c.RenderArgs["userInfo"] = userInfo
+	// c.ViewArgs["userInfo"] = userInfo
-	c.RenderArgs["curIsPost"] = true
+	c.ViewArgs["curIsPost"] = true
 
 	// 上一篇, 下一篇
 	var baseTime interface{}
@@ -651,10 +649,10 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) {
 
 	prePost, nextPost := blogService.PreNextBlog(userId, userBlog.SortField, userBlog.IsAsc, post.NoteId, baseTime)
 	if prePost.NoteId != "" {
-		c.RenderArgs["prePost"] = prePost
+		c.ViewArgs["prePost"] = prePost
 	}
 	if nextPost.NoteId != "" {
-		c.RenderArgs["nextPost"] = nextPost
+		c.ViewArgs["nextPost"] = nextPost
 	}
 	return c.render("post.html", userBlog.ThemePath)
 }
@@ -684,7 +682,7 @@ func (c Blog) Single(userIdOrEmail, singleId string) (re revel.Result) {
 		panic("")
 	}
 
-	c.RenderArgs["single"] = map[string]interface{}{
+	c.ViewArgs["single"] = map[string]interface{}{
 		"SingleId":    single.SingleId.Hex(),
 		"Title":       single.Title,
 		"UrlTitle":    single.UrlTitle,
@@ -692,8 +690,8 @@ func (c Blog) Single(userIdOrEmail, singleId string) (re revel.Result) {
 		"CreatedTime": single.CreatedTime,
 		"UpdatedTime": single.UpdatedTime,
 	}
-	c.RenderArgs["curSingleId"] = single.SingleId.Hex()
+	c.ViewArgs["curSingleId"] = single.SingleId.Hex()
-	c.RenderArgs["curIsSingle"] = true
+	c.ViewArgs["curIsSingle"] = true
 
 	return c.render("single.html", userBlog.ThemePath)
 }
@@ -718,7 +716,7 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) {
 	} else {
 		userInfo = userService.GetUserInfoByAny(userIdOrEmail)
 	}
-	//	c.RenderArgs["userInfo"] = userInfo
+	//	c.ViewArgs["userInfo"] = userInfo
 	userId = userInfo.UserId.Hex()
 	var ok = false
 	if ok, userBlog = c.blogCommon(userId, userBlog, userInfo); !ok {
@@ -729,11 +727,11 @@ func (c Blog) Search(userIdOrEmail, keywords string) (re revel.Result) {
 	pageInfo, blogs := blogService.SearchBlog(keywords, userId, page, userBlog.PerPageSize, userBlog.SortField, userBlog.IsAsc)
 	c.setPaging(pageInfo)
 
-	c.RenderArgs["posts"] = blogService.FixBlogs(blogs)
+	c.ViewArgs["posts"] = blogService.FixBlogs(blogs)
-	c.RenderArgs["keywords"] = keywords
+	c.ViewArgs["keywords"] = keywords
-	searchUrl, _ := c.RenderArgs["searchUrl"].(string)
+	searchUrl, _ := c.ViewArgs["searchUrl"].(string)
-	c.RenderArgs["pagingBaseUrl"] = searchUrl + "?keywords=" + keywords
+	c.ViewArgs["pagingBaseUrl"] = searchUrl + "?keywords=" + keywords
-	c.RenderArgs["curIsSearch"] = true
+	c.ViewArgs["curIsSearch"] = true
 
 	return c.render("search.html", userBlog.ThemePath)
 }
@@ -743,7 +741,7 @@ func (c Blog) setRenderUserInfo(userInfo info.User) {
 	if userInfo.Username == "" {
 		userInfo.Username = userInfo.Email
 	}
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
 }
 
 //----------------
@@ -755,7 +753,7 @@ func (c Blog) GetPostStat(noteId string) revel.Result {
 	re.Ok = true
 	statInfo := blogService.GetBlogStat(noteId)
 	re.Item = statInfo
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // jsonP
@@ -780,7 +778,7 @@ func (c Blog) GetLikes(noteId string, callback string) revel.Result {
 	result["hasMoreLikedUser"] = hasMoreLikedUser
 
 	re.Item = result
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }
 func (c Blog) GetLikesAndComments(noteId, callback string) revel.Result {
 	userId := c.GetUserId()
@@ -808,13 +806,13 @@ func (c Blog) GetLikesAndComments(noteId, callback string) revel.Result {
 	result["comments"] = comments
 	result["commentUserInfo"] = commentUserInfo
 	re.Item = result
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }
 
 func (c Blog) IncReadNum(noteId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.IncReadNum(noteId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 点赞, 要用jsonp
@@ -822,9 +820,9 @@ func (c Blog) LikePost(noteId string, callback string) revel.Result {
 	re := info.NewRe()
 	userId := c.GetUserId()
 	re.Ok, re.Item = blogService.LikeBlog(noteId, userId)
-	return c.RenderJsonP(callback, re)
+	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()
@@ -837,21 +835,25 @@ func (c Blog) GetComments(noteId string) revel.Result {
 	result["commentUserInfo"] = commentUserInfo
 	re.Item = result
 
-	return c.RenderJson(re)
+	if callback != "" {
+		return c.RenderJSONP(callback, result)
+	}
+
+	return c.RenderJSON(re)
 }
 
 // jsonp
 func (c Blog) DeleteComment(noteId, commentId string, callback string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.DeleteComment(noteId, commentId, c.GetUserId())
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }
 
 // jsonp
 func (c Blog) CommentPost(noteId, content, toCommentId string, callback string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Item = blogService.Comment(noteId, toCommentId, c.GetUserId(), content)
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }
 
 // jsonp
@@ -860,7 +862,7 @@ func (c Blog) LikeComment(commentId string, callback string) revel.Result {
 	ok, isILikeIt, num := blogService.LikeComment(commentId, c.GetUserId())
 	re.Ok = ok
 	re.Item = bson.M{"IsILikeIt": isILikeIt, "Num": num}
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }
 
 // 显示分类的最近博客, jsonp
@@ -896,5 +898,5 @@ func (c Blog) ListCateLatest(notebookId, callback string) revel.Result {
 	re := info.NewRe()
 	re.Ok = true
 	re.List = blogs
-	return c.RenderJsonP(callback, re)
+	return c.RenderJSONP(callback, re)
 }

app/controllers/CaptchaController.go

@@ -2,17 +2,17 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/lea/captcha"
-//	"github.com/leanote/leanote/app/types"
+	//	"github.com/leanote/leanote/app/types"
-//	"io/ioutil"
+	//	"io/ioutil"
-//	"fmt"
+	//	"fmt"
-//	"math"
+	//	"math"
-//	"os"
+	//	"os"
-//	"path"
+	//	"path"
-//	"strconv"
+	//	"strconv"
 	"net/http"
 )
 
@@ -22,6 +22,7 @@ type Captcha struct {
 }
 
 type Ca string
+
 func (r Ca) Apply(req *revel.Request, resp *revel.Response) {
 	resp.WriteHeader(http.StatusOK, "image/png")
 }
@@ -32,11 +33,11 @@ func (c Captcha) Get() revel.Result {
 	image.WriteTo(c.Response.Out)
 
 	sessionId := c.Session["_ID"]
-//	LogJ(c.Session)
+	//	LogJ(c.Session)
-//	Log("------")
+	//	Log("------")
-//	Log(str)
+	//	Log(str)
-//	Log(sessionId)
+	//	Log(sessionId)
-Log("..")
+	Log("..")
 	sessionService.SetCaptcha(sessionId, str)
 
 	return c.Render()

app/controllers/FileController.go

@@ -2,15 +2,15 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-	"gopkg.in/mgo.v2/bson"
+	"fmt"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/lea/netutil"
-	"github.com/leanote/leanote/app/info"
+	"gopkg.in/mgo.v2/bson"
 	"io/ioutil"
 	"os"
-	"fmt"
+	//	"strconv"
-//	"strconv"
 	"strings"
 )
 
@@ -22,11 +22,11 @@ type File struct {
 // 上传的是博客logo
 // TODO logo不要设置权限, 另外的目录
 func (c File) UploadBlogLogo() revel.Result {
-	re := c.uploadImage("blogLogo", "");
+	re := c.uploadImage("blogLogo", "")
 
-	c.RenderArgs["fileUrlPath"] = re.Id
+	c.ViewArgs["fileUrlPath"] = re.Id
-	c.RenderArgs["resultCode"] = re.Code
+	c.ViewArgs["resultCode"] = re.Code
-	c.RenderArgs["resultMsg"] = re.Msg
+	c.ViewArgs["resultMsg"] = re.Msg
 
 	return c.RenderTemplate("file/blog_logo.html")
 }
@@ -34,8 +34,9 @@ func (c File) UploadBlogLogo() revel.Result {
 // 拖拉上传, pasteImage
 // noteId 是为了判断是否是协作的note, 如果是则需要复制一份到note owner中
 func (c File) PasteImage(noteId string) revel.Result {
-	re := c.uploadImage("pasteImage", "");
+	re := c.uploadImage("pasteImage", "")
 
+	if noteId != "" {
 		userId := c.GetUserId()
 		note := noteService.GetNoteById(noteId)
 		if note.UserId != "" {
@@ -51,32 +52,33 @@ func (c File) PasteImage(noteId string) revel.Result {
 				}
 			}
 		}
+	}
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 头像设置
 func (c File) UploadAvatar() revel.Result {
-	re := c.uploadImage("logo", "");
+	re := c.uploadImage("logo", "")
 
-	c.RenderArgs["fileUrlPath"] = re.Id
+	c.ViewArgs["fileUrlPath"] = re.Id
-	c.RenderArgs["resultCode"] = re.Code
+	c.ViewArgs["resultCode"] = re.Code
-	c.RenderArgs["resultMsg"] = re.Msg
+	c.ViewArgs["resultMsg"] = re.Msg
 
 	if re.Ok {
 		re.Ok = userService.UpdateAvatar(c.GetUserId(), re.Id)
 		if re.Ok {
-			c.UpdateSession("Logo", re.Id);
+			c.UpdateSession("Logo", re.Id)
 		}
 	}
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // leaui image plugin upload image
 func (c File) UploadImageLeaui(albumId string) revel.Result {
-	re := c.uploadImage("", albumId);
+	re := c.uploadImage("", albumId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 上传图片, 公用方法
@@ -100,12 +102,19 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 		return re
 	}
 	defer file.Close()
+
 	// 生成上传路径
-	if(from == "logo" || from == "blogLogo") {
+	newGuid := NewGuid()
-		fileUrlPath = "public/upload/" + c.GetUserId() + "/images/logo"
+
+	userId := c.GetUserId()
+
+	if from == "logo" || from == "blogLogo" {
+		fileUrlPath = "public/upload/" + Digest3(userId) + "/" + userId + "/images/logo"
 	} else {
-		fileUrlPath = "files/" + c.GetUserId() + "/images"
+		// fileUrlPath = "files/" + Digest3(userId) + "/" + userId + "/" + Digest2(newGuid) + "/images"
+		fileUrlPath = "files/" + GetRandomFilePath(userId, newGuid) + "/images"
 	}
+
 	dir := revel.BasePath + "/" + fileUrlPath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
@@ -114,18 +123,19 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	// 生成新的文件名
 	filename := handel.Filename
 
-	var ext string;
+	var ext string
 	if from == "pasteImage" {
-		ext = ".png"; // TODO 可能不是png类型
+		handel.Filename = c.Message("unTitled")
+		ext = ".png" // TODO 可能不是png类型
 	} else {
 		_, ext = SplitFilename(filename)
-		if(ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg") {
+		if ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg" {
 			resultMsg = "Please upload image"
 			return re
 		}
 	}
 
-	filename = NewGuid() + ext
+	filename = newGuid + ext
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
 		LogJ(err)
@@ -133,25 +143,25 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	}
 
 	var maxFileSize float64
-	if(from == "logo") {
+	if from == "logo" {
-		maxFileSize = configService.GetUploadSize("uploadAvatarSize");
+		maxFileSize = configService.GetUploadSize("uploadAvatarSize")
 	} else if from == "blogLogo" {
-		maxFileSize = configService.GetUploadSize("uploadBlogLogoSize");
+		maxFileSize = configService.GetUploadSize("uploadBlogLogoSize")
 	} else {
-		maxFileSize = configService.GetUploadSize("uploadImageSize");
+		maxFileSize = configService.GetUploadSize("uploadImageSize")
 	}
 	if maxFileSize <= 0 {
 		maxFileSize = 1000
 	}
 
 	// > 2M?
-	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+	if float64(len(data)) > maxFileSize*float64(1024*1024) {
 		resultCode = 0
 		resultMsg = fmt.Sprintf("The file Size is bigger than %vM", maxFileSize)
 		return re
 	}
 
-	toPath := dir + "/" + filename;
+	toPath := dir + "/" + filename
 	err = ioutil.WriteFile(toPath, data, 0777)
 	if err != nil {
 		LogJ(err)
@@ -171,17 +181,18 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 		Path:  fileUrlPath,
 		Size:  filesize}
 
-	id := bson.NewObjectId();
+	id := bson.NewObjectId()
 	fileInfo.FileId = id
 	fileId = id.Hex()
-	if(from == "logo" || from == "blogLogo") {
+
-		fileId = "public/upload/" + c.GetUserId() + "/images/logo/" + filename
+	if from == "logo" || from == "blogLogo" {
+		fileId = fileUrlPath
 	}
 
 	Ok, resultMsg = fileService.AddImage(fileInfo, albumId, c.GetUserId(), from == "" || from == "pasteImage")
 	resultMsg = c.Message(resultMsg)
 
-	fileInfo.Path = ""; // 不要返回
+	fileInfo.Path = "" // 不要返回
 	re.Item = fileInfo
 
 	return re
@@ -190,26 +201,27 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 // get all images by userId with page
 func (c File) GetImages(albumId, key string, page int) revel.Result {
 	re := fileService.ListImagesWithPage(c.GetUserId(), albumId, key, page, 12)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c File) UpdateImageTitle(fileId, title string) revel.Result {
 	re := info.NewRe()
 	re.Ok = fileService.UpdateImageTitle(c.GetUserId(), fileId, title)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c File) DeleteImage(fileId string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Msg = fileService.DeleteImage(c.GetUserId(), fileId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
+
 //-----------
 
 // 输出image
 // 权限判断
 func (c File) OutputImage(noteId, fileId string) revel.Result {
-	path := fileService.GetFile(c.GetUserId(), fileId); // 得到路径
+	path := fileService.GetFile(c.GetUserId(), fileId) // 得到路径
 	if path == "" {
 		return c.RenderText("")
 	}
@@ -223,24 +235,29 @@ func (c File) OutputImage(noteId, fileId string) revel.Result {
 func (c File) CopyImage(userId, fileId, toUserId string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
-// 复制外网的图片, 成公共图片 放在/upload下
+// 复制外网的图片
 // 都要好好的计算大小
 func (c File) CopyHttpImage(src string) revel.Result {
 	re := info.NewRe()
-	fileUrlPath := "upload/" + c.GetUserId() + "/images"
+
-	dir := revel.BasePath + "/public/" +  fileUrlPath
+	// 生成上传路径
+	newGuid := NewGuid()
+	userId := c.GetUserId()
+	// fileUrlPath := "files/" + Digest3(userId) + "/" + userId + "/" + Digest2(newGuid) + "/images"
+	fileUrlPath := "files/" + GetRandomFilePath(userId, newGuid) + "/images"
+	dir := revel.BasePath + "/" + fileUrlPath
 	err := os.MkdirAll(dir, 0755)
 	if err != nil {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	filesize, filename, _, ok := netutil.WriteUrl(src, dir)
 
 	if !ok {
 		re.Msg = "copy error"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	// File
@@ -249,12 +266,12 @@ func (c File) CopyHttpImage(src string) revel.Result {
 		Path:  fileUrlPath + "/" + filename,
 		Size:  filesize}
 
-	id := bson.NewObjectId();
+	id := bson.NewObjectId()
 	fileInfo.FileId = id
 
 	re.Id = id.Hex()
-	re.Item = fileInfo.Path
+	//	re.Item = fileInfo.Path
 	re.Ok, re.Msg = fileService.AddImage(fileInfo, "", c.GetUserId(), true)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

app/controllers/IndexController.go

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

app/controllers/NoteContentHistoryController.go

@@ -12,5 +12,5 @@ type NoteContentHistory struct {
 func (c NoteContentHistory) ListHistories(noteId string) revel.Result {
 	histories := noteContentHistoryService.ListHistories(noteId, c.GetUserId())
 
-	return c.RenderJson(histories)
+	return c.RenderJSON(histories)
 }

app/controllers/NoteController.go

@@ -2,17 +2,20 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-	"gopkg.in/mgo.v2/bson"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
+	"os"
+	"os/exec"
+	"regexp"
 	"strings"
-//	"time"
+	"time"
-//	"github.com/leanote/leanote/app/types"
+	//	"github.com/leanote/leanote/app/types"
-//	"io/ioutil"
+	//	"io/ioutil"
-//	"fmt"
+	"fmt"
-//	"bytes"
+	//	"bytes"
-//	"os"
+	//	"os"
 )
 
 type Note struct {
@@ -22,9 +25,9 @@ type Note struct {
 // 笔记首页, 判断是否已登录
 // 已登录, 得到用户基本信息(notebook, shareNotebook), 跳转到index.html中
 // 否则, 转向登录页面
-func (c Note) Index(noteId string) revel.Result {
+func (c Note) Index(noteId, online string) revel.Result {
 	c.SetLocale()
-	userInfo := c.GetUserInfo()
+	userInfo := c.GetUserAndBlogUrl()
 
 	userId := userInfo.UserId.Hex()
 
@@ -33,7 +36,7 @@ func (c Note) Index(noteId string) revel.Result {
 		return c.Redirect("/login")
 	}
 
-	c.RenderArgs["openRegister"] = configService.IsOpenRegister()
+	c.ViewArgs["openRegister"] = configService.IsOpenRegister()
 
 	// 已登录了, 那么得到所有信息
 	notebooks := notebookService.GetNotebooks(userId)
@@ -49,27 +52,28 @@ func (c Note) Index(noteId string) revel.Result {
 		hasRightNoteId := false
 		if IsObjectId(noteId) {
 			note := noteService.GetNoteById(noteId)
+
+			if note.NoteId != "" {
 				var noteOwner = note.UserId.Hex()
 				noteContent = noteService.GetNoteContent(noteId, noteOwner)
 
-			if note.NoteId != "" {
 				hasRightNoteId = true
-				c.RenderArgs["curNoteId"] = noteId
+				c.ViewArgs["curNoteId"] = noteId
-				c.RenderArgs["curNotebookId"] = note.NotebookId.Hex()
+				c.ViewArgs["curNotebookId"] = note.NotebookId.Hex()
 
 				// 打开的是共享的笔记, 那么判断是否是共享给我的默认笔记
 				if noteOwner != c.GetUserId() {
 					if shareService.HasReadPerm(noteOwner, c.GetUserId(), noteId) {
 						// 不要获取notebook下的笔记
 						// 在前端下发请求
-						c.RenderArgs["curSharedNoteNotebookId"] = note.NotebookId.Hex()
+						c.ViewArgs["curSharedNoteNotebookId"] = note.NotebookId.Hex()
-						c.RenderArgs["curSharedUserId"] = noteOwner;
+						c.ViewArgs["curSharedUserId"] = noteOwner
 						// 没有读写权限
 					} else {
 						hasRightNoteId = false
 					}
 				} else {
-					_, notes = noteService.ListNotes(c.GetUserId(), note.NotebookId.Hex(), false, c.GetPage(), 50, defaultSortField, false, false);
+					_, notes = noteService.ListNotes(c.GetUserId(), note.NotebookId.Hex(), false, c.GetPage(), 50, defaultSortField, false, false)
 
 					// 如果指定了某笔记, 则该笔记放在首位
 					lenNotes := len(notes)
@@ -80,7 +84,7 @@ func (c Note) Index(noteId string) revel.Result {
 						for _, note := range notes {
 							if note.NoteId.Hex() != noteId {
 								if i == lenNotes { // 防止越界
-									break;
+									break
 								}
 								notes2[i] = note
 								i++
@@ -92,40 +96,41 @@ func (c Note) Index(noteId string) revel.Result {
 			}
 
 			// 得到最近的笔记
-			_, latestNotes := noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false);
+			_, latestNotes := noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false)
-			c.RenderArgs["latestNotes"] = latestNotes
+			c.ViewArgs["latestNotes"] = latestNotes
 		}
 
 		// 没有传入笔记
 		// 那么得到最新笔记
 		if !hasRightNoteId {
-			_, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false);
+			_, notes = noteService.ListNotes(c.GetUserId(), "", false, c.GetPage(), 50, defaultSortField, false, false)
 			if len(notes) > 0 {
 				noteContent = noteService.GetNoteContent(notes[0].NoteId.Hex(), userId)
-				c.RenderArgs["curNoteId"] = notes[0].NoteId.Hex()
+				c.ViewArgs["curNoteId"] = notes[0].NoteId.Hex()
 			}
 		}
 	}
 
 	// 当然, 还需要得到第一个notes的content
 	//...
-	c.RenderArgs["isAdmin"] = configService.GetAdminUsername() == userInfo.Username
+	c.ViewArgs["isAdmin"] = configService.GetAdminUsername() == userInfo.Username
 
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
-	c.RenderArgs["notebooks"] = notebooks
+	c.ViewArgs["notebooks"] = notebooks
-	c.RenderArgs["shareNotebooks"] = shareNotebooks // note信息在notes列表中
+	c.ViewArgs["shareNotebooks"] = shareNotebooks // note信息在notes列表中
-	c.RenderArgs["sharedUserInfos"] = sharedUserInfos
+	c.ViewArgs["sharedUserInfos"] = sharedUserInfos
 
-	c.RenderArgs["notes"] = notes
+	c.ViewArgs["notes"] = notes
-	c.RenderArgs["noteContentJson"] = noteContent
+	c.ViewArgs["noteContentJson"] = noteContent
-	c.RenderArgs["noteContent"] = noteContent.Content
+	c.ViewArgs["noteContent"] = noteContent.Content
 
-	c.RenderArgs["tags"] = tagService.GetTags(c.GetUserId())
+	c.ViewArgs["tags"] = tagService.GetTags(c.GetUserId())
 
-	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
+	c.ViewArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
 
-//		return c.RenderTemplate("note/note.html")
+	// return c.RenderTemplate("note/note.html")
-	if isDev, _ := revel.Config.Bool("mode.dev"); isDev {
+
+	if isDev, _ := revel.Config.Bool("mode.dev"); isDev && online == "" {
 		return c.RenderTemplate("note/note-dev.html")
 	} else {
 		return c.RenderTemplate("note/note.html")
@@ -136,51 +141,43 @@ func (c Note) Index(noteId string) revel.Result {
 // 已登录, 得到用户基本信息(notebook, shareNotebook), 跳转到index.html中
 // 否则, 转向登录页面
 func (c Note) ListNotes(notebookId string) revel.Result {
-	_, notes := noteService.ListNotes(c.GetUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false);
+	_, notes := noteService.ListNotes(c.GetUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false)
-	return c.RenderJson(notes)
+	return c.RenderJSON(notes)
 }
 
 // 得到trash
 func (c Note) ListTrashNotes() revel.Result {
-	_, notes := noteService.ListNotes(c.GetUserId(), "", true, c.GetPage(), pageSize, defaultSortField, false, false);
+	_, notes := noteService.ListNotes(c.GetUserId(), "", true, c.GetPage(), pageSize, defaultSortField, false, false)
-	return c.RenderJson(notes)
+	return c.RenderJSON(notes)
 }
 
 // 得到note和内容
 func (c Note) GetNoteAndContent(noteId string) revel.Result {
-	return c.RenderJson(noteService.GetNoteAndContent(noteId, c.GetUserId()))
+	return c.RenderJSON(noteService.GetNoteAndContent(noteId, c.GetUserId()))
+}
+
+func (c Note) GetNoteAndContentBySrc(src string) revel.Result {
+	noteId, noteAndContent := noteService.GetNoteAndContentBySrc(src, c.GetUserId())
+	ret := info.Re{}
+	if noteId != "" {
+		ret.Ok = true
+		ret.Item = noteAndContent
+	}
+	return c.RenderJSON(ret)
 }
 
 // 得到内容
 func (c Note) GetNoteContent(noteId string) revel.Result {
 	noteContent := noteService.GetNoteContent(noteId, c.GetUserId())
-	return c.RenderJson(noteContent)
+	return c.RenderJSON(noteContent)
 }
 
-// 更新note或content
-// 肯定会传userId(谁的), NoteId
-// 会传Title, Content, Tags, 一种或几种
-type NoteOrContent struct {
-	NotebookId string
-	NoteId string
-	UserId string
-	Title string
-	Desc string
-	ImgSrc string
-	Tags string
-	Content string
-	Abstract string
-	IsNew bool
-	IsMarkdown bool
-	FromUserId string // 为共享而新建
-	IsBlog bool // 是否是blog, 更新note不需要修改, 添加note时才有可能用到, 此时需要判断notebook是否设为Blog
-}
 // 这里不能用json, 要用post
-func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
+func (c Note) UpdateNoteOrContent(noteOrContent info.NoteOrContent) revel.Result {
 	// 新添加note
 	if noteOrContent.IsNew {
-		userId := c.GetObjectUserId();
+		userId := c.GetObjectUserId()
-//		myUserId := userId
+		//		myUserId := userId
 		// 为共享新建?
 		if noteOrContent.FromUserId != "" {
 			userId = bson.ObjectIdHex(noteOrContent.FromUserId)
@@ -190,20 +187,21 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 			NoteId:     bson.ObjectIdHex(noteOrContent.NoteId),
 			NotebookId: bson.ObjectIdHex(noteOrContent.NotebookId),
 			Title:      noteOrContent.Title,
+			Src: noteOrContent.Src, // 来源
 			Tags:       strings.Split(noteOrContent.Tags, ","),
 			Desc:       noteOrContent.Desc,
 			ImgSrc:     noteOrContent.ImgSrc,
 			IsBlog:     noteOrContent.IsBlog,
 			IsMarkdown: noteOrContent.IsMarkdown,
-		};
+		}
 		noteContent := info.NoteContent{NoteId: note.NoteId,
 			UserId:   userId,
 			IsBlog:   note.IsBlog,
 			Content:  noteOrContent.Content,
-			Abstract: noteOrContent.Abstract};
+			Abstract: noteOrContent.Abstract}
 
 		note = noteService.AddNoteAndContentForController(note, noteContent, c.GetUserId())
-		return c.RenderJson(note)
+		return c.RenderJSON(note)
 	}
 
 	noteUpdate := bson.M{}
@@ -212,20 +210,20 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 	// Desc前台传来
 	if c.Has("Desc") {
 		needUpdateNote = true
-		noteUpdate["Desc"] = noteOrContent.Desc;
+		noteUpdate["Desc"] = noteOrContent.Desc
 	}
 	if c.Has("ImgSrc") {
 		needUpdateNote = true
-		noteUpdate["ImgSrc"] = noteOrContent.ImgSrc;
+		noteUpdate["ImgSrc"] = noteOrContent.ImgSrc
 	}
 	if c.Has("Title") {
 		needUpdateNote = true
-		noteUpdate["Title"] = noteOrContent.Title;
+		noteUpdate["Title"] = noteOrContent.Title
 	}
 
 	if c.Has("Tags") {
 		needUpdateNote = true
-		noteUpdate["Tags"] = strings.Split(noteOrContent.Tags, ",");
+		noteUpdate["Tags"] = strings.Split(noteOrContent.Tags, ",")
 	}
 
 	// web端不控制
@@ -239,43 +237,75 @@ func (c Note) UpdateNoteOrContent(noteOrContent NoteOrContent) revel.Result {
 	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)
+			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract,
+			needUpdateNote, -1, time.Now())
 	}
 
 	Log(afterContentUsn)
 	Log(contentOk)
 	Log(contentMsg)
 
-	return c.RenderJson(true)
+	return c.RenderJSON(true)
 }
 
 // 删除note/ 删除别人共享给我的笔记
 // userId 是note.UserId
-func (c Note) DeleteNote(noteId, userId string, isShared bool) revel.Result {
+func (c Note) DeleteNote(noteIds []string, isShared bool) revel.Result {
-	if(!isShared) {
+	if !isShared {
-		return c.RenderJson(trashService.DeleteNote(noteId, c.GetUserId()));
+		for _, noteId := range noteIds {
+			trashService.DeleteNote(noteId, c.GetUserId())
+		}
+		return c.RenderJSON(true)
 	}
 
-	return c.RenderJson(trashService.DeleteSharedNote(noteId, userId, c.GetUserId()));
+	for _, noteId := range noteIds {
+		trashService.DeleteSharedNote(noteId, c.GetUserId())
+	}
+
+	return c.RenderJSON(true)
 }
-// 删除trash
+
+// 删除trash, 已弃用, 用DeleteNote
 func (c Note) DeleteTrash(noteId string) revel.Result {
-	return c.RenderJson(trashService.DeleteTrash(noteId, c.GetUserId()));
+	return c.RenderJSON(trashService.DeleteTrash(noteId, c.GetUserId()))
 }
+
 // 移动note
-func (c Note) MoveNote(noteId, notebookId string) revel.Result {
+func (c Note) MoveNote(noteIds []string, notebookId string) revel.Result {
-	return c.RenderJson(noteService.MoveNote(noteId, notebookId, c.GetUserId()));
+	userId := c.GetUserId()
+	for _, noteId := range noteIds {
+		noteService.MoveNote(noteId, notebookId, userId)
+	}
+	return c.RenderJSON(true)
 }
+
 // 复制note
-func (c Note) CopyNote(noteId, notebookId string) revel.Result {
+func (c Note) CopyNote(noteIds []string, notebookId string) revel.Result {
-	return c.RenderJson(noteService.CopyNote(noteId, notebookId, c.GetUserId()));
+	copyNotes := make([]info.Note, len(noteIds))
+	userId := c.GetUserId()
+	for i, noteId := range noteIds {
+		copyNotes[i] = noteService.CopyNote(noteId, notebookId, userId)
+	}
+	re := info.NewRe()
+	re.Ok = true
+	re.Item = copyNotes
+	return c.RenderJSON(re)
 }
+
 // 复制别人共享的笔记给我
-func (c Note) CopySharedNote(noteId, notebookId, fromUserId string) revel.Result {
+func (c Note) CopySharedNote(noteIds []string, notebookId, fromUserId string) revel.Result {
-	return c.RenderJson(noteService.CopySharedNote(noteId, notebookId, fromUserId, c.GetUserId()));
+	copyNotes := make([]info.Note, len(noteIds))
+	userId := c.GetUserId()
+	for i, noteId := range noteIds {
+		copyNotes[i] = noteService.CopySharedNote(noteId, notebookId, fromUserId, userId)
+	}
+	re := info.NewRe()
+	re.Ok = true
+	re.Item = copyNotes
+	return c.RenderJSON(re)
 }
 
 //------------
@@ -283,16 +313,180 @@ func (c Note) CopySharedNote(noteId, notebookId, fromUserId string) revel.Result
 // 通过title搜索
 func (c Note) SearchNote(key string) revel.Result {
 	_, blogs := noteService.SearchNote(key, c.GetUserId(), c.GetPage(), pageSize, "UpdatedTime", false, false)
-	return c.RenderJson(blogs)
+	return c.RenderJSON(blogs)
 }
+
 // 通过tags搜索
 func (c Note) SearchNoteByTags(tags []string) revel.Result {
 	_, blogs := noteService.SearchNoteByTags(tags, c.GetUserId(), c.GetPage(), pageSize, "UpdatedTime", false)
-	return c.RenderJson(blogs)
+	return c.RenderJSON(blogs)
+}
+
+// 生成PDF
+func (c Note) ToPdf(noteId, appKey string) revel.Result {
+	// 虽然传了cookie但是这里还是不能得到userId, 所以还是通过appKey来验证之
+	appKeyTrue, _ := revel.Config.String("app.secret")
+	if appKeyTrue != appKey {
+		return c.RenderText("auth error")
+	}
+	note := noteService.GetNoteById(noteId)
+	if note.NoteId == "" {
+		return c.RenderText("no note")
+	}
+
+	noteUserId := note.UserId.Hex()
+	content := noteService.GetNoteContent(noteId, noteUserId)
+	userInfo := userService.GetUserInfo(noteUserId)
+
+	//------------------
+	// 将content的图片转换为base64
+	contentStr := content.Content
+
+	siteUrlPattern := configService.GetSiteUrl()
+	if strings.Contains(siteUrlPattern, "https") {
+		siteUrlPattern = strings.Replace(siteUrlPattern, "https", "https*", 1)
+	} else {
+		siteUrlPattern = strings.Replace(siteUrlPattern, "http", "https*", 1)
+	}
+
+	siteUrlPattern = "(?:" + siteUrlPattern + ")*"
+
+	regImage, _ := regexp.Compile(`<img .*?(src=('|")` + siteUrlPattern + `/(file/outputImage|api/file/getImage)\?fileId=([a-z0-9A-Z]{24})("|'))`)
+
+	findsImage := regImage.FindAllStringSubmatch(contentStr, -1) // 查找所有的
+	//	[<img src="http://leanote.com/api/getImage?fileId=3354672e8d38f411286b000069" alt="" width="692" height="302" data-mce-src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069" " file/outputImage 54672e8d38f411286b000069 "]
+	for _, eachFind := range findsImage {
+		if len(eachFind) == 6 {
+			fileId := eachFind[4]
+			// 得到base64编码文件
+			fileBase64 := fileService.GetImageBase64(noteUserId, fileId)
+			if fileBase64 == "" {
+				continue
+			}
+
+			// 1
+			// src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069"
+			allFixed := strings.Replace(eachFind[0], eachFind[1], "src=\""+fileBase64+"\"", -1)
+			contentStr = strings.Replace(contentStr, eachFind[0], allFixed, -1)
+		}
+	}
+
+	// markdown
+	if note.IsMarkdown {
+		// ![enter image description here](url)
+		regImageMarkdown, _ := regexp.Compile(`!\[.*?\]\(` + siteUrlPattern + `/(file/outputImage|api/file/getImage)\?fileId=([a-z0-9A-Z]{24})\)`)
+		findsImageMarkdown := regImageMarkdown.FindAllStringSubmatch(contentStr, -1) // 查找所有的
+		for _, eachFind := range findsImageMarkdown {
+			if len(eachFind) == 3 {
+				fileId := eachFind[2]
+				// 得到base64编码文件
+				fileBase64 := fileService.GetImageBase64(noteUserId, fileId)
+				if fileBase64 == "" {
+					continue
+				}
+
+				// 1
+				// src="http://leanote.com/file/outputImage?fileId=54672e8d38f411286b000069"
+				allFixed := "![](" + fileBase64 + ")"
+				contentStr = strings.Replace(contentStr, eachFind[0], allFixed, -1)
+			}
+		}
+	}
+
+	if note.Tags != nil && len(note.Tags) > 0 && note.Tags[0] != "" {
+	} else {
+		note.Tags = nil
+	}
+	c.ViewArgs["blog"] = note
+	c.ViewArgs["content"] = contentStr
+	c.ViewArgs["userInfo"] = userInfo
+	userBlog := blogService.GetUserBlog(noteUserId)
+	c.ViewArgs["userBlog"] = userBlog
+
+	return c.RenderTemplate("file/pdf.html")
+}
+
+// 导出成PDF
+func (c Note) ExportPdf(noteId string) revel.Result {
+	re := info.NewRe()
+	userId := c.GetUserId()
+	note := noteService.GetNoteById(noteId)
+	if note.NoteId == "" {
+		re.Msg = "No Note"
+		return c.RenderText("error")
+	}
+
+	noteUserId := note.UserId.Hex()
+	// 是否有权限
+	if noteUserId != userId {
+		// 是否是有权限协作的
+		if !note.IsBlog && !shareService.HasReadPerm(noteUserId, userId, noteId) {
+			re.Msg = "No Perm"
+			return c.RenderText("No Perm")
+		}
+	}
+
+	// path 判断是否需要重新生成之
+	guid := NewGuid()
+	fileUrlPath := "files/export_pdf"
+	dir := revel.BasePath + "/" + fileUrlPath
+	if !MkdirAll(dir) {
+		return c.RenderText("error, no dir")
+	}
+	filename := guid + ".pdf"
+	path := dir + "/" + filename
+
+	// leanote.com的secret
+	appKey, _ := revel.Config.String("app.secretLeanote")
+	if appKey == "" {
+		appKey, _ = revel.Config.String("app.secret")
+	}
+
+	// 生成之
+	binPath := configService.GetGlobalStringConfig("exportPdfBinPath")
+	// 默认路径
+	if binPath == "" {
+		binPath = "/usr/local/bin/wkhtmltopdf"
+	}
+
+	url := configService.GetSiteUrl() + "/note/toPdf?noteId=" + noteId + "&appKey=" + appKey
+	//	cc := binPath + " --no-stop-slow-scripts --javascript-delay 10000 \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	//	cc := binPath + " \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	// 等待--window-status为done的状态
+	// http://madalgo.au.dk/~jakobt/wkhtmltoxdoc/wkhtmltopdf_0.10.0_rc2-doc.html
+	// wkhtmltopdf参数大全
+	var cc string
+	if note.IsMarkdown {
+		cc = binPath + " --lowquality --window-status done \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	} else {
+		cc = binPath + " --lowquality \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	}
+
+	cmd := exec.Command("/bin/sh", "-c", cc)
+	_, err := cmd.Output()
+	if err != nil {
+		return c.RenderText("export pdf error. " + fmt.Sprintf("%v", err))
+	}
+	file, err := os.Open(path)
+	if err != nil {
+		return c.RenderText("export pdf error. " + fmt.Sprintf("%v", err))
+	}
+	// http://stackoverflow.com/questions/8588818/chrome-pdf-display-duplicate-headers-received-from-the-server
+	//	filenameReturn = strings.Replace(filenameReturn, ",", "-", -1)
+	filenameReturn := note.Title
+	filenameReturn = FixFilename(filenameReturn)
+	if filenameReturn == "" {
+		filenameReturn = "Untitled.pdf"
+	} else {
+		filenameReturn += ".pdf"
+	}
+	return c.RenderBinary(file, filenameReturn, revel.Attachment, time.Now()) // revel.Attachment
 }
 
 // 设置/取消Blog; 置顶
-func (c Note) SetNote2Blog(noteId string, isBlog, isTop bool) revel.Result {
+func (c Note) SetNote2Blog(noteIds []string, isBlog, isTop bool) revel.Result {
-	re := noteService.ToBlog(c.GetUserId(), noteId, isBlog, isTop)
+	for _, noteId := range noteIds {
-	return c.RenderJson(re)
+		noteService.ToBlog(c.GetUserId(), noteId, isBlog, isTop)
+	}
+	return c.RenderJSON(true)
 }

app/controllers/NotebookController.go

@@ -1,12 +1,12 @@
 package controllers
 
 import (
-	"github.com/revel/revel"
 	"encoding/json"
 	"github.com/leanote/leanote/app/info"
+	"github.com/revel/revel"
 	"gopkg.in/mgo.v2/bson"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
-//	"io/ioutil"
+	//	"io/ioutil"
 )
 
 type Notebook struct {
@@ -14,18 +14,18 @@ type Notebook struct {
 }
 
 func (c Notebook) Index(notebook info.Notebook, i int, name string) revel.Result {
-	return c.RenderJson(notebook)
+	return c.RenderJSON(notebook)
 }
 
 // 得到用户的所有笔记本
 func (c Notebook) GetNotebooks() revel.Result {
 	re := notebookService.GetNotebooks(c.GetUserId())
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c Notebook) DeleteNotebook(notebookId string) revel.Result {
 	re, msg := notebookService.DeleteNotebook(c.GetUserId(), notebookId)
-	return c.RenderJson(info.Re{Ok: re, Msg: msg})
+	return c.RenderJSON(info.Re{Ok: re, Msg: msg})
 }
 
 // 添加notebook
@@ -34,28 +34,29 @@ func (c Notebook) AddNotebook(notebookId, title, parentNotebookId string) revel.
 		Title:  title,
 		Seq:    -1,
 		UserId: c.GetObjectUserId()}
-	if(parentNotebookId != "") {
+	if parentNotebookId != "" {
 		notebook.ParentNotebookId = bson.ObjectIdHex(parentNotebookId)
 	}
 
 	re, notebook := notebookService.AddNotebook(notebook)
 
-	if(re) {
+	if re {
-		return c.RenderJson(notebook)
+		return c.RenderJSON(notebook)
 	} else {
-		return c.RenderJson(false)
+		return c.RenderJSON(false)
 	}
 }
+
 // 修改标题
 func (c Notebook) UpdateNotebookTitle(notebookId, title string) revel.Result {
-	return c.RenderJson(notebookService.UpdateNotebookTitle(notebookId, c.GetUserId(), title))
+	return c.RenderJSON(notebookService.UpdateNotebookTitle(notebookId, c.GetUserId(), title))
 }
 
 // 排序
 // 无用
-func (c Notebook) SortNotebooks(notebookId2Seqs map[string]int) revel.Result {
+// func (c Notebook) SortNotebooks(notebookId2Seqs map[string]int) revel.Result {
-	return c.RenderJson(notebookService.SortNotebooks(c.GetUserId(), notebookId2Seqs))
+// 	return c.RenderJSON(notebookService.SortNotebooks(c.GetUserId(), notebookId2Seqs))
-}
+// }
 
 // 调整notebooks, 可能是排序, 可能是移动到其它笔记本下
 type DragNotebooksInfo struct {
@@ -63,16 +64,17 @@ type DragNotebooksInfo struct {
 	ParentNotebookId string
 	Siblings         []string
 }
+
 // 传过来的data是JSON.stringfy数据
 func (c Notebook) DragNotebooks(data string) revel.Result {
 	info := DragNotebooksInfo{}
 	json.Unmarshal([]byte(data), &info)
 
-	return c.RenderJson(notebookService.DragNotebooks(c.GetUserId(), info.CurNotebookId, info.ParentNotebookId, info.Siblings))
+	return c.RenderJSON(notebookService.DragNotebooks(c.GetUserId(), info.CurNotebookId, info.ParentNotebookId, info.Siblings))
 }
 
 // 设置notebook <-> blog
 func (c Notebook) SetNotebook2Blog(notebookId string, isBlog bool) revel.Result {
 	re := notebookService.ToBlog(c.GetUserId(), notebookId, isBlog)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

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

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

app/controllers/ShareController.go

@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
-//	"github.com/leanote/leanote/app/types"
+	. "github.com/leanote/leanote/app/lea"
-//	"io/ioutil"
+	//	"github.com/leanote/leanote/app/types"
-//	"fmt"
+	//	"io/ioutil"
+	//	"fmt"
 )
 
 type Share struct {
@@ -19,13 +19,13 @@ type Share struct {
 func (c Share) AddShareNote(noteId string, emails []string, perm int) revel.Result {
 	status := make(map[string]info.Re, len(emails))
 	// 自己不能给自己添加共享
-	myEmail := c.GetEmail();
+	myEmail := c.GetEmail()
 	for _, email := range emails {
 		if email == "" {
-			continue;
+			continue
 		}
-		if(myEmail != email) {
+		if myEmail != email {
-			ok, msg, userId := shareService.AddShareNote(noteId, perm, c.GetUserId(), email);
+			ok, msg, userId := shareService.AddShareNote(noteId, perm, c.GetUserId(), email)
 			status[email] = info.Re{Ok: ok, Msg: msg, Id: userId}
 
 		} else {
@@ -33,27 +33,27 @@ func (c Share) AddShareNote(noteId string, emails []string, perm int) revel.Resu
 		}
 	}
 
-	return c.RenderJson(status)
+	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))
 	// 自己不能给自己添加共享
-	myEmail := c.GetEmail();
+	myEmail := c.GetEmail()
 	for _, email := range emails {
 		if email == "" {
-			continue;
+			continue
 		}
-		if(myEmail != email) {
+		if myEmail != email {
-			ok, msg, userId := shareService.AddShareNotebook(notebookId, perm, c.GetUserId(), email);
+			ok, msg, userId := shareService.AddShareNotebook(notebookId, perm, c.GetUserId(), email)
 			status[email] = info.Re{Ok: ok, Msg: msg, Id: userId}
 		} else {
 			status[email] = info.Re{Ok: false, Msg: "不能分享给自己"}
 		}
 	}
 
-	return c.RenderJson(status)
+	return c.RenderJSON(status)
 }
 
 // 得到notes
@@ -62,11 +62,11 @@ func (c Share) ListShareNotes(notebookId, userId string) revel.Result {
 	// 表示是默认笔记本, 不是某个特定notebook的共享
 	var notes []info.ShareNoteWithPerm
 	if notebookId == "" {
-		notes = shareService.ListShareNotes(c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false);
+		notes = shareService.ListShareNotes(c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false)
-		return c.RenderJson(notes)
+		return c.RenderJSON(notes)
 	} else {
 		// 有notebookId的
-		return c.RenderJson(shareService.ListShareNotesByNotebookId(notebookId, c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false));
+		return c.RenderJSON(shareService.ListShareNotesByNotebookId(notebookId, c.GetUserId(), userId, c.GetPage(), pageSize, defaultSortField, false))
 	}
 }
 
@@ -74,7 +74,7 @@ func (c Share) ListShareNotes(notebookId, userId string) revel.Result {
 // sharedUserId 是谁的笔记
 func (c Share) GetShareNoteContent(noteId, sharedUserId string) revel.Result {
 	noteContent := shareService.GetShareNoteContent(noteId, c.GetUserId(), sharedUserId)
-	return c.RenderJson(noteContent)
+	return c.RenderJSON(noteContent)
 }
 
 // 查看note的分享信息
@@ -85,13 +85,13 @@ func (c Share) ListNoteShareUserInfo(noteId string) revel.Result {
 	note := noteService.GetNote(noteId, c.GetUserId())
 
 	noteShareUserInfos := shareService.ListNoteShareUserInfo(noteId, c.GetUserId())
-	c.RenderArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos 
+	c.ViewArgs["noteOrNotebookShareUserInfos"] = noteShareUserInfos
 
-	c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId())
+	c.ViewArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNoteShareGroups(noteId, c.GetUserId())
 
-	c.RenderArgs["isNote"] = true
+	c.ViewArgs["isNote"] = true
-	c.RenderArgs["noteOrNotebookId"] = note.NoteId.Hex();
+	c.ViewArgs["noteOrNotebookId"] = note.NoteId.Hex()
-	c.RenderArgs["title"] = note.Title
+	c.ViewArgs["title"] = note.Title
 
 	return c.RenderTemplate("share/note_notebook_share_user_infos.html")
 }
@@ -99,14 +99,14 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result {
 	notebook := notebookService.GetNotebook(notebookId, c.GetUserId())
 
 	notebookShareUserInfos := shareService.ListNotebookShareUserInfo(notebookId, c.GetUserId())
-	c.RenderArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos 
+	c.ViewArgs["noteOrNotebookShareUserInfos"] = notebookShareUserInfos
 
-	c.RenderArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId())
+	c.ViewArgs["noteOrNotebookShareGroupInfos"] = shareService.GetNotebookShareGroups(notebookId, c.GetUserId())
-	LogJ(c.RenderArgs["noteOrNotebookShareGroupInfos"])
+	LogJ(c.ViewArgs["noteOrNotebookShareGroupInfos"])
 
-	c.RenderArgs["isNote"] = false
+	c.ViewArgs["isNote"] = false
-	c.RenderArgs["noteOrNotebookId"] = notebook.NotebookId.Hex();
+	c.ViewArgs["noteOrNotebookId"] = notebook.NotebookId.Hex()
-	c.RenderArgs["title"] = notebook.Title
+	c.ViewArgs["title"] = notebook.Title
 
 	return c.RenderTemplate("share/note_notebook_share_user_infos.html")
 }
@@ -114,74 +114,78 @@ func (c Share) ListNotebookShareUserInfo(notebookId string) revel.Result {
 //------------
 // 改变share note 权限
 func (c Share) UpdateShareNotePerm(noteId string, perm int, toUserId string) revel.Result {
-	return c.RenderJson(shareService.UpdateShareNotePerm(noteId, perm, c.GetUserId(), toUserId));
+	return c.RenderJSON(shareService.UpdateShareNotePerm(noteId, perm, c.GetUserId(), toUserId))
 }
 
 // 改变share notebook 权限
 func (c Share) UpdateShareNotebookPerm(notebookId string, perm int, toUserId string) revel.Result {
-	return c.RenderJson(shareService.UpdateShareNotebookPerm(notebookId, perm, c.GetUserId(), toUserId));
+	return c.RenderJSON(shareService.UpdateShareNotebookPerm(notebookId, perm, c.GetUserId(), toUserId))
 }
 
 //---------------
 // 删除share note
 func (c Share) DeleteShareNote(noteId string, toUserId string) revel.Result {
-	return c.RenderJson(shareService.DeleteShareNote(noteId, c.GetUserId(), toUserId));
+	return c.RenderJSON(shareService.DeleteShareNote(noteId, c.GetUserId(), toUserId))
 }
+
 // 删除share notebook
 func (c Share) DeleteShareNotebook(notebookId string, toUserId string) revel.Result {
-	return c.RenderJson(shareService.DeleteShareNotebook(notebookId, c.GetUserId(), toUserId));
+	return c.RenderJSON(shareService.DeleteShareNotebook(notebookId, c.GetUserId(), toUserId))
 }
 
 // 删除share note, 被共享方删除
 func (c Share) DeleteShareNoteBySharedUser(noteId string, fromUserId string) revel.Result {
-	return c.RenderJson(shareService.DeleteShareNote(noteId, fromUserId, c.GetUserId()));
+	return c.RenderJSON(shareService.DeleteShareNote(noteId, fromUserId, c.GetUserId()))
 }
+
 // 删除share notebook, 被共享方删除
 func (c Share) DeleteShareNotebookBySharedUser(notebookId string, fromUserId string) revel.Result {
-	return c.RenderJson(shareService.DeleteShareNotebook(notebookId, fromUserId, c.GetUserId()));
+	return c.RenderJSON(shareService.DeleteShareNotebook(notebookId, fromUserId, c.GetUserId()))
 }
 
 // 删除fromUserId分享给我的所有note, notebook
 func (c Share) DeleteUserShareNoteAndNotebook(fromUserId string) revel.Result {
-	return c.RenderJson(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId()));
+	return c.RenderJSON(shareService.DeleteUserShareNoteAndNotebook(fromUserId, c.GetUserId()))
 }
 
 //-------------
 // 用户组
 
-
 // 将笔记分享给分组
 func (c Share) AddShareNoteGroup(noteId, groupId string, perm int) revel.Result {
 	re := info.NewRe()
-	re.Ok = shareService.AddShareNoteGroup(c.GetUserId(), noteId, groupId, perm);
+	re.Ok = shareService.AddShareNoteGroup(c.GetUserId(), noteId, groupId, perm)
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
+
 // 删除
 func (c Share) DeleteShareNoteGroup(noteId, groupId string) revel.Result {
 	re := info.NewRe()
-	re.Ok = shareService.DeleteShareNoteGroup(c.GetUserId(), noteId, groupId);
+	re.Ok = shareService.DeleteShareNoteGroup(c.GetUserId(), noteId, groupId)
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
+
 // 更新, 也是一样, 先删后加
 func (c Share) UpdateShareNoteGroupPerm(noteId, groupId string, perm int) revel.Result {
 	return c.AddShareNoteGroup(noteId, groupId, perm)
 }
 
-
 //------
 
 // 将笔记分享给分组
 func (c Share) AddShareNotebookGroup(notebookId, groupId string, perm int) revel.Result {
 	re := info.NewRe()
-	re.Ok = shareService.AddShareNotebookGroup(c.GetUserId(), notebookId, groupId, perm);
+	re.Ok = shareService.AddShareNotebookGroup(c.GetUserId(), notebookId, groupId, perm)
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
+
 // 删除
 func (c Share) DeleteShareNotebookGroup(notebookId, groupId string) revel.Result {
 	re := info.NewRe()
-	re.Ok = shareService.DeleteShareNotebookGroup(c.GetUserId(), notebookId, groupId);
+	re.Ok = shareService.DeleteShareNotebookGroup(c.GetUserId(), notebookId, groupId)
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
+
 // 更新, 也是一样, 先删后加
 func (c Share) UpdateShareNotebookGroupPerm(notebookId, groupId string, perm int) revel.Result {
 	return c.AddShareNotebookGroup(notebookId, groupId, perm)

app/controllers/TagController.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
-//	"os/exec"
+	//	"os/exec"
 )
 
 type Tag struct {
@@ -18,7 +18,7 @@ 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)
+	return c.RenderJSON(ret)
 }
 
 // 删除标签
@@ -26,5 +26,5 @@ 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)
+	return c.RenderJSON(ret)
 }

app/controllers/UserController.go

@@ -2,16 +2,16 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
-//	"github.com/leanote/leanote/app/types"
+	. "github.com/leanote/leanote/app/lea"
-//	"io/ioutil"
+	//	"github.com/leanote/leanote/app/types"
-//	"fmt"
+	//	"io/ioutil"
-//	"math"
+	//	"fmt"
-//	"os"
+	//	"math"
-//	"path"
+	//	"os"
+	//	"path"
 	"strconv"
 )
 
@@ -21,67 +21,67 @@ type User struct {
 
 func (c User) Account(tab int) revel.Result {
 	userInfo := c.GetUserInfo()
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
-	c.RenderArgs["tab"] = tab
+	c.ViewArgs["tab"] = tab
 	c.SetLocale()
 	return c.RenderTemplate("user/account.html")
 }
 
 // 修改用户名, 需要重置session
 func (c User) UpdateUsername(username string) revel.Result {
-	re := info.NewRe();
+	re := info.NewRe()
-	if(c.GetUsername() == "demo") {
+	if c.GetUserId() == configService.GetGlobalStringConfig("demoUserId") {
 		re.Msg = "cannotUpdateDemo"
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 
 	if re.Ok, re.Msg = Vd("username", username); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 
 	re.Ok, re.Msg = userService.UpdateUsername(c.GetUserId(), username)
-	if(re.Ok) {
+	if re.Ok {
 		c.UpdateSession("Username", username)
 	}
-	return c.RenderRe(re);
+	return c.RenderRe(re)
 }
 
 // 修改密码
 func (c User) UpdatePwd(oldPwd, pwd string) revel.Result {
-	re := info.NewRe();
+	re := info.NewRe()
-	if(c.GetUsername() == "demo") {
+	if c.GetUserId() == configService.GetGlobalStringConfig("demoUserId") {
 		re.Msg = "cannotUpdateDemo"
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 	if re.Ok, re.Msg = Vd("password", oldPwd); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderRe(re);
+		return c.RenderRe(re)
 	}
 	re.Ok, re.Msg = userService.UpdatePwd(c.GetUserId(), oldPwd, pwd)
-	return c.RenderRe(re);
+	return c.RenderRe(re)
 }
 
 // 更新主题
 func (c User) UpdateTheme(theme string) revel.Result {
-	re := info.NewRe();
+	re := info.NewRe()
 	re.Ok = userService.UpdateTheme(c.GetUserId(), theme)
 	if re.Ok {
 		c.UpdateSession("Theme", theme)
 	}
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
 
 // 发送邀请链接
 func (c User) SendRegisterEmail(content, toEmail string) revel.Result {
 	re := info.NewRe()
 	if content == "" || !IsEmail(toEmail) {
-		return c.RenderJson(re);
+		return c.RenderJSON(re)
 	}
 
 	re.Ok = emailService.SendInviteEmail(c.GetUserInfo(), toEmail, content)
-	return c.RenderJson(re);
+	return c.RenderJSON(re)
 }
 
 //---------------------------
@@ -90,35 +90,20 @@ func (c User) SendRegisterEmail(content, toEmail string) revel.Result {
 func (c User) ReSendActiveEmail() revel.Result {
 	re := info.NewRe()
 	re.Ok = emailService.RegisterSendActiveEmail(c.GetUserInfo(), c.GetEmail())
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
-}
-
-// 修改Email发送激活邮箱
-func (c User) UpdateEmailSendActiveEmail(email string) revel.Result {
-	re := info.NewRe()
-	if(c.GetUsername() == "demo") {
-		re.Msg = "cannotUpdateDemo"
-		return c.RenderJson(re);
-	}
-	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderRe(re);
-	}
-	
-	re.Ok, re.Msg = emailService.UpdateEmailSendActiveEmail(c.GetUserInfo(), email)
-	return c.RenderRe(re)
 }
 
 // 通过点击链接
 // 修改邮箱
 func (c User) UpdateEmail(token string) revel.Result {
-	c.SetUserInfo();
+	c.SetUserInfo()
 
 	ok, msg, email := userService.UpdateEmail(token)
 
-	c.RenderArgs["title"] = "验证邮箱"
+	c.ViewArgs["title"] = "验证邮箱"
-	c.RenderArgs["ok"] = ok
+	c.ViewArgs["ok"] = ok
-	c.RenderArgs["msg"] = msg
+	c.ViewArgs["msg"] = msg
-	c.RenderArgs["email"] = email
+	c.ViewArgs["email"] = email
 
 	// 修改session
 	if ok {
@@ -130,67 +115,46 @@ func (c User) UpdateEmail(token string) revel.Result {
 
 // 注册后激活邮箱
 func (c User) ActiveEmail(token string) revel.Result {
-	c.SetUserInfo();
+	c.SetUserInfo()
 
 	ok, msg, email := userService.ActiveEmail(token)
 
 	// 需要修改session
 	if ok {
-		c.UpdateSession("Verified", "1");
+		c.UpdateSession("Verified", "1")
 	}
 
-	c.RenderArgs["title"] = "验证邮箱"
+	c.ViewArgs["title"] = "验证邮箱"
-	c.RenderArgs["ok"] = ok
+	c.ViewArgs["ok"] = ok
-	c.RenderArgs["msg"] = msg
+	c.ViewArgs["msg"] = msg
-	c.RenderArgs["email"] = email
+	c.ViewArgs["email"] = email
 
 	return c.RenderTemplate("user/active_email.html")
 }
 
-//------------
-// 第三方账号添加leanote账号
-func (c User) AddAccount(email, pwd string) revel.Result {
-	re := info.NewRe()
-	
-	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderRe(re);
-	}
-	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderRe(re);
-	}
-	
-	re.Ok, re.Msg = userService.ThirdAddUser(c.GetUserId(), email, pwd)
-	
-	if re.Ok {
-		c.UpdateSession("Email", email);
-	}
-	
-	return c.RenderRe(re)
-}
-
 //-----------------
 // 用户偏爱
 func (c User) UpdateColumnWidth(notebookWidth, noteListWidth, mdEditorWidth int) revel.Result {
 	re := info.NewRe()
 	re.Ok = userService.UpdateColumnWidth(c.GetUserId(), notebookWidth, noteListWidth, mdEditorWidth)
 	if re.Ok {
-		c.UpdateSession("NotebookWidth", strconv.Itoa(notebookWidth));
+		c.UpdateSession("NotebookWidth", strconv.Itoa(notebookWidth))
-		c.UpdateSession("NoteListWidth", strconv.Itoa(noteListWidth)); 
+		c.UpdateSession("NoteListWidth", strconv.Itoa(noteListWidth))
-		c.UpdateSession("MdEditorWidth", strconv.Itoa(mdEditorWidth)); 
+		c.UpdateSession("MdEditorWidth", strconv.Itoa(mdEditorWidth))
 
 		LogJ(c.Session)
 	}
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c User) UpdateLeftIsMin(leftIsMin bool) revel.Result {
 	re := info.NewRe()
 	re.Ok = userService.UpdateLeftIsMin(c.GetUserId(), leftIsMin)
 	if re.Ok {
 		if leftIsMin {
-			c.UpdateSession("LeftIsMin", "1");
+			c.UpdateSession("LeftIsMin", "1")
 		} else {
-			c.UpdateSession("LeftIsMin", "0");
+			c.UpdateSession("LeftIsMin", "0")
 		}
 	}
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

app/controllers/admin/AdminBaseController.go

@@ -1,15 +1,15 @@
 package admin
 
 import (
-//	"github.com/revel/revel"
+	//	"github.com/revel/revel"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
-//	"encoding/json"
+	//	"encoding/json"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/controllers"
-//	"io/ioutil"
+	. "github.com/leanote/leanote/app/lea"
-//	"fmt"
+	//	"io/ioutil"
-//	"math"
+	//	"fmt"
-//	"strconv"
+	//	"math"
+	//	"strconv"
 	"strings"
 )
 
@@ -20,23 +20,23 @@ type AdminBaseController struct {
 
 // 得到sorterField 和 isAsc
 // okSorter = ['email', 'username']
-func (c AdminBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool){
+func (c AdminBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool) {
 	sorter := ""
 	c.Params.Bind(&sorter, "sorter")
 	if sorter == "" {
-		return sorterField, isAsc;
+		return sorterField, isAsc
 	}
 
 	// sorter形式 email-up, email-down
 	s2 := strings.Split(sorter, "-")
 	if len(s2) != 2 {
-		return sorterField, isAsc;
+		return sorterField, isAsc
 	}
 
 	// 必须是可用的sorter
 	if okSorter != nil && len(okSorter) > 0 {
 		if !InArray(okSorter, s2[0]) {
-			return sorterField, isAsc;
+			return sorterField, isAsc
 		}
 	}
 
@@ -46,8 +46,8 @@ func (c AdminBaseController) getSorter(sorterField string, isAsc bool, okSorter
 	} else {
 		isAsc = false
 	}
-	c.RenderArgs["sorter"] = sorter
+	c.ViewArgs["sorter"] = sorter
-	return sorterField, isAsc;
+	return sorterField, isAsc
 }
 
 func (c AdminBaseController) updateConfig(keys []string) {

app/controllers/admin/AdminBlogController.go

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

app/controllers/admin/AdminController.go

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

app/controllers/admin/AdminData.go

@@ -1,13 +1,13 @@
 package admin
 
 import (
-	"github.com/revel/revel"
-	. "github.com/leanote/leanote/app/lea"
-	"github.com/leanote/leanote/app/info"
 	"archive/tar"
 	"compress/gzip"
-    "os"
+	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
 	"io"
+	"os"
 	"time"
 )
 
@@ -22,37 +22,37 @@ func (c AdminData) Index() revel.Result {
 	// 逆序之
 	backups2 := make([]map[string]string, len(backups))
 	j := 0
-	for i := len(backups)-1; i >= 0; i-- {
+	for i := len(backups) - 1; i >= 0; i-- {
 		backups2[j] = backups[i]
 		j++
 	}
-	c.RenderArgs["backups"] = backups2
+	c.ViewArgs["backups"] = backups2
-	return c.RenderTemplate("admin/data/index.html");
+	return c.RenderTemplate("admin/data/index.html")
 }
 
 func (c AdminData) Backup() revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Msg = configService.Backup("")
-    return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 还原
 func (c AdminData) Restore(createdTime string) revel.Result {
 	re := info.Re{}
 	re.Ok, re.Msg = configService.Restore(createdTime)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminData) Delete(createdTime string) revel.Result {
 	re := info.Re{}
 	re.Ok, re.Msg = configService.DeleteBackup(createdTime)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c AdminData) UpdateRemark(createdTime, remark string) revel.Result {
 	re := info.Re{}
 	re.Ok, re.Msg = configService.UpdateBackupRemark(createdTime, remark)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c AdminData) Download(createdTime string) revel.Result {
 	backup, ok := configService.GetBackup(createdTime)

app/controllers/admin/AdminEmailController.go

@@ -1,11 +1,11 @@
 package admin
 
 import (
-	"github.com/revel/revel"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
-	"strings"
+	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
 	"strconv"
+	"strings"
 )
 
 // admin 首页
@@ -23,9 +23,9 @@ func (c AdminEmail) Email() revel.Result {
 func (c AdminEmail) Blog() revel.Result {
 	recommendTags := configService.GetGlobalArrayConfig("recommendTags")
 	newTags := configService.GetGlobalArrayConfig("newTags")
-	c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",")
+	c.ViewArgs["recommendTags"] = strings.Join(recommendTags, ",")
-	c.RenderArgs["newTags"] = strings.Join(newTags, ",")
+	c.ViewArgs["newTags"] = strings.Join(newTags, ",")
-	return c.RenderTemplate("admin/setting/blog.html");
+	return c.RenderTemplate("admin/setting/blog.html")
 }
 func (c AdminEmail) DoBlogTag(recommendTags, newTags string) revel.Result {
 	re := info.NewRe()
@@ -33,52 +33,56 @@ func (c AdminEmail) DoBlogTag(recommendTags, newTags string) revel.Result {
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ","))
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ","))
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // demo
 // blog标签设置
 func (c AdminEmail) Demo() revel.Result {
-	c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
+	c.ViewArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
-	c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
+	c.ViewArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
-	return c.RenderTemplate("admin/setting/demo.html");
+	return c.RenderTemplate("admin/setting/demo.html")
 }
 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";
+		re.Msg = "The User is Not Exists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex())
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // ToImage
 // 长微博的bin路径phantomJs
 func (c AdminEmail) ToImage() revel.Result {
-	c.RenderArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath")
+	c.ViewArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath")
-	return c.RenderTemplate("admin/setting/toImage.html");
+	return c.RenderTemplate("admin/setting/toImage.html")
 }
 func (c AdminEmail) DoToImage(toImageBinPath string) revel.Result {
 	re := info.NewRe()
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "toImageBinPath", toImageBinPath)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
-func (c AdminEmail) Set(emailHost, emailPort, emailUsername, emailPassword string) revel.Result {
+func (c AdminEmail) Set(emailHost, emailPort, emailUsername, emailPassword, emailSSL string) revel.Result {
 	re := info.NewRe()
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailHost", emailHost)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailPort", emailPort)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailUsername", emailUsername)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailPassword", emailPassword)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "emailSSL", emailSSL)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c AdminEmail) Template() revel.Result {
 	re := info.NewRe()
@@ -104,7 +108,7 @@ func (c AdminEmail) Template() revel.Result {
 			if !ok {
 				re.Ok = false
 				re.Msg = "Error key: " + key + "<br />" + msg
-				return c.RenderJson(re)
+				return c.RenderJSON(re)
 			} else {
 				configService.UpdateGlobalStringConfig(userId, key, v)
 			}
@@ -112,7 +116,7 @@ func (c AdminEmail) Template() revel.Result {
 	}
 
 	re.Ok = true
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 发送Email
@@ -123,20 +127,20 @@ func (c AdminEmail) SendEmailToEmails(sendEmails, latestEmailSubject, latestEmai
 
 	if latestEmailSubject == "" || latestEmailBody == "" {
 		re.Msg = "subject or body is blank"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if saveAsOldEmail {
 		oldEmails := configService.GetGlobalMapConfig("oldEmails")
 		oldEmails[latestEmailSubject] = latestEmailBody
-		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails)
 	}
 
 	sendEmails = strings.Replace(sendEmails, "\r", "", -1)
 	emails := strings.Split(sendEmails, "\n")
 
-	re.Ok, re.Msg = emailService.SendEmailToEmails(emails, latestEmailSubject, latestEmailBody);
+	re.Ok, re.Msg = emailService.SendEmailToEmails(emails, latestEmailSubject, latestEmailBody)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 发送Email
@@ -147,13 +151,13 @@ func (c AdminEmail) SendToUsers2(emails, latestEmailSubject, latestEmailBody str
 
 	if latestEmailSubject == "" || latestEmailBody == "" {
 		re.Msg = "subject or body is blank"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if saveAsOldEmail {
 		oldEmails := configService.GetGlobalMapConfig("oldEmails")
 		oldEmails[latestEmailSubject] = latestEmailBody
-		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails)
 	}
 
 	emails = strings.Replace(emails, "\r", "", -1)
@@ -162,22 +166,21 @@ func (c AdminEmail) SendToUsers2(emails, latestEmailSubject, latestEmailBody str
 	users := userService.ListUserInfosByEmails(emailsArr)
 	LogJ(emailsArr)
 
+	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody)
 
-	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody);
+	return c.RenderJSON(re)
-	
-	return c.RenderJson(re)
 }
 
 // send Email dialog
-func (c AdminEmail) SendEmailDialog(emails string) revel.Result{
+func (c AdminEmail) SendEmailDialog(emails string) revel.Result {
 	emailsArr := strings.Split(emails, ",")
 	emailsNl := strings.Join(emailsArr, "\n")
 
-	c.RenderArgs["emailsNl"] = emailsNl
+	c.ViewArgs["emailsNl"] = emailsNl
-	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.ViewArgs["str"] = configService.GlobalStringConfigs
-	c.RenderArgs["map"] = configService.GlobalMapConfigs
+	c.ViewArgs["map"] = configService.GlobalMapConfigs
 
-	return c.RenderTemplate("admin/email/emailDialog.html");
+	return c.RenderTemplate("admin/email/emailDialog.html")
 }
 
 func (c AdminEmail) SendToUsers(userFilterEmail, userFilterWhiteList, userFilterBlackList, latestEmailSubject, latestEmailBody string, verified, saveAsOldEmail bool) revel.Result {
@@ -187,47 +190,47 @@ func (c AdminEmail) SendToUsers(userFilterEmail, userFilterWhiteList, userFilter
 
 	if latestEmailSubject == "" || latestEmailBody == "" {
 		re.Msg = "subject or body is blank"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if saveAsOldEmail {
 		oldEmails := configService.GetGlobalMapConfig("oldEmails")
 		oldEmails[latestEmailSubject] = latestEmailBody
-		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails);
+		configService.UpdateGlobalMapConfig(c.GetUserId(), "oldEmails", oldEmails)
 	}
 
 	users := userService.GetAllUserByFilter(userFilterEmail, userFilterWhiteList, userFilterBlackList, verified)
 
-	if(users == nil || len(users) == 0) {
+	if users == nil || len(users) == 0 {
 		re.Ok = false
 		re.Msg = "no users"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
-	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody);
+	re.Ok, re.Msg = emailService.SendEmailToUsers(users, latestEmailSubject, latestEmailBody)
-	if(!re.Ok) {
+	if !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	re.Ok = true
 	re.Msg = "users:" + strconv.Itoa(len(users))
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 删除emails
 func (c AdminEmail) DeleteEmails(ids string) revel.Result {
 	re := info.NewRe()
 	re.Ok = emailService.DeleteEmails(strings.Split(ids, ","))
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminEmail) List(sorter, keywords string) revel.Result {
 	pageNumber := c.GetPage()
-	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "ok", "subject", "createdTime"});
+	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"email", "ok", "subject", "createdTime"})
-	pageInfo, emails := emailService.ListEmailLogs(pageNumber, userPageSize, sorterField, isAsc, keywords);
+	pageInfo, emails := emailService.ListEmailLogs(pageNumber, userPageSize, sorterField, isAsc, keywords)
-	c.RenderArgs["pageInfo"] = pageInfo
+	c.ViewArgs["pageInfo"] = pageInfo
-	c.RenderArgs["emails"] = emails
+	c.ViewArgs["emails"] = emails
-	c.RenderArgs["keywords"] = keywords
+	c.ViewArgs["keywords"] = keywords
-	return c.RenderTemplate("admin/email/list.html");
+	return c.RenderTemplate("admin/email/list.html")
 }

app/controllers/admin/AdminSettingController.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/revel/revel"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
+	"fmt"
 	"github.com/leanote/leanote/app/info"
 	"strings"
-	"fmt"
 )
 
 // admin 首页
@@ -23,9 +23,9 @@ func (c AdminSetting) Email() revel.Result {
 func (c AdminSetting) Blog() revel.Result {
 	recommendTags := configService.GetGlobalArrayConfig("recommendTags")
 	newTags := configService.GetGlobalArrayConfig("newTags")
-	c.RenderArgs["recommendTags"] = strings.Join(recommendTags, ",")
+	c.ViewArgs["recommendTags"] = strings.Join(recommendTags, ",")
-	c.RenderArgs["newTags"] = strings.Join(newTags, ",")
+	c.ViewArgs["newTags"] = strings.Join(newTags, ",")
-	return c.RenderTemplate("admin/setting/blog.html");
+	return c.RenderTemplate("admin/setting/blog.html")
 }
 func (c AdminSetting) DoBlogTag(recommendTags, newTags string) revel.Result {
 	re := info.NewRe()
@@ -33,7 +33,7 @@ func (c AdminSetting) DoBlogTag(recommendTags, newTags string) revel.Result {
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "recommendTags", strings.Split(recommendTags, ","))
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "newTags", strings.Split(newTags, ","))
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 共享设置
@@ -42,55 +42,59 @@ func (c AdminSetting) ShareNote(registerSharedUserId string,
 	registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds []string) revel.Result {
 
 	re := info.NewRe()
-	re.Ok, re.Msg = configService.UpdateShareNoteConfig(registerSharedUserId, registerSharedNotebookPerms, registerSharedNotePerms, registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds);
+	re.Ok, re.Msg = configService.UpdateShareNoteConfig(registerSharedUserId, registerSharedNotebookPerms, registerSharedNotePerms, registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // demo
 // blog标签设置
 func (c AdminSetting) Demo() revel.Result {
-	c.RenderArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
+	c.ViewArgs["demoUsername"] = configService.GetGlobalStringConfig("demoUsername")
-	c.RenderArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
+	c.ViewArgs["demoPassword"] = configService.GetGlobalStringConfig("demoPassword")
-	return c.RenderTemplate("admin/setting/demo.html");
+	return c.RenderTemplate("admin/setting/demo.html")
 }
 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";
+		re.Msg = "The User is Not Exists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUserId", userInfo.UserId.Hex())
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoUsername", demoUsername)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "demoPassword", demoPassword)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
-// ToImage
+func (c AdminSetting) ExportPdf(path string) revel.Result {
-// 长微博的bin路径phantomJs
-func (c AdminSetting) ToImage() revel.Result {
-	c.RenderArgs["toImageBinPath"] = configService.GetGlobalStringConfig("toImageBinPath")
-	return c.RenderTemplate("admin/setting/toImage.html");
-}
-func (c AdminSetting) DoToImage(toImageBinPath string) revel.Result {
 	re := info.NewRe()
-	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "toImageBinPath", toImageBinPath)
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "exportPdfBinPath", path)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
+}
+
+func (c AdminSetting) DoSiteUrl(siteUrl string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "siteUrl", siteUrl)
+	return c.RenderJSON(re)
 }
 
 // SubDomain
 func (c AdminSetting) SubDomain() revel.Result {
-	c.RenderArgs["str"] = configService.GlobalStringConfigs
+	c.ViewArgs["str"] = configService.GlobalStringConfigs
-	c.RenderArgs["arr"] = configService.GlobalArrayConfigs
+	c.ViewArgs["arr"] = configService.GlobalArrayConfigs
 
-	c.RenderArgs["noteSubDomain"] = configService.GetGlobalStringConfig("noteSubDomain")
+	c.ViewArgs["noteSubDomain"] = configService.GetGlobalStringConfig("noteSubDomain")
-	c.RenderArgs["blogSubDomain"] = configService.GetGlobalStringConfig("blogSubDomain")
+	c.ViewArgs["blogSubDomain"] = configService.GetGlobalStringConfig("blogSubDomain")
-	c.RenderArgs["leaSubDomain"] = configService.GetGlobalStringConfig("leaSubDomain")
+	c.ViewArgs["leaSubDomain"] = configService.GetGlobalStringConfig("leaSubDomain")
 
-	return c.RenderTemplate("admin/setting/subDomain.html");
+	return c.RenderTemplate("admin/setting/subDomain.html")
 }
 func (c AdminSetting) DoSubDomain(noteSubDomain, blogSubDomain, leaSubDomain, blackSubDomains, allowCustomDomain, blackCustomDomains string) revel.Result {
 	re := info.NewRe()
@@ -102,13 +106,13 @@ func (c AdminSetting) DoSubDomain(noteSubDomain, blogSubDomain, leaSubDomain, bl
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackSubDomains", strings.Split(blackSubDomains, ","))
 	re.Ok = configService.UpdateGlobalArrayConfig(c.GetUserId(), "blackCustomDomains", strings.Split(blackCustomDomains, ","))
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminSetting) OpenRegister(openRegister string) revel.Result {
 	re := info.NewRe()
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "openRegister", openRegister)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminSetting) HomePage(homePage string) revel.Result {
@@ -117,7 +121,7 @@ func (c AdminSetting) HomePage(homePage string) revel.Result {
 		homePage = ""
 	}
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "homePage", homePage)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Result {
@@ -125,7 +129,7 @@ func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Resu
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongodumpPath", mongodumpPath)
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongorestorePath", mongorestorePath)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c AdminSetting) UploadSize(uploadImageSize, uploadAvatarSize, uploadBlogLogoSize, uploadAttachSize float64) revel.Result {
@@ -134,5 +138,5 @@ func (c AdminSetting) UploadSize(uploadImageSize, uploadAvatarSize, uploadBlogLo
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAvatarSize", fmt.Sprintf("%v", uploadAvatarSize))
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadBlogLogoSize", fmt.Sprintf("%v", uploadBlogLogoSize))
 	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "uploadAttachSize", fmt.Sprintf("%v", uploadAttachSize))
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

app/controllers/admin/AdminUpgradeController.go

@@ -2,9 +2,9 @@ package admin
 
 import (
 	"github.com/revel/revel"
-//	"encoding/json"
+	//	"encoding/json"
 	"github.com/leanote/leanote/app/info"
-//	"io/ioutil"
+	//	"io/ioutil"
 )
 
 // Upgrade controller
@@ -14,17 +14,17 @@ type AdminUpgrade struct {
 
 func (c AdminUpgrade) UpgradeBlog() revel.Result {
 	upgradeService.UpgradeBlog()
-	return nil;
+	return nil
 }
 
 func (c AdminUpgrade) UpgradeBetaToBeta2() revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Msg = upgradeService.UpgradeBetaToBeta2(c.GetUserId())
-	return c.RenderJson(re)
+	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)
+	return c.RenderJSON(re)
 }

app/controllers/admin/AdminUserController.go

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

app/controllers/admin/init.go

@@ -1,11 +1,11 @@
 package admin
 
 import (
-	"github.com/leanote/leanote/app/service"
 	"github.com/leanote/leanote/app/info"
-//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/service"
+	//	. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
-//	"strings"
+	//	"strings"
 )
 
 var userService *service.UserService
@@ -42,7 +42,7 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	"FindPassword2":      true,
 	"FindPasswordUpdate": true,
 	"Suggestion":         true,
-	},
+},
 	"Blog": map[string]bool{"Index": true,
 		"View":       true,
 		"AboutMe":    true,
@@ -50,12 +50,13 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	},
 	// 用户的激活与修改邮箱都不需要登录, 通过链接地址
 	"User": map[string]bool{"UpdateEmail": true,
-		"ActiveEmail":true,
+		"ActiveEmail": true,
 	},
 	"Oauth":  map[string]bool{"GithubCallback": true},
 	"File":   map[string]bool{"OutputImage": true, "OutputFile": true},
 	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
 }
+
 func needValidate(controller, method string) bool {
 	// 在里面
 	if v, ok := commonUrl[controller]; ok {
@@ -66,7 +67,7 @@ func needValidate(controller, method string) bool {
 		return true
 	} else {
 		// controller不在这里的, 肯定要验证
-		return true;
+		return true
 	}
 }
 func AuthInterceptor(c *revel.Controller) revel.Result {
@@ -90,7 +91,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" {
 		re := info.NewRe()
 		re.Msg = "NOTLOGIN"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	return c.Redirect("/login")
@@ -110,7 +111,7 @@ func InitService() {
 	tokenService = service.TokenS
 	noteImageService = service.NoteImageS
 	fileService = service.FileS
-	albumService= service.AlbumS
+	albumService = service.AlbumS
 	attachService = service.AttachS
 	pwdService = service.PwdS
 	suggestionService = service.SuggestionS

app/controllers/api/ApiAuthController.go

@@ -24,16 +24,16 @@ type ApiAuth struct {
 func (c ApiAuth) Login(email, pwd string) revel.Result {
 	var msg = ""
 
-	userInfo := authService.Login(email, pwd)
+	userInfo, err := authService.Login(email, pwd)
-	if userInfo.Email != "" {
+	if err == nil {
 		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.AuthOk{Ok: true, Token: token, UserId: userInfo.UserId, Email: userInfo.Email, Username: userInfo.Username})
 	} else {
 		// 登录错误, 则错误次数++
 		msg = "wrongUsernameOrPassword"
 	}
-	return c.RenderJson(info.ApiRe{Ok: false, Msg: c.Message(msg)})
+	return c.RenderJSON(info.ApiRe{Ok: false, Msg: c.Message(msg)})
 }
 
 // 注销
@@ -43,7 +43,7 @@ func (c ApiAuth) Logout() revel.Result {
 	sessionService.Clear(token)
 	re := info.NewApiRe()
 	re.Ok = true
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 注册
@@ -53,17 +53,17 @@ func (c ApiAuth) Register(email, pwd string) revel.Result {
 	re := info.NewApiRe()
 	if !configService.IsOpenRegister() {
 		re.Msg = "notOpenRegister" // 未开放注册
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	// 注册
 	re.Ok, re.Msg = authService.Register(email, pwd, "")
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }

app/controllers/api/ApiBaseController.go

@@ -4,11 +4,11 @@ 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"
+	. "github.com/leanote/leanote/app/lea"
 	"os"
-//	"fmt"
+	//	"fmt"
 	"io/ioutil"
 	//	"fmt"
 	//	"math"
@@ -43,7 +43,7 @@ func (c ApiBaseContrller) getUserInfo() info.User {
 
 // 上传附件
 func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg string, id string) {
-	userId := c.getUserId();
+	userId := c.getUserId()
 
 	// 判断是否有权限为笔记添加附件
 	// 如果笔记还没有添加是不是会有问题
@@ -64,17 +64,20 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
 		return
 	}
 	// > 5M?
-	maxFileSize := configService.GetUploadSize("uploadAttachSize");
+	maxFileSize := configService.GetUploadSize("uploadAttachSize")
 	if maxFileSize <= 0 {
 		maxFileSize = 1000
 	}
-	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+	if float64(len(data)) > maxFileSize*float64(1024*1024) {
 		msg = "fileIsTooLarge"
 		return
 	}
 
 	// 生成上传路径
-	filePath := "files/" + userId + "/attachs"
+	newGuid := NewGuid()
+	//	filePath :=	"files/" + Digest3(userId) + "/" + userId + "/" + Digest2(newGuid) + "/attachs"
+	filePath := "files/" + GetRandomFilePath(userId, newGuid) + "/attachs"
+
 	dir := revel.BasePath + "/" + filePath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
@@ -83,8 +86,8 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
 	// 生成新的文件名
 	filename := handel.Filename
 	_, ext := SplitFilename(filename) // .doc
-	filename = NewGuid() + ext
+	filename = newGuid + ext
-	toPath := dir + "/" + filename;
+	toPath := dir + "/" + filename
 	err = ioutil.WriteFile(toPath, data, 0777)
 	if err != nil {
 		return
@@ -124,8 +127,13 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
 		return
 	}
 	defer file.Close()
+
+	newGuid := NewGuid()
 	// 生成上传路径
-	fileUrlPath := "files/" + c.getUserId() + "/images"
+	userId := c.getUserId()
+	// fileUrlPath := "files/" + Digest3(userId) + "/" + userId + "/" + Digest2(newGuid) + "/images"
+	fileUrlPath := "files/" + GetRandomFilePath(userId, newGuid) + "/images"
+
 	dir := revel.BasePath + "/" + fileUrlPath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
@@ -134,29 +142,29 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
 	// 生成新的文件名
 	filename := handel.Filename
 	_, ext := SplitFilename(filename)
-	if(ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg") {
+	// if ext != ".gif" && ext != ".jpg" && ext != ".png" && ext != ".bmp" && ext != ".jpeg" {
-		msg = "notImage"
+	// 	msg = "notImage"
-		return
+	// 	return
-	}
+	// }
 
-	filename = NewGuid() + ext
+	filename = newGuid + ext
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
 		return
 	}
 
-	maxFileSize := configService.GetUploadSize("uploadImageSize");
+	maxFileSize := configService.GetUploadSize("uploadImageSize")
 	if maxFileSize <= 0 {
 		maxFileSize = 1000
 	}
 
 	// > 2M?
-	if(float64(len(data)) > maxFileSize * float64(1024*1024)) {
+	if float64(len(data)) > maxFileSize*float64(1024*1024) {
 		msg = "fileIsTooLarge"
 		return
 	}
 
-	toPath := dir + "/" + filename;
+	toPath := dir + "/" + filename
 	err = ioutil.WriteFile(toPath, data, 0777)
 	if err != nil {
 		return

app/controllers/api/ApiFileController.go

@@ -3,18 +3,18 @@ package api
 import (
 	"github.com/revel/revel"
 	//	"encoding/json"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
 	//	"github.com/leanote/leanote/app/lea/netutil"
-//	"github.com/leanote/leanote/app/info"
+	//	"github.com/leanote/leanote/app/info"
-//	"io/ioutil"
+	//	"io/ioutil"
 	"os"
 	//	"strconv"
-	"io"
-	"time"
-	"strings"
 	"archive/tar"
 	"compress/gzip"
+	"io"
+	"strings"
+	"time"
 )
 
 // 文件操作, 图片, 头像上传, 输出
@@ -30,7 +30,7 @@ func (c ApiFile) CopyImage(userId, fileId, toUserId string) revel.Result {
 
 	re.Ok, re.Id = fileService.CopyImage(userId, fileId, toUserId)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // get all images by userId with page
@@ -39,19 +39,19 @@ func (c ApiFile) GetImages(albumId, key string, page int) revel.Result {
 	re := info.NewRe()
 	re.Ok = true
 	re.Item = imagesPage
-	return c.RenderJson(re)
+	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)
+	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)
+	return c.RenderJSON(re)
 }
 
 */
@@ -73,7 +73,7 @@ func (c ApiFile) GetImage(fileId string) revel.Result {
 // 下载附件
 // [OK]
 func (c ApiFile) GetAttach(fileId string) revel.Result {
-	attach := attachService.GetAttach(fileId, c.getUserId()); // 得到路径
+	attach := attachService.GetAttach(fileId, c.getUserId()) // 得到路径
 	path := attach.Path
 	if path == "" {
 		return c.RenderText("No Such File")
@@ -154,11 +154,10 @@ func (c ApiFile) GetAllAttachs(noteId string) revel.Result {
 		}
 	} // for
 
-//    tw.Close()
+	//    tw.Close()
-//    gw.Close()
+	//    gw.Close()
-//    fw.Close()
+	//    fw.Close()
-//    file, _ := os.Open(dir + "/" + filename)
+	//    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

@@ -6,9 +6,11 @@ import (
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-	"regexp"
+	"os"
-	"strings"
+	"os/exec"
+	// "strings"
 	"time"
+	"regexp"
 	//	"github.com/leanote/leanote/app/types"
 	//	"io/ioutil"
 	//	"fmt"
@@ -50,7 +52,7 @@ func (c ApiNote) GetSyncNotes(afterUsn, maxEntry int) revel.Result {
 		maxEntry = 100
 	}
 	notes := noteService.GetSyncNotes(c.getUserId(), afterUsn, maxEntry)
-	return c.RenderJson(notes)
+	return c.RenderJSON(notes)
 }
 
 // 得到笔记本下的笔记
@@ -59,17 +61,18 @@ func (c ApiNote) GetNotes(notebookId string) revel.Result {
 	if notebookId != "" && !bson.IsObjectIdHex(notebookId) {
 		re := info.NewApiRe()
 		re.Msg = "notebookIdInvalid"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	_, notes := noteService.ListNotes(c.getUserId(), notebookId, false, c.GetPage(), pageSize, defaultSortField, false, false)
-	return c.RenderJson(noteService.ToApiNotes(notes))
+	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))
+	return c.RenderJSON(noteService.ToApiNotes(notes))
+
 }
 
 // get Note
@@ -82,7 +85,6 @@ func (c ApiNote) GetTrashNotes() revel.Result {
   "Title": "asdfadsf--=",
   "Desc": "",
   "Tags": [
-    ""
   ],
   "Abstract": "",
   "Content": "",
@@ -92,7 +94,7 @@ func (c ApiNote) GetTrashNotes() revel.Result {
   "Usn": 8,
   "Files": [
     {
-      "FileId": "551975d599c37b970f000002",
+      "FileId": "551975d599c37b970f000000",
       "LocalFileId": "",
       "Type": "",
       "Title": "",
@@ -100,18 +102,18 @@ func (c ApiNote) GetTrashNotes() revel.Result {
       "IsAttach": false
     },
     {
-      "FileId": "551975de99c37b970f000003",
+      "FileId": "551975de99c37b970f000001",
       "LocalFileId": "",
       "Type": "doc",
-      "Title": "李铁-简历-ali-print-en.doc",
+      "Title": "李铁-print-en.doc",
       "HasBody": false,
       "IsAttach": true
     },
     {
-      "FileId": "551975de99c37b970f000004",
+      "FileId": "551975de99c37b970f000002",
       "LocalFileId": "",
       "Type": "doc",
-      "Title": "李铁-简历-ali-print.doc",
+      "Title": "李铁-print.doc",
       "HasBody": false,
       "IsAttach": true
     }
@@ -125,17 +127,17 @@ func (c ApiNote) GetNote(noteId string) revel.Result {
 	if !bson.IsObjectIdHex(noteId) {
 		re := info.NewApiRe()
 		re.Msg = "noteIdInvalid"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	note := noteService.GetNote(noteId, c.getUserId())
 	if note.NoteId == "" {
 		re := info.NewApiRe()
 		re.Msg = "notExists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	apiNotes := noteService.ToApiNotes([]info.Note{note})
-	return c.RenderJson(apiNotes[0])
+	return c.RenderJSON(apiNotes[0])
 }
 
 // 得到note和内容
@@ -145,66 +147,8 @@ func (c ApiNote) GetNoteAndContent(noteId string) revel.Result {
 
 	apiNotes := noteService.ToApiNotes([]info.Note{noteAndContent.Note})
 	apiNote := apiNotes[0]
-	apiNote.Content = noteAndContent.Content
+	apiNote.Content = noteService.FixContent(noteAndContent.Content, noteAndContent.IsMarkdown)
-	return c.RenderJson(apiNote)
+	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链接是
@@ -215,23 +159,46 @@ 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)
+				LogJ(file)
+				if !file.IsAttach {
+					// <img src="https://"
+					// ![](http://demo.leanote.top/api/file/getImage?fileId=5863219465b68e4fd5000001)
+					reg, _ := regexp.Compile(`https*://[^/]*?/api/file/getImage\?fileId=`+file.LocalFileId)
+					// Log(reg)
+					noteOrContent.Content = reg.ReplaceAllString(noteOrContent.Content, `/api/file/getImage?fileId=`+file.FileId)  
+
+					// // "http://a.com/api/file/getImage?fileId=localId" => /api/file/getImage?fileId=serverId
+					// noteOrContent.Content = strings.Replace(noteOrContent.Content, 
+					// 	baseUrl + "/api/file/getImage?fileId="+file.LocalFileId, 
+					// 	"/api/file/getImage?fileId="+file.FileId, -1)
+				} else {
+					reg, _ := regexp.Compile(`https*://[^/]*?/api/file/getAttach\?fileId=`+file.LocalFileId)
+					Log(reg)
+					noteOrContent.Content = reg.ReplaceAllString(noteOrContent.Content, `/api/file/getAttach?fileId=`+file.FileId)  
+					/*
+					noteOrContent.Content = strings.Replace(noteOrContent.Content, 
+						baseUrl + "/api/file/getAttach?fileId="+file.LocalFileId, 
+						"/api/file/getAttach?fileId="+file.FileId, -1)
+					*/
+				}
 			}
 		}
 	}
 }
 
 // 得到内容
-// [OK]
 func (c ApiNote) GetNoteContent(noteId string) revel.Result {
+	userId := c.getUserId()
+	note := noteService.GetNote(noteId, userId)
 	//	re := info.NewRe()
-	noteContent := noteService.GetNoteContent(noteId, c.getUserId())
+	noteContent := noteService.GetNoteContent(noteId, userId)
 	if noteContent.Content != "" {
-		noteContent.Content = c.fixContent(noteContent.Content)
+		noteContent.Content = noteService.FixContent(noteContent.Content, note.IsMarkdown)
 	}
 
 	apiNoteContent := info.ApiNoteContent{
@@ -240,8 +207,7 @@ func (c ApiNote) GetNoteContent(noteId string) revel.Result {
 		Content: noteContent.Content,
 	}
 
-	//	re.Item = noteContent
+	return c.RenderJSON(apiNoteContent)
-	return c.RenderJson(apiNoteContent)
 }
 
 // 添加笔记
@@ -258,6 +224,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 	*/
 	//	Log(noteOrContent.Title)
 	//		LogJ(noteOrContent)
+
 	/*
 		LogJ(c.Params)
 		for name, _ := range c.Params.Files {
@@ -266,10 +233,10 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 			LogJ(file)
 		}
 	*/
-	//	return c.RenderJson(re)
+	//	return c.RenderJSON(re)
 	if noteOrContent.NotebookId == "" || !bson.IsObjectIdHex(noteOrContent.NotebookId) {
 		re.Msg = "notebookIdNotExists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	noteId := bson.NewObjectId()
@@ -292,7 +259,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 						}
 						// 报不是图片的错误没关系, 证明客户端传来非图片的数据
 						if msg != "notImage" {
-							return c.RenderJson(re)
+							return c.RenderJSON(re)
 						}
 					} else {
 						// 建立映射
@@ -304,7 +271,7 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 						}
 					}
 				} else {
-					return c.RenderJson(re)
+					return c.RenderJSON(re)
 				}
 			}
 		}
@@ -312,10 +279,10 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 
 	c.fixPostNotecontent(&noteOrContent)
 
-//	Log("Add")
+	//	Log("Add")
-//	LogJ(noteOrContent)
+	//	LogJ(noteOrContent)
 
-	//	return c.RenderJson(re)
+	//	return c.RenderJSON(re)
 
 	note := info.Note{UserId: userId,
 		NoteId:     noteId,
@@ -323,26 +290,35 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 		Title:      noteOrContent.Title,
 		Tags:       noteOrContent.Tags,
 		Desc:       noteOrContent.Desc,
-//		ImgSrc:     noteOrContent.ImgSrc,
+		//		ImgSrc:     noteOrContent.ImgSrc,
 		IsBlog:      noteOrContent.IsBlog,
 		IsMarkdown:  noteOrContent.IsMarkdown,
 		AttachNum:   attachNum,
+		CreatedTime: noteOrContent.CreatedTime,
+		UpdatedTime: noteOrContent.UpdatedTime,
 	}
 	noteContent := info.NoteContent{NoteId: note.NoteId,
 		UserId:      userId,
 		IsBlog:      note.IsBlog,
 		Content:     noteOrContent.Content,
-		Abstract: noteOrContent.Abstract}
+		Abstract:    noteOrContent.Abstract,
+		CreatedTime: noteOrContent.CreatedTime,
+		UpdatedTime: noteOrContent.UpdatedTime,
+	}
 
 	// 通过内容得到Desc, abstract
-	note.Desc = SubStringHTMLToRaw(noteContent.Content, 50)
+	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)
+		return c.RenderJSON(re)
 	}
 
 	// 添加需要返回的
@@ -352,11 +328,11 @@ func (c ApiNote) AddNote(noteOrContent info.ApiNote) revel.Result {
 	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)
+	return c.RenderJSON(noteOrContent)
 }
 
 // 更新笔记
@@ -371,16 +347,16 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 
 	if noteOrContent.NoteId == "" {
 		re.Msg = "noteIdNotExists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if noteOrContent.Usn <= 0 {
 		re.Msg = "usnNotExists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
-//	Log("_____________")
+	//	Log("_____________")
-//	LogJ(noteOrContent)
+	//	LogJ(noteOrContent)
 	/*
 		LogJ(c.Params.Files)
 		LogJ(c.Request.Header)
@@ -392,13 +368,14 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 	note := noteService.GetNote(noteId, userId)
 	if note.NoteId == "" {
 		re.Msg = "notExists"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	if note.Usn != noteOrContent.Usn {
 		re.Msg = "conflict"
 		Log("conflict")
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
+	Log("没有冲突")
 
 	// 如果传了files
 	// TODO 测试
@@ -408,9 +385,9 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 			Log(v)
 		}
 	*/
-//	Log(c.Has("Files[0]"))
+	//	Log(c.Has("Files[0]"))
 	if c.Has("Files[0][LocalFileId]") {
-//		LogJ(c.Params.Files)
+		//		LogJ(c.Params.Files)
 		if noteOrContent.Files != nil && len(noteOrContent.Files) > 0 {
 			for i, file := range noteOrContent.Files {
 				if file.HasBody {
@@ -425,21 +402,22 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 							} else {
 								re.Msg = msg
 							}
-							return c.RenderJson(re)
+							return c.RenderJSON(re)
 						} else {
 							// 建立映射
 							file.FileId = fileId
 							noteOrContent.Files[i] = file
 						}
 					} else {
-						return c.RenderJson(re)
+						return c.RenderJSON(re)
 					}
 				}
 			}
 		}
 
-//		Log("after upload")
+		//		Log("after upload")
-//		LogJ(noteOrContent.Files)
+		//		LogJ(noteOrContent.Files)
+
 	}
 
 	// 移到外面来, 删除最后一个file时也要处理, 不然总删不掉
@@ -494,9 +472,15 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 	}
 
 	if c.Has("Content") {
-		// 通过内容得到Desc, abstract
+		// 通过内容得到Desc, 如果有Abstract, 则用Abstract生成Desc
-		noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Content, 50)
+		if noteOrContent.Abstract == "" {
+			noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Content, 200)
+		} else {
+			noteUpdate["Desc"] = SubStringHTMLToRaw(noteOrContent.Abstract, 200)
 		}
+	}
+
+	noteUpdate["UpdatedTime"] = noteOrContent.UpdatedTime
 
 	afterNoteUsn := 0
 	noteOk := false
@@ -506,7 +490,7 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 		if !noteOk {
 			re.Ok = false
 			re.Msg = noteMsg
-			return c.RenderJson(re)
+			return c.RenderJSON(re)
 		}
 	}
 
@@ -521,10 +505,16 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 		if noteOrContent.Abstract == "" {
 			noteOrContent.Abstract = SubStringHTML(noteOrContent.Content, 200, "")
 		}
-//		Log("--------> afte fixed")
+
-//		Log(noteOrContent.Content)
+		//		Log("--------> afte fixed")
+		//		Log(noteOrContent.Content)
 		contentOk, contentMsg, afterContentUsn = noteService.UpdateNoteContent(c.getUserId(),
-			noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract, needUpdateNote, noteOrContent.Usn)
+			noteOrContent.NoteId,
+			noteOrContent.Content,
+			noteOrContent.Abstract,
+			needUpdateNote,
+			noteOrContent.Usn,
+			noteOrContent.UpdatedTime)
 	}
 
 	if needUpdateNote {
@@ -538,25 +528,25 @@ func (c ApiNote) UpdateNote(noteOrContent info.ApiNote) revel.Result {
 	}
 
 	if !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	noteOrContent.Content = ""
 	noteOrContent.Usn = re.Usn
 	noteOrContent.UpdatedTime = time.Now()
 
-//	Log("after upload")
+	//	Log("after upload")
-//	LogJ(noteOrContent.Files)
+	//	LogJ(noteOrContent.Files)
 	noteOrContent.UserId = c.getUserId()
 
-	return c.RenderJson(noteOrContent)
+	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)
+	return c.RenderJSON(re)
 }
 
 // 得到历史列表
@@ -568,6 +558,85 @@ func (c ApiNote) GetHistories(noteId string) revel.Result {
 		re.Ok = true
 		re.Item = histories
 	}
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 */
+
+// 0.2 新增
+// 导出成PDF
+func (c ApiNote) ExportPdf(noteId string) revel.Result {
+	re := info.NewApiRe()
+	userId := c.getUserId()
+	if noteId == "" {
+		re.Msg = "noteNotExists"
+		return c.RenderJSON(re)
+	}
+
+	note := noteService.GetNoteById(noteId)
+	if note.NoteId == "" {
+		re.Msg = "noteNotExists"
+		return c.RenderJSON(re)
+	}
+
+	noteUserId := note.UserId.Hex()
+	// 是否有权限
+	if noteUserId != userId {
+		// 是否是有权限协作的
+		if !note.IsBlog && !shareService.HasReadPerm(noteUserId, userId, noteId) {
+			re.Msg = "noteNotExists"
+			return c.RenderJSON(re)
+		}
+	}
+
+	// path 判断是否需要重新生成之
+	guid := NewGuid()
+	fileUrlPath := "files/export_pdf"
+	dir := revel.BasePath + "/" + fileUrlPath
+	if !MkdirAll(dir) {
+		re.Msg = "noDir"
+		return c.RenderJSON(re)
+	}
+	filename := guid + ".pdf"
+	path := dir + "/" + filename
+
+	appKey, _ := revel.Config.String("app.secretLeanote")
+	if appKey == "" {
+		appKey, _ = revel.Config.String("app.secret")
+	}
+
+	// 生成之
+	binPath := configService.GetGlobalStringConfig("exportPdfBinPath")
+	// 默认路径
+	if binPath == "" {
+		binPath = "/usr/local/bin/wkhtmltopdf"
+	}
+
+	url := configService.GetSiteUrl() + "/note/toPdf?noteId=" + noteId + "&appKey=" + appKey
+	var cc string
+	if note.IsMarkdown {
+		cc = binPath + " --lowquality --window-status done \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	} else {
+		cc = binPath + " --lowquality \"" + url + "\"  \"" + path + "\"" //  \"" + cookieDomain + "\" \"" + cookieName + "\" \"" + cookieValue + "\""
+	}
+
+	cmd := exec.Command("/bin/sh", "-c", cc)
+	_, err := cmd.Output()
+	if err != nil {
+		re.Msg = "sysError"
+		return c.RenderJSON(re)
+	}
+	file, err := os.Open(path)
+	if err != nil {
+		re.Msg = "sysError"
+		return c.RenderJSON(re)
+	}
+
+	filenameReturn := note.Title
+	filenameReturn = FixFilename(filenameReturn)
+	if filenameReturn == "" {
+		filenameReturn = "Untitled.pdf"
+	} else {
+		filenameReturn += ".pdf"
+	}
+	return c.RenderBinary(file, filenameReturn, revel.Attachment, time.Now()) // revel.Attachment
+}

app/controllers/api/ApiNotebookController.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"github.com/leanote/leanote/app/info"
+	. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
 	"gopkg.in/mgo.v2/bson"
-		. "github.com/leanote/leanote/app/lea"
 	//	"io/ioutil"
 )
 
@@ -30,15 +30,15 @@ func (c ApiNotebook) fixNotebook(notebook *info.Notebook) info.ApiNotebook {
 		return info.ApiNotebook{}
 	}
 	return info.ApiNotebook{
-		NotebookId       : notebook.NotebookId,
+		NotebookId:       notebook.NotebookId,
-		UserId           : notebook.UserId,
+		UserId:           notebook.UserId,
-		ParentNotebookId : notebook.ParentNotebookId,
+		ParentNotebookId: notebook.ParentNotebookId,
-		Seq              : notebook.Seq,
+		Seq:              notebook.Seq,
-		Title            : notebook.Title,
+		Title:            notebook.Title,
-		UrlTitle         : notebook.UrlTitle,
+		UrlTitle:         notebook.UrlTitle,
-		IsBlog           : notebook.IsBlog,
+		IsBlog:           notebook.IsBlog,
-		CreatedTime      : notebook.CreatedTime,
+		CreatedTime:      notebook.CreatedTime,
-		UpdatedTime      : notebook.UpdatedTime,
+		UpdatedTime:      notebook.UpdatedTime,
 		Usn:              notebook.Usn,
 		IsDeleted:        notebook.IsDeleted,
 	}
@@ -53,7 +53,7 @@ func (c ApiNotebook) GetSyncNotebooks(afterUsn, maxEntry int) revel.Result {
 		maxEntry = 100
 	}
 	notebooks := notebookService.GeSyncNotebooks(c.getUserId(), afterUsn, maxEntry)
-	return c.RenderJson(c.fixNotebooks(notebooks))
+	return c.RenderJSON(c.fixNotebooks(notebooks))
 }
 
 // 得到用户的所有笔记本
@@ -61,7 +61,7 @@ func (c ApiNotebook) GetSyncNotebooks(afterUsn, maxEntry int) revel.Result {
 // info.SubNotebooks
 func (c ApiNotebook) GetNotebooks() revel.Result {
 	notebooks := notebookService.GeSyncNotebooks(c.getUserId(), 0, 99999)
-	return c.RenderJson(c.fixNotebooks(notebooks))
+	return c.RenderJSON(c.fixNotebooks(notebooks))
 }
 
 // 添加notebook
@@ -77,9 +77,9 @@ func (c ApiNotebook) AddNotebook(title, parentNotebookId string, seq int) revel.
 	re := info.NewRe()
 	re.Ok, notebook = notebookService.AddNotebook(notebook)
 	if !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
-	return c.RenderJson(c.fixNotebook(&notebook))
+	return c.RenderJSON(c.fixNotebook(&notebook))
 }
 
 // 修改笔记
@@ -91,10 +91,10 @@ func (c ApiNotebook) UpdateNotebook(notebookId, title, parentNotebookId string,
 	if !ok {
 		re.Ok = false
 		re.Msg = msg
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	LogJ(notebook)
-	return c.RenderJson(c.fixNotebook(&notebook))
+	return c.RenderJSON(c.fixNotebook(&notebook))
 }
 
 // 删除笔记本
@@ -102,5 +102,5 @@ func (c ApiNotebook) UpdateNotebook(notebookId, title, parentNotebookId string,
 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)
+	return c.RenderJSON(re)
 }

app/controllers/api/ApiTagController.go

@@ -3,7 +3,7 @@ package api
 import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/revel/revel"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
 	//	. "github.com/leanote/leanote/app/lea"
 	//	"io/ioutil"
 )
@@ -23,7 +23,7 @@ func (c ApiTag) GetSyncTags(afterUsn, maxEntry int) revel.Result {
 		maxEntry = 100
 	}
 	tags := tagService.GeSyncTags(c.getUserId(), afterUsn, maxEntry)
-	return c.RenderJson(tags)
+	return c.RenderJSON(tags)
 }
 
 // 添加Tag
@@ -44,7 +44,7 @@ func (c ApiTag) GetSyncTags(afterUsn, maxEntry int) revel.Result {
 */
 func (c ApiTag) AddTag(tag string) revel.Result {
 	ret := tagService.AddOrUpdateTag(c.getUserId(), tag)
-	return c.RenderJson(ret)
+	return c.RenderJSON(ret)
 }
 
 // 删除标签
@@ -52,5 +52,5 @@ func (c ApiTag) AddTag(tag string) revel.Result {
 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)
+	return c.RenderJSON(re)
 }

app/controllers/api/ApiUserController.go

@@ -3,9 +3,9 @@ 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"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 	//	"github.com/leanote/leanote/app/types"
 	"io/ioutil"
@@ -28,7 +28,7 @@ func (c ApiUser) Info() revel.Result {
 
 	userInfo := c.getUserInfo()
 	if userInfo.UserId == "" {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	apiUser := info.ApiUser{
 		UserId:   userInfo.UserId.Hex(),
@@ -37,7 +37,7 @@ func (c ApiUser) Info() revel.Result {
 		Logo:     userInfo.Logo,
 		Verified: userInfo.Verified,
 	}
-	return c.RenderJson(apiUser)
+	return c.RenderJSON(apiUser)
 }
 
 // 修改用户名
@@ -46,15 +46,15 @@ func (c ApiUser) UpdateUsername(username string) revel.Result {
 	re := info.NewApiRe()
 	if c.GetUsername() == "demo" {
 		re.Msg = "cannotUpdateDemo"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	if re.Ok, re.Msg = Vd("username", username); !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	re.Ok, re.Msg = userService.UpdateUsername(c.getUserId(), username)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 修改密码
@@ -63,26 +63,25 @@ func (c ApiUser) UpdatePwd(oldPwd, pwd string) revel.Result {
 	re := info.NewApiRe()
 	if c.GetUsername() == "demo" {
 		re.Msg = "cannotUpdateDemo"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	if re.Ok, re.Msg = Vd("password", oldPwd); !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	re.Ok, re.Msg = userService.UpdatePwd(c.getUserId(), oldPwd, pwd)
-	return c.RenderJson(re)
+	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)
+	return c.RenderJSON(ret)
 }
 
-
 // 头像设置
 // 参数file=文件
 // 成功返回{Logo: url} 头像新url
@@ -92,11 +91,11 @@ func (c ApiUser) UpdateLogo() revel.Result {
 
 	if ok {
 		ok = userService.UpdateAvatar(c.getUserId(), url)
-		return c.RenderJson(map[string]string{"Logo": url})
+		return c.RenderJSON(map[string]string{"Logo": url})
 	} else {
 		re := info.NewApiRe()
 		re.Msg = msg
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 }
 

app/controllers/api/init.go

@@ -3,7 +3,7 @@ package api
 import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/service"
-//		. "github.com/leanote/leanote/app/lea"
+	//		. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
 	"strings"
 )
@@ -46,7 +46,7 @@ const (
 // 不需要拦截的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,
@@ -75,7 +75,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	noToken := false
 	if token == "" {
 		// 若无, 则取sessionId
-		token = c.Session.Id()
+		token = c.Session.ID()
 		noToken = true
 	}
 	c.Session["_token"] = token
@@ -90,7 +90,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	if noToken && userId == "" {
 		// 从session中获取, api/file/getImage, api/file/getAttach, api/file/getAllAttach
 		// 客户端
-		userId, _ = c.Session["UserId"];
+		userId, _ = c.Session["UserId"]
 	}
 	c.Session["_userId"] = userId
 
@@ -106,7 +106,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	// 没有登录, 返回错误的信息, 需要登录
 	re := info.NewApiRe()
 	re.Msg = "NOTLOGIN"
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func init() {

app/controllers/init.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"github.com/leanote/leanote/app/service"
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/lea/blog"
-//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/service"
+	//	. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
 	"strings"
 )
@@ -48,7 +48,7 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	"FindPasswordUpdate": true,
 	"Suggestion":         true,
 },
-	"Note": map[string]bool{"ToImage": true},
+	"Note": map[string]bool{"ToPdf": true},
 	"Blog": map[string]bool{"Index": true,
 		"View":               true,
 		"AboutMe":            true,
@@ -68,7 +68,7 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	},
 	"Oauth":  map[string]bool{"GithubCallback": true},
 	"File":   map[string]bool{"OutputImage": true, "OutputFile": true},
-	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
+	"Attach": map[string]bool{"Download": true /*, "DownloadAll": true*/},
 }
 
 func needValidate(controller, method string) bool {
@@ -103,7 +103,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" {
 		re := info.NewRe()
 		re.Msg = "NOTLOGIN"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	return c.Redirect("/login")
@@ -146,9 +146,10 @@ func init() {
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Note{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Share{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &User{})
+	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Album{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &File{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Attach{})
-//	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Blog{})
+	//	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &Blog{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &NoteContentHistory{})
 
 	revel.OnAppStart(func() {

app/controllers/member/MemberBaseController.go

@@ -1,15 +1,15 @@
 package member
 
 import (
-//	"github.com/revel/revel"
+	//	"github.com/revel/revel"
-//	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
-//	"encoding/json"
+	//	"encoding/json"
-	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/controllers"
-//	"io/ioutil"
+	. "github.com/leanote/leanote/app/lea"
-//	"fmt"
+	//	"io/ioutil"
-//	"math"
+	//	"fmt"
-//	"strconv"
+	//	"math"
+	//	"strconv"
 	"strings"
 )
 
@@ -20,23 +20,23 @@ type MemberBaseController struct {
 
 // 得到sorterField 和 isAsc
 // okSorter = ['email', 'username']
-func (c MemberBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool){
+func (c MemberBaseController) getSorter(sorterField string, isAsc bool, okSorter []string) (string, bool) {
 	sorter := ""
 	c.Params.Bind(&sorter, "sorter")
 	if sorter == "" {
-		return sorterField, isAsc;
+		return sorterField, isAsc
 	}
 
 	// sorter形式 email-up, email-down
 	s2 := strings.Split(sorter, "-")
 	if len(s2) != 2 {
-		return sorterField, isAsc;
+		return sorterField, isAsc
 	}
 
 	// 必须是可用的sorter
 	if okSorter != nil && len(okSorter) > 0 {
 		if !InArray(okSorter, s2[0]) {
-			return sorterField, isAsc;
+			return sorterField, isAsc
 		}
 	}
 
@@ -46,8 +46,8 @@ func (c MemberBaseController) getSorter(sorterField string, isAsc bool, okSorter
 	} else {
 		isAsc = false
 	}
-	c.RenderArgs["sorter"] = sorter
+	c.ViewArgs["sorter"] = sorter
-	return sorterField, isAsc;
+	return sorterField, isAsc
 }
 
 func (c MemberBaseController) updateConfig(keys []string) {

app/controllers/member/MemberBlogController.go

@@ -21,13 +21,13 @@ type MemberBlog struct {
 func (c MemberBlog) common() info.UserBlog {
 	userId := c.GetUserId()
 	userInfo := userService.GetUserInfo(userId)
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
 
 	// 得到博客设置信息
-	c.RenderArgs["allowCustomDomain"] = configService.GetGlobalStringConfig("allowCustomDomain")
+	c.ViewArgs["allowCustomDomain"] = configService.GetGlobalStringConfig("allowCustomDomain")
 
 	userBlog := blogService.GetUserBlog(userId)
-	c.RenderArgs["userBlog"] = userBlog
+	c.ViewArgs["userBlog"] = userBlog
 
 	c.SetUserInfo()
 	c.SetLocale()
@@ -62,7 +62,7 @@ func (c MemberBlog) getSorter(sorterField string, isAsc bool, okSorter []string)
 	} else {
 		isAsc = false
 	}
-	c.RenderArgs["sorter"] = sorter
+	c.ViewArgs["sorter"] = sorter
 	return sorterField, isAsc
 }
 
@@ -72,18 +72,20 @@ var userPageSize = 15
 func (c MemberBlog) Index(sorter, keywords string) revel.Result {
 	userId := c.GetUserId()
 	userInfo := userService.GetUserInfo(userId)
-	c.RenderArgs["userInfo"] = userInfo
+	c.ViewArgs["userInfo"] = userInfo
 
-	c.RenderArgs["title"] = "Posts"
+	c.ViewArgs["title"] = c.Message("Posts")
 	pageNumber := c.GetPage()
 	sorterField, isAsc := c.getSorter("CreatedTime", false, []string{"title", "urlTitle", "updatedTime", "publicTime", "createdTime"})
 	pageInfo, blogs := blogService.ListAllBlogs(c.GetUserId(), "", keywords, false, pageNumber, userPageSize, sorterField, isAsc)
-	c.RenderArgs["pageInfo"] = pageInfo
+	c.ViewArgs["pageInfo"] = pageInfo
-	c.RenderArgs["blogs"] = blogs
+	c.ViewArgs["blogs"] = blogs
-	c.RenderArgs["keywords"] = keywords
+	c.ViewArgs["keywords"] = keywords
 
 	userAndBlog := userService.GetUserAndBlog(c.GetUserId())
-	c.RenderArgs["userAndBlog"] = userAndBlog
+	c.ViewArgs["userAndBlog"] = userAndBlog
+
+	c.common()
 
 	return c.RenderTemplate("member/blog/list.html")
 }
@@ -92,48 +94,48 @@ func (c MemberBlog) Index(sorter, keywords string) revel.Result {
 func (c MemberBlog) UpdateBlogUrlTitle(noteId, urlTitle string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Item = blogService.UpateBlogUrlTitle(c.GetUserId(), noteId, urlTitle)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 修改笔记的urlTitle
 func (c MemberBlog) UpdateBlogAbstract(noteId string) revel.Result {
-	c.RenderArgs["title"] = "Update Post Abstract"
+	c.common()
+	c.ViewArgs["title"] = c.Message("Update Post Abstract")
 	note := noteService.GetNoteAndContent(noteId, c.GetUserId())
 	if !note.Note.IsBlog {
 		return c.E404()
 	}
-	c.RenderArgs["note"] = note
+	c.ViewArgs["note"] = note
-	c.RenderArgs["noteId"] = noteId
+	c.ViewArgs["noteId"] = noteId
 	return c.RenderTemplate("member/blog/update_abstract.html")
 }
 func (c MemberBlog) DoUpdateBlogAbstract(noteId, imgSrc, desc, abstract string) revel.Result {
-
 	re := info.NewRe()
 	re.Ok = blogService.UpateBlogAbstract(c.GetUserId(), noteId, imgSrc, desc, abstract)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 基本信息设置
 func (c MemberBlog) Base() revel.Result {
 	c.common()
-	c.RenderArgs["title"] = "Blog Base Info"
+	c.ViewArgs["title"] = c.Message("Blog Base Info")
 	return c.RenderTemplate("member/blog/base.html")
 }
 func (c MemberBlog) Comment() revel.Result {
 	c.common()
-	c.RenderArgs["title"] = "Comment"
+	c.ViewArgs["title"] = c.Message("Comment")
 	return c.RenderTemplate("member/blog/comment.html")
 }
 
 func (c MemberBlog) Paging() revel.Result {
 	c.common()
-	c.RenderArgs["title"] = "Paging"
+	c.ViewArgs["title"] = c.Message("Paging")
 	return c.RenderTemplate("member/blog/paging.html")
 }
 
 func (c MemberBlog) Cate() revel.Result {
 	userBlog := c.common()
-	c.RenderArgs["title"] = "Cate"
+	c.ViewArgs["title"] = c.Message("Category")
 
 	notebooks := blogService.ListBlogNotebooks(c.GetUserId())
 	notebooksMap := map[string]info.Notebook{}
@@ -164,7 +166,7 @@ func (c MemberBlog) Cate() revel.Result {
 			i++
 		}
 	}
-	c.RenderArgs["notebooks"] = notebooks2
+	c.ViewArgs["notebooks"] = notebooks2
 
 	return c.RenderTemplate("member/blog/cate.html")
 }
@@ -173,54 +175,54 @@ func (c MemberBlog) Cate() revel.Result {
 func (c MemberBlog) UpateCateIds(cateIds []string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.UpateCateIds(c.GetUserId(), cateIds)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) UpdateCateUrlTitle(cateId, urlTitle string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Item = blogService.UpateCateUrlTitle(c.GetUserId(), cateId, urlTitle)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 保存之, 包含增加与保存
 func (c MemberBlog) DoAddOrUpdateSingle(singleId, title, content string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.AddOrUpdateSingle(c.GetUserId(), singleId, title, content)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c MemberBlog) AddOrUpdateSingle(singleId string) revel.Result {
 	c.common()
-	c.RenderArgs["title"] = "Add Single"
+	c.ViewArgs["title"] = c.Message("Add Single")
-	c.RenderArgs["singleId"] = singleId
+	c.ViewArgs["singleId"] = singleId
 	if singleId != "" {
-		c.RenderArgs["title"] = "Update Single"
+		c.ViewArgs["title"] = c.Message("Update Single")
-		c.RenderArgs["single"] = blogService.GetSingle(singleId)
+		c.ViewArgs["single"] = blogService.GetSingle(singleId)
 	}
 	return c.RenderTemplate("member/blog/add_single.html")
 }
 func (c MemberBlog) SortSingles(singleIds []string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.SortSingles(c.GetUserId(), singleIds)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) DeleteSingle(singleId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.DeleteSingle(c.GetUserId(), singleId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 修改页面标题
 func (c MemberBlog) UpdateSingleUrlTitle(singleId, urlTitle string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Item = blogService.UpdateSingleUrlTitle(c.GetUserId(), singleId, urlTitle)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) Single() revel.Result {
 	c.common()
-	c.RenderArgs["title"] = "Cate"
+	c.ViewArgs["title"] = c.Message("Single")
-	c.RenderArgs["singles"] = blogService.GetSingles(c.GetUserId())
+	c.ViewArgs["singles"] = blogService.GetSingles(c.GetUserId())
 
 	return c.RenderTemplate("member/blog/single.html")
 }
@@ -229,12 +231,12 @@ func (c MemberBlog) Single() revel.Result {
 func (c MemberBlog) Theme() revel.Result {
 	c.common()
 	activeTheme, otherThemes := themeService.GetUserThemes(c.GetUserId())
-	c.RenderArgs["activeTheme"] = activeTheme
+	c.ViewArgs["activeTheme"] = activeTheme
-	c.RenderArgs["otherThemes"] = otherThemes
+	c.ViewArgs["otherThemes"] = otherThemes
 
-	c.RenderArgs["optionThemes"] = themeService.GetDefaultThemes()
+	c.ViewArgs["optionThemes"] = themeService.GetDefaultThemes()
 
-	c.RenderArgs["title"] = "Theme"
+	c.ViewArgs["title"] = c.Message("Theme")
 	return c.RenderTemplate("member/blog/theme.html")
 }
 
@@ -251,11 +253,11 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result {
 	}
 
 	c.common()
-	c.RenderArgs["title"] = "Upate Theme"
+	c.ViewArgs["title"] = c.Message("Update Theme")
-	c.RenderArgs["isNew"] = isNew
+	c.ViewArgs["isNew"] = isNew
 
 	// 先复制之
-	c.RenderArgs["themeId"] = themeId
+	c.ViewArgs["themeId"] = themeId
 
 	// 得到脚本目录
 	userId := c.GetUserId()
@@ -264,7 +266,7 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result {
 	if theme.ThemeId == "" {
 		return c.E404()
 	}
-	c.RenderArgs["theme"] = theme
+	c.ViewArgs["theme"] = theme
 
 	path := revel.BasePath + "/" + theme.Path
 
@@ -285,7 +287,7 @@ func (c MemberBlog) UpdateTheme(themeId string, isNew int) revel.Result {
 		}
 	}
 
-	c.RenderArgs["myTpls"] = myTpls
+	c.ViewArgs["myTpls"] = myTpls
 
 	return c.RenderTemplate("member/blog/update_theme.html")
 }
@@ -296,7 +298,7 @@ func (c MemberBlog) GetTplContent(themeId string, filename string) revel.Result
 	re.Ok = true
 	re.Item = themeService.GetTplContent(c.GetUserId(), themeId, filename)
 
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c MemberBlog) UpdateTplContent(themeId, filename, content string) revel.Result {
 	re := info.NewRe()
@@ -307,7 +309,7 @@ func (c MemberBlog) UpdateTplContent(themeId, filename, content string) revel.Re
 func (c MemberBlog) DeleteTpl(themeId, filename string) revel.Result {
 	re := info.NewRe()
 	re.Ok = themeService.DeleteTpl(c.GetUserId(), themeId, filename)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) ListThemeImages(themeId string) revel.Result {
@@ -318,22 +320,22 @@ func (c MemberBlog) ListThemeImages(themeId string) revel.Result {
 	images := ListDir(path)
 	re.List = images
 	re.Ok = true
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) DeleteThemeImage(themeId, filename string) revel.Result {
 	re := info.NewRe()
 	path := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images/" + filename
 	re.Ok = DeleteFile(path)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 上传主题图片
 func (c MemberBlog) UploadThemeImage(themeId string) revel.Result {
 	re := c.uploadImage(themeId)
-	c.RenderArgs["fileUrlPath"] = re.Id
+	c.ViewArgs["fileUrlPath"] = re.Id
-	c.RenderArgs["resultCode"] = re.Code
+	c.ViewArgs["resultCode"] = re.Code
-	c.RenderArgs["resultMsg"] = re.Msg
+	c.ViewArgs["resultMsg"] = re.Msg
 	return c.RenderTemplate("file/blog_logo.html")
 }
 func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
@@ -403,21 +405,21 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
 func (c MemberBlog) ActiveTheme(themeId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = themeService.ActiveTheme(c.GetUserId(), themeId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 删除主题
 func (c MemberBlog) DeleteTheme(themeId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = themeService.DeleteTheme(c.GetUserId(), themeId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 管理员公开主题
 func (c MemberBlog) PublicTheme(themeId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = themeService.PublicTheme(c.GetUserId(), themeId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 导出
@@ -442,9 +444,9 @@ func (c MemberBlog) ImportTheme() revel.Result {
 	file, handel, err := c.Request.FormFile("file")
 	if err != nil {
 		re.Msg = fmt.Sprintf("%v", err)
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
-
 	}
+
 	defer file.Close()
 	// 生成上传路径
 	userId := c.GetUserId()
@@ -452,7 +454,7 @@ func (c MemberBlog) ImportTheme() revel.Result {
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
 		re.Msg = fmt.Sprintf("%v", err)
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 	// 生成新的文件名
 	filename := handel.Filename
@@ -460,27 +462,27 @@ 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)
+		return c.RenderJSON(re)
 	}
 
 	filename = filename
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	// > 10M?
 	if len(data) > 10*1024*1024 {
-		re.Msg = "文件大于10M"
+		re.Msg = "File is big than 10M"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	toPath := dir + "/" + filename
 	err = ioutil.WriteFile(toPath, data, 0777)
 	if err != nil {
 		re.Msg = fmt.Sprintf("%v", err)
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	// 上传好后, 增加之
@@ -492,7 +494,7 @@ func (c MemberBlog) ImportTheme() revel.Result {
 func (c MemberBlog) InstallTheme(themeId string) revel.Result {
 	re := info.NewRe()
 	re.Ok = themeService.InstallTheme(c.GetUserId(), themeId)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 // 新建主题
@@ -506,17 +508,17 @@ func (c MemberBlog) NewTheme() revel.Result {
 func (c MemberBlog) SetUserBlogBase(userBlog info.UserBlogBase) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.UpdateUserBlogBase(c.GetUserId(), userBlog)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c MemberBlog) SetUserBlogComment(userBlog info.UserBlogComment) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.UpdateUserBlogComment(c.GetUserId(), userBlog)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 func (c MemberBlog) SetUserBlogStyle(userBlog info.UserBlogStyle) revel.Result {
 	re := info.NewRe()
 	re.Ok = blogService.UpdateUserBlogStyle(c.GetUserId(), userBlog)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberBlog) SetUserBlogPaging(perPageSize int, sortField string, isAsc bool) revel.Result {

app/controllers/member/MemberGroupController.go

@@ -1,8 +1,8 @@
 package member
 
 import (
-	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
+	"github.com/revel/revel"
 )
 
 // 分组管理
@@ -14,22 +14,22 @@ type MemberGroup struct {
 func (c MemberGroup) Index() revel.Result {
 	c.SetUserInfo()
 	c.SetLocale()
-	c.RenderArgs["title"] = "My Group"
+	c.ViewArgs["title"] = c.Message("My Group")
-	c.RenderArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId())
+	c.ViewArgs["groups"] = groupService.GetGroupsAndUsers(c.GetUserId())
-	return c.RenderTemplate("member/group/index.html");
+	return c.RenderTemplate("member/group/index.html")
 }
 
 // 添加分组
 func (c MemberGroup) AddGroup(title string) revel.Result {
 	re := info.NewRe()
 	re.Ok, re.Item = groupService.AddGroup(c.GetUserId(), title)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberGroup) UpdateGroupTitle(groupId, title string) revel.Result {
 	re := info.NewRe()
 	re.Ok = groupService.UpdateGroupTitle(c.GetUserId(), groupId, title)
-	return c.RenderJson(re)
+	return c.RenderJSON(re)
 }
 
 func (c MemberGroup) DeleteGroup(groupId string) revel.Result {

app/controllers/member/MemberIndexController.go

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

app/controllers/member/MemberUserController.go

@@ -13,34 +13,28 @@ type MemberUser struct {
 func (c MemberUser) Username() revel.Result {
 	c.SetUserInfo()
 	c.SetLocale()
-	c.RenderArgs["title"] = "Username"
+	c.ViewArgs["title"] = c.Message("Username")
-	return c.RenderTemplate("member/user/username.html");
+	return c.RenderTemplate("member/user/username.html")
 }
 
 func (c MemberUser) Email() revel.Result {
 	c.SetUserInfo()
 	c.SetLocale()
-	c.RenderArgs["title"] = "Email"
+	c.ViewArgs["title"] = c.Message("Email")
-	return c.RenderTemplate("member/user/email.html");
+	return c.RenderTemplate("member/user/email.html")
 }
 
 func (c MemberUser) Password() revel.Result {
 	c.SetUserInfo()
 	c.SetLocale()
-	c.RenderArgs["title"] = "Password"
+	c.ViewArgs["title"] = c.Message("Password")
-	return c.RenderTemplate("member/user/password.html");
+	return c.RenderTemplate("member/user/password.html")
 }
 
 func (c MemberUser) Avatar() revel.Result {
 	c.SetUserInfo()
 	c.SetLocale()
-	c.RenderArgs["title"] = "Avatar"
+	c.ViewArgs["title"] = c.Message("Avatar")
-	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
+	c.ViewArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
-	return c.RenderTemplate("member/user/avatar.html");
+	return c.RenderTemplate("member/user/avatar.html")
-}
-func (c MemberUser) AddAccount() revel.Result {
-	c.SetUserInfo()
-	c.SetLocale()
-	c.RenderArgs["title"] = "Add Account"
-	return c.RenderTemplate("member/user/add_account.html");
 }

app/controllers/member/init.go

@@ -1,11 +1,11 @@
 package member
 
 import (
-	"github.com/leanote/leanote/app/service"
 	"github.com/leanote/leanote/app/info"
-//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/service"
+	//	. "github.com/leanote/leanote/app/lea"
 	"github.com/revel/revel"
-//	"strings"
+	//	"strings"
 )
 
 var userService *service.UserService
@@ -44,7 +44,7 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	"FindPassword2":      true,
 	"FindPasswordUpdate": true,
 	"Suggestion":         true,
-	},
+},
 	"Blog": map[string]bool{"Index": true,
 		"View":       true,
 		"AboutMe":    true,
@@ -52,12 +52,13 @@ var commonUrl = map[string]map[string]bool{"Index": map[string]bool{"Index": tru
 	},
 	// 用户的激活与修改邮箱都不需要登录, 通过链接地址
 	"User": map[string]bool{"UpdateEmail": true,
-		"ActiveEmail":true,
+		"ActiveEmail": true,
 	},
 	"Oauth":  map[string]bool{"GithubCallback": true},
 	"File":   map[string]bool{"OutputImage": true, "OutputFile": true},
 	"Attach": map[string]bool{"Download": true, "DownloadAll": true},
 }
+
 func needValidate(controller, method string) bool {
 	// 在里面
 	if v, ok := commonUrl[controller]; ok {
@@ -68,7 +69,7 @@ func needValidate(controller, method string) bool {
 		return true
 	} else {
 		// controller不在这里的, 肯定要验证
-		return true;
+		return true
 	}
 }
 func AuthInterceptor(c *revel.Controller) revel.Result {
@@ -92,7 +93,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	if c.Request.Header.Get("X-Requested-With") == "XMLHttpRequest" {
 		re := info.NewRe()
 		re.Msg = "NOTLOGIN"
-		return c.RenderJson(re)
+		return c.RenderJSON(re)
 	}
 
 	return c.Redirect("/login")
@@ -113,7 +114,7 @@ func InitService() {
 	tokenService = service.TokenS
 	noteImageService = service.NoteImageS
 	fileService = service.FileS
-	albumService= service.AlbumS
+	albumService = service.AlbumS
 	attachService = service.AttachS
 	pwdService = service.PwdS
 	suggestionService = service.SuggestionS

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

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

app/db/Mgo.go

@@ -2,10 +2,11 @@ package db
 
 import (
 	"fmt"
-	"github.com/revel/revel"
 	. "github.com/leanote/leanote/app/lea"
+	"github.com/revel/revel"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
+	"strings"
 )
 
 // Init mgo and the common DAO
@@ -62,10 +63,26 @@ 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 {
+				Log("get db conf from urlEnv: " + url)
+			}
+		} else {
+			Log("get db conf from db.url: " + url)
+		}
+
+		if ok {
+			// get dbname from urlEnv
+			urls := strings.Split(url, "/")
+			dbname = urls[len(urls)-1]
+		}
 	}
 	if dbname == "" {
 		dbname, _ = config.String("db.dbname")
 	}
+
+	// get db config from host, port, username, password
 	if !ok {
 		host, _ := revel.Config.String("db.host")
 		port, _ := revel.Config.String("db.port")
@@ -338,3 +355,20 @@ func Err(err error) bool {
 	}
 	return true
 }
+
+// 检查mognodb是否lost connection
+// 每个请求之前都要检查!!
+func CheckMongoSessionLost() {
+	// fmt.Println("检查CheckMongoSessionLostErr")
+	err := Session.Ping()
+	if err != nil {
+		Log("Lost connection to db!")
+		Session.Refresh()
+		err = Session.Ping()
+		if err == nil {
+			Log("Reconnect to db successful.")
+		} else {
+			Log("重连失败!!!! 警告")
+		}
+	}
+}

app/i18n/i18n.go

@@ -1,89 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"bufio"
-	"strings"
-	"encoding/json"
-)
-
-// convert revel msg to js msg
-
-var msgBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/messages/"
-var targetBasePath = "/Users/life/Documents/Go/package1/src/github.com/leanote/leanote/public/js/i18n/"
-func parse(filename string) {
-	file, err := os.Open(msgBasePath + filename)
-	reader := bufio.NewReader(file)
-	msg := map[string]string{}
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	for true {
-		line, _, err := reader.ReadLine()
-		
-		if err != nil {
-			break
-		}
-		
-		if len(line) == 0 {
-			continue
-		}
-		// 对每一行进行处理
-		if line[0] == '#' || line[1] == '#' {
-			continue;
-		}
-		lineStr := string(line)
-		
-		// 找到第一个=位置
-		pos := strings.Index(lineStr, "=")
-		
-		if pos < 0 {
-			continue;
-		}
-		
-		key := string(line[0:pos])
-		value := string(line[pos+1:])
-		
-//		fmt.Println(lineStr)
-//		fmt.Println(value)
-		
-		msg[key] = value
-	}
-	
-	// JSON
-	b, _ := json.Marshal(msg)
-	str := string(b)
-	fmt.Println(str);
-	
-	targetName := targetBasePath + filename + ".js"
-	file2, err2 := os.OpenFile(targetName, os.O_RDWR|os.O_CREATE, 0644)
-	if err2 != nil {
-		file2, err2 = os.Create(targetName)
-	}
-	file2.WriteString("var MSG = " + str + ";" + `
-function getMsg(key, data) {
-	var msg = MSG[key]
-	if(msg) {
-		if(data) {
-			if(!isArray(data)) {
-				data = [data];
-			}
-			for(var i = 0; i < data.length; ++i) {
-				msg = msg.replace("%s", data[i]);
-			}
-		}
-		return msg;
-	}
-	return key;
-}`)
-}
-
-// 生成js的i18n文件
-func main() {
-	parse("msg.en")
-	parse("msg.zh")
-	parse("blog.zh")
-	parse("blog.en")
-}

app/info/Api.go

@@ -1,8 +1,8 @@
 package info
 
 import (
-	"time"
 	"gopkg.in/mgo.v2/bson"
+	"time"
 )
 
 //---------
@@ -22,12 +22,12 @@ type ApiNote struct {
 	UserId     string
 	Title      string
 	Desc       string
-//	ImgSrc     string
+	//	ImgSrc     string
 	Tags       []string
 	Abstract   string
 	Content    string
 	IsMarkdown bool
-//	FromUserId string // 为共享而新建
+	//	FromUserId string // 为共享而新建
 	IsBlog      bool // 是否是blog, 更新note不需要修改, 添加note时才有可能用到, 此时需要判断notebook是否设为Blog
 	IsTrash     bool
 	IsDeleted   bool
@@ -38,7 +38,6 @@ type ApiNote struct {
 	PublicTime  time.Time
 }
 
-
 // 内容
 type ApiNoteContent struct {
 	NoteId bson.ObjectId `bson:"_id,omitempty"`
@@ -46,8 +45,8 @@ type ApiNoteContent struct {
 
 	Content string `Content`
 
-//	CreatedTime   time.Time     `CreatedTime`
+	//	CreatedTime   time.Time     `CreatedTime`
-//	UpdatedTime   time.Time     `UpdatedTime`
+	//	UpdatedTime   time.Time     `UpdatedTime`
 }
 
 // 转换
@@ -114,6 +113,7 @@ type ReUpdate struct {
 	Msg string
 	Usn int
 }
+
 func NewReUpdate() ReUpdate {
 	return ReUpdate{Ok: false}
 }

app/info/BlogCustom.go

@@ -37,6 +37,7 @@ type Post struct {
 	LikeNum     int
 	IsMarkdown  bool
 }
+
 // 归档
 type ArchiveMonth struct {
 	Month int

app/info/BlogInfo.go

@@ -19,7 +19,7 @@ type UserBlogBase struct {
 	Logo     string `Logo`
 	Title    string `Title`    // 标题
 	SubTitle string `SubTitle` // 副标题
-//	AboutMe  string `AboutMe`  // 关于我
+	//	AboutMe  string `AboutMe`  // 关于我
 }
 
 type UserBlogComment struct {

app/info/NoteInfo.go

@@ -15,6 +15,8 @@ type Note struct {
 	Title         string        `Title` // 标题
 	Desc          string        `Desc`  // 描述, 非html
 
+	Src string   `Src,omitempty` // 来源, 2016/4/22
+
 	ImgSrc string   `ImgSrc` // 图片, 第一张缩略图地址
 	Tags   []string `Tags,omitempty`
 
@@ -80,3 +82,31 @@ type NoteContentHistory struct {
 	UserId    bson.ObjectId `bson:"UserId"` // 所属者
 	Histories []EachHistory `Histories`
 }
+
+// 为了NoteController接收参数
+
+// 更新note或content
+// 肯定会传userId(谁的), NoteId
+// 会传Title, Content, Tags, 一种或几种
+type NoteOrContent struct {
+	NotebookId string
+	NoteId     string
+	UserId     string
+	Title      string
+	Desc       string
+	Src        string
+	ImgSrc     string
+	Tags       string
+	Content    string
+	Abstract   string
+	IsNew      bool
+	IsMarkdown bool
+	FromUserId string // 为共享而新建
+	IsBlog     bool   // 是否是blog, 更新note不需要修改, 添加note时才有可能用到, 此时需要判断notebook是否设为Blog
+}
+
+// 分开的
+type NoteAndContentSep struct {
+	NoteInfo Note
+	NoteContentInfo NoteContent
+}

app/info/Re.go

@@ -1,7 +1,6 @@
 package info
 
-import (
+import ()
-)
 
 // controller ajax返回
 type Re struct {

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

@@ -70,6 +70,13 @@ type UserAccount struct {
 	MaxPerAttachSize int `bson:"MaxPerAttachSize" json:"-"` // 单个附件大小
 }
 
+// note主页需要
+type UserAndBlogUrl struct {
+	User
+	BlogUrl string `BlogUrl`
+	PostUrl string `PostUrl`
+}
+
 // 用户与博客信息结合, 公开
 type UserAndBlog struct {
 	UserId    bson.ObjectId `bson:"_id,omitempty"` // 必须要设置bson:"_id" 不然mgo不会认为是主键

app/info/common.go

@@ -4,7 +4,6 @@ import (
 	"math"
 )
 
-
 // 分页数据
 type Page struct {
 	CurPage     int // 当前页码

app/init.go

@@ -1,27 +1,26 @@
 package app
 
 import (
-	"github.com/revel/revel"
+	"encoding/json"
-	. "github.com/leanote/leanote/app/lea"
-	"github.com/leanote/leanote/app/service"
-	"github.com/leanote/leanote/app/db"
-	"github.com/leanote/leanote/app/controllers"
-	"github.com/leanote/leanote/app/controllers/api"
-	"github.com/leanote/leanote/app/controllers/admin"
-	"github.com/leanote/leanote/app/controllers/member"
-	_ "github.com/leanote/leanote/app/lea/binder"
-	"github.com/leanote/leanote/app/lea/session"
-	"github.com/leanote/leanote/app/lea/memcache"
-	"github.com/leanote/leanote/app/lea/route"
-	"reflect"
 	"fmt"
+	"github.com/leanote/leanote/app/controllers"
+	"github.com/leanote/leanote/app/controllers/admin"
+	"github.com/leanote/leanote/app/controllers/api"
+	"github.com/leanote/leanote/app/controllers/member"
+	"github.com/leanote/leanote/app/db"
+	. "github.com/leanote/leanote/app/lea"
+	_ "github.com/leanote/leanote/app/lea/binder"
+	"github.com/leanote/leanote/app/lea/i18n"
+	"github.com/leanote/leanote/app/lea/route"
+	"github.com/leanote/leanote/app/service"
+	"github.com/revel/revel"
 	"html/template"
 	"math"
-	"strings"
-	"strconv"
-	"time"
-	"encoding/json"
 	"net/url"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
 )
 
 func init() {
@@ -33,16 +32,17 @@ 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.
 		revel.ValidationFilter, // Restore kept validation errors and save new ones from cookie.
-		revel.I18nFilter,              // Resolve the requested language
+		// revel.I18nFilter,        // Resolve the requested language
+		i18n.I18nFilter,         // Resolve the requested language by leanote
 		revel.InterceptorFilter, // Run interceptors around the action.
 		revel.CompressFilter,    // Compress the result.
 		revel.ActionInvoker,     // Invoke the action.
@@ -51,17 +51,29 @@ 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;
+		i = i + 1
 		return fmt.Sprintf("%v", i)
 	}
 	revel.TemplateFuncs["sub"] = func(i int) int {
-		i = i - 1;
+		i = i - 1
 		return i
 	}
 	// 增加或减少
 	revel.TemplateFuncs["incr"] = func(n, i int) int {
-		n = n + i;
+		n = n + i
 		return n
 	}
 	revel.TemplateFuncs["join"] = func(arr []string) template.HTML {
@@ -117,7 +129,7 @@ func init() {
 		if tags == nil || len(tags) == 0 {
 			return ""
 		}
-		locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
 		tagStr := ""
 		lenTags := len(tags)
 
@@ -136,29 +148,74 @@ func init() {
 			}
 
 			classes += " label-post"
-			var url = tagPostUrl + "/" + url.QueryEscape(tag)
+			var url = tagPostUrl + "/" + tag
-			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>";
+			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>"
-			if i != lenTags - 1 {
+			if i != lenTags-1 {
 				tagStr += " "
 			}
 		}
 		return template.HTML(tagStr)
 	}
 
-	// lea++
+	revel.TemplateFuncs["blogTagsForExport"] = func(renderArgs map[string]interface{}, tags []string) template.HTML {
-	revel.TemplateFuncs["blogTagsLea"] = func(renderArgs map[string]interface{}, tags []string, isRecommend bool) template.HTML {
 		if tags == nil || len(tags) == 0 {
 			return ""
 		}
-		locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		tagStr := ""
+		lenTags := len(tags)
+
+		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)
+	}
+
+	revel.TemplateFuncs["msg"] = func(renderArgs map[string]interface{}, message string, args ...interface{}) template.HTML {
+		str, ok := renderArgs[revel.CurrentLocaleViewArg].(string)
+		if !ok {
+			return ""
+		}
+		return template.HTML(i18n.Message(str, message, args...))
+	}
+
+	// 不用revel的msg
+	revel.TemplateFuncs["leaMsg"] = func(renderArgs map[string]interface{}, key string) template.HTML {
+		locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
+		str := i18n.Message(locale, key)
+		if strings.HasPrefix(str, "???") {
+			str = key
+		}
+		return template.HTML(str)
+	}
+
+	// lea++
+	revel.TemplateFuncs["blogTagsLea"] = func(renderArgs map[string]interface{}, tags []string, typeStr string) template.HTML {
+		if tags == nil || len(tags) == 0 {
+			return ""
+		}
+		locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
 		tagStr := ""
 		lenTags := len(tags)
 
 		tagPostUrl := "http://lea.leanote.com/"
-		if isRecommend {
+		if typeStr == "recommend" {
-			tagPostUrl += "?tag=";
+			tagPostUrl += "?tag="
+		} else if typeStr == "latest" {
+			tagPostUrl += "latest?tag="
 		} else {
-			tagPostUrl += "latest?tag=";
+			tagPostUrl += "subscription?tag="
 		}
 
 		for i, tag := range tags {
@@ -173,9 +230,9 @@ func init() {
 				classes += " label-default"
 			}
 			classes += " label-post"
-			var url = tagPostUrl + url.QueryEscape(tag)
+			var url = tagPostUrl + tag
-			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>";
+			tagStr += "<a class=\"" + classes + "\" href=\"" + url + "\">" + str + "</a>"
-			if i != lenTags - 1 {
+			if i != lenTags-1 {
 				tagStr += " "
 			}
 		}
@@ -208,12 +265,12 @@ func init() {
 		return ""
 	}
 	// str连接
-	revel.TemplateFuncs["urlConcat"] = func(url string, v... interface{}) string {
+	revel.TemplateFuncs["urlConcat"] = func(url string, v ...interface{}) string {
 		html := ""
 		for i := 0; i < len(v); i = i + 2 {
 			item := v[i]
 			if i+1 == len(v) {
-				break;
+				break
 			}
 			value := v[i+1]
 			if item != nil && value != nil {
@@ -250,7 +307,7 @@ func init() {
 
 	// http://stackoverflow.com/questions/14226416/go-lang-templates-always-quotes-a-string-and-removes-comments
 	revel.TemplateFuncs["rawMsg"] = func(renderArgs map[string]interface{}, message string, args ...interface{}) template.JS {
-		str, ok := renderArgs[revel.CurrentLocaleRenderArg].(string)
+		str, ok := renderArgs[revel.CurrentLocaleViewArg].(string)
 		if !ok {
 			return ""
 		}
@@ -270,23 +327,23 @@ func init() {
 		if sorterI != nil {
 			sorter, _ = sorterI.(string)
 		}
-		html := "data-url=\"" + url + "\" data-sorter=\"" + sorterField + "\"";
+		html := "data-url=\"" + url + "\" data-sorter=\"" + sorterField + "\""
-		html += " class=\"th-sortable ";
+		html += " class=\"th-sortable "
-		if sorter == sorterField + "-up" {
+		if sorter == sorterField+"-up" {
-			html += "th-sort-up\"";
+			html += "th-sort-up\""
-		} else if(sorter == sorterField + "-down") {
+		} else if sorter == sorterField+"-down" {
-			html += "th-sort-down";
+			html += "th-sort-down"
 		}
-		html += "\"";
+		html += "\""
 		return template.HTMLAttr(html)
 	}
 
 	// pagination
 	revel.TemplateFuncs["page"] = func(urlBase string, page, pageSize, count int) template.HTML {
 		if count == 0 {
-			return "";
+			return ""
 		}
-		totalPage := int(math.Ceil(float64(count)/float64(pageSize)))
+		totalPage := int(math.Ceil(float64(count) / float64(pageSize)))
 
 		preClass := ""
 		prePage := page - 1
@@ -367,7 +424,7 @@ func init() {
 		// email配置
 		InitEmail()
 		InitVd()
-		memcache.InitMemcache() // session服务
+		// memcache.InitMemcache() // session服务
 		// 其它service
 		service.InitService()
 		controllers.InitService()

app/lea/Debug.go

@@ -2,12 +2,20 @@ package lea
 
 import (
     "encoding/json"
-	"github.com/revel/revel"
     "fmt"
+    "github.com/revel/revel"
 )
 
-func Log(i interface{}) {
+func Log(i ...interface{}) {
-	revel.INFO.Println(i)
+    revel.INFO.Println(i...)
+}
+
+func LogW(i ...interface{}) {
+    revel.WARN.Println(i...)
+}
+
+func Log1(key, i interface{}) {
+    revel.INFO.Println(key, i)
 }
 
 func LogJ(i interface{}) {

app/lea/Email.go

@@ -1,10 +1,11 @@
 package lea
 
 import (
+	"github.com/revel/revel"
 	"net/smtp"
 	"strings"
-	"github.com/revel/revel"
 )
+
 // 发送邮件
 var host = "smtp.ym.163.com"
 var port = "25"
@@ -12,7 +13,7 @@ var username = "noreply@leanote.com"
 var password = "---"
 
 func InitEmail() {
-	config := revel.Config;
+	config := revel.Config
 	host, _ = config.String("email.host")
 	port, _ = config.String("email.port")
 	username, _ = config.String("email.username")
@@ -56,6 +57,7 @@ var bodyTpl = `
 	</body>
 	</html>
 `
+
 func SendEmailOld(to, subject, body string) bool {
 	hp := strings.Split(host, ":")
 	auth := smtp.PlainAuth("", username, password, hp[0])
@@ -64,15 +66,15 @@ func SendEmailOld(to, subject, body string) bool {
 
 	mailtype := "html"
 	if mailtype == "html" {
-		content_type = "Content-Type: text/"+ mailtype + "; charset=UTF-8"
+		content_type = "Content-Type: text/" + mailtype + "; charset=UTF-8"
-	} else{
+	} else {
 		content_type = "Content-Type: text/plain" + "; charset=UTF-8"
 	}
 
 	//body = strings.Replace(bodyTpl, "$body", body, 1)
 	//body = strings.Replace(body, "$title", title, 1)
 
-	msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
+	msg := []byte("To: " + to + "\r\nFrom: " + username + "<" + username + ">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
 	send_to := strings.Split(to, ";")
 	err := smtp.SendMail(host+":"+port, auth, username, send_to, msg)
 
@@ -85,5 +87,5 @@ func SendEmailOld(to, subject, body string) bool {
 
 func SendToLeanoteOld(subject, title, body string) {
 	to := "leanote@leanote.com"
-	SendEmailOld(to, subject, body);
+	SendEmailOld(to, subject, body)
 }

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)
@@ -108,13 +116,13 @@ func CopyDir(source string, dest string) (err error) {
 			// create sub-directories - recursively
 			err = CopyDir(sourcefilepointer, destinationfilepointer)
 			if err != nil {
-//				fmt.Println(err)
+				//				fmt.Println(err)
 			}
 		} else {
 			// perform copy
 			_, err = CopyFile(sourcefilepointer, destinationfilepointer)
 			if err != nil {
-//				fmt.Println(err)
+				//				fmt.Println(err)
 			}
 		}
 	}

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

@@ -1,16 +1,19 @@
 package lea
 
 import (
-	"fmt"
+	"bytes"
-	"regexp"
 	"crypto/md5"
 	"crypto/rand"
 	"encoding/base64"
 	"encoding/hex"
-	"io"
+	"fmt"
+	"github.com/PuerkitoBio/goquery"
 	"gopkg.in/mgo.v2/bson"
-	"time"
+	"io"
 	math_rand "math/rand"
+	"regexp"
+	"strings"
+	"time"
 )
 
 // 字符串
@@ -22,6 +25,22 @@ func Md5(s string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }
 
+// 3位数的转换, 为了用bson.id -> 3位数
+func Digest3(str string) string {
+	var b rune = 0
+	for _, k := range str {
+		b += k
+	}
+	return fmt.Sprintf("%d", b%1000)
+}
+func Digest2(str string) string {
+	var b rune = 0
+	for _, k := range str {
+		b += k
+	}
+	return fmt.Sprintf("%d", b%100)
+}
+
 // Guid
 func NewGuid() string {
 	b := make([]byte, 48)
@@ -123,73 +142,48 @@ func ReplaceAll(oldStr, pattern, newStr string) string {
 }
 
 // 获取纯文本
-func SubStringHTMLToRaw(param string, length int) (result string) {
+func SubStringHTMLToRaw(param string, length int) string {
 	if param == "" {
-		return ""
+		return param
 	}
-	result = ""
 	n := 0
 	var temp rune // 中文问题, 用rune来解决
 	rStr := []rune(param)
+	lenStr := len(rStr)
 	isCode := false
-	for i := 0; i < len(rStr); i++ {
+
+	resultRune := make([]rune, length)
+	// s := ""
+	for i := 0; i < lenStr; i++ {
 		temp = rStr[i]
 		if temp == '<' {
 			isCode = true
 			continue
 		} else if temp == '>' {
 			isCode = false
-			result += " "; // 空格
+			resultRune[n] = ' '
+
+			n++
+			if n >= length {
+				break
+			}
 			continue
 		}
 		if !isCode {
-			result += string(temp)
+			resultRune[n] = temp
+			// s += string(temp)
 			n++
 			if n >= length {
 				break
 			}
 		}
 	}
-	return 
+	result := string(resultRune[0:n])
+	return strings.Trim(result, " ")
 }
 
-// 获取摘要, HTML
+// 自带方法补全html
-func SubStringHTML(param string, length int, end string) string {
+func fixHtml(result string) string {
-	if param == "" {
-		return ""
-	}
-	
-	// 先取出<pre></pre>占位..
-	result := ""
-
-	// 1
-	n := 0
-	var temp rune // 中文问题, 用rune来解决
-	isCode := false //是不是HTML代码
-	isHTML := false //是不是HTML特殊字符,如&nbsp;
-	rStr := []rune(param)
-	for i := 0; i < len(rStr); i++ {
-		temp = rStr[i]
-		if temp == '<' {
-			isCode = true
-		} else if temp == '&' {
-			isHTML = true
-		} else if temp == '>' && isCode {
-			n = n - 1
-			isCode = false
-		} else if temp == ';' && isHTML {
-			isHTML = false
-		}
-		if !isCode && !isHTML {
-			n = n + 1
-		}
-		result += string(temp)
-		if n >= length {
-			break
-		}
-	}
-	result += end
-	
 	// 取出所有标签
 	tempResult := ReplaceAll(result, "(>)[^<>]*(<?)", "$1$2") // 把标签中间的所有内容都去掉了
 
@@ -204,7 +198,7 @@ func SubStringHTML(param string, length int, end string) string {
 	p, _ := regexp.Compile("<(/?[a-zA-Z]+)[^<>]*>") // 得到所有的<div>, </div>...
 	strs := p.FindAllString(tempResult, -1)
 
-//	fmt.Println(strs)
+	//	fmt.Println(strs)
 	stack := make([]string, len(strs))
 	stackP := -1
 	for _, each := range strs {
@@ -232,6 +226,71 @@ func SubStringHTML(param string, length int, end string) string {
 	return result
 }
 
+// 获取摘要, HTML
+func SubStringHTML(param string, length int, end string) string {
+	if param == "" {
+		return param
+	}
+	result := ""
+
+	rStr := []rune(param)
+	lenStr := len(rStr)
+
+	if lenStr <= length {
+		result = param
+	} else {
+		// 1
+		n := 0
+		var temp rune   // 中文问题, 用rune来解决
+		isCode := false //是不是HTML代码
+		isHTML := false //是不是HTML特殊字符,如&nbsp;
+		var i = 0
+		for ; i < lenStr; i++ {
+			temp = rStr[i]
+			if temp == '<' {
+				isCode = true
+			} else if temp == '&' {
+				isHTML = true
+			} else if temp == '>' && isCode {
+				// n = n - 1
+				isCode = false
+			} else if temp == ';' && isHTML {
+				isHTML = false
+			}
+			if !isCode && !isHTML {
+				n = n + 1
+			}
+			// 每一次都相加, 速度非常慢!, 重新分配内存, 7倍的差距
+			// result += string(temp)
+			if n >= length {
+				break
+			}
+		}
+
+		result = string(rStr[0:i])
+
+		if end != "" {
+			result += end
+		}
+	}
+
+	// 使用goquery来取出html, 为了补全html
+	htmlReader := bytes.NewBufferString(result)
+	dom, err1 := goquery.NewDocumentFromReader(htmlReader)
+	if err1 == nil {
+		html, _ := dom.Html()
+		html = strings.Replace(html, "<html><head></head><body>", "", 1)
+		html = strings.Replace(html, "</body></html>", "", 1)
+
+		// TODO 把style="float: left"去掉
+		return html
+
+		// 如果有错误, 则使用自己的方法补全, 有风险
+	} else {
+		return fixHtml(result)
+	}
+}
+
 // 是否是合格的密码
 func IsGoodPwd(pwd string) (bool, string) {
 	if pwd == "" {
@@ -246,16 +305,16 @@ func IsGoodPwd(pwd string) (bool, string) {
 // 是否是email
 func IsEmail(email string) bool {
 	if email == "" {
-		return false;
+		return false
 	}
-	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)
+	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,6}$`, email)
 	return ok
 }
 
 // 是否只包含数字, 字母 -, _
 func IsUsername(username string) bool {
 	if username == "" {
-		return false;
+		return false
 	}
 	ok, _ := regexp.MatchString(`[^0-9a-zA-Z_\-]`, username)
 	return !ok
@@ -292,7 +351,7 @@ func RandomPwd(num int) string {
 		chars[j] = byte(i)
 		j++
 	}
-	j--;
+	j--
 
 	str := ""
 	math_rand.Seed(time.Now().UnixNano())
@@ -315,3 +374,60 @@ 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
+}
+
+// 是否是合法的时间
+// 不是, 0001-01-01T00:00:00Z, 且比今天小
+func IsValidTime(t time.Time) bool {
+	if t.Year() > 20 {
+		now := time.Now()
+		Log("------")
+		Log(t)
+		Log(now)
+		if t.Before(now) {
+			return true
+		}
+	}
+	return false
+}
+
+// url传过来的时间没有时区信息, 转到本地时间
+func ToLocalTime(t time.Time) time.Time {
+	return time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), 0, time.Local)
+}
+
+// 修复传过来的时间, 如果比今天大, 则设为现在
+func FixUrlTime(t time.Time) time.Time {
+	localTime := ToLocalTime(t)
+	if IsValidTime(localTime) {
+		return localTime
+	}
+	return time.Now()
+}
+
+// 得到用户的随机文件路径 3位/userId/2位
+func GetRandomFilePath(userId, uuid string) string {
+	if uuid == "" {
+		uuid = NewGuid()
+	}
+	return Digest3(userId) + "/" + userId + "/" + Digest2(uuid)
+}

app/lea/Vd.go

@@ -2,8 +2,8 @@ package lea
 
 import (
 	"encoding/json"
-	"strconv"
 	"regexp"
+	"strconv"
 )
 
 // 验证
@@ -38,15 +38,15 @@ var rulesStr = `{
 `
 var rulesMap map[string][]map[string]string
 
-var rules = map[string]func(string, map[string]string)(bool, string) {
+var rules = map[string]func(string, map[string]string) (bool, string){
-	"required": func(value string, rule map[string]string)(ok bool, msg string) {
+	"required": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
 		ok = true
 		return
 	},
-	"minLength": func(value string, rule map[string]string)(ok bool, msg string) {
+	"minLength": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
@@ -55,7 +55,7 @@ var rules = map[string]func(string, map[string]string)(bool, string) {
 		ok = len(value) >= dataI
 		return
 	},
-	"min": func(value string, rule map[string]string)(ok bool, msg string) {
+	"min": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
@@ -66,7 +66,7 @@ var rules = map[string]func(string, map[string]string)(bool, string) {
 		return
 	},
 
-	"sortField": func(value string, rule map[string]string)(ok bool, msg string) {
+	"sortField": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
@@ -75,21 +75,21 @@ var rules = map[string]func(string, map[string]string)(bool, string) {
 		return
 	},
 
-	"password": func(value string, rule map[string]string)(ok bool, msg string) {
+	"password": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
 		ok = len(value) >= 6
 		return
 	},
-	"email": func(value string, rule map[string]string)(ok bool, msg string) {
+	"email": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
 		ok = IsEmail(value)
 		return
 	},
-	"noSpecialChars": func(value string, rule map[string]string)(ok bool, msg string) {
+	"noSpecialChars": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			return
 		}
@@ -98,7 +98,7 @@ var rules = map[string]func(string, map[string]string)(bool, string) {
 	},
 	// www.baidu.com
 	//
-	"domain": func(value string, rule map[string]string)(ok bool, msg string) {
+	"domain": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			ok = true
 			return // 可为空
@@ -112,7 +112,7 @@ var rules = map[string]func(string, map[string]string)(bool, string) {
 		return
 	},
 	// abcd
-	"subDomain": func(value string, rule map[string]string)(ok bool, msg string) {
+	"subDomain": func(value string, rule map[string]string) (ok bool, msg string) {
 		if value == "" {
 			ok = true
 			return // 可为空

app/lea/archive/tar.go

@@ -28,7 +28,7 @@ func main() {
 	   //UnTarGz("/home/ty4z2008/1.tar.gz", "/home/ty4z2008")     //解压
 	   os.RemoveAll("/home/ty4z2008/tar")
 	*/
-//    TaZip("/Users/life/Desktop/j", "/Users/life/Desktop/aaa.tar.gz")
+	//    TaZip("/Users/life/Desktop/j", "/Users/life/Desktop/aaa.tar.gz")
 	Zip("/Users/life/Desktop/j", "/Users/life/Desktop/aaa.zip")
 	fmt.Println("ok")
 }
@@ -67,11 +67,11 @@ func TarGz(srcDirPath string, destFilePath string) (ok bool) {
 	}
 	if fi.IsDir() {
 		// handle source directory
-//        fmt.Println("Cerating tar.gz from directory...")
+		//        fmt.Println("Cerating tar.gz from directory...")
 		tarGzDir(srcDirPath, path.Base(srcDirPath), tw)
 	} else {
 		// handle file directly
-//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
+		//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
 		tarGzFile(srcDirPath, fi.Name(), tw, fi)
 	}
 	ok = true
@@ -102,11 +102,11 @@ func tarGzDir(srcDirPath string, recPath string, tw *tar.Writer) {
 		if fi.IsDir() {
 			// Directory
 			// (Directory won't add unitl all subfiles are added)
-//            fmt.Printf("Adding path...%s\n", curPath)
+			//            fmt.Printf("Adding path...%s\n", curPath)
 			tarGzDir(curPath, recPath+"/"+fi.Name(), tw)
 		} else {
 			// File
-//            fmt.Printf("Adding file...%s\n", curPath)
+			//            fmt.Printf("Adding file...%s\n", curPath)
 		}
 
 		tarGzFile(curPath, recPath+"/"+fi.Name(), tw, fi)
@@ -116,18 +116,18 @@ func tarGzDir(srcDirPath string, recPath string, tw *tar.Writer) {
 // Deal with files
 func tarGzFile(srcFile string, recPath string, tw *tar.Writer, fi os.FileInfo) {
 	if fi.IsDir() {
-//    	fmt.Println("??")
+		//    	fmt.Println("??")
 		// Create tar header
 		hdr := new(tar.Header)
 		// if last character of header name is '/' it also can be directory
 		// but if you don't set Typeflag, error will occur when you untargz
 		hdr.Name = recPath // + "/"
-//        fmt.Println(hdr.Name)
+		//        fmt.Println(hdr.Name)
 		hdr.Typeflag = tar.TypeDir
-//        hdr.Size = 0
+		//        hdr.Size = 0
 		//hdr.Mode = 0755 | c_ISDIR
-//        hdr.Mode = int64(fi.Mode()) // 加这个会有错误!!!
+		//        hdr.Mode = int64(fi.Mode()) // 加这个会有错误!!!
-//        hdr.ModTime = fi.ModTime() // 加这个会有错误!!
+		//        hdr.ModTime = fi.ModTime() // 加这个会有错误!!
 
 		// Write hander
 		err := tw.WriteHeader(hdr)
@@ -145,7 +145,7 @@ func tarGzFile(srcFile string, recPath string, tw *tar.Writer, fi os.FileInfo) {
 		// Create tar header
 		hdr := new(tar.Header)
 		hdr.Name = recPath
-//        fmt.Println(hdr.Name)
+		//        fmt.Println(hdr.Name)
 		hdr.Size = fi.Size()
 		hdr.Mode = int64(fi.Mode())
 		hdr.ModTime = fi.ModTime()
@@ -167,7 +167,7 @@ func tarGzFile(srcFile string, recPath string, tw *tar.Writer, fi os.FileInfo) {
 // Ungzip and untar from source file to destination directory
 // you need check file exist before you call this function
 func UnTarGz(srcFilePath string, destDirPath string) {
-//    fmt.Println("UnTarGzing " + srcFilePath + "...")
+	//    fmt.Println("UnTarGzing " + srcFilePath + "...")
 	// Create destination directory
 	os.Mkdir(destDirPath, os.ModePerm)
 
@@ -194,7 +194,7 @@ func UnTarGz(srcFilePath string, destDirPath string) {
 			break
 		}
 		//handleError(err)
-//        fmt.Println("UnTarGzing file..." + hdr.Name)
+		//        fmt.Println("UnTarGzing file..." + hdr.Name)
 		// Check if it is diretory or file
 		if hdr.Typeflag != tar.TypeDir {
 			// Get files from archive
@@ -211,7 +211,7 @@ func UnTarGz(srcFilePath string, destDirPath string) {
 			}
 		}
 	}
-//    fmt.Println("Well done!")
+	//    fmt.Println("Well done!")
 }
 
 // Copyfile

app/lea/archive/zip.go

@@ -3,10 +3,11 @@ package archive
 import (
 	"archive/zip"
 	"fmt"
-	"strings"
 	"io"
 	"os"
 	"path"
+	"strings"
+	"github.com/leanote/leanote/app/lea"
 )
 
 // main functions shows how to TarGz a directory/file and
@@ -43,11 +44,11 @@ func Zip(srcDirPath string, destFilePath string) (ok bool) {
 	}
 	if fi.IsDir() {
 		// handle source directory
-//        fmt.Println("Cerating tar.gz from directory...")
+		//        fmt.Println("Cerating tar.gz from directory...")
 		zipDir(srcDirPath, path.Base(srcDirPath), tw)
 	} else {
 		// handle file directly
-//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
+		//        fmt.Println("Cerating tar.gz from " + fi.Name() + "...")
 		zipFile(srcDirPath, fi.Name(), tw, fi)
 	}
 	ok = true
@@ -78,11 +79,11 @@ func zipDir(srcDirPath string, recPath string, tw *zip.Writer) {
 		if fi.IsDir() {
 			// Directory
 			// (Directory won't add unitl all subfiles are added)
-//            fmt.Printf("Adding path...%s\n", curPath)
+			//            fmt.Printf("Adding path...%s\n", curPath)
 			zipDir(curPath, recPath+"/"+fi.Name(), tw)
 		} else {
 			// File
-//            fmt.Printf("Adding file...%s\n", curPath)
+			//            fmt.Printf("Adding file...%s\n", curPath)
 		}
 
 		zipFile(curPath, recPath+"/"+fi.Name(), tw, fi)
@@ -92,7 +93,7 @@ func zipDir(srcDirPath string, recPath string, tw *zip.Writer) {
 // Deal with files
 func zipFile(srcFile string, recPath string, tw *zip.Writer, fi os.FileInfo) {
 	if fi.IsDir() {
-//    	fmt.Println("??")
+		//    	fmt.Println("??")
 		// Create tar header
 		/*
 		   fh, err := zip.FileInfoHeader(fi)
@@ -138,24 +139,30 @@ func Unzip(srcFilePath string, destDirPath string) (ok bool, msg string) {
 	}()
 
 	os.Mkdir(destDirPath, os.ModePerm)
-	r, err := zip.OpenReader(srcFilePath);
+	r, err := zip.OpenReader(srcFilePath)
 	if err != nil {
 		panic(err)
 	}
-	defer r.Close();
+	defer r.Close()
 	for _, f := range r.File {
-//		fmt.Println("FileName : ", f.Name); // j/aaa.zip
+		// fmt.Println("FileName : ", f.Name); // j/aaa.zip
-		rc, err := f.Open();
+		rc, err := f.Open()
-		if err!=nil {
+		if err != nil {
 			panic(err)
 		}
 
+		// 包含恶意目录
+		if strings.Contains(f.Name, "../") {
+			lea.LogW("恶意文件", f.Name);
+			continue
+		}
+
 		// 把首文件夹去掉, 即j去掉, 分离出文件夹和文件名
 		paths := strings.Split(f.Name, "/")
 		prePath := ""
 		filename := ""
 		l := len(paths)
-//		fmt.Println(l)
+		//		fmt.Println(l)
 		if l > 1 {
 			// 去掉第1个文件夹
 			if l == 2 {
@@ -167,16 +174,16 @@ func Unzip(srcFilePath string, destDirPath string) (ok bool, msg string) {
 		} else {
 			filename = f.Name
 		}
-//		fmt.Println(prePath)
+		//		fmt.Println(prePath)
 
 		// 相对于目标文件件下的路径
 		destPath := destDirPath + "/" + filename
 		if prePath != "" {
-			os.MkdirAll(destDirPath + "/" + prePath, os.ModePerm)
+			os.MkdirAll(destDirPath+"/"+prePath, os.ModePerm)
 			destPath = destDirPath + "/" + prePath + "/" + filename
 		}
 		// Write data to file
-//        fmt.Println(destPath)
+		//        fmt.Println(destPath)
 		fw, _ := os.Create(destPath)
 		if err != nil {
 			panic(err)

app/lea/binder/binder.go

@@ -1,10 +1,9 @@
 package binder
 
 import (
-	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
-	"github.com/leanote/leanote/app/controllers"
+	"github.com/revel/revel"
-//	"github.com/leanote/leanote/app/controllers/api"
+	//	"github.com/leanote/leanote/app/controllers/api"
 	"fmt"
 	"reflect"
 	"strings"
@@ -54,35 +53,36 @@ 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() // 创建一个该类型的, 然后其field从所有的param去取
 		fieldValues := make(map[string]reflect.Value)
-//		fmt.Println(name)
+		//		fmt.Println(name)
 		// fmt.Println(typ) // api.NoteFiles
 		// name = files[0], files[1], noteContent
-//		fmt.Println(params.Values)
+		//		fmt.Println(params.Values)
 		/*
-map[Title:[test1] METHOD:[POST] NotebookId:[54c4f51705fcd14031000002] 
+			map[Title:[test1] METHOD:[POST] NotebookId:[54c4f51705fcd14031000002]
-files[1][FileId]:[] 
+			files[1][FileId]:[]
-controller:[note] 
+			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[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]]		
+			files[0][HasBody]:[true]]
 		*/
 		nameIsSlice := strings.Contains(name, "[")
-//		fmt.Println(params.Values["files[1]"])
+		//		fmt.Println(params.Values["files[1]"])
-//		fmt.Println(params.Values["Title"])
+		//		fmt.Println(params.Values["Title"])
-		for key, _ := range params.Values {// Title, Content, Files
+		for key, _ := range params.Values { // Title, Content, Files
 			// 这里, 如果没有点, 默认就是a.
 			// life
-//			fmt.Println("key:" + key); // files[0][LocalFileId]
+			//			fmt.Println("key:" + key); // files[0][LocalFileId]
-//			fmt.Println("name:" + name); // files[0][LocalFileId]
+			//			fmt.Println("name:" + name); // files[0][LocalFileId]
 			var suffix string
 			var noPrefix = false
 			if nameIsSlice && strings.HasPrefix(key, name) {
-				suffix = key[len(name)+1:len(key)-1] // files[0][LocalFileId] 去掉 => LocalFileId
+				suffix = key[len(name)+1 : len(key)-1] // files[0][LocalFileId] 去掉 => LocalFileId
-			} else if !strings.HasPrefix(key, name + ".") {
+			} else if !strings.HasPrefix(key, name+".") {
 				noPrefix = true
 				suffix = key
 				//			continue
@@ -91,18 +91,18 @@ files[0][HasBody]:[true]]
 				// Strip off the prefix. e.g. foo.bar.baz => bar.baz
 				suffix = key[len(name)+1:]
 			}
-//			fmt.Println(suffix);
+			//			fmt.Println(suffix);
 
 			fieldName := nextKey(suffix) // e.g. bar => "bar", bar.baz => "bar", bar[0] => "bar"
-//			fmt.Println(fieldName);
+			//			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)
+				//				fmt.Println("xx: " + fieldName)
 				fieldValue := result.FieldByName(fieldName)
-//				fmt.Println(fieldValue)
+				//				fmt.Println(fieldValue)
 				if !fieldValue.IsValid() {
 					continue
 				}
@@ -111,14 +111,14 @@ files[0][HasBody]:[true]]
 				}
 				var boundVal reflect.Value
 				// 没有name前缀
-				if(noPrefix) {
+				if noPrefix {
 					// life
-//					fmt.Println("<<")
+					//					fmt.Println("<<")
-//					fmt.Println(strings.Title(key[:fieldLen]));
+					//					fmt.Println(strings.Title(key[:fieldLen]));
 					boundVal = revel.Bind(params, key[:fieldLen], fieldValue.Type())
 				} else {
-//					fmt.Println("final")
+					//					fmt.Println("final")
-//					fmt.Println(key[:len(name)+1+fieldLen]) // files[0][HasBody
+					//					fmt.Println(key[:len(name)+1+fieldLen]) // files[0][HasBody
 					if nameIsSlice {
 						fieldLen += 1
 					}
@@ -150,7 +150,7 @@ func init() {
 	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.NoteOrContent{})] = leanoteStructBinder
 	revel.TypeBinders[reflect.TypeOf(info.ApiNote{})] = leanoteStructBinder
 	revel.TypeBinders[reflect.TypeOf(info.NoteFile{})] = leanoteStructBinder
 }

app/lea/blog/Template.go

@@ -6,8 +6,8 @@ import (
 	"html/template"
 	"io/ioutil"
 	//	"os"
-	"fmt"
 	"bytes"
+	"fmt"
 	"io"
 	"net/http"
 	"regexp"
@@ -39,7 +39,7 @@ var CloneTemplate *template.Template
 type RenderTemplateResult struct {
 	Template    *template.Template
 	PathContent map[string]string
-	RenderArgs  map[string]interface{}
+	ViewArgs map[string]interface{}
 
 	IsPreview  bool // 是否是预览
 	CurBlogTpl *BlogTpl
@@ -62,7 +62,7 @@ func parseTemplateError(err error) (templateName string, line int, description s
 	return templateName, line, description
 }
 func (r *RenderTemplateResult) render(req *revel.Request, resp *revel.Response, wr io.Writer) {
-	err := r.Template.Execute(wr, r.RenderArgs)
+	err := r.Template.Execute(wr, r.ViewArgs)
 	if err == nil {
 		return
 	}
@@ -91,7 +91,7 @@ func (r *RenderTemplateResult) render(req *revel.Request, resp *revel.Response,
 	// 这里, 错误!!
 	// 这里应该导向到本主题的错误页面
 	resp.Status = 500
-	ErrorResult{r.RenderArgs, compileError, r.IsPreview, r.CurBlogTpl}.Apply(req, resp)
+	ErrorResult{r.ViewArgs, compileError, r.IsPreview, r.CurBlogTpl}.Apply(req, resp)
 }
 
 func (r *RenderTemplateResult) Apply(req *revel.Request, resp *revel.Response) {
@@ -139,7 +139,7 @@ func Init() {
 		fileBytes, _ := ioutil.ReadFile(revel.ViewsPath + "/Blog/" + path)
 		fileStr := string(fileBytes)
 		path := "blog/" + path
-//		path := path
+		//		path := path
 		BlogTplObject.PathContent[path] = fileStr
 		BlogTplObject.Template.New(path).Parse(fileStr) // 以blog为根
 	}
@@ -157,12 +157,12 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 	// 都不会为空的
 	if basePath == "" {
 		path := "blog/" + name
-//		path := name
+		//		path := name
 		t := BlogTplObject.Template.Lookup(path)
 		r = &RenderTemplateResult{
 			Template:    t,
 			PathContent: BlogTplObject.PathContent, // 为了显示错误
-			RenderArgs:  args,                      // 把args给它
+			ViewArgs:  args,                      // 把args给它
 		}
 	} else {
 		// 复制一份
@@ -181,7 +181,7 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 		files := ListDir(basePath)
 		for _, t := range files {
 			if !strings.Contains(t, ".html") {
-				continue;
+				continue
 			}
 			fileBytes, err := ioutil.ReadFile(basePath + "/" + t)
 			if err != nil {
@@ -202,7 +202,7 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 		r = &RenderTemplateResult{
 			Template:    t,
 			PathContent: newBlogTplObject.PathContent, // 为了显示错误
-			RenderArgs:  args,
+			ViewArgs:  args,
 			CurBlogTpl:  newBlogTplObject,
 			IsPreview:   isPreview,
 		}
@@ -211,13 +211,11 @@ func RenderTemplate(name string, args map[string]interface{}, basePath string, i
 	return r
 }
 
-
 ////////////////////
 //
 
-
 type ErrorResult struct {
-	RenderArgs map[string]interface{}
+	ViewArgs map[string]interface{}
 	Error      error
 	IsPreview  bool
 	CurBlogTpl *BlogTpl
@@ -240,7 +238,7 @@ func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) {
 	var err error
 	templatePath := fmt.Sprintf("errors/%d.%s", status, format)
 	err = nil
-//	tmpl, err := revel.MainTemplateLoader.Template("index.html") // 这里找到错误页面主题
+	//	tmpl, err := revel.MainTemplateLoader.Template("index.html") // 这里找到错误页面主题
 
 	// This func shows a plaintext error message, in case the template rendering
 	// doesn't work.
@@ -282,18 +280,18 @@ func (r ErrorResult) Apply(req *revel.Request, resp *revel.Response) {
 		panic("no error provided")
 	}
 
-	if r.RenderArgs == nil {
+	if r.ViewArgs == nil {
-		r.RenderArgs = make(map[string]interface{})
+		r.ViewArgs = make(map[string]interface{})
 	}
-	r.RenderArgs["Error"] = revelError
+	r.ViewArgs["Error"] = revelError
-	r.RenderArgs["Router"] = revel.MainRouter
+	r.ViewArgs["Router"] = revel.MainRouter
 
 	// 不是preview就不要显示错误了
 	if r.IsPreview {
 		var b bytes.Buffer
 		out := io.Writer(resp.Out)
 		//	out = ioutil.Discard
-		err = tmpl.Execute(&b, r.RenderArgs)
+		err = tmpl.Execute(&b, r.ViewArgs)
 		resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
 		b.WriteTo(out)
 	}

app/lea/captcha/Captcha.go

@@ -1,15 +1,16 @@
 package captcha
 
 import (
+	crand "crypto/rand"
 	"image"
 	"image/color"
 	"image/png"
 	"io"
 	"math/rand"
-    crand "crypto/rand"
-    "time"
 	"strconv"
+	"time"
 )
+
 const (
 	stdWidth  = 100
 	stdHeight = 40
@@ -132,7 +133,8 @@ type Image struct {
 	height  int //a digit height
 	dotsize int
 }
-func init(){
+
+func init() {
 	rand.Seed(int64(time.Second))
 }
 

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/html2image/ToImage.go

@@ -7,4 +7,3 @@ import (
 func Html2Image(userInfo info.User, note info.Note, content, toPath string) bool {
 	return true
 }
-

app/lea/i18n/i18n.go

@@ -0,0 +1,223 @@
+package i18n
+
+import (
+	"fmt"
+	"github.com/revel/revel"
+	"github.com/robfig/config"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+const (
+	CurrentLocaleViewArg = "currentLocale" // The key for the current locale render arg value
+
+	messageFilesDirectory = "messages"
+	messageFilePattern    = `^\w+\.conf$`
+	unknownValueFormat    = "??? %s ???"
+	defaultLanguageOption = "i18n.default_language"
+	localeCookieConfigKey = "i18n.cookie"
+)
+
+var (
+	// All currently loaded message configs.
+	// en-us, zh-cn, zh-hk ->
+	messages map[string]*config.Config
+)
+
+func GetAllLangMessages() map[string]*config.Config {
+	return messages
+}
+
+func HasLang(lang string) bool {
+	_, ok := messages[lang]
+	return ok
+}
+
+func GetDefaultLang() string {
+	lang, _ := revel.Config.String(defaultLanguageOption)
+	return lang
+}
+
+// Return all currently loaded message languages.
+func MessageLanguages() []string {
+	languages := make([]string, len(messages))
+	i := 0
+	for language, _ := range messages {
+		languages[i] = language
+		i++
+	}
+	return languages
+}
+
+// Perform a message look-up for the given locale and message using the given arguments.
+//
+// When either an unknown locale or message is detected, a specially formatted string is returned.
+func Message(locale, message string, args ...interface{}) string {
+	language, region := parseLocale(locale)
+
+	langAndRegion := language + "-" + region
+	// revel.TRACE.Println(langAndRegion + " 怎么回事")
+
+	messageConfig, knownLanguage := messages[langAndRegion]
+	if !knownLanguage {
+		// revel.TRACE.Printf("Unsupported language for locale '%s' and message '%s', trying default language", locale, message)
+
+		if defaultLanguage, found := revel.Config.String(defaultLanguageOption); found {
+			// revel.TRACE.Printf("Using default language '%s'", defaultLanguage)
+
+			messageConfig, knownLanguage = messages[defaultLanguage]
+			if !knownLanguage {
+				// WARN.Printf("Unsupported default language for locale '%s' and message '%s'", defaultLanguage, message)
+				return fmt.Sprintf(unknownValueFormat, message)
+			}
+		} else {
+			// WARN.Printf("Unable to find default language option (%s); messages for unsupported locales will never be translated", defaultLanguageOption)
+			return fmt.Sprintf(unknownValueFormat, message)
+		}
+	}
+
+	// This works because unlike the goconfig documentation suggests it will actually
+	// try to resolve message in DEFAULT if it did not find it in the given section.
+	value, error := messageConfig.String(region, message)
+	if error != nil {
+		// WARN.Printf("Unknown message '%s' for locale '%s'", message, locale)
+		return fmt.Sprintf(unknownValueFormat, message)
+	}
+
+	if len(args) > 0 {
+		// revel.TRACE.Printf("Arguments detected, formatting '%s' with %v", value, args)
+		value = fmt.Sprintf(value, args...)
+	}
+
+	return value
+}
+
+func parseLocale(locale string) (language, region string) {
+	if strings.Contains(locale, "-") {
+		languageAndRegion := strings.Split(locale, "-")
+		return languageAndRegion[0], languageAndRegion[1]
+	}
+
+	return locale, ""
+}
+
+// Recursively read and cache all available messages from all message files on the given path.
+func loadMessages(path string) {
+	messages = make(map[string]*config.Config)
+
+	if error := filepath.Walk(path, loadEachMessageLang); error != nil && !os.IsNotExist(error) {
+		// ERROR.Println("Error reading messages files:", error)
+	}
+}
+
+// 加载每一个文件夹
+func loadEachMessageLang(parentPath string, parentInfo os.FileInfo, osError error) (err error) {
+	if !parentInfo.IsDir() {
+		return nil
+	}
+
+	if err := filepath.Walk(parentPath, func(path string, info os.FileInfo, osError error) error {
+		return loadMessageFile(parentInfo.Name(), path, info, osError)
+
+	}); err != nil && !os.IsNotExist(err) {
+		// ERROR.Println("Error reading messages files:", error)
+	}
+	return err
+}
+
+// Load a single message file
+func loadMessageFile(locale string, path string, info os.FileInfo, osError error) error {
+	if osError != nil {
+		return osError
+	}
+	if info.IsDir() {
+		return nil
+	}
+
+	if matched, _ := regexp.MatchString(messageFilePattern, info.Name()); matched {
+		if config, error := parseMessagesFile(path); error != nil {
+			return error
+		} else {
+			// locale := parseLocaleFromFileName(info.Name())
+			// revel.TRACE.Print(locale + "----locale")
+
+			// If we have already parsed a message file for this locale, merge both
+			if _, exists := messages[locale]; exists {
+				messages[locale].Merge(config)
+				revel.TRACE.Printf("Successfully merged messages for locale '%s'", locale)
+			} else {
+				messages[locale] = config
+			}
+
+			revel.TRACE.Println("Successfully loaded messages from file", info.Name())
+		}
+	} else {
+		revel.TRACE.Printf("Ignoring file %s because it did not have a valid extension", info.Name())
+	}
+
+	return nil
+}
+
+func parseMessagesFile(path string) (messageConfig *config.Config, error error) {
+	messageConfig, error = config.ReadDefault(path)
+	return
+}
+
+func parseLocaleFromFileName(file string) string {
+	extension := filepath.Ext(file)[1:]
+	return strings.ToLower(extension)
+}
+
+func init() {
+	revel.OnAppStart(func() {
+		loadMessages(filepath.Join(revel.BasePath, messageFilesDirectory))
+	})
+}
+
+func I18nFilter(c *revel.Controller, fc []revel.Filter) {
+	if foundCookie, cookieValue := hasLocaleCookie(c.Request); foundCookie {
+		revel.TRACE.Printf("Found locale cookie value: %s", cookieValue)
+		setCurrentLocaleControllerArguments(c, cookieValue)
+	} else if foundHeader, headerValue := hasAcceptLanguageHeader(c.Request); foundHeader {
+		revel.TRACE.Printf("Found Accept-Language header value: %s", headerValue)
+		setCurrentLocaleControllerArguments(c, headerValue)
+	} else {
+		revel.TRACE.Println("Unable to find locale in cookie or header, using empty string")
+		setCurrentLocaleControllerArguments(c, "")
+	}
+	fc[0](c, fc[1:])
+}
+
+// Set the current locale controller argument (CurrentLocaleControllerArg) with the given locale.
+func setCurrentLocaleControllerArguments(c *revel.Controller, locale string) {
+	c.Request.Locale = locale
+	c.ViewArgs[CurrentLocaleViewArg] = locale
+}
+
+// Determine whether the given request has valid Accept-Language value.
+//
+// Assumes that the accept languages stored in the request are sorted according to quality, with top
+// quality first in the slice.
+func hasAcceptLanguageHeader(request *revel.Request) (bool, string) {
+	if request.AcceptLanguages != nil && len(request.AcceptLanguages) > 0 {
+		return true, request.AcceptLanguages[0].Language
+	}
+
+	return false, ""
+}
+
+// Determine whether the given request has a valid language cookie value.
+func hasLocaleCookie(request *revel.Request) (bool, string) {
+	if request != nil && request.Cookies() != nil {
+		name := revel.Config.StringDefault(localeCookieConfigKey, revel.CookiePrefix+"_LANG")
+		if cookie, error := request.Cookie(name); error == nil {
+			return true, cookie.Value
+		} else {
+			revel.TRACE.Printf("Unable to read locale cookie with name '%s': %s", name, error.Error())
+		}
+	}
+
+	return false, ""
+}

app/lea/memcache/Memcache.go

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

app/lea/netutil/NetUtil.go

@@ -1,12 +1,13 @@
 package netutil
+
 import (
-	"strings"
 	"os"
-//	"path/filepath"
+	"strings"
+	//	"path/filepath"
+	. "github.com/leanote/leanote/app/lea"
+	"io/ioutil"
 	"net"
 	"net/http"
-	"io/ioutil"
-	. "github.com/leanote/leanote/app/lea"
 )
 
 // net的util
@@ -16,11 +17,11 @@ import (
 // 返回文件的完整目录
 func WriteUrl(url string, toPath string) (length int64, newFilename, path string, ok bool) {
 	if url == "" {
-		return;
+		return
 	}
 	content, err := GetContent(url)
 	if err != nil {
-		return;
+		return
 	}
 
 	length = int64(len(content))
@@ -31,7 +32,7 @@ func WriteUrl(url string, toPath string) (length int64, newFilename, path string
 	if toPath == "" {
 		toPath = "/tmp"
 	}
-//	dir := filepath.Dir(toPath)
+	//	dir := filepath.Dir(toPath)
 	newFilename = NewGuid() + ext
 	fullPath := toPath + "/" + newFilename
 
@@ -53,7 +54,7 @@ func GetContent(url string) (content []byte, err error) {
 	var resp *http.Response
 	resp, err = http.Get(url)
 	Log(err)
-	if(resp != nil && resp.Body != nil) {
+	if resp != nil && resp.Body != nil {
 		defer resp.Body.Close()
 	} else {
 	}
@@ -63,33 +64,33 @@ func GetContent(url string) (content []byte, err error) {
 
 	var buf []byte
 	buf, err = ioutil.ReadAll(resp.Body)
-   	if(err != nil) {
+	if err != nil {
 		Log(err)
 		return
 	}
 
-   	content = buf;
+	content = buf
 	err = nil
 	return
 }
 
 // 将url ?, #后面的字符串去掉
 func trimQueryParams(url string) string {
-	pos := strings.Index(url, "?");
+	pos := strings.Index(url, "?")
 	if pos != -1 {
-		url = Substr(url, 0, pos);
+		url = Substr(url, 0, pos)
 	}
 
-	pos = strings.Index(url, "#");
+	pos = strings.Index(url, "#")
 	if pos != -1 {
-		url = Substr(url, 0, pos);
+		url = Substr(url, 0, pos)
 	}
 
-	pos = strings.Index(url, "!");
+	pos = strings.Index(url, "!")
 	if pos != -1 {
-		url = Substr(url, 0, pos);
+		url = Substr(url, 0, pos)
 	}
-	return url;
+	return url
 }
 
 // 通过domain得到ip

app/lea/route/Route.go

@@ -1,9 +1,9 @@
 package route
 
 import (
+	"github.com/leanote/leanote/app/db"
 	"github.com/revel/revel"
-//	"github.com/leanote/leanote/app/service"
+	//	. "github.com/leanote/leanote/app/lea"
-//	. "github.com/leanote/leanote/app/lea"
 	"net/url"
 	"strings"
 )
@@ -11,6 +11,7 @@ import (
 // overwite revel RouterFilter
 // /api/user/Info => ApiUser.Info()
 var staticPrefix = []string{"/public", "/favicon.ico", "/css", "/js", "/images", "/tinymce", "/upload", "/fonts"}
+
 func RouterFilter(c *revel.Controller, fc []revel.Filter) {
 	// 补全controller部分
 	path := c.Request.Request.URL.Path
@@ -42,10 +43,14 @@ func RouterFilter(c *revel.Controller, fc []revel.Filter) {
 		}
 	*/
 	if route.ControllerName != "Static" {
+
+		// 检查mongodb 是否lost
+		db.CheckMongoSessionLost()
+
 		// api设置
 		// leanote.com/api/user/get => ApiUser::Get
 		//*       /api/login               ApiAuth.Login,  这里的设置, 其实已经转成了ApiAuth了
-		if strings.HasPrefix(path, "/api") && !strings.HasPrefix(route.ControllerName, "Api"){
+		if strings.HasPrefix(path, "/api") && !strings.HasPrefix(route.ControllerName, "Api") {
 			route.ControllerName = "Api" + route.ControllerName
 		} else if strings.HasPrefix(path, "/member") && !strings.HasPrefix(route.ControllerName, "Member") {
 			// member设置
@@ -80,4 +85,3 @@ func RouterFilter(c *revel.Controller, fc []revel.Filter) {
 
 	fc[0](c, fc[1:])
 }
-

app/lea/session/MSession.go

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

app/release/release.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"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/"
@@ -53,13 +54,13 @@ func compressJs(filename string) {
 	to := base + filename + "-min.js"
 	cmd := exec.Command(cmdPath, source, "-o", to)
 	_, err := cmd.CombinedOutput()
-	fmt.Println(source);
+	fmt.Println(source)
 	cmdError(err)
 }
 
 func combineJs() {
 	// 生成一个总文件
-	cmd := exec.Command("rm", base + "js/all.js")
+	cmd := exec.Command("rm", base+"js/all.js")
 	_, err := cmd.CombinedOutput()
 	cmdError(err)
 
@@ -69,10 +70,10 @@ func combineJs() {
 		compressJs(js)
 
 		// 每个压缩后的文件放入之
-		cmd2 := exec.Command("/bin/sh", "-c", "cat " + to + " >> " + base + "js/all.js")
+		cmd2 := exec.Command("/bin/sh", "-c", "cat "+to+" >> "+base+"js/all.js")
 		_, err := cmd2.CombinedOutput()
 		cmdError(err)
-		cmd2 = exec.Command("/bin/sh", "-c", "cat \n >> " + base + "js/all.js")
+		cmd2 = exec.Command("/bin/sh", "-c", "cat \n >> "+base+"js/all.js")
 		_, err = cmd2.CombinedOutput()
 		cmdError(err)
 	}
@@ -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,48 +107,44 @@ 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)
 }
 
 // 压缩js成一块
 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]"
+	//	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", "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")
+	cmd2 := exec.Command("/bin/sh", "-c", "rm "+cmd.Dir+"/js/tinymce/tinymce.dev.js")
 	cmd2.CombinedOutput()
-	cmd2 = exec.Command("/bin/sh", "-c", "rm " + cmd.Dir + "/js/tinymce/tinymce.jquery.dev.js")
+	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();
+	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/AlbumService.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"github.com/leanote/leanote/app/info"
-//	. "github.com/leanote/leanote/app/lea"
+	//	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/db"
 	"gopkg.in/mgo.v2/bson"
 	"time"

app/service/AttachService.go

@@ -63,11 +63,20 @@ func (this *AttachService) updateNoteAttachNum(noteId bson.ObjectId, addNum int)
 // list attachs
 func (this *AttachService) ListAttachs(noteId, userId string) []info.Attach {
 	attachs := []info.Attach{}
-	// 判断是否有权限为笔记添加附件
+
-	if !shareService.HasUpdateNotePerm(noteId, userId) {
+	// 判断是否有权限为笔记添加附件, userId为空时表示是分享笔记的附件
+	if userId != "" && !shareService.HasUpdateNotePerm(noteId, userId) {
 		return attachs
 	}
 
+	// 笔记是否是自己的
+	note := noteService.GetNoteByIdAndUserId(noteId, userId)
+	if note.NoteId == "" {
+		return attachs
+	}
+
+	// TODO 这里, 优化权限控制
+
 	db.ListByQ(db.Attachs, bson.M{"NoteId": bson.ObjectIdHex(noteId)}, &attachs)
 
 	return attachs
@@ -110,11 +119,12 @@ func (this *AttachService) DeleteAllAttachs(noteId, userId string) bool {
 }
 
 // delete attach
+// 删除附件为什么要incrNoteUsn ? 因为可能没有内容要修改的
 func (this *AttachService) DeleteAttach(attachId, userId string) (bool, string) {
 	attach := info.Attach{}
 	db.Get(db.Attachs, attachId, &attach)
 
-	if(attach.AttachId != "") {
+	if attach.AttachId != "" {
 		// 判断是否有权限为笔记添加附件
 		if !shareService.HasUpdateNotePerm(attach.NoteId.Hex(), userId) {
 			return false, "No Perm"

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,18 +45,21 @@ 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();
+		userId := user.UserId.Hex()
 		notebook := info.Notebook{
 			Seq:    -1,
 			UserId: user.UserId}
@@ -60,12 +68,12 @@ func (this *AuthService) register(user info.User) (bool, string) {
 			notebook.Title = title
 			notebook.NotebookId = objectId
 			notebook.UserId = user.UserId
-			notebookService.AddNotebook(notebook);
+			notebookService.AddNotebook(notebook)
 		}
 
 		// 添加leanote -> 该用户的共享
 		registerSharedUserId := configService.GetGlobalStringConfig("registerSharedUserId")
-		if(registerSharedUserId != "") {
+		if registerSharedUserId != "" {
 			registerSharedNotebooks := configService.GetGlobalArrMapConfig("registerSharedNotebooks")
 			registerSharedNotes := configService.GetGlobalArrMapConfig("registerSharedNotes")
 			registerCopyNoteIds := configService.GetGlobalArrayConfig("registerCopyNoteIds")
@@ -73,21 +81,21 @@ func (this *AuthService) register(user info.User) (bool, string) {
 			// 添加共享笔记本
 			for _, notebook := range registerSharedNotebooks {
 				perm, _ := strconv.Atoi(notebook["perm"])
-				shareService.AddShareNotebookToUserId(notebook["notebookId"], perm, registerSharedUserId, userId);
+				shareService.AddShareNotebookToUserId(notebook["notebookId"], perm, registerSharedUserId, userId)
 			}
 
 			// 添加共享笔记
 			for _, note := range registerSharedNotes {
 				perm, _ := strconv.Atoi(note["perm"])
-				shareService.AddShareNoteToUserId(note["noteId"], perm, registerSharedUserId, userId);
+				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())
-//				Log(noteId)
+				//				Log(noteId)
-//				Log("Copy")
+				//				Log("Copy")
-//				LogJ(note)
+				//				LogJ(note)
 				noteUpdate := bson.M{"IsBlog": false} // 不要是博客
 				noteService.UpdateNote(user.UserId.Hex(), note.NoteId.Hex(), noteUpdate, -1)
 			}
@@ -115,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
 		}

app/service/BlogService.go

@@ -45,7 +45,9 @@ func (this *BlogService) GetBlogByIdAndUrlTitle(userId string, noteIdOrUrlTitle
 		return this.GetBlog(noteIdOrUrlTitle)
 	}
 	note := info.Note{}
-	db.GetByQ(db.Notes, bson.M{"UserId": bson.ObjectIdHex(userId), "UrlTitle": encodeValue(noteIdOrUrlTitle), "IsBlog": true, "IsTrash": false}, &note)
+	db.GetByQ(db.Notes, bson.M{"UserId": bson.ObjectIdHex(userId), "UrlTitle": encodeValue(noteIdOrUrlTitle),
+		"IsBlog":  true,
+		"IsTrash": false, "IsDeleted": false}, &note)
 	return this.GetBlogItem(note)
 }
 
@@ -56,7 +58,7 @@ func (this *BlogService) GetBlog(noteId string) (blog info.BlogItem) {
 }
 func (this *BlogService) GetBlogItem(note info.Note) (blog info.BlogItem) {
 	if note.NoteId == "" || !note.IsBlog {
-		return
+		return info.BlogItem{}
 	}
 
 	// 内容
@@ -131,7 +133,8 @@ func (this *BlogService) ListBlogs(userId, notebookId string, page, pageSize int
 func (this *BlogService) GetBlogTags(userId string) []info.TagCount {
 	// 得到所有博客
 	tagCounts := []info.TagCount{}
-	query := bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true}
+	// tag不能为空
+	query := bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true, "Tag": bson.M{"$ne": ""}}
 	db.TagCounts.Find(query).Sort("-Count").All(&tagCounts)
 	return tagCounts
 }
@@ -142,7 +145,7 @@ func (this *BlogService) ReCountBlogTags(userId string) bool {
 	// 得到所有博客
 	notes := []info.Note{}
 	userIdO := bson.ObjectIdHex(userId)
-	query := bson.M{"UserId": userIdO, "IsTrash": false, "IsBlog": true}
+	query := bson.M{"UserId": userIdO, "IsTrash": false, "IsDeleted": false, "IsBlog": true}
 	db.ListByQWithFields(db.Notes, query, []string{"Tags"}, &notes)
 
 	db.DeleteAll(db.TagCounts, bson.M{"UserId": userIdO, "IsBlog": true})
@@ -184,7 +187,7 @@ Posts: []
 */
 func (this *BlogService) ListBlogsArchive(userId, notebookId string, year, month int, sortField string, isAsc bool) []info.Archive {
 	//	_, notes := noteService.ListNotes(userId, notebookId, false, 1, 99999, sortField, isAsc, true);
-	q := bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true, "IsTrash": false}
+	q := bson.M{"UserId": bson.ObjectIdHex(userId), "IsBlog": true, "IsTrash": false, "IsDeleted": false}
 	if notebookId != "" {
 		q["NotebookId"] = bson.ObjectIdHex(notebookId)
 	}
@@ -292,6 +295,7 @@ func (this *BlogService) SearchBlogByTags(tags []string, userId string, pageNumb
 	// 不是trash的
 	query := bson.M{"UserId": bson.ObjectIdHex(userId),
 		"IsTrash":   false,
+		"IsDeleted": false,
 		"IsBlog":    true,
 		"Tags":      bson.M{"$all": tags}}
 
@@ -393,10 +397,12 @@ func (this *BlogService) PreNextBlog(userId string, sorterField string, isAsc bo
 		sortFieldR2 = sorterField
 	}
 
+	// 1
 	// 上一篇, 比基时间要小, 但是是最后一篇, 所以是降序
 	note := info.Note{}
 	query := bson.M{"UserId": userIdO,
 		"IsTrash":   false,
+		"IsDeleted": false,
 		"IsBlog":    true,
 		"_id":       bson.M{"$ne": bson.ObjectIdHex(noteId)},
 		sorterField: sortFieldT1,
@@ -430,7 +436,7 @@ func (this *BlogService) ListAllBlogs(userId, tag string, keywords string, isRec
 	skipNum, sortFieldR := parsePageAndSort(page, pageSize, sorterField, isAsc)
 
 	// 不是trash的
-	query := bson.M{"IsTrash": false, "IsBlog": true, "Title": bson.M{"$ne": "欢迎来到leanote!"}}
+	query := bson.M{"IsTrash": false, "IsDeleted": false, "IsBlog": true, "Title": bson.M{"$ne": "欢迎来到leanote!"}}
 	if tag != "" {
 		query["Tags"] = bson.M{"$in": []string{tag}}
 	}
@@ -496,6 +502,9 @@ func (this *BlogService) ListAllBlogs(userId, tag string, keywords string, isRec
 				content = noteContent.Abstract
 			}
 		*/
+		if len(note.Tags) == 1 && note.Tags[0] == "" {
+			note.Tags = nil
+		}
 		blogs[i] = info.BlogItem{note, "", content, hasMore, userMap[note.UserId]}
 	}
 	pageInfo = info.NewPage(page, pageSize, count, nil)
@@ -509,7 +518,7 @@ func (this *BlogService) fixUserBlog(userBlog *info.UserBlog) {
 	// Logo路径问题, 有些有http: 有些没有
 	if userBlog.Logo != "" && !strings.HasPrefix(userBlog.Logo, "http") {
 		userBlog.Logo = strings.Trim(userBlog.Logo, "/")
-		userBlog.Logo = configService.GetSiteUrl() + "/" + userBlog.Logo
+		userBlog.Logo = "/" + userBlog.Logo
 	}
 
 	if userBlog.SortField == "" {
@@ -664,19 +673,18 @@ func (this *BlogService) LikeBlog(noteId, userId string) (ok bool, isLike bool)
 
 	noteIdO := bson.ObjectIdHex(noteId)
 	userIdO := bson.ObjectIdHex(userId)
-	var n int
 	if !db.Has(db.BlogLikes, bson.M{"NoteId": noteIdO, "UserId": userIdO}) {
-		n = 1
 		// 添加之
 		db.Insert(db.BlogLikes, info.BlogLike{LikeId: bson.NewObjectId(), NoteId: noteIdO, UserId: userIdO, CreatedTime: time.Now()})
 		isLike = true
 	} else {
 		// 已点过, 那么删除之
-		n = -1
 		db.Delete(db.BlogLikes, bson.M{"NoteId": noteIdO, "UserId": userIdO})
 		isLike = false
 	}
-	ok = db.Update(db.Notes, bson.M{"_id": noteIdO}, bson.M{"$inc": bson.M{"LikeNum": n}})
+	
+	count := db.Count(db.BlogLikes, bson.M{"NoteId": noteIdO})
+	ok = db.UpdateByQI(db.Notes, bson.M{"_id": noteIdO}, bson.M{"LikeNum": count})
 
 	return
 }
@@ -910,7 +918,7 @@ func (this *BlogService) UpateCateUrlTitle(userId string, cateId, urlTitle strin
 			"UrlTitle": "",
 		})
 	*/
-	url = GetUrTitle(userId, urlTitle, "notebook")
+	url = GetUrTitle(userId, urlTitle, "notebook", cateId)
 	ok = db.UpdateByIdAndUserIdMap(db.Notebooks, cateId, userId, bson.M{
 		"UrlTitle": url,
 	})
@@ -926,7 +934,7 @@ func (this *BlogService) UpateBlogUrlTitle(userId string, noteId, urlTitle strin
 	ok = db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, bson.M{
 		"UrlTitle": "",
 	})
-	url = GetUrTitle(userId, urlTitle, "note")
+	url = GetUrTitle(userId, urlTitle, "note", noteId)
 	ok = db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, bson.M{
 		"UrlTitle": url,
 	})
@@ -1027,7 +1035,7 @@ func (this *BlogService) UpdateSingleUrlTitle(userId, singleId, urlTitle string)
 			"UrlTitle": "",
 		})
 	*/
-	url = GetUrTitle(userId, urlTitle, "single")
+	url = GetUrTitle(userId, urlTitle, "single", singleId)
 	ok = db.UpdateByIdAndUserIdMap(db.BlogSingles, singleId, userId, bson.M{
 		"UrlTitle": url,
 	})
@@ -1061,7 +1069,7 @@ func (this *BlogService) AddOrUpdateSingle(userId, singleId, title, content stri
 		UserId:      bson.ObjectIdHex(userId),
 		Title:       title,
 		Content:     content,
-		UrlTitle:    GetUrTitle(userId, title, "single"),
+		UrlTitle:    GetUrTitle(userId, title, "single", singleId),
 		CreatedTime: time.Now(),
 	}
 	page.UpdatedTime = page.CreatedTime
@@ -1099,6 +1107,7 @@ func (this *BlogService) SortSingles(userId string, singleIds []string) (ok bool
 
 // 得到用户的博客url
 func (this *BlogService) GetUserBlogUrl(userBlog *info.UserBlog, username string) string {
+	/*
 	if userBlog != nil {
 		if userBlog.Domain != "" && configService.AllowCustomDomain() {
 			return configService.GetUserUrl(userBlog.Domain)
@@ -1109,12 +1118,15 @@ func (this *BlogService) GetUserBlogUrl(userBlog *info.UserBlog, username string
 			username = userBlog.UserId.Hex()
 		}
 	}
+	*/
 	return configService.GetBlogUrl() + "/" + username
 }
 
 // 得到所有url
 func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.User) info.BlogUrls {
 	var indexUrl, postUrl, searchUrl, cateUrl, singleUrl, tagsUrl, archiveUrl, tagPostsUrl string
+	
+	/*
 	if userBlog.Domain != "" && configService.AllowCustomDomain() { // http://demo.com
 		// ok
 		indexUrl = configService.GetUserUrl(userBlog.Domain)
@@ -1135,6 +1147,7 @@ func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.Use
 		tagsUrl = indexUrl + "/tags"
 		tagPostsUrl = indexUrl + "/tag"
 	} else {
+		*/
 		// ok
 		blogUrl := configService.GetBlogUrl() // blog.leanote.com
 		userIdOrEmail := ""
@@ -1153,7 +1166,7 @@ func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.Use
 		archiveUrl = blogUrl + "/archives/" + userIdOrEmail // blog.leanote.com/archive/username
 		tagsUrl = blogUrl + "/tags/" + userIdOrEmail
 		tagPostsUrl = blogUrl + "/tag/" + userIdOrEmail // blog.leanote.com/archive/username
-	}
+	// }
 
 	return info.BlogUrls{
 		IndexUrl:    indexUrl,
@@ -1197,6 +1210,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

@@ -1,17 +1,17 @@
 package service
 
 import (
+	"fmt"
+	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
-	"github.com/leanote/leanote/app/db"
-	"gopkg.in/mgo.v2/bson"
 	"github.com/revel/revel"
-	"time"
+	"gopkg.in/mgo.v2/bson"
 	"os"
 	"os/exec"
-	"fmt"
-	"strings"
 	"strconv"
+	"strings"
+	"time"
 )
 
 // 配置服务
@@ -27,6 +27,7 @@ type ConfigService struct {
 	GlobalMapConfigs    map[string]map[string]string
 	GlobalArrMapConfigs map[string][]map[string]string
 }
+
 // appStart时 将全局的配置从数据库中得到作为全局
 func (this *ConfigService) InitGlobalConfigs() bool {
 	this.GlobalAllConfigs = map[string]interface{}{}
@@ -48,7 +49,8 @@ func (this *ConfigService) InitGlobalConfigs() bool {
 	this.adminUserId = userInfo.UserId.Hex()
 
 	configs := []info.Config{}
-	db.ListByQ(db.Configs, bson.M{"UserId": userInfo.UserId}, &configs)
+	// db.ListByQ(db.Configs, bson.M{"UserId": userInfo.UserId}, &configs)
+	db.ListByQ(db.Configs, bson.M{}, &configs)
 
 	for _, config := range configs {
 		if config.IsArr {
@@ -66,11 +68,21 @@ func (this *ConfigService) InitGlobalConfigs() bool {
 		}
 	}
 
+	// site URL
+	if s, ok := this.GlobalStringConfigs["siteUrl"]; !ok || s != "" {
+		this.GlobalStringConfigs["siteUrl"] = this.siteUrl
+	}
+
 	return true
 }
 
 func (this *ConfigService) GetSiteUrl() string {
-	return this.siteUrl;
+	s := this.GetGlobalStringConfig("siteUrl")
+	if s != "" {
+		return s
+	}
+
+	return this.siteUrl
 }
 func (this *ConfigService) GetAdminUsername() string {
 	return this.adminUsername
@@ -85,14 +97,14 @@ func (this *ConfigService) updateGlobalConfig(userId, key string, value interfac
 	if _, ok := this.GlobalAllConfigs[key]; !ok {
 		// 需要添加
 		config := info.Config{ConfigId: bson.NewObjectId(),
-			UserId: bson.ObjectIdHex(userId),
+			UserId:      bson.ObjectIdHex(userId), // 没用
 			Key:         key,
 			IsArr:       isArr,
 			IsMap:       isMap,
 			IsArrMap:    isArrMap,
 			UpdatedTime: time.Now(),
 		}
-		if(isArr) {
+		if isArr {
 			v, _ := value.([]string)
 			config.ValueArr = v
 			this.GlobalArrayConfigs[key] = v
@@ -113,7 +125,7 @@ func (this *ConfigService) updateGlobalConfig(userId, key string, value interfac
 	} else {
 		i := bson.M{"UpdatedTime": time.Now()}
 		this.GlobalAllConfigs[key] = value
-		if(isArr) {
+		if isArr {
 			v, _ := value.([]string)
 			i["ValueArr"] = v
 			this.GlobalArrayConfigs[key] = v
@@ -130,7 +142,8 @@ func (this *ConfigService) updateGlobalConfig(userId, key string, value interfac
 			i["ValueStr"] = v
 			this.GlobalStringConfigs[key] = v
 		}
-		return db.UpdateByQMap(db.Configs, bson.M{"UserId": bson.ObjectIdHex(userId), "Key": key}, i)
+		// return db.UpdateByQMap(db.Configs, bson.M{"UserId": bson.ObjectIdHex(userId), "Key": key}, i)
+		return db.UpdateByQMap(db.Configs, bson.M{"Key": key}, i)
 	}
 }
 
@@ -177,6 +190,7 @@ func (this *ConfigService) GetGlobalArrMapConfig(key string) []map[string]string
 func (this *ConfigService) IsOpenRegister() bool {
 	return this.GetGlobalStringConfig("openRegister") != ""
 }
+
 //-------
 // 修改共享笔记的配置
 func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string,
@@ -188,7 +202,7 @@ func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string,
 			ok = false
 			msg = fmt.Sprint(err)
 		}
-	}();
+	}()
 
 	// 用户是否存在?
 	if registerSharedUserId == "" {
@@ -222,7 +236,7 @@ func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string,
 				msg = "The user has no such notebook: " + notebookId
 				return
 			} else {
-				perm := "0";
+				perm := "0"
 				if registerSharedNotebookPerms[i] == 1 {
 					perm = "1"
 				}
@@ -247,7 +261,7 @@ func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string,
 				msg = "The user has no such note: " + noteId
 				return
 			} else {
-				perm := "0";
+				perm := "0"
 				if registerSharedNotePerms[i] == 1 {
 					perm = "1"
 				}
@@ -298,7 +312,7 @@ func (this *ConfigService) getBackupDirname() string {
 }
 func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
 	binPath := configService.GetGlobalStringConfig("mongodumpPath")
-	config := revel.Config;
+	config := revel.Config
 	dbname, _ := config.String("db.dbname")
 	host, _ := revel.Config.String("db.host")
 	port, _ := revel.Config.String("db.port")
@@ -320,7 +334,7 @@ func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
 	}
 
 	cmd := exec.Command("/bin/sh", "-c", binPath)
-	Log(binPath);
+	Log(binPath)
 	b, err := cmd.Output()
 	if err != nil {
 		msg = fmt.Sprintf("%v", err)
@@ -332,6 +346,7 @@ func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
 	ok = configService.AddBackup(dir, remark)
 	return ok, msg
 }
+
 // 还原
 func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 	backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
@@ -339,7 +354,7 @@ func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 	var backup map[string]string
 	for i, backup = range backups {
 		if backup["createdTime"] == createdTime {
-			break;
+			break
 		}
 	}
 	if i == len(backups) {
@@ -347,14 +362,14 @@ func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 	}
 
 	// 先备份当前
-	ok, msg = this.Backup("Auto backup when restore from " + backup["createdTime"] )
+	ok, msg = this.Backup("Auto backup when restore from " + backup["createdTime"])
 	if !ok {
 		return
 	}
 
 	// mongorestore -h localhost -d leanote --directoryperdb /home/user1/gopackage/src/github.com/leanote/leanote/mongodb_backup/leanote_install_data/
 	binPath := configService.GetGlobalStringConfig("mongorestorePath")
-	config := revel.Config;
+	config := revel.Config
 	dbname, _ := config.String("db.dbname")
 	host, _ := revel.Config.String("db.host")
 	port, _ := revel.Config.String("db.port")
@@ -375,7 +390,7 @@ func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
 	binPath += " " + path
 
 	cmd := exec.Command("/bin/sh", "-c", binPath)
-	Log(binPath);
+	Log(binPath)
 	b, err := cmd.Output()
 	if err != nil {
 		msg = fmt.Sprintf("%v", err)
@@ -393,7 +408,7 @@ func (this *ConfigService) DeleteBackup(createdTime string) (bool, string) {
 	var backup map[string]string
 	for i, backup = range backups {
 		if backup["createdTime"] == createdTime {
-			break;
+			break
 		}
 	}
 	if i == len(backups) {
@@ -419,13 +434,13 @@ func (this *ConfigService) UpdateBackupRemark(createdTime, remark string) (bool,
 	var backup map[string]string
 	for i, backup = range backups {
 		if backup["createdTime"] == createdTime {
-			break;
+			break
 		}
 	}
 	if i == len(backups) {
 		return false, "Backup Not Found"
 	}
-	backup["remark"] = remark;
+	backup["remark"] = remark
 
 	ok := this.UpdateGlobalArrMapConfig(this.adminUserId, "backups", backups)
 	return ok, ""
@@ -438,7 +453,7 @@ func (this *ConfigService) GetBackup(createdTime string) (map[string]string, boo
 	var backup map[string]string
 	for i, backup = range backups {
 		if backup["createdTime"] == createdTime {
-			break;
+			break
 		}
 	}
 	if i == len(backups) {
@@ -455,12 +470,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,53 +487,51 @@ 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
+		}
 	})
 }
 
 func (this *ConfigService) GetSchema() string {
-	return schema;
+	return schema
 }
+
 // 默认
 func (this *ConfigService) GetDefaultDomain() string {
 	return defaultDomain
 }
-// 包含http://
+
-func (this *ConfigService) GetDefaultUrl() string {
-	return schema + defaultDomain
-}
 // note
 func (this *ConfigService) GetNoteDomain() string {
-	subDomain := this.GetGlobalStringConfig("noteSubDomain");
+	return "/note"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/note"
 }
 func (this *ConfigService) GetNoteUrl() string {
-	return schema + this.GetNoteDomain();
+	return this.GetNoteDomain()
 }
 
 // blog
 func (this *ConfigService) GetBlogDomain() string {
-	subDomain := this.GetGlobalStringConfig("blogSubDomain");
+	return "/blog"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/blog"
 }
 func (this *ConfigService) GetBlogUrl() string {
-	return schema + this.GetBlogDomain();
+	return this.GetBlogDomain()
 }
+
 // lea
 func (this *ConfigService) GetLeaDomain() string {
-	subDomain := this.GetGlobalStringConfig("leaSubDomain");
+	return "/lea"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/lea"
 }
 func (this *ConfigService) GetLeaUrl() string {
-	return schema + this.GetLeaDomain();
+	return schema + this.GetLeaDomain()
 }
 
 func (this *ConfigService) GetUserUrl(domain string) string {
@@ -529,6 +545,7 @@ func (this *ConfigService) GetUserSubUrl(subDomain string) string {
 func (this *ConfigService) AllowCustomDomain() bool {
 	return configService.GetGlobalStringConfig("allowCustomDomain") != ""
 }
+
 // 是否是好的自定义域名
 func (this *ConfigService) IsGoodCustomDomain(domain string) bool {
 	blacks := this.GetGlobalArrayConfig("blackCustomDomains")
@@ -553,20 +570,29 @@ func (this *ConfigService) IsGoodSubDomain(domain string) bool {
 // 上传大小
 func (this *ConfigService) GetUploadSize(key string) float64 {
 	f, _ := strconv.ParseFloat(this.GetGlobalStringConfig(key), 64)
-	return f;
+	return f
+}
+func (this *ConfigService) GetInt64(key string) int64 {
+	f, _ := strconv.ParseInt(this.GetGlobalStringConfig(key), 10, 64)
+	return f
+}
+func (this *ConfigService) GetInt32(key string) int32 {
+	f, _ := strconv.ParseInt(this.GetGlobalStringConfig(key), 10, 32)
+	return int32(f)
 }
 func (this *ConfigService) GetUploadSizeLimit() map[string]float64 {
 	return map[string]float64{
 		"uploadImageSize":    this.GetUploadSize("uploadImageSize"),
-		"uploadBlogLogoSize":this.GetUploadSize("uploadBlogLogoSize"),
+		"uploadBlogLogoSize": this.GetUploadSize("uploadBlogLogoSize"),
-		"uploadAttachSize":this.GetUploadSize("uploadAttachSize"),
+		"uploadAttachSize":   this.GetUploadSize("uploadAttachSize"),
-		"uploadAvatarSize":this.GetUploadSize("uploadAvatarSize"),
+		"uploadAvatarSize":   this.GetUploadSize("uploadAvatarSize"),
 	}
 }
+
 // 为用户得到全局的配置
 // NoteController调用
 func (this *ConfigService) GetGlobalConfigForUser() map[string]interface{} {
-	uploadSizeConfigs := this.GetUploadSizeLimit();
+	uploadSizeConfigs := this.GetUploadSizeLimit()
 	config := map[string]interface{}{}
 	for k, v := range uploadSizeConfigs {
 		config[k] = v
@@ -580,5 +606,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "1.0-beta.4"
+	return "2.4"
 }

app/service/EmailService.go

@@ -1,17 +1,19 @@
 package service
 
 import (
-	"github.com/leanote/leanote/app/info"
+	"crypto/tls"
+	"net"
+	"bytes"
+	"fmt"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-	"time"
+	"html/template"
-	"strings"
 	"net/smtp"
 	"strconv"
-	"fmt"
+	"strings"
-	"html/template"
+	"time"
-	"bytes"
 )
 
 // 发送邮件
@@ -20,7 +22,7 @@ type EmailService struct {
 	tpls map[string]*template.Template
 }
 
-func NewEmailService() (*EmailService) {
+func NewEmailService() *EmailService {
 	return &EmailService{tpls: map[string]*template.Template{}}
 }
 
@@ -29,12 +31,74 @@ var host = ""
 var emailPort = ""
 var username = ""
 var password = ""
+var ssl = false
 
 func InitEmailFromDb() {
 	host = configService.GetGlobalStringConfig("emailHost")
 	emailPort = configService.GetGlobalStringConfig("emailPort")
 	username = configService.GetGlobalStringConfig("emailUsername")
 	password = configService.GetGlobalStringConfig("emailPassword")
+	if configService.GetGlobalStringConfig("emailSSL") == "1" {
+		ssl = true
+	}
+}
+
+//return a smtp client
+func dial(addr string) (*smtp.Client, error) {
+    conn, err := tls.Dial("tcp", addr, nil)
+    if err != nil {
+        LogW("Dialing Error:", err)
+        return nil, err
+    }
+    //分解主机端口字符串
+    host, _, _ := net.SplitHostPort(addr)
+    return smtp.NewClient(conn, host)
+}
+ 
+func SendEmailWithSSL (auth smtp.Auth, to []string, msg []byte) (err error) {
+    //create smtp client
+    c, err := dial(host + ":" + emailPort)
+    if err != nil {
+        LogW("Create smpt client error:", err)
+        return err
+    }
+    defer c.Close()
+
+    if auth != nil {
+        if ok, _ := c.Extension("AUTH"); ok {
+            if err = c.Auth(auth); err != nil {
+                LogW("Error during AUTH", err)
+                return err
+            }
+        }
+    }
+ 
+    if err = c.Mail(username); err != nil {
+        return err
+    }
+ 
+    for _, addr := range to {
+        if err = c.Rcpt(addr); err != nil {
+            return err
+        }
+    }
+ 
+    w, err := c.Data()
+    if err != nil {
+        return err
+    }
+ 
+    _, err = w.Write(msg)
+    if err != nil {
+        return err
+    }
+ 
+    err = w.Close()
+    if err != nil {
+        return err
+    }
+ 
+    return c.Quit()
 }
 
 func (this *EmailService) SendEmail(to, subject, body string) (ok bool, e string) {
@@ -50,14 +114,21 @@ func (this *EmailService) SendEmail(to, subject, body string) (ok bool, e string
 
 	mailtype := "html"
 	if mailtype == "html" {
-		content_type = "Content-Type: text/"+ mailtype + "; charset=UTF-8"
+		content_type = "Content-Type: text/" + mailtype + "; charset=UTF-8"
-	} else{
+	} else {
 		content_type = "Content-Type: text/plain" + "; charset=UTF-8"
 	}
 
-	msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
+	msg := []byte("To: " + to + "\r\nFrom: " + username + "<" + username + ">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
 	send_to := strings.Split(to, ";")
-	err := smtp.SendMail(host+":"+emailPort, auth, username, send_to, msg)
+
+	var err error
+	if ssl {
+		err = SendEmailWithSSL(auth, send_to, msg)
+	} else {
+		Log("no ssl")
+		err = smtp.SendMail(host + ":" + emailPort, auth, username, send_to, msg)
+	}
 
 	if err != nil {
 		e = fmt.Sprint(err)
@@ -75,10 +146,10 @@ func (this *EmailService) RegisterSendActiveEmail(userInfo info.User, email stri
 		return false
 	}
 
-	subject := configService.GetGlobalStringConfig("emailTemplateRegisterSubject");
+	subject := configService.GetGlobalStringConfig("emailTemplateRegisterSubject")
-	tpl := configService.GetGlobalStringConfig("emailTemplateRegister");
+	tpl := configService.GetGlobalStringConfig("emailTemplateRegister")
 
-	if(tpl == "") {
+	if tpl == "" {
 		return false
 	}
 
@@ -118,8 +189,8 @@ func (this *EmailService) UpdateEmailSendActiveEmail(userInfo info.User, email s
 		return
 	}
 
-	subject := configService.GetGlobalStringConfig("emailTemplateUpdateEmailSubject");
+	subject := configService.GetGlobalStringConfig("emailTemplateUpdateEmailSubject")
-	tpl := configService.GetGlobalStringConfig("emailTemplateUpdateEmail");
+	tpl := configService.GetGlobalStringConfig("emailTemplateUpdateEmail")
 
 	// 发送邮件
 	tokenUrl := configService.GetSiteUrl() + "/user/updateEmail?token=" + token
@@ -144,8 +215,8 @@ func (this *EmailService) UpdateEmailSendActiveEmail(userInfo info.User, email s
 }
 
 func (this *EmailService) FindPwdSendEmail(token, email string) (ok bool, msg string) {
-	subject := configService.GetGlobalStringConfig("emailTemplateFindPasswordSubject");
+	subject := configService.GetGlobalStringConfig("emailTemplateFindPasswordSubject")
-	tpl := configService.GetGlobalStringConfig("emailTemplateFindPassword");
+	tpl := configService.GetGlobalStringConfig("emailTemplateFindPassword")
 
 	// 发送邮件
 	tokenUrl := configService.GetSiteUrl() + "/findPassword/" + token
@@ -164,8 +235,8 @@ func (this *EmailService) FindPwdSendEmail(token, email string) (ok bool, msg st
 
 // 发送邀请链接
 func (this *EmailService) SendInviteEmail(userInfo info.User, email, content string) bool {
-	subject := configService.GetGlobalStringConfig("emailTemplateInviteSubject");
+	subject := configService.GetGlobalStringConfig("emailTemplateInviteSubject")
-	tpl := configService.GetGlobalStringConfig("emailTemplateInvite");
+	tpl := configService.GetGlobalStringConfig("emailTemplateInvite")
 
 	token2Value := map[string]interface{}{"siteUrl": configService.GetSiteUrl(),
 		"registerUrl": configService.GetSiteUrl() + "/register?from=" + userInfo.Username,
@@ -187,8 +258,8 @@ func (this *EmailService) SendInviteEmail(userInfo info.User, email, content str
 
 // 发送评论
 func (this *EmailService) SendCommentEmail(note info.Note, comment info.BlogComment, userId, content string) bool {
-	subject := configService.GetGlobalStringConfig("emailTemplateCommentSubject");
+	subject := configService.GetGlobalStringConfig("emailTemplateCommentSubject")
-	tpl := configService.GetGlobalStringConfig("emailTemplateComment");
+	tpl := configService.GetGlobalStringConfig("emailTemplateComment")
 
 	// title := "评论提醒"
 
@@ -257,17 +328,16 @@ func (this *EmailService) SendCommentEmail(note info.Note, comment info.BlogComm
 	return ok
 }
 
-
 // 验证模板是否正确
-func (this *EmailService) ValidTpl(str string) (ok bool, msg string){
+func (this *EmailService) ValidTpl(str string) (ok bool, msg string) {
 	defer func() {
 		if err := recover(); err != nil {
 			ok = false
 			msg = fmt.Sprint(err)
 		}
-	}();
+	}()
-	header := configService.GetGlobalStringConfig("emailTemplateHeader");
+	header := configService.GetGlobalStringConfig("emailTemplateHeader")
-	footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+	footer := configService.GetGlobalStringConfig("emailTemplateFooter")
 	str = strings.Replace(str, "{{header}}", header, -1)
 	str = strings.Replace(str, "{{footer}}", footer, -1)
 	_, err := template.New("tpl name").Parse(str)
@@ -280,13 +350,13 @@ func (this *EmailService) ValidTpl(str string) (ok bool, msg string){
 }
 
 // ok, msg, subject, tpl
-func (this *EmailService) getTpl(str string) (ok bool, msg string, tpl *template.Template){
+func (this *EmailService) getTpl(str string) (ok bool, msg string, tpl *template.Template) {
 	defer func() {
 		if err := recover(); err != nil {
 			ok = false
 			msg = fmt.Sprint(err)
 		}
-	}();
+	}()
 
 	var err error
 	var has bool
@@ -312,16 +382,16 @@ func (this *EmailService) renderEmail(subject, body string, values map[string]in
 			ok = false
 			msg = fmt.Sprint(err) // 这里的err其实就是panic传入的内容，
 		}
-	}();
+	}()
 
 	var tpl *template.Template
 
-	values["siteUrl"] = configService.GetSiteUrl();
+	values["siteUrl"] = configService.GetSiteUrl()
 
 	// subject
 	if subject != "" {
 		ok, msg, tpl = this.getTpl(subject)
-		if(!ok) {
+		if !ok {
 			return
 		}
 		var buffer bytes.Buffer
@@ -336,13 +406,13 @@ func (this *EmailService) renderEmail(subject, body string, values map[string]in
 	}
 
 	// content
-    header := configService.GetGlobalStringConfig("emailTemplateHeader");
+	header := configService.GetGlobalStringConfig("emailTemplateHeader")
-	footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+	footer := configService.GetGlobalStringConfig("emailTemplateFooter")
 	body = strings.Replace(body, "{{header}}", header, -1)
 	body = strings.Replace(body, "{{footer}}", footer, -1)
 	values["subject"] = o
 	ok, msg, tpl = this.getTpl(body)
-	if(!ok) {
+	if !ok {
 		return
 	}
 	var buffer2 bytes.Buffer
@@ -359,14 +429,14 @@ func (this *EmailService) renderEmail(subject, body string, values map[string]in
 // 发送email给用户
 // 需要记录
 func (this *EmailService) SendEmailToUsers(users []info.User, subject, body string) (ok bool, msg string) {
-	if(users == nil || len(users) == 0) {
+	if users == nil || len(users) == 0 {
 		msg = "no users"
 		return
 	}
 
 	// 尝试renderHtml
 	ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
-	if(!ok) {
+	if !ok {
 		Log(msg)
 		return
 	}
@@ -381,8 +451,8 @@ func (this *EmailService) SendEmailToUsers(users []info.User, subject, body stri
 			ok2, msg2, subject2, body2 := this.renderEmail(subject, body, m)
 			ok = ok2
 			msg = msg2
-			if(ok2) {
+			if ok2 {
-				sendOk, msg := this.SendEmail(user.Email, subject2, body2);
+				sendOk, msg := this.SendEmail(user.Email, subject2, body2)
 				this.AddEmailLog(user.Email, subject, body, sendOk, msg) // 把模板记录下
 				// 记录到Email Log
 				if sendOk {
@@ -400,19 +470,19 @@ func (this *EmailService) SendEmailToUsers(users []info.User, subject, body stri
 }
 
 func (this *EmailService) SendEmailToEmails(emails []string, subject, body string) (ok bool, msg string) {
-	if(emails == nil || len(emails) == 0) {
+	if emails == nil || len(emails) == 0 {
 		msg = "no emails"
 		return
 	}
 
 	// 尝试renderHtml
 	ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
-	if(!ok) {
+	if !ok {
 		Log(msg)
 		return
 	}
 
-//	go func() {
+	//	go func() {
 	for _, email := range emails {
 		if email == "" {
 			continue
@@ -420,8 +490,8 @@ func (this *EmailService) SendEmailToEmails(emails []string, subject, body strin
 		m := map[string]interface{}{}
 		m["email"] = email
 		ok, msg, subject, body = this.renderEmail(subject, body, m)
-			if(ok) {
+		if ok {
-				sendOk, msg := this.SendEmail(email, subject, body);
+			sendOk, msg := this.SendEmail(email, subject, body)
 			this.AddEmailLog(email, subject, body, sendOk, msg)
 			// 记录到Email Log
 			if sendOk {
@@ -430,10 +500,10 @@ func (this *EmailService) SendEmailToEmails(emails []string, subject, body strin
 				Log("no " + email)
 			}
 		} else {
-				Log(msg);
+			Log(msg)
 		}
 	}
-//	}()
+	//	}()
 
 	return
 }
@@ -443,6 +513,7 @@ func (this *EmailService) AddEmailLog(email, subject, body string, ok bool, msg
 	log := info.EmailLog{LogId: bson.NewObjectId(), Email: email, Subject: subject, Body: body, Ok: ok, Msg: msg, CreatedTime: time.Now()}
 	db.Insert(db.EmailLogs, log)
 }
+
 // 展示邮件日志
 
 func (this *EmailService) DeleteEmails(ids []string) bool {
@@ -461,7 +532,7 @@ func (this *EmailService) ListEmailLogs(pageNumber, pageSize int, sortField stri
 	if email != "" {
 		query["Email"] = bson.M{"$regex": bson.RegEx{".*?" + email + ".*", "i"}}
 	}
-	q := db.EmailLogs.Find(query);
+	q := db.EmailLogs.Find(query)
 	// 总记录数
 	count, _ := q.Count()
 	// 列表

app/service/FileService.go

@@ -1,14 +1,18 @@
 package service
 
 import (
+	"encoding/base64"
+	"fmt"
+	"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"
+	"io/ioutil"
+	"net/http"
 	"os"
 	"strings"
+	"time"
 )
 
 const DEFAULT_ALBUM_ID = "52d3e8ac99c37b7f0d000001"
@@ -39,7 +43,7 @@ func (this *FileService) ListImagesWithPage(userId, albumId, key string, pageNum
 
 	q := bson.M{"UserId": bson.ObjectIdHex(userId), "Type": ""} // life
 	if albumId != "" {
-		q["AlbumId"] = bson.ObjectIdHex(albumId);
+		q["AlbumId"] = bson.ObjectIdHex(albumId)
 	} else {
 		q["IsDefaultAlbum"] = true
 	}
@@ -47,9 +51,9 @@ func (this *FileService) ListImagesWithPage(userId, albumId, key string, pageNum
 		q["Title"] = bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}
 	}
 
-//	LogJ(q)
+	//	LogJ(q)
 
-	count := db.Count(db.Files, q);
+	count := db.Count(db.Files, q)
 
 	db.Files.
 		Find(q).
@@ -88,7 +92,7 @@ func (this *FileService) DeleteImage(userId, fileId string) (bool, string) {
 	file := info.File{}
 	db.GetByIdAndUserId(db.Files, fileId, userId, &file)
 
-	if(file.FileId != "") {
+	if file.FileId != "" {
 		if db.DeleteByIdAndUserId(db.Files, fileId, userId) {
 			// delete image
 			// TODO
@@ -115,6 +119,53 @@ func (this *FileService) UpdateImage(userId, fileId, title string) bool {
 	return db.UpdateByIdAndUserIdField(db.Files, fileId, userId, "Title", title)
 }
 
+func (this *FileService) GetFileBase64(userId, fileId string) (str string, mine string) {
+	defer func() { // 必须要先声明defer，否则不能捕获到panic异常
+		if err := recover(); err != nil {
+			fmt.Println(err) // 这里的err其实就是panic传入的内容，55
+		}
+	}()
+
+	path := this.GetFile(userId, fileId)
+
+	if path == "" {
+		return "", ""
+	}
+
+	path = revel.BasePath + "/" + strings.TrimLeft(path, "/")
+
+	ff, err := ioutil.ReadFile(path)
+	if err != nil {
+		return "", ""
+	}
+
+	e64 := base64.StdEncoding
+	maxEncLen := e64.EncodedLen(len(ff))
+	encBuf := make([]byte, maxEncLen)
+
+	e64.Encode(encBuf, ff)
+
+	mime := http.DetectContentType(ff)
+
+	str = string(encBuf)
+	return str, mime
+}
+
+// 得到图片base64, 图片要在之前添加data:image/png;base64,
+func (this *FileService) GetImageBase64(userId, fileId string) string {
+
+	str, mime := this.GetFileBase64(userId, fileId)
+	if str == "" {
+		return ""
+	}
+	switch mime {
+	case "image/gif", "image/jpeg", "image/pjpeg", "image/png", "image/tiff":
+		return fmt.Sprintf("data:%s;base64,%s", mime, str)
+	default:
+	}
+	return "data:image/png;base64," + str
+}
+
 // 获取文件路径
 // 要判断是否具有权限
 // userId是否具有fileId的访问权限
@@ -152,7 +203,7 @@ func (this *FileService) GetFile(userId, fileId string) string {
 		for _, noteId := range noteIds {
 			note := noteService.GetNoteById(noteId.Hex())
 			if shareService.HasReadPerm(note.UserId.Hex(), userId, noteId.Hex()) {
-				return path;
+				return path
 			}
 		}
 		/*
@@ -191,17 +242,17 @@ func (this *FileService) GetFile(userId, fileId string) string {
 	return ""
 }
 
+// 复制共享的笔记时, 复制其中的图片到我本地
 // 复制图片
 func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, string) {
 	// 是否已经复制过了
 	file2 := info.File{}
 	db.GetByQ(db.Files, bson.M{"UserId": bson.ObjectIdHex(toUserId), "FromFileId": bson.ObjectIdHex(fileId)}, &file2)
 	if file2.FileId != "" {
-		return true, file2.FileId.Hex();
+		return true, file2.FileId.Hex()
 	}
 
 	// 复制之
-	
 	file := info.File{}
 	db.GetByIdAndUserId(db.Files, fileId, userId, &file)
 
@@ -210,18 +261,20 @@ func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, strin
 	}
 
 	_, ext := SplitFilename(file.Name)
-	newFilename := NewGuid() + ext
+	guid := NewGuid()
+	newFilename := guid + ext
 
-	dir := "files/" + toUserId + "/images"
+	// TODO 统一目录格式
+	// dir := "files/" + toUserId + "/images"
+	dir := "files/" + GetRandomFilePath(toUserId, guid) + "/images"
 	filePath := dir + "/" + newFilename
-	err := os.MkdirAll(dir, 0755)
+	err := os.MkdirAll(revel.BasePath+dir, 0755)
 	if err != nil {
 		return false, ""
 	}
 
-	_, err = CopyFile(revel.BasePath + "/" + file.Path, revel.BasePath + "/" + filePath)
+	_, err = CopyFile(revel.BasePath+"/"+file.Path, revel.BasePath+"/"+filePath)
 	if err != nil {
-		Log(err)
 		return false, ""
 	}
 
@@ -230,7 +283,7 @@ func (this *FileService) CopyImage(userId, fileId, toUserId string) (bool, strin
 		Path:       filePath,
 		Size:       file.Size,
 		FromFileId: file.FileId}
-	id := bson.NewObjectId();
+	id := bson.NewObjectId()
 	fileInfo.FileId = id
 	fileId = id.Hex()
 	Ok, _ := this.AddImage(fileInfo, "", toUserId, false)
@@ -245,7 +298,7 @@ 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 false
 	}
 	return db.Has(db.Files, bson.M{"UserId": bson.ObjectIdHex(userId), "_id": bson.ObjectIdHex(fileId)})
 }

app/service/GroupService.go

@@ -1,12 +1,12 @@
 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/info"
+	//	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
 	"time"
-//	"strings"
+	//	"strings"
 )
 
 // 用户组, 用户组用户管理
@@ -16,7 +16,7 @@ type GroupService struct {
 
 // 添加分组
 func (this *GroupService) AddGroup(userId, title string) (bool, info.Group) {
-	group := info.Group {
+	group := info.Group{
 		GroupId:     bson.NewObjectId(),
 		UserId:      bson.ObjectIdHex(userId),
 		Title:       title,
@@ -24,6 +24,7 @@ func (this *GroupService) AddGroup(userId, title string) (bool, info.Group) {
 	}
 	return db.Insert(db.Groups, group), group
 }
+
 // 删除分组
 // 判断是否有好友
 func (this *GroupService) DeleteGroup(userId, groupId string) (ok bool, msg string) {
@@ -32,21 +33,36 @@ 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)
 }
 
 // 得到用户的所有分组(包括下的所有用户)
-func (this *GroupService) GetGroupsAndUsers(userId string) ([]info.Group) {
+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())
@@ -54,41 +70,65 @@ func (this *GroupService) GetGroupsAndUsers(userId string) ([]info.Group) {
 	}
 	return groups
 }
+
 // 仅仅得到所有分组
-func (this *GroupService) GetGroups(userId string) ([]info.Group) {
+func (this *GroupService) GetGroups(userId string) []info.Group {
 	// 得到分组s
 	groups := []info.Group{}
 	db.ListByQ(db.Groups, bson.M{"UserId": bson.ObjectIdHex(userId)}, &groups)
 	return groups
 }
 
+// 得到我的和我所属组的ids
+func (this *GroupService) GetMineAndBelongToGroupIds(userId string) []bson.ObjectId {
+	// 所属组
+	groupIds := this.GetBelongToGroupIds(userId)
 
-// 获取包含此用户的组对象数组
+	m := map[bson.ObjectId]bool{}
-func (this *GroupService) GetGroupsContainOf(userId string) []info.Group {
+	for _, groupId := range groupIds {
-	groupIds := this.GetGroupIdsContainOf(userId)
+		m[groupId] = true
-	groups := []info.Group{}
-	db.ListByQ(db.Groups, bson.M{"_id": bson.M{"$in": groupIds}}, &groups)
-	return groups
-}
-
-// 获取包含此用户的组Id数组
-func (this *GroupService) GetGroupIdsContainOf(userId string) []bson.ObjectId {
-	groupUsers := []info.GroupUser{}
-	db.ListByQWithFields(db.GroupUsers, bson.M{"UserId": bson.ObjectIdHex(userId)}, []string{"GroupId"}, &groupUsers)
-	if len(groupUsers) == 0 {
-		return nil
 	}
 
-	groupIds := make([]bson.ObjectId, len(groupUsers))
+	// 我的组
-	for i, each := range groupUsers {
+	myGroups := this.GetGroups(userId)
-		groupIds[i] = each.GroupId
+
+	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) {
+func (this *GroupService) GetGroup(userId, groupId string) info.Group {
 	// 得到分组s
 	group := info.Group{}
 	db.GetByIdAndUserId(db.Groups, groupId, userId, &group)
@@ -96,7 +136,7 @@ func (this *GroupService) GetGroup(userId, groupId string) (info.Group) {
 }
 
 // 得到某分组下的用户
-func (this *GroupService) GetUsers(groupId string) ([]info.User) {
+func (this *GroupService) GetUsers(groupId string) []info.User {
 	// 得到UserIds
 	groupUsers := []info.GroupUser{}
 	db.ListByQWithFields(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId)}, []string{"UserId"}, &groupUsers)
@@ -112,7 +152,7 @@ func (this *GroupService) GetUsers(groupId string) ([]info.User) {
 }
 
 // 得到我所属的所有分组ids
-func (this *GroupService) GetBelongToGroupIds(userId string) ([]bson.ObjectId) {
+func (this *GroupService) GetBelongToGroupIds(userId string) []bson.ObjectId {
 	// 得到UserIds
 	groupUsers := []info.GroupUser{}
 	db.ListByQWithFields(db.GroupUsers, bson.M{"UserId": bson.ObjectIdHex(userId)}, []string{"GroupId"}, &groupUsers)
@@ -129,17 +169,32 @@ 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, "forbiddenNotMyGroup"
+		}
+	*/
 	if !this.isMyGroup(ownUserId, groupId) {
-		return false, "forbidden"
+		return false, "forbiddenNotMyGroup"
 	}
 
 	// 是否已存在
 	if db.Has(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(userId)}) {
-		return false, "hasUsers"
+		return false, "userExistsInGroup"
 	}
 
 	return db.Insert(db.GroupUsers, info.GroupUser{
@@ -149,16 +204,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.isMyGroup(ownUserId, groupId) {
+	/*
-		return false, "forbidden"
+		if !this.IsExistsGroupUser(ownUserId, groupId) {
+			return false, "forbiddenNotMyGroup"
 		}
+	*/
+	if !this.isMyGroup(ownUserId, groupId) {
+		return false, "forbiddenNotMyGroup"
+	}
+
+	// 删除该用户分享到本组的笔记本, 笔记
+	shareService.DeleteShareNotebookGroupWhenDeleteGroupUser(userId, groupId)
+	shareService.DeleteShareNoteGroupWhenDeleteGroupUser(userId, groupId)
+
 	return db.Delete(db.GroupUsers, bson.M{"GroupId": bson.ObjectIdHex(groupId), "UserId": bson.ObjectIdHex(userId)}), ""
 }
-
-// 判断组中是否包含指定用户
-func (this *GroupService) IsExistsGroupUser(userId, groupId string) (ok bool) {
-	return db.Has(db.GroupUsers, bson.M{"UserId": bson.ObjectIdHex(userId), "GroupId": bson.ObjectIdHex(groupId)})
-}

app/service/NoteContentHistoryService.go

@@ -1,11 +1,11 @@
 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/info"
+	//	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-//	"time"
+	//	"time"
 )
 
 // 历史记录

app/service/NoteImageService.go

@@ -1,19 +1,19 @@
 package service
 
 import (
-	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
 	"regexp"
-//	"time"
+	//	"time"
 )
 
 type NoteImageService struct {
 }
 
 // 通过id, userId得到noteIds
-func (this *NoteImageService) GetNoteIds(imageId string) ([]bson.ObjectId) {
+func (this *NoteImageService) GetNoteIds(imageId string) []bson.ObjectId {
 	noteImages := []info.NoteImage{}
 	db.ListByQWithFields(db.NoteImages, bson.M{"ImageId": bson.ObjectIdHex(imageId)}, []string{"NoteId"}, &noteImages)
 
@@ -73,17 +73,13 @@ func (this *NoteImageService) UpdateNoteImages(userId, noteId, imgSrc, content s
 
 // 复制图片, 把note的图片都copy给我, 且修改noteContent图片路径
 func (this *NoteImageService) CopyNoteImages(fromNoteId, fromUserId, newNoteId, content, toUserId string) string {
+	/* 弃用之
 	// 得到fromNoteId的noteImages, 如果为空, 则直接返回content
 	noteImages := []info.NoteImage{}
 	db.ListByQWithFields(db.NoteImages, bson.M{"NoteId": bson.ObjectIdHex(fromNoteId)}, []string{"ImageId"}, &noteImages)
-	
 	if len(noteImages) == 0 {
 		return content;
 	}
-	
-	// <img src="/file/outputImage?fileId=12323232" />
-	// 把fileId=1232替换成新的
-	replaceMap := map[string]string{}
 	for _, noteImage := range noteImages {
 		imageId := noteImage.ImageId.Hex()
 		ok, newImageId := fileService.CopyImage(fromUserId, imageId, toUserId)
@@ -91,21 +87,45 @@ func (this *NoteImageService) CopyNoteImages(fromNoteId, fromUserId, newNoteId,
 			replaceMap[imageId] = newImageId
 		}
 	}
+	*/
 
-	if len(replaceMap) > 0 {
+	// 因为很多图片上传就会删除, 所以直接从内容中查看图片id进行复制
-		// 替换之
+
-		reg, _ := regexp.Compile("outputImage\\?fileId=([a-z0-9A-Z]{24})")
+	// <img src="/file/outputImage?fileId=12323232" />
+	// 把fileId=1232替换成新的
+	replaceMap := map[string]string{}
+
+	reg, _ := regexp.Compile("(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})")
 	content = reg.ReplaceAllStringFunc(content, func(each string) string {
-			// each=outputImage?fileId=541bd2f599c37b4f3r000003
+		// each = outputImage?fileId=541bd2f599c37b4f3r000003
+		// each = getImage?fileId=541bd2f599c37b4f3r000003
+
 		fileId := each[len(each)-24:] // 得到后24位, 也即id
-			if replaceFileId, ok := replaceMap[fileId]; ok {
+
+		if _, ok := replaceMap[fileId]; !ok {
+			if bson.IsObjectIdHex(fileId) {
+				ok2, newImageId := fileService.CopyImage(fromUserId, fileId, toUserId)
+				if ok2 {
+					replaceMap[fileId] = newImageId
+				} else {
+					replaceMap[fileId] = ""
+				}
+			} else {
+				replaceMap[fileId] = ""
+			}
+		}
+
+		replaceFileId := replaceMap[fileId]
+		if replaceFileId != "" {
+			if each[0] == 'o' {
 				return "outputImage?fileId=" + replaceFileId
 			}
-			return each
+			return "getImage?fileId=" + replaceFileId
-		});
 		}
+		return each
+	})
 
-	return content;
+	return content
 }
 
 //

app/service/NoteService.go

@@ -1,10 +1,12 @@
 package service
 
 import (
-	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
+	"regexp"
+	"strings"
 	"time"
 )
 
@@ -17,19 +19,35 @@ func (this *NoteService) GetNote(noteId, userId string) (note info.Note) {
 	db.GetByIdAndUserId(db.Notes, noteId, userId, &note)
 	return
 }
+
 // fileService调用
+// 不能是已经删除了的, life bug, 客户端删除后, 竟然还能在web上打开
 func (this *NoteService) GetNoteById(noteId string) (note info.Note) {
 	note = info.Note{}
-	db.Get(db.Notes, noteId, &note)
+	if noteId == "" {
+		return
+	}
+	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsDeleted": false}, &note)
 	return
 }
+func (this *NoteService) GetNoteByIdAndUserId(noteId, userId string) (note info.Note) {
+	note = info.Note{}
+	if noteId == "" || userId == "" {
+		return
+	}
+	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "UserId": bson.ObjectIdHex(userId), "IsDeleted": false}, &note)
+	return
+}
+
 // 得到blog, blogService用
 // 不要传userId, 因为是公开的
 func (this *NoteService) GetBlogNote(noteId string) (note info.Note) {
 	note = info.Note{}
-	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsBlog": true, "IsTrash": false}, &note)
+	db.GetByQ(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId),
+		"IsBlog": true, "IsTrash": false, "IsDeleted": false}, &note)
 	return
 }
+
 // 通过id, userId得到noteContent
 func (this *NoteService) GetNoteContent(noteContentId, userId string) (noteContent info.NoteContent) {
 	noteContent = info.NoteContent{}
@@ -44,6 +62,35 @@ func (this *NoteService) GetNoteAndContent(noteId, userId string) (noteAndConten
 	return info.NoteAndContent{note, noteContent}
 }
 
+func (this *NoteService) GetNoteBySrc(src, userId string) (note info.Note) {
+	note = info.Note{}
+	if src == "" {
+		return
+	}
+
+	notes := []info.Note{}
+	q := db.Notes.Find(bson.M{
+		"UserId": bson.ObjectIdHex(userId),
+		"Src":    src,
+	})
+	q.Sort("-Usn").Limit(1).All(&notes)
+	if len(notes) > 0 {
+		return notes[0]
+	}
+	// db.GetByQ(db.Notes, bson.M{"Src": src, "UserId": bson.ObjectIdHex(userId), "IsDeleted": false}, &note)
+	return
+}
+
+func (this *NoteService) GetNoteAndContentBySrc(src, userId string) (noteId string, noteAndContent info.NoteAndContentSep) {
+	note := this.GetNoteBySrc(src, userId)
+	if (note.NoteId != "") {
+		noteId = note.NoteId.Hex()
+		noteContent := this.GetNoteContent(note.NoteId.Hex(), userId)
+		return noteId, info.NoteAndContentSep{note, noteContent}
+	}
+	return
+}
+
 // 获取同步的笔记
 // > afterUsn的笔记
 func (this *NoteService) GetSyncNotes(userId string, afterUsn, maxEntry int) []info.ApiNote {
@@ -51,7 +98,7 @@ func (this *NoteService) GetSyncNotes(userId string, afterUsn, maxEntry int) []i
 	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)
@@ -62,7 +109,7 @@ func (this *NoteService) ToApiNotes(notes []info.Note) []info.ApiNote {
 	// 2, 得到所有图片, 附件信息
 	// 查images表, attachs表
 	if len(notes) > 0 {
-		noteIds := make([]bson.ObjectId, len(notes));
+		noteIds := make([]bson.ObjectId, len(notes))
 		for i, note := range notes {
 			noteIds[i] = note.NoteId
 		}
@@ -79,23 +126,22 @@ func (this *NoteService) ToApiNotes(notes []info.Note) []info.ApiNote {
 	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(),
+		UserId:      note.UserId.Hex(),
-		Title      : note.Title,
+		Title:       note.Title,
-		Tags       : note.Tags,
+		Tags:        note.Tags,
-		IsMarkdown : note.IsMarkdown,
+		IsMarkdown:  note.IsMarkdown,
-		IsBlog    : note.IsBlog,
+		IsBlog:      note.IsBlog,
-		IsTrash : note.IsTrash,
+		IsTrash:     note.IsTrash,
-		IsDeleted : note.IsDeleted,
+		IsDeleted:   note.IsDeleted,
-		Usn : note.Usn,
+		Usn:         note.Usn,
-		CreatedTime : note.CreatedTime,
+		CreatedTime: note.CreatedTime,
-		UpdatedTime : note.UpdatedTime,
+		UpdatedTime: note.UpdatedTime,
-		PublicTime : note.PublicTime,
+		PublicTime:  note.PublicTime,
 		Files:       files,
 	}
 	return apiNote
@@ -108,7 +154,7 @@ func (this *NoteService) ToApiNote(note *info.Note, files []info.NoteFile) info.
 // 查images表, attachs表
 // [待测]
 func (this *NoteService) getFiles(noteIds []bson.ObjectId) map[string][]info.NoteFile {
-	noteImages := noteImageService.getImagesByNoteIds(noteIds);
+	noteImages := noteImageService.getImagesByNoteIds(noteIds)
 	noteAttachs := attachService.getAttachsByNoteIds(noteIds)
 
 	noteFilesMap := map[string][]info.NoteFile{}
@@ -122,7 +168,7 @@ func (this *NoteService) getFiles(noteIds []bson.ObjectId) map[string][]info.Not
 				noteFiles = append(noteFiles, info.NoteFile{
 					FileId: image.FileId.Hex(),
 					Type:   image.Type,
-				});
+				})
 			}
 		}
 
@@ -134,7 +180,7 @@ func (this *NoteService) getFiles(noteIds []bson.ObjectId) map[string][]info.Not
 					Type:     attach.Type,
 					Title:    attach.Title,
 					IsAttach: true,
-				});
+				})
 			}
 		}
 
@@ -160,7 +206,7 @@ func (this *NoteService) ListNotes(userId, notebookId string,
 		query["NotebookId"] = bson.ObjectIdHex(notebookId)
 	}
 
-	q := db.Notes.Find(query);
+	q := db.Notes.Find(query)
 
 	// 总记录数
 	count, _ = q.Count()
@@ -188,6 +234,7 @@ func (this *NoteService) ListNotesByNoteIdsWithPageSort(noteIds []bson.ObjectId,
 		All(&notes)
 	return
 }
+
 // shareService调用
 func (this *NoteService) ListNotesByNoteIds(noteIds []bson.ObjectId) (notes []info.Note) {
 	notes = []info.Note{}
@@ -197,6 +244,7 @@ func (this *NoteService) ListNotesByNoteIds(noteIds []bson.ObjectId) (notes []in
 		All(&notes)
 	return
 }
+
 // blog需要
 func (this *NoteService) ListNoteContentsByNoteIds(noteIds []bson.ObjectId) (notes []info.NoteContent) {
 	notes = []info.NoteContent{}
@@ -206,6 +254,7 @@ func (this *NoteService) ListNoteContentsByNoteIds(noteIds []bson.ObjectId) (not
 		All(&notes)
 	return
 }
+
 // 只得到abstract, 不需要content
 func (this *NoteService) ListNoteAbstractsByNoteIds(noteIds []bson.ObjectId) (notes []info.NoteContent) {
 	notes = []info.NoteContent{}
@@ -223,28 +272,30 @@ func (this *NoteService) ListNoteContentByNoteIds(noteIds []bson.ObjectId) (note
 // [ok]
 
 func (this *NoteService) AddNote(note info.Note, fromApi bool) info.Note {
-	if(note.NoteId.Hex() == "") {
+	if note.NoteId.Hex() == "" {
-		noteId := bson.NewObjectId();
+		noteId := bson.NewObjectId()
-		note.NoteId = noteId;
+		note.NoteId = noteId
 	}
-	note.CreatedTime = time.Now()
+
-	note.UpdatedTime = note.CreatedTime
+	// 关于创建时间, 可能是客户端发来, 此时判断时间是否有
+	note.CreatedTime = FixUrlTime(note.CreatedTime)
+	note.UpdatedTime = FixUrlTime(note.UpdatedTime)
+
 	note.IsTrash = false
 	note.UpdatedUserId = note.UserId
-	note.UrlTitle = GetUrTitle(note.UserId.Hex(), note.Title, "note")
+	note.UrlTitle = GetUrTitle(note.UserId.Hex(), note.Title, "note", note.NoteId.Hex())
 	note.Usn = userService.IncrUsn(note.UserId.Hex())
 
 	notebookId := note.NotebookId.Hex()
 
 	// api会传IsBlog, web不会传
 	if !fromApi {
-		note.PublicTime = note.UpdatedTime
 		// 设为blog
 		note.IsBlog = notebookService.IsBlog(notebookId)
 	}
-//	if note.IsBlog {
+	//	if note.IsBlog {
 	note.PublicTime = note.UpdatedTime
-//	}
+	//	}
 
 	db.Insert(db.Notes, note)
 
@@ -267,19 +318,20 @@ func (this *NoteService) AddSharedNote(note info.Note, myUserId bson.ObjectId) i
 	return info.Note{}
 }
 
-
 // 添加笔记本内容
 // [ok]
 func (this *NoteService) AddNoteContent(noteContent info.NoteContent) info.NoteContent {
-	noteContent.CreatedTime = time.Now()
+
-	noteContent.UpdatedTime = noteContent.CreatedTime 
+	noteContent.CreatedTime = FixUrlTime(noteContent.CreatedTime)
+	noteContent.UpdatedTime = FixUrlTime(noteContent.UpdatedTime)
+
 	noteContent.UpdatedUserId = noteContent.UserId
 	db.Insert(db.NoteContents, noteContent)
 
 	// 更新笔记图片
 	noteImageService.UpdateNoteImages(noteContent.UserId.Hex(), noteContent.NoteId.Hex(), "", noteContent.Content)
 
-	return noteContent;
+	return noteContent
 }
 
 // API, abstract, desc需要这里获取
@@ -336,10 +388,10 @@ func (this *NoteService) AddNoteAndContentForController(note info.Note, noteCont
 			Log("HAS AUTH -----------")
 		}
 	}
-	return this.AddNoteAndContent(note, noteContent, bson.ObjectIdHex(updatedUserId));
+	return this.AddNoteAndContent(note, noteContent, bson.ObjectIdHex(updatedUserId))
 }
 func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.NoteContent, myUserId bson.ObjectId) info.Note {
-	if(note.NoteId.Hex() == "") {
+	if note.NoteId.Hex() == "" {
 		noteId := bson.NewObjectId()
 		note.NoteId = noteId
 	}
@@ -356,7 +408,7 @@ func (this *NoteService) AddNoteAndContent(note info.Note, noteContent info.Note
 }
 
 func (this *NoteService) AddNoteAndContentApi(note info.Note, noteContent info.NoteContent, myUserId bson.ObjectId) info.Note {
-	if(note.NoteId.Hex() == "") {
+	if note.NoteId.Hex() == "" {
 		noteId := bson.NewObjectId()
 		note.NoteId = noteId
 	}
@@ -392,9 +444,15 @@ func (this *NoteService) UpdateNote(updatedUserId, noteId string, needUpdate bso
 		}
 	}
 
+	/*
+	// 这里不再判断, 因为controller已经判断了, 删除附件会新增, 所以不用判断
 	if usn > 0 && note.Usn != usn {
+		Log("有冲突!!")
+		Log(note.Usn)
+		Log(usn)
 		return false, "conflict", 0
 	}
+	*/
 
 	// 是否已自定义
 	if note.IsBlog && note.HasSelfDefined {
@@ -402,36 +460,60 @@ func (this *NoteService) UpdateNote(updatedUserId, noteId string, needUpdate bso
 		delete(needUpdate, "Desc")
 	}
 
-	needUpdate["UpdatedUserId"] = bson.ObjectIdHex(updatedUserId);
+	needUpdate["UpdatedUserId"] = bson.ObjectIdHex(updatedUserId)
-	needUpdate["UpdatedTime"] = time.Now();
+
-	afterUsn := userService.IncrUsn(userId);
+	// 可以将时间传过来
+	updatedTime, ok := needUpdate["UpdatedTime"].(time.Time)
+	if ok {
+		needUpdate["UpdatedTime"] = FixUrlTime(updatedTime)
+	} else {
+		needUpdate["UpdatedTime"] = time.Now()
+	}
+
+	afterUsn := userService.IncrUsn(userId)
 	needUpdate["Usn"] = afterUsn
 
-	// 添加tag2
+	needRecountTags := false
-	// TODO 这个tag去掉, 添加tag另外添加, 不要这个
-	if tags, ok := needUpdate["Tags"]; ok {
-		tagService.AddTagsI(userId, tags)
-	}
 
 	// 是否修改了isBlog
 	// 也要修改noteContents的IsBlog
 	if isBlog, ok := needUpdate["IsBlog"]; ok {
 		isBlog2 := isBlog.(bool)
 		if note.IsBlog != isBlog2 {
-			db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, bson.M{"IsBlog": isBlog2})
+			this.UpdateNoteContentIsBlog(noteId, userId, isBlog2)
 
 			// 重新发布成博客
 			if !note.IsBlog {
 				needUpdate["PublicTime"] = needUpdate["UpdatedTime"]
 			}
+
+			needRecountTags = true
 		}
 	}
 
-	ok := db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, needUpdate)
+	// 添加tag2
+	// TODO 这个tag去掉, 添加tag另外添加, 不要这个
+	if tags, ok := needUpdate["Tags"]; ok {
+		tagService.AddTagsI(userId, tags)
+
+		// 如果是博客, 标签改了, 那么重新计算
+		if note.IsBlog {
+			needRecountTags = true
+		}
+	}
+
+	ok = db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, needUpdate)
 	if !ok {
 		return ok, "", 0
 	}
 
+	if needRecountTags {
+		// 重新计算tags
+		go (func() {
+			blogService.ReCountBlogTags(userId)
+		})()
+	}
+
 	// 重新获取之
 	note = this.GetNoteById(noteId)
 
@@ -444,14 +526,19 @@ func (this *NoteService) UpdateNote(updatedUserId, noteId string, needUpdate bso
 		notebookId := notebookIdI.(bson.ObjectId)
 		if notebookId != "" {
 			notebookService.ReCountNotebookNumberNotes(note.NotebookId.Hex())
-			hasRecount = true
 			notebookService.ReCountNotebookNumberNotes(notebookId.Hex())
+			hasRecount = true
 		}
 	}
 
 	// 不要多次更新, isTrash = false, = true都要重新统计
+	if isTrashI, ok := needUpdate["IsTrash"]; ok {
+		// 如果是垃圾, 则删除之共享
+		isTrash := isTrashI.(bool)
+		if isTrash {
+			shareService.DeleteShareNoteAll(noteId, userId)
+		}
 		if !hasRecount {
-		if _, ok := needUpdate["IsTrash"]; ok {
 			notebookService.ReCountNotebookNumberNotes(note.NotebookId.Hex())
 		}
 	}
@@ -459,6 +546,11 @@ func (this *NoteService) UpdateNote(updatedUserId, noteId string, needUpdate bso
 	return true, "", afterUsn
 }
 
+// 当设置/取消了笔记为博客
+func (this *NoteService) UpdateNoteContentIsBlog(noteId, userId string, isBlog bool) {
+	db.UpdateByIdAndUserIdMap(db.NoteContents, noteId, userId, bson.M{"IsBlog": isBlog})
+}
+
 // 附件修改, 增加noteIncr
 func (this *NoteService) IncrNoteUsn(noteId, userId string) int {
 	afterUsn := userService.IncrUsn(userId)
@@ -486,7 +578,9 @@ func (this *NoteService) UpdateNoteTitle(userId, updatedUserId, noteId, title st
 // [ok] TODO perm未测
 // hasBeforeUpdateNote 之前是否更新过note其它信息, 如果有更新, usn不用更新
 // TODO abstract这里生成
-func (this *NoteService) UpdateNoteContent(updatedUserId, noteId, content, abstract string, hasBeforeUpdateNote bool, usn int) (bool, string, int) {
+func (this *NoteService) UpdateNoteContent(updatedUserId, noteId, content, abstract string,
+	hasBeforeUpdateNote bool,
+	usn int, updatedTime time.Time) (bool, string, int) {
 	// 是否已自定义
 	note := this.GetNoteById(noteId)
 	if note.NoteId == "" {
@@ -501,11 +595,13 @@ func (this *NoteService) UpdateNoteContent(updatedUserId, noteId, content, abstr
 		}
 	}
 
+	updatedTime = FixUrlTime(updatedTime)
+
 	// abstract重置
 	data := bson.M{"UpdatedUserId": bson.ObjectIdHex(updatedUserId),
 		"Content":     content,
 		"Abstract":    abstract,
-		"UpdatedTime": time.Now()}
+		"UpdatedTime": updatedTime}
 
 	if note.IsBlog && note.HasSelfDefined {
 		delete(data, "Abstract")
@@ -572,6 +668,8 @@ func (this *NoteService) ToBlog(userId, noteId string, isBlog, isTop bool) bool
 	ok := db.UpdateByIdAndUserIdMap(db.Notes, noteId, userId, noteUpdate)
 	// 重新计算tags
 	go (func() {
+		this.UpdateNoteContentIsBlog(noteId, userId, isBlog)
+
 		blogService.ReCountBlogTags(userId)
 	})()
 	return ok
@@ -604,7 +702,7 @@ func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
 			}
 		}
 
-		return this.GetNote(noteId, userId);
+		return this.GetNote(noteId, userId)
 	}
 	return info.Note{}
 }
@@ -624,10 +722,11 @@ func (this *NoteService) updateToNotebookBlog(noteId, notebookId, userId string)
 	}
 	return false
 }
+
 // 判断是否是blog
 func (this *NoteService) IsBlog(noteId string) bool {
 	note := info.Note{}
-	db.GetByQWithFields(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, []string{"IsBlog"}, &note);
+	db.GetByQWithFields(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, []string{"IsBlog"}, &note)
 	return note.IsBlog
 }
 
@@ -641,11 +740,11 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
 		noteContent := this.GetNoteContent(noteId, userId)
 
 		// 重新生成noteId
-		note.NoteId = bson.NewObjectId();
+		note.NoteId = bson.NewObjectId()
 		note.NotebookId = bson.ObjectIdHex(notebookId)
 
 		noteContent.NoteId = note.NoteId
-		this.AddNoteAndContent(note, noteContent, note.UserId);
+		note = this.AddNoteAndContent(note, noteContent, note.UserId)
 
 		// 更新blog状态
 		isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, userId)
@@ -664,10 +763,9 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
 // 复制别人的共享笔记给我
 // 将别人可用的图片转为我的图片, 复制图片
 func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId string) info.Note {
-	// Log(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId))
 	// 判断是否共享了给我
-	if notebookService.IsMyNotebook(notebookId, myUserId) && 
+	// Log(notebookService.IsMyNotebook(notebookId, myUserId))
-		(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId)) {
+	if notebookService.IsMyNotebook(notebookId, myUserId) && shareService.HasReadPerm(fromUserId, myUserId, noteId) {
 		note := this.GetNote(noteId, fromUserId)
 		if note.NoteId == "" {
 			return info.Note{}
@@ -675,7 +773,7 @@ func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId
 		noteContent := this.GetNoteContent(noteId, fromUserId)
 
 		// 重新生成noteId
-		note.NoteId = bson.NewObjectId();
+		note.NoteId = bson.NewObjectId()
 		note.NotebookId = bson.ObjectIdHex(notebookId)
 		note.UserId = bson.ObjectIdHex(myUserId)
 		note.IsTop = false
@@ -694,7 +792,7 @@ func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId
 		attachService.CopyAttachs(noteId, note.NoteId.Hex(), myUserId)
 
 		// 添加之
-		note = this.AddNoteAndContent(note, noteContent, note.UserId);
+		note = this.AddNoteAndContent(note, noteContent, note.UserId)
 
 		// 更新blog状态
 		isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, myUserId)
@@ -734,12 +832,13 @@ func (this *NoteService) SearchNote(key, userId string, pageNumber, pageSize int
 	// 不是trash的
 	query := bson.M{"UserId": bson.ObjectIdHex(userId),
 		"IsTrash":   false,
+		"IsDeleted": false, // 不能搜索已删除了的
 		"$or":       orQ,
 	}
 	if isBlog {
 		query["IsBlog"] = true
 	}
-	q := db.Notes.Find(query);
+	q := db.Notes.Find(query)
 
 	// 总记录数
 	count, _ = q.Count()
@@ -764,7 +863,11 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 		noteIds[i] = note.NoteId
 	}
 	noteContents := []info.NoteContent{}
-	query := bson.M{"_id": bson.M{"$nin": noteIds}, "UserId": bson.ObjectIdHex(userId), "Content": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}}}
+	query := bson.M{
+		"_id":     bson.M{"$nin": noteIds},
+		"UserId":  bson.ObjectIdHex(userId),
+		"Content": bson.M{"$regex": bson.RegEx{".*?" + key + ".*", "i"}},
+	}
 	if isBlog {
 		query["IsBlog"] = true
 	}
@@ -775,7 +878,7 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 		Select(bson.M{"_id": true}).
 		All(&noteContents)
 	var lenContent = len(noteContents)
-	if(lenContent == 0) {
+	if lenContent == 0 {
 		return notes
 	}
 
@@ -789,7 +892,13 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 	notes2 := this.ListNotesByNoteIds(noteIds2)
 
 	// 合并之
-	notes = append(notes, notes2...)
+	// 不能是删除的
+	for _, n := range notes2 {
+		if !n.IsDeleted && !n.IsTrash {
+			// notes = append(notes, notes2...)
+			notes = append(notes, n)
+		}
+	}
 	return notes
 }
 
@@ -804,7 +913,7 @@ func (this *NoteService) SearchNoteByTags(tags []string, userId string, pageNumb
 		"IsTrash": false,
 		"Tags":    bson.M{"$all": tags}}
 
-	q := db.Notes.Find(query);
+	q := db.Notes.Find(query)
 
 	// 总记录数
 	count, _ = q.Count()
@@ -819,14 +928,14 @@ func (this *NoteService) SearchNoteByTags(tags []string, userId string, pageNumb
 //------------
 // 统计
 func (this *NoteService) CountNote(userId string) int {
-	q := bson.M{"IsTrash": false}
+	q := bson.M{"IsTrash": false, "IsDeleted": false}
 	if userId != "" {
 		q["UserId"] = bson.ObjectIdHex(userId)
 	}
 	return db.Count(db.Notes, q)
 }
 func (this *NoteService) CountBlog(userId string) int {
-	q := bson.M{"IsBlog": true, "IsTrash": false}
+	q := bson.M{"IsBlog": true, "IsTrash": false, "IsDeleted": false}
 	if userId != "" {
 		q["UserId"] = bson.ObjectIdHex(userId)
 	}
@@ -839,7 +948,7 @@ func (this *NoteService) CountNoteByTag(userId string, tag string) int {
 		return 0
 	}
 	query := bson.M{"UserId": bson.ObjectIdHex(userId),
-//		"IsTrash": false, 
+		//		"IsTrash": false,
 		"IsDeleted": false,
 		"Tags":      bson.M{"$in": []string{tag}}}
 	return db.Count(db.Notes, query)
@@ -862,7 +971,7 @@ func (this *NoteService) UpdateNoteToDeleteTag(userId string, targetTag string)
 			if tag == targetTag {
 				tags = tags
 				tags = append(tags[:i], tags[i+1:]...)
-				break;
+				break
 			}
 		}
 		usn := userService.IncrUsn(userId)
@@ -871,3 +980,198 @@ func (this *NoteService) UpdateNoteToDeleteTag(userId string, targetTag string)
 	}
 	return ret
 }
+
+// api
+
+// 得到笔记的内容, 此时将笔记内的链接转成标准的Leanote Url
+// 将笔记的图片, 附件链接转换成 site.url/file/getImage?fileId=xxx,  site.url/file/getAttach?fileId=xxxx
+func (this *NoteService) FixContentBad(content string, isMarkdown bool) string {
+	baseUrl := configService.GetSiteUrl()
+
+	baseUrlPattern := baseUrl
+
+	// 避免https的url
+	if baseUrl[0:8] == "https://" {
+		baseUrlPattern = strings.Replace(baseUrl, "https://", "https*://", 1)
+	} else {
+		baseUrlPattern = strings.Replace(baseUrl, "http://", "https*://", 1)
+	}
+
+	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 {
+
+		if !isMarkdown {
+
+			// 富文本处理
+
+			// <img src="http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1">
+			// <a href="http://leanote.com/attach/download?attachId=5504243a38f4111dcb00017d"></a>
+
+			var reg *regexp.Regexp
+			if eachPattern["src"] == "src" {
+				reg, _ = regexp.Compile("<img(?:[^>]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`)
+			} else {
+				reg, _ = regexp.Compile("<a(?:[^>]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`)
+			}
+
+			finds := reg.FindAllStringSubmatch(content, -1) // 查找所有的
+
+			for _, eachFind := range finds {
+				if len(eachFind) == 3 {
+					// 这一行会非常慢!, content是全部的内容, 多次replace导致
+					content = strings.Replace(content,
+						eachFind[1],
+						eachPattern["src"]+"=\""+baseUrl+"/api/file/"+eachPattern["to"]+eachFind[2]+"\"",
+						1)
+				}
+			}
+		} else {
+
+			// 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 + `\[([^]]*?)\]\(` + baseUrlPattern + 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
+}
+
+// 得到笔记的内容, 此时将笔记内的链接转成标准的Leanote Url
+// 将笔记的图片, 附件链接转换成 site.url/file/getImage?fileId=xxx,  site.url/file/getAttach?fileId=xxxx
+// 性能更好, 5倍的差距
+func (this *NoteService) FixContent(content string, isMarkdown bool) string {
+	baseUrl := configService.GetSiteUrl()
+
+	baseUrlPattern := baseUrl
+
+	// 避免https的url
+	if baseUrl[0:8] == "https://" {
+		baseUrlPattern = strings.Replace(baseUrl, "https://", "https*://", 1)
+	} else {
+		baseUrlPattern = strings.Replace(baseUrl, "http://", "https*://", 1)
+	}
+	baseUrlPattern = "(?:" + baseUrlPattern + ")*"
+
+	Log(baseUrlPattern)
+
+	patterns := []map[string]string{
+		map[string]string{"src": "src", "middle": "/api/file/getImage", "param": "fileId", "to": "getImage?fileId="},
+		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": "/api/file/getAtach", "param": "fileId", "to": "getAttach?fileId="},
+
+		// 该链接已失效, 不再支持
+		// map[string]string{"src": "href", "middle": "/attach/downloadAll", "param": "noteId", "to": "getAllAttachs?noteId="},
+	}
+
+	for _, eachPattern := range patterns {
+
+		if !isMarkdown {
+
+			// 富文本处理
+
+			// <img src="http://leanote.com/file/outputImage?fileId=5503537b38f4111dcb0000d1">
+			// <a href="http://leanote.com/attach/download?attachId=5504243a38f4111dcb00017d"></a>
+
+			var reg *regexp.Regexp
+			var reg2 *regexp.Regexp
+			if eachPattern["src"] == "src" {
+				reg, _ = regexp.Compile("<img(?:[^>]+?)(?:" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=(?:[a-z0-9A-Z]{24})["']*)[^>]*>`)
+				reg2, _ = regexp.Compile("<img(?:[^>]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`)
+			} else {
+				reg, _ = regexp.Compile("<a(?:[^>]+?)(?:" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=(?:[a-z0-9A-Z]{24})["']*)[^>]*>`)
+				reg2, _ = regexp.Compile("<a(?:[^>]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`)
+			}
+
+			Log(reg2)
+
+			content = reg.ReplaceAllStringFunc(content, func(str string) string {
+				// str=这样的
+				// <img src="http://localhost:9000/file/outputImage?fileId=563d706e99c37b48e0000001" alt="" data-mce-src="http://localhost:9000/file/outputImage?fileId=563d706e99c37b48e0000002">
+
+				eachFind := reg2.FindStringSubmatch(str)
+				str = strings.Replace(str,
+					eachFind[1],
+					eachPattern["src"]+"=\""+baseUrl+"/api/file/"+eachPattern["to"]+eachFind[2]+"\"",
+					1)
+
+				// fmt.Println(str)
+				return str
+			})
+			/*
+				finds := reg.FindAllStringSubmatch(content, -1) // 查找所有的
+
+				for _, eachFind := range finds {
+					if len(eachFind) == 3 {
+						// 这一行会非常慢!, content是全部的内容, 多次replace导致
+						content = strings.Replace(content,
+							eachFind[1],
+							eachPattern["src"]+"=\""+baseUrl+"/api/file/"+eachPattern["to"]+eachFind[2]+"\"",
+							1)
+					}
+				}
+			*/
+		} else {
+
+			// 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 + `\[(?:[^]]*?)\]\(` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=(?:[a-z0-9A-Z]{24})\)`)
+			regImageMarkdown2, _ := regexp.Compile(pre + `\[([^]]*?)\]\(` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})\)`)
+
+			content = regImageMarkdown.ReplaceAllStringFunc(content, func(str string) string {
+				// str=这样的
+				// <img src="http://localhost:9000/file/outputImage?fileId=563d706e99c37b48e0000001" alt="" data-mce-src="http://localhost:9000/file/outputImage?fileId=563d706e99c37b48e0000002">
+
+				eachFind := regImageMarkdown2.FindStringSubmatch(str)
+				str = strings.Replace(str, eachFind[0], pre+"["+eachFind[1]+"]("+baseUrl+"/api/file/"+eachPattern["to"]+eachFind[2]+")", 1)
+
+				// fmt.Println(str)
+				return str
+			})
+
+			/*
+				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
+}

app/service/NotebookService.go

@@ -1,13 +1,15 @@
 package service
 
 import (
-//	"fmt"
+	//	"fmt"
-	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
 	"sort"
+	"strings"
 	"time"
+	//	"html"
 )
 
 // 笔记本
@@ -41,6 +43,8 @@ func ParseAndSortNotebooks(userNotebooks []info.Notebook, noParentDelete, needSo
 		newNotebooks := info.Notebooks{Subs: info.SubNotebooks{}}
 		newNotebooks.NotebookId = each.NotebookId
 		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
@@ -112,9 +116,9 @@ func (this *NotebookService) GetNotebookByUserIdAndUrlTitle(userId, notebookIdOr
 }
 
 // 同步的方法
-func (this *NotebookService) GeSyncNotebooks(userId string, afterUsn, maxEntry int) ([]info.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 := db.Notebooks.Find(bson.M{"UserId": bson.ObjectIdHex(userId), "Usn": bson.M{"$gt": afterUsn}})
 	q.Sort("Usn").Limit(maxEntry).All(&notebooks)
 	return notebooks
 }
@@ -152,9 +156,13 @@ func (this *NotebookService) GetNotebooksByNotebookIds(notebookIds []bson.Object
 }
 
 // 添加
-// [ok]
 func (this *NotebookService) AddNotebook(notebook info.Notebook) (bool, info.Notebook) {
-	notebook.UrlTitle = GetUrTitle(notebook.UserId.Hex(), notebook.Title, "notebook")
+
+	if notebook.NotebookId == "" {
+		notebook.NotebookId = bson.NewObjectId()
+	}
+
+	notebook.UrlTitle = GetUrTitle(notebook.UserId.Hex(), notebook.Title, "notebook", notebook.NotebookId.Hex())
 	notebook.Usn = userService.IncrUsn(notebook.UserId.Hex())
 	now := time.Now()
 	notebook.CreatedTime = now
@@ -165,6 +173,7 @@ func (this *NotebookService) AddNotebook(notebook info.Notebook) (bool, info.Not
 	}
 	return true, notebook
 }
+
 // 更新笔记, api
 func (this *NotebookService) UpdateNotebookApi(userId, notebookId, title, parentNotebookId string, seq, usn int) (bool, string, info.Notebook) {
 	if notebookId == "" {
@@ -179,16 +188,16 @@ func (this *NotebookService) UpdateNotebookApi(userId, notebookId, title, parent
 	} else if notebook.Usn != usn {
 		return false, "conflict", notebook
 	}
-	notebook.Usn = userService.IncrUsn(userId);
+	notebook.Usn = userService.IncrUsn(userId)
-	notebook.Title = title;
+	notebook.Title = title
 
-	updates := bson.M{"Title": title, "Usn": notebook.Usn, "Seq": seq, "UpdatedTime": time.Now()};
+	updates := bson.M{"Title": title, "Usn": notebook.Usn, "Seq": seq, "UpdatedTime": time.Now()}
-	if(parentNotebookId != "" && bson.IsObjectIdHex(parentNotebookId)) {
+	if parentNotebookId != "" && bson.IsObjectIdHex(parentNotebookId) {
-		updates["ParentNotebookId"] = bson.ObjectIdHex(parentNotebookId);
+		updates["ParentNotebookId"] = bson.ObjectIdHex(parentNotebookId)
 	} else {
-		updates["ParentNotebookId"] = "";
+		updates["ParentNotebookId"] = ""
 	}
-	ok := db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates);
+	ok := db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates)
 	if ok {
 		return ok, "", this.GetNotebookById(notebookId)
 	}
@@ -198,7 +207,7 @@ func (this *NotebookService) UpdateNotebookApi(userId, notebookId, title, parent
 // 判断是否是blog
 func (this *NotebookService) IsBlog(notebookId string) bool {
 	notebook := info.Notebook{}
-	db.GetByQWithFields(db.Notebooks, bson.M{"_id": bson.ObjectIdHex(notebookId)}, []string{"IsBlog"}, &notebook);
+	db.GetByQWithFields(db.Notebooks, bson.M{"_id": bson.ObjectIdHex(notebookId)}, []string{"IsBlog"}, &notebook)
 	return notebook.IsBlog
 }
 
@@ -224,13 +233,13 @@ func (this *NotebookService) UpdateNotebookTitle(notebookId, userId, title strin
 
 // 更新notebook
 func (this *NotebookService) UpdateNotebook(userId, notebookId string, needUpdate bson.M) bool {
-	needUpdate["UpdatedTime"] = time.Now();
+	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) {
+func (this *NotebookService) ToBlog(userId, notebookId string, isBlog bool) bool {
 	updates := bson.M{"IsBlog": isBlog, "Usn": userService.IncrUsn(userId)}
 	// 笔记本
 	db.UpdateByIdAndUserIdMap(db.Notebooks, notebookId, userId, updates)
@@ -271,15 +280,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,
+			"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 db.DeleteByIdAndUserId(db.Notebooks, notebookId, userId), ""
 		}
 		return false, "笔记本下有笔记"
 	} else {
@@ -321,10 +334,10 @@ func (this *NotebookService) SortNotebooks(userId string, notebookId2Seqs map[st
 func (this *NotebookService) DragNotebooks(userId string, curNotebookId string, parentNotebookId string, siblings []string) bool {
 	ok := false
 	// 如果没parentNotebookId, 则parentNotebookId设空
-	if(parentNotebookId == "") {
+	if parentNotebookId == "" {
-		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": "",  "Usn": userService.IncrUsn(userId)});
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": "", "Usn": userService.IncrUsn(userId)})
 	} else {
-		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": bson.ObjectIdHex(parentNotebookId), "Usn": userService.IncrUsn(userId)});
+		ok = db.UpdateByIdAndUserIdMap(db.Notebooks, curNotebookId, userId, bson.M{"ParentNotebookId": bson.ObjectIdHex(parentNotebookId), "Usn": userService.IncrUsn(userId)})
 	}
 
 	if !ok {

app/service/PwdService.go

@@ -1,10 +1,10 @@
 package service
 
 import (
-	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 找回密码
@@ -34,6 +34,7 @@ func (this *PwdService) FindPwd(email string) (ok bool, msg string) {
 	return
 }
 
+// 重置密码时
 // 修改密码
 // 先验证
 func (this *PwdService) UpdatePwd(token, pwd string) (bool, string) {
@@ -46,8 +47,13 @@ func (this *PwdService) UpdatePwd(token, pwd string) (bool, string) {
 		return ok, msg
 	}
 
+	passwd := GenPwd(pwd)
+	if passwd == "" {
+		return false, "GenerateHash error"
+	}
+
 	// 修改密码之
-	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

@@ -1,12 +1,12 @@
 package service
 
 import (
-	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
 	"time"
-//	"strings"
+	//	"strings"
 )
 
 // Session存储到mongodb中
@@ -17,6 +17,7 @@ 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()})
 }
+
 // 注销时清空session
 func (this *SessionService) Clear(sessionId string) bool {
 	return db.Delete(db.Sessions, bson.M{"SessionId": sessionId})
@@ -45,14 +46,16 @@ func (this *SessionService) LoginTimesIsOver(sessionId string) bool {
 	session := this.Get(sessionId)
 	return session.LoginTimes > 5
 }
+
 // 登录成功后清空错误次数
 func (this *SessionService) ClearLoginTimes(sessionId string) bool {
 	return this.Update(sessionId, "LoginTimes", 0)
 }
+
 // 增加错误次数
 func (this *SessionService) IncrLoginTimes(sessionId string) bool {
 	session := this.Get(sessionId)
-	return this.Update(sessionId, "LoginTimes", session.LoginTimes + 1)
+	return this.Update(sessionId, "LoginTimes", session.LoginTimes+1)
 }
 
 //----------

app/service/ShareService.go

@@ -1,12 +1,12 @@
 package service
 
 import (
-	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-	"time"
 	"sort"
+	"time"
 )
 
 // 共享Notebook, Note服务
@@ -33,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{
@@ -44,13 +45,15 @@ func (this *ShareService) getOrQ(userId string) bson.M {
 		// 不是trash的
 		q["$or"] = orQ
 	} else {
-		q["ToUserId"] = bson.ObjectIdHex(userId);
+		q["ToUserId"] = bson.ObjectIdHex(userId)
 	}
 	return q
 }
 
 // 得到共享给我的笔记本和用户(谁共享给了我)
 func (this *ShareService) GetShareNotebooks(userId string) (info.ShareNotebooksByUser, []info.User) {
+	myUserId := userId
+
 	// 得到共享给我的用户s信息
 	// 得到我参与的组织
 	q := this.getOrQ(userId)
@@ -64,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);
+
+	userInfos := userService.GetUserInfosOrderBySeq(userIds)
+	// 不要我的id
+	for i, userInfo := range userInfos {
+		if userInfo.UserId.Hex() == myUserId {
+			userInfos = append(userInfos[:i], userInfos[i+1:]...)
+			break
+		}
+	}
 
 	//--------------------
 	// 得到他们共享给我的notebooks
@@ -98,17 +109,22 @@ func (this *ShareService) GetShareNotebooks(userId string) (info.ShareNotebooksB
 	subShareNotebooks := this.parseToSubShareNotebooks(&subNotebooks, &shareNotebooksMap)
 
 	// 3 按用户进行分组成ShareNotebooksByUser
-	shareNotebooksByUsersMap := map[bson.ObjectId] []info.ShareNotebooks{}
+	shareNotebooksByUsersMap := map[bson.ObjectId][]info.ShareNotebooks{}
 	// 先建立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 {
 			shareNotebooksByUsersMap[userId] = []info.ShareNotebooks{eachSub}
 		}
 	}
-	shareNotebooksByUser := info.ShareNotebooksByUser{};
+	shareNotebooksByUser := info.ShareNotebooksByUser{}
 	for userId, eachShareNotebooks := range shareNotebooksByUsersMap {
 		// 4, 按用户排序
 		shareNotebooksByUser[userId.Hex()] = sortSubShareNotebooks(eachShareNotebooks)
@@ -157,11 +173,11 @@ func (this *ShareService) parseToSubShareNotebooks(subNotebooks *info.SubNoteboo
 
 // 得到共享笔记本下的notes
 func (this *ShareService) ListShareNotesByNotebookId(notebookId, myUserId, sharedUserId string,
-		page, pageSize int, sortField string, isAsc bool) ([]info.ShareNoteWithPerm) {
+	page, pageSize int, sortField string, isAsc bool) []info.ShareNoteWithPerm {
 	// 1 首先判断是否真的sharedUserId 共享了 notebookId 给 myUserId
 	q := this.getOrQ(myUserId)
-	q["NotebookId"] = bson.ObjectIdHex(notebookId);
+	q["NotebookId"] = bson.ObjectIdHex(notebookId)
-	q["UserId"] =  bson.ObjectIdHex(sharedUserId);
+	q["UserId"] = bson.ObjectIdHex(sharedUserId)
 	shareNotebook := info.ShareNotebook{}
 	db.GetByQ(db.ShareNotebooks,
 		q,
@@ -174,7 +190,7 @@ func (this *ShareService) ListShareNotesByNotebookId(notebookId, myUserId, share
 	perm := shareNotebook.Perm
 
 	// 2 得到该notebook下分页显示所有的notes
-	_, notes := noteService.ListNotes(sharedUserId, notebookId, false, page, pageSize, sortField, isAsc, false);
+	_, notes := noteService.ListNotes(sharedUserId, notebookId, false, page, pageSize, sortField, isAsc, false)
 
 	// 3 添加权限信息
 	// 3.1 如果该notebook自己有其它权限信息, 比如1, 那么覆盖notebook的权限信息
@@ -194,12 +210,12 @@ func (this *ShareService) ListShareNotesByNotebookId(notebookId, myUserId, share
 		}
 	}
 	Log("笔记权限")
-	LogJ(notePerms);
+	LogJ(notePerms)
 
 	// 3.2 组合
 	notesWithPerm := make([]info.ShareNoteWithPerm, len(notes))
 	for i, each := range notes {
-		thisPerm := perm;
+		thisPerm := perm
 		if selfPerm, ok := notePerms[each.NoteId]; ok {
 			thisPerm = selfPerm
 		}
@@ -231,13 +247,13 @@ func (this *ShareService) ListShareNotesByNotebookId(notebookId, myUserId, share
 // 可以这样! 到时将零散的共享noteId放在用户基本数据中
 // 这里不好排序
 func (this *ShareService) ListShareNotes(myUserId, sharedUserId string,
-		pageNumber, pageSize int, sortField string, isAsc bool) ([]info.ShareNoteWithPerm) {
+	pageNumber, pageSize int, sortField string, isAsc bool) []info.ShareNoteWithPerm {
 
 	skipNum, _ := parsePageAndSort(pageNumber, pageSize, sortField, isAsc)
 	shareNotes := []info.ShareNote{}
 
 	q := this.getOrQ(myUserId)
-	q["UserId"] =  bson.ObjectIdHex(sharedUserId);
+	q["UserId"] = bson.ObjectIdHex(sharedUserId)
 
 	db.ShareNotes.
 		Find(q).
@@ -281,7 +297,7 @@ func (this *ShareService) notes2NotesWithPerm(notes []info.Note) {
 // [ok]
 func (this *ShareService) AddShareNotebook1(shareNotebook info.ShareNotebook) bool {
 	// 添加一条记录说明两者存在关系
-	this.AddHasShareNote(shareNotebook.UserId.Hex(), shareNotebook.ToUserId.Hex());
+	this.AddHasShareNote(shareNotebook.UserId.Hex(), shareNotebook.ToUserId.Hex())
 
 	shareNotebook.CreatedTime = time.Now()
 	return db.Insert(db.ShareNotebooks, shareNotebook)
@@ -300,13 +316,13 @@ func (this *ShareService) AddShareNotebook(notebookId string, perm int, userId,
 // 第三方注册时没有email
 func (this *ShareService) AddShareNotebookToUserId(notebookId string, perm int, userId, toUserId string) (bool, string, string) {
 	// 添加一条记录说明两者存在关系
-	this.AddHasShareNote(userId, toUserId);
+	this.AddHasShareNote(userId, toUserId)
 
 	// 先删除之
 	db.Delete(db.ShareNotebooks, bson.M{"NotebookId": bson.ObjectIdHex(notebookId),
 		"UserId":   bson.ObjectIdHex(userId),
 		"ToUserId": bson.ObjectIdHex(toUserId),
-	});
+	})
 
 	shareNotebook := info.ShareNotebook{NotebookId: bson.ObjectIdHex(notebookId),
 		UserId:      bson.ObjectIdHex(userId),
@@ -337,13 +353,13 @@ func (this *ShareService) AddShareNote(noteId string, perm int, userId, email st
 // 第三方测试没有userId
 func (this *ShareService) AddShareNoteToUserId(noteId string, perm int, userId, toUserId string) (bool, string, string) {
 	// 添加一条记录说明两者存在关系
-	this.AddHasShareNote(userId, toUserId);
+	this.AddHasShareNote(userId, toUserId)
 
 	// 先删除之
 	db.Delete(db.ShareNotes, bson.M{"NoteId": bson.ObjectIdHex(noteId),
 		"UserId":   bson.ObjectIdHex(userId),
 		"ToUserId": bson.ObjectIdHex(toUserId),
-	});
+	})
 
 	shareNote := info.ShareNote{NoteId: bson.ObjectIdHex(noteId),
 		UserId:      bson.ObjectIdHex(userId),
@@ -354,7 +370,6 @@ func (this *ShareService) AddShareNoteToUserId(noteId string, perm int, userId,
 	return db.Insert(db.ShareNotes, shareNote), "", toUserId
 }
 
-
 // updatedUserId是否有查看userId noteId的权限?
 // userId是所有者
 func (this *ShareService) HasReadPerm(userId, updatedUserId, noteId string) bool {
@@ -427,13 +442,14 @@ func (this *ShareService) HasUpdateNotebookPerm(userId, updatedUserId, notebookI
 // 共享note, notebook时使用
 func (this *ShareService) AddHasShareNote(userId, toUserId string) bool {
 	db.Insert(db.HasShareNotes, info.HasShareNote{UserId: bson.ObjectIdHex(userId), ToUserId: bson.ObjectIdHex(toUserId)})
-	return true;
+	return true
 }
 
 // userId是否被共享了noteId
 func (this *ShareService) HasSharedNote(noteId, myUserId string) bool {
 	return db.Has(db.ShareNotes, bson.M{"ToUserId": bson.ObjectIdHex(myUserId), "NoteId": bson.ObjectIdHex(noteId)})
 }
+
 // noteId的notebook是否共享了给我
 func (this *ShareService) HasSharedNotebook(noteId, myUserId, sharedUserId string) bool {
 	notebookId := noteService.GetNotebookId(noteId)
@@ -452,11 +468,12 @@ func (this *ShareService) GetShareNoteContent(noteId, myUserId, sharedUserId str
 	noteContent = info.NoteContent{}
 	// 是否单独共享了该notebook
 	// 或者, 其notebook共享了我
-//	Log(this.HasSharedNote(noteId, myUserId))
+	//	Log(this.HasSharedNote(noteId, myUserId))
-//	Log(this.HasSharedNotebook(noteId, myUserId, sharedUserId))
+	//	Log(this.HasSharedNotebook(noteId, myUserId, sharedUserId))
-	Log(this.HasReadPerm(sharedUserId, myUserId, noteId))
+	//	Log(this.HasReadPerm(sharedUserId, myUserId, noteId))
+
 	if this.HasReadPerm(sharedUserId, myUserId, noteId) {
-//	if this.HasSharedNote(noteId, myUserId) || this.HasSharedNotebook(noteId, myUserId, sharedUserId) {
+		//	if this.HasSharedNote(noteId, myUserId) || this.HasSharedNotebook(noteId, myUserId, sharedUserId) {
 		db.Get(db.NoteContents, noteId, &noteContent)
 	} else {
 	}
@@ -477,8 +494,8 @@ func (this *ShareService) ListNoteShareUserInfo(noteId, userId string) []info.Sh
 			"ToGroupId": bson.M{"$exists": false},
 		}, &shareNotes, 100)
 
-//	Log("<<>>>>")
+	//	Log("<<>>>>")
-//	Log(len(shareNotes))
+	//	Log(len(shareNotes))
 
 	if len(shareNotes) == 0 {
 		return nil
@@ -575,7 +592,6 @@ func (this *ShareService) ListNotebookShareUserInfo(notebookId, userId string) [
 	return shareUserInfos
 }
 
-
 //----------------
 // 改变note share权限
 func (this *ShareService) UpdateShareNotePerm(noteId string, perm int, userId, toUserId string) bool {
@@ -606,6 +622,7 @@ func (this *ShareService) DeleteShareNoteAll(noteId string, userId string) bool
 	return db.DeleteAll(db.ShareNotes,
 		bson.M{"NoteId": bson.ObjectIdHex(noteId), "UserId": bson.ObjectIdHex(userId)})
 }
+
 // 删除share notebook
 func (this *ShareService) DeleteShareNotebook(notebookId string, userId, toUserId string) bool {
 	return db.DeleteAll(db.ShareNotebooks,
@@ -615,9 +632,9 @@ func (this *ShareService) DeleteShareNotebook(notebookId string, userId, toUserI
 // 删除userId分享给toUserId的所有
 func (this *ShareService) DeleteUserShareNoteAndNotebook(userId, toUserId string) bool {
 	query := bson.M{"UserId": bson.ObjectIdHex(userId), "ToUserId": bson.ObjectIdHex(toUserId)}
-	db.DeleteAll(db.ShareNotebooks, query);
+	db.DeleteAll(db.ShareNotebooks, query)
-	db.DeleteAll(db.ShareNotes, query);
+	db.DeleteAll(db.ShareNotes, query)
-	db.DeleteAll(db.HasShareNotes, query);
+	db.DeleteAll(db.HasShareNotes, query)
 
 	return true
 }
@@ -625,10 +642,10 @@ func (this *ShareService) DeleteUserShareNoteAndNotebook(userId, toUserId string
 // 用户userId是否有修改noteId的权限
 func (this *ShareService) HasUpdateNotePerm(noteId, userId string) bool {
 	if noteId == "" || userId == "" {
-		return false;
+		return false
 	}
 	note := noteService.GetNoteById(noteId)
-	LogJ(note);
+	LogJ(note)
 	if note.UserId != "" {
 		noteUserId := note.UserId.Hex()
 		if noteUserId != userId {
@@ -636,20 +653,20 @@ func (this *ShareService) HasUpdateNotePerm(noteId, userId string) bool {
 			if this.HasUpdatePerm(noteUserId, userId, noteId) {
 				return true
 			} else {
-				return false;
+				return false
 			}
 		} else {
 			return true
 		}
 	} else {
-		return false;
+		return false
 	}
 }
 
 // 用户userId是否有查看noteId的权限
 func (this *ShareService) HasReadNotePerm(noteId, userId string) bool {
 	if noteId == "" || userId == "" {
-		return false;
+		return false
 	}
 	note := noteService.GetNoteById(noteId)
 	if note.UserId != "" {
@@ -659,13 +676,13 @@ func (this *ShareService) HasReadNotePerm(noteId, userId string) bool {
 			if this.HasReadPerm(noteUserId, userId, noteId) {
 				return true
 			} else {
-				return false;
+				return false
 			}
 		} else {
 			return true
 		}
 	} else {
-		return false;
+		return false
 	}
 }
 
@@ -679,7 +696,7 @@ func (this *ShareService) GetNoteShareGroups(noteId, userId string) []info.Share
 	// 得到有分享的分组
 	shares := []info.ShareNote{}
 	db.ListByQ(db.ShareNotes,
-		bson.M{"NoteId": bson.ObjectIdHex(noteId), "UserId": bson.ObjectIdHex(userId), "ToGroupId": bson.M{"$exists":true}}, &shares)
+		bson.M{"NoteId": bson.ObjectIdHex(noteId), "UserId": bson.ObjectIdHex(userId), "ToGroupId": bson.M{"$exists": true}}, &shares)
 	mapShares := map[bson.ObjectId]info.ShareNote{}
 	for _, share := range shares {
 		mapShares[share.ToGroupId] = share
@@ -692,7 +709,7 @@ func (this *ShareService) GetNoteShareGroups(noteId, userId string) []info.Share
 		if !ok {
 			share = info.ShareNote{}
 		}
-		share.ToGroup = group;
+		share.ToGroup = group
 		shares2[i] = share
 	}
 
@@ -700,7 +717,7 @@ func (this *ShareService) GetNoteShareGroups(noteId, userId string) []info.Share
 }
 
 // 共享笔记给分组
-func (this *ShareService) AddShareNoteGroup(userId, noteId, groupId string, perm int) (bool) {
+func (this *ShareService) AddShareNoteGroup(userId, noteId, groupId string, perm int) bool {
 	if !groupService.IsExistsGroupUser(userId, groupId) {
 		return false
 	}
@@ -722,7 +739,7 @@ func (this *ShareService) DeleteShareNoteGroup(userId, noteId, groupId string) b
 	return db.Delete(db.ShareNotes, bson.M{"NoteId": bson.ObjectIdHex(noteId),
 		"UserId":    bson.ObjectIdHex(userId),
 		"ToGroupId": bson.ObjectIdHex(groupId),
-	});
+	})
 }
 
 //-------
@@ -734,7 +751,7 @@ func (this *ShareService) GetNotebookShareGroups(notebookId, userId string) []in
 	// 得到有分享的分组
 	shares := []info.ShareNotebook{}
 	db.ListByQ(db.ShareNotebooks,
-		bson.M{"NotebookId": bson.ObjectIdHex(notebookId), "UserId": bson.ObjectIdHex(userId), "ToGroupId": bson.M{"$exists":true}}, &shares)
+		bson.M{"NotebookId": bson.ObjectIdHex(notebookId), "UserId": bson.ObjectIdHex(userId), "ToGroupId": bson.M{"$exists": true}}, &shares)
 	mapShares := map[bson.ObjectId]info.ShareNotebook{}
 	for _, share := range shares {
 		mapShares[share.ToGroupId] = share
@@ -748,14 +765,15 @@ func (this *ShareService) GetNotebookShareGroups(notebookId, userId string) []in
 		if !ok {
 			share = info.ShareNotebook{}
 		}
-		share.ToGroup = group;
+		share.ToGroup = group
 		shares2[i] = share
 	}
 
 	return shares2
 }
+
 // 共享笔记给分组
-func (this *ShareService) AddShareNotebookGroup(userId, notebookId, groupId string, perm int) (bool) {
+func (this *ShareService) AddShareNotebookGroup(userId, notebookId, groupId string, perm int) bool {
 	if !groupService.IsExistsGroupUser(userId, groupId) {
 		return false
 	}
@@ -777,5 +795,38 @@ func (this *ShareService) DeleteShareNotebookGroup(userId, notebookId, groupId s
 	return db.Delete(db.ShareNotebooks, bson.M{"NotebookId": bson.ObjectIdHex(notebookId),
 		"UserId":    bson.ObjectIdHex(userId),
 		"ToGroupId": bson.ObjectIdHex(groupId),
-	});
+	})
+}
+
+//--------------------
+// 删除组时, 删除所有的
+//--------------------
+
+func (this *ShareService) DeleteAllShareNotebookGroup(groupId string) bool {
+	return db.Delete(db.ShareNotebooks, bson.M{
+		"ToGroupId": bson.ObjectIdHex(groupId),
+	})
+}
+func (this *ShareService) DeleteAllShareNoteGroup(groupId string) bool {
+	return db.Delete(db.ShareNotes, bson.M{
+		"ToGroupId": bson.ObjectIdHex(groupId),
+	})
+}
+
+//--------------------
+// 删除组内用户时, 删除其分享的
+//--------------------
+
+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) DeleteShareNoteGroupWhenDeleteGroupUser(userId, groupId string) bool {
+	return db.Delete(db.ShareNotes, bson.M{
+		"UserId":    bson.ObjectIdHex(userId),
+		"ToGroupId": bson.ObjectIdHex(groupId),
+	})
 }

app/service/SuggestionService.go

@@ -1,12 +1,12 @@
 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/info"
+	//	. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
-//	"time"
+	//	"time"
-//	"sort"
+	//	"sort"
 )
 
 type SuggestionService struct {

app/service/TagService.go

@@ -1,9 +1,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/info"
+		. "github.com/leanote/leanote/app/lea"
 	"gopkg.in/mgo.v2/bson"
 	"time"
 )
@@ -60,7 +60,15 @@ func (this *TagService) AddOrUpdateTag(userId string, tag string) info.NoteTag {
 		count := noteService.CountNoteByTag(userId, tag)
 		noteTag.Count = count
 		noteTag.UpdatedTime = time.Now()
-//		noteTag.Usn = userService.IncrUsn(userId), 更新count而已
+		//		noteTag.Usn = userService.IncrUsn(userId), 更新count而已
+
+		// 之前删除过的, 现在要添加回来了
+		if noteTag.IsDeleted {
+			Log("之前删除过的, 现在要添加回来了:  " + tag)
+			noteTag.Usn = userService.IncrUsn(userId)
+			noteTag.IsDeleted = false
+		}
+
 		db.UpdateByIdAndUserId(db.NoteTags, noteTag.TagId.Hex(), userId, noteTag)
 		return noteTag
 	}
@@ -83,7 +91,7 @@ func (this *TagService) AddOrUpdateTag(userId string, tag string) info.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);
+	q := db.NoteTags.Find(query)
 	sortFieldR := "-UpdatedTime"
 	q.Sort(sortFieldR).All(&tags)
 	return tags
@@ -95,7 +103,7 @@ func (this *TagService) GetTags(userId string) []info.NoteTag {
 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 noteService.UpdateNoteToDeleteTag(userId, tag)
 	}
 	return map[string]int{}
 }
@@ -124,14 +132,14 @@ func (this *TagService) reCountTagCount(userId string, tags []string) {
 		return
 	}
 	for _, tag := range tags {
-		this.AddOrUpdateTag(userId, tag);
+		this.AddOrUpdateTag(userId, tag)
 	}
 }
 
 // 同步用
-func (this *TagService) GeSyncTags(userId string, afterUsn, maxEntry int) ([]info.NoteTag) {
+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 := 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/ThemeService.go

@@ -1,20 +1,20 @@
 package service
 
 import (
-	"github.com/revel/revel"
+	"encoding/json"
-	"github.com/leanote/leanote/app/info"
+	"fmt"
 	"github.com/leanote/leanote/app/db"
+	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/lea/archive"
+	"github.com/revel/revel"
 	"gopkg.in/mgo.v2/bson"
-	"time"
-	"strings"
-	"os"
-	"fmt"
 	"html/template"
-	"regexp"
 	"io/ioutil"
-	"encoding/json"
+	"os"
+	"regexp"
+	"strings"
+	"time"
 )
 
 // 主题
@@ -29,6 +29,7 @@ var fixedStyle = "blog_left_fixed"
 func (this *ThemeService) getDefaultThemeBasePath() string {
 	return revel.BasePath + "/public/blog/themes"
 }
+
 // 默认主题路径
 func (this *ThemeService) getDefaultThemePath(style string) string {
 	if style == elegantStyle {
@@ -39,6 +40,7 @@ func (this *ThemeService) getDefaultThemePath(style string) string {
 		return this.getDefaultThemeBasePath() + "/default"
 	}
 }
+
 // blogService用
 func (this *ThemeService) GetDefaultThemePath(style string) string {
 	if style == elegantStyle {
@@ -85,13 +87,13 @@ func (this *ThemeService) getDefaultTheme(style string) info.Theme {
 
 // 用户的主题路径设置
 func (this *ThemeService) getUserThemeBasePath(userId string) string {
-	return revel.BasePath + "/public/upload/" + userId + "/themes"
+	return revel.BasePath + "/public/upload/" + Digest3(userId) + "/" + userId + "/themes"
 }
 func (this *ThemeService) getUserThemePath(userId, themeId string) string {
 	return this.getUserThemeBasePath(userId) + "/" + themeId
 }
 func (this *ThemeService) getUserThemePath2(userId, themeId string) string {
-	return "public/upload/" + userId + "/themes/" + themeId
+	return "public/upload/" + Digest3(userId) + "/" + userId + "/themes/" + themeId
 }
 
 // 新建主题
@@ -141,7 +143,7 @@ func (this *ThemeService) NewTheme(userId string) (ok bool, themeId string) {
 		themeService.NewThemeForFirst(userBlog)
 	}
 	// 再copy一个默认主题
-	userBlog.Style = "defaultStyle";
+	userBlog.Style = "defaultStyle"
 	ok, themeId = this.CopyDefaultTheme(userBlog)
 	return
 }
@@ -223,11 +225,11 @@ func (this *ThemeService) GetUserThemes(userId string) (theme info.Theme, themes
 	theme = info.Theme{}
 	themes = []info.Theme{}
 
-//	db.ListByQ(db.Themes, bson.M{"UserId": bson.ObjectIdHex(userId)}, &themes)
+	//	db.ListByQ(db.Themes, bson.M{"UserId": bson.ObjectIdHex(userId)}, &themes)
 
 	// 创建时间逆序
 	query := bson.M{"UserId": bson.ObjectIdHex(userId)}
-	q := db.Themes.Find(query);
+	q := db.Themes.Find(query)
 	q.Sort("-CreatedTime").All(&themes)
 	if len(themes) == 0 {
 		userBlog := blogService.GetUserBlog(userId)
@@ -262,8 +264,22 @@ func (this *ThemeService) GetDefaultThemes() (themes []info.Theme) {
 	return
 }
 
+
+func validateFilename(filename string) bool {
+	// 防止用"../../来获取其它文件"
+	if (strings.Contains(filename, "..")) {
+		return false
+	}
+	return true
+}
+
+
 // 得到模板内容
 func (this *ThemeService) GetTplContent(userId, themeId, filename string) string {
+	if (!validateFilename(filename)) {
+		return ""
+	}
+	
 	path := this.GetThemeAbsolutePath(userId, themeId) + "/" + filename
 	return GetFileStrContent(path)
 }
@@ -285,8 +301,13 @@ func (this *ThemeService) GetThemePath(userId, themeId string) string {
 	}
 	return ""
 }
+
 // 更新模板内容
 func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content string) (ok bool, msg string) {
+	if (!validateFilename(filename)) {
+		return 
+	}
+
 	basePath := this.GetThemeAbsolutePath(userId, themeId)
 	path := basePath + "/" + filename
 	if strings.Contains(filename, ".html") {
@@ -323,6 +344,10 @@ func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content st
 }
 
 func (this *ThemeService) DeleteTpl(userId, themeId, filename string) (ok bool) {
+	if (!validateFilename(filename)) {
+		return
+	}
+
 	path := this.GetThemeAbsolutePath(userId, themeId) + "/" + filename
 	ok = DeleteFile(path)
 	return
@@ -361,7 +386,7 @@ func (this *ThemeService) ActiveTheme(userId, themeId string) (ok bool) {
 
 // 删除主题
 func (this *ThemeService) DeleteTheme(userId, themeId string) (ok bool) {
-	return db.Delete(db.Themes,bson.M{"_id": bson.ObjectIdHex(themeId), "UserId": bson.ObjectIdHex(userId), "IsActive": false})
+	return db.Delete(db.Themes, bson.M{"_id": bson.ObjectIdHex(themeId), "UserId": bson.ObjectIdHex(userId), "IsActive": false})
 }
 
 // 公开主题, 只有管理员才有权限, 之前没公开的变成公开
@@ -375,7 +400,6 @@ func (this *ThemeService) PublicTheme(userId, themeId string) (ok bool) {
 	return false
 }
 
-
 // 导出主题
 func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path string) {
 	theme := this.GetThemeById(themeId)
@@ -406,16 +430,25 @@ func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path str
 
 	return true, targetName
 }
+
 // 导入主题
 // path == /llllllll/..../public/upload/.../aa.zip, 绝对路径
 func (this *ThemeService) ImportTheme(userId, path string) (ok bool, msg string) {
 	themeIdO := bson.NewObjectId()
 	themeId := themeIdO.Hex()
 	targetPath := this.getUserThemePath(userId, themeId) // revel.BasePath + "/public/upload/" + userId + "/themes/" + themeId
-	if ok, msg = archive.Unzip(path, targetPath); !ok {
+
-		DeleteFile(targetPath)
+	err := os.MkdirAll(targetPath, 0755)
+	if err != nil {
+		msg = "error"
 		return
 	}
+	if ok, msg = archive.Unzip(path, targetPath); !ok {
+		DeleteFile(targetPath)
+		Log("oh no")
+		return
+	}
+
 	// 主题验证
 	if ok, msg = this.ValidateTheme(targetPath, "", ""); !ok {
 		DeleteFile(targetPath)
@@ -517,7 +550,7 @@ func (this *ThemeService) InstallTheme(userId, themeId string) (ok bool) {
 	ok = db.Insert(db.Themes, theme)
 
 	// 激活之
-	this.ActiveTheme(userId, themeId);
+	this.ActiveTheme(userId, themeId)
 
 	return ok
 }
@@ -530,10 +563,10 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 	// 建立一个有向图
 	// 将该path下的所有文件提出, 得到文件的引用情况
 	files := ListDir(path)
-	LogJ(files);
+	LogJ(files)
 	size := len(files)
-	if(size > 100) {
+	if size > 100 {
-		ok = false;
+		ok = false
 		msg = "tooManyFiles"
 		return
 	}
@@ -551,7 +584,7 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 	// 得到文件内容, 和建立索引, 每个文件都有一个index, 对应数组位置
 	for _, t := range files {
 		if !strings.Contains(t, ".html") {
-			continue;
+			continue
 		}
 		if t != filename {
 			fileBytes, err := ioutil.ReadFile(path + "/" + t)
@@ -559,7 +592,7 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 				continue
 			}
 
-			fileIndexMap[t] = index;
+			fileIndexMap[t] = index
 			// html内容
 			fileStr := string(fileBytes)
 			fileContent[t] = fileStr
@@ -575,7 +608,7 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 		thisIndex := fileIndexMap[filename]
 		finds := reg.FindAllStringSubmatch(content, -1) // 子匹配
 		LogJ(finds)
-//		Log(content)
+		//		Log(content)
 		if finds != nil && len(finds) > 0 {
 			for _, includes := range finds {
 				include := includes[1]
@@ -599,7 +632,7 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string
 	} else {
 		ok = true
 	}
-	return;
+	return
 }
 
 // 检测有向图是否有环, DFS
@@ -607,9 +640,7 @@ func (this *ThemeService) hasRound(vector [][]int, size int) (ok bool) {
 	for i := 0; i < size; i++ {
 		visited := make([]int, size)
 		if this.hasRoundEach(vector, i, size, visited) {
-			Log(">>")
+			return true
-			Log(i);
-			return true;
 		}
 	}
 	return false
@@ -618,17 +649,15 @@ func (this *ThemeService) hasRound(vector [][]int, size int) (ok bool) {
 // 从每个节点出发, 判断是否有环
 func (this *ThemeService) hasRoundEach(vector [][]int, index int, size int, visited []int) (ok bool) {
 	if visited[index] > 0 {
-		Log("<")
-		Log(index)
 		return true
 	}
-	visited[index] = 1;
+	visited[index] = 1
 	// 遍历它的孩子
 	for i := 0; i < size; i++ {
 		if vector[index][i] > 0 {
-			return this.hasRoundEach(vector, i, size, visited);
+			return this.hasRoundEach(vector, i, size, visited)
 		}
 	}
-	visited[index] = 0;
+	visited[index] = 0
-	return false;
+	return false
 }

app/service/TokenService.go

@@ -1,10 +1,10 @@
 package service
 
 import (
-	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/service/TrashService.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 回收站
@@ -25,6 +25,12 @@ type TrashService struct {
 // 应该放在回收站里
 // 有trashService
 func (this *TrashService) DeleteNote(noteId, userId string) bool {
+	note := noteService.GetNote(noteId, userId)
+	// 如果是垃圾, 则彻底删除
+	if note.IsTrash {
+		return this.DeleteTrash(noteId, userId)
+	}
+
 	// 首先删除其共享
 	if shareService.DeleteShareNoteAll(noteId, userId) {
 		// 更新note isTrash = true
@@ -36,13 +42,15 @@ func (this *TrashService) DeleteNote(noteId, userId string) bool {
 			return true
 		}
 	}
+
 	return false
 }
 
 // 删除别人共享给我的笔记
 // 先判断我是否有权限, 笔记是否是我创建的
-func (this *TrashService) DeleteSharedNote(noteId, userId, myUserId string) bool {
+func (this *TrashService) DeleteSharedNote(noteId, myUserId string) bool {
-	note := noteService.GetNote(noteId, userId)
+	note := noteService.GetNoteById(noteId)
+	userId := note.UserId.Hex()
 	if shareService.HasUpdatePerm(userId, myUserId, noteId) && note.CreatedUserId.Hex() == myUserId {
 		return db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true, "Usn": userService.IncrUsn(userId)}})
 	}
@@ -55,12 +63,12 @@ func (this *TrashService) recoverNote(noteId, notebookId, userId string) bool {
 		bson.M{"$set": bson.M{"IsTrash": false,
 			"Usn":        userService.IncrUsn(userId),
 			"NotebookId": bson.ObjectIdHex(notebookId)}})
-	return re;
+	return re
 }
 
 // 删除trash
 func (this *TrashService) DeleteTrash(noteId, userId string) bool {
-	note := noteService.GetNote(noteId, userId);
+	note := noteService.GetNote(noteId, userId)
 	if note.NoteId == "" {
 		return false
 	}
@@ -72,11 +80,14 @@ func (this *TrashService) DeleteTrash(noteId, userId string) bool {
 		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)
 
+	// 删除content history
+	ok = db.DeleteByIdAndUserId(db.NoteContentHistories, noteId, userId)
+
 	// 重新统计tag's count
 	// TODO 这里会改变tag's Usn
 	tagService.reCountTagCount(userId, note.Tags)
@@ -107,6 +118,13 @@ func (this *TrashService) DeleteTrashApi(noteId, userId string, usn int) (bool,
 	// delete content
 	ok = db.DeleteByIdAndUserId(db.NoteContents, noteId, userId)
 
+	// 删除content history
+	ok = db.DeleteByIdAndUserId(db.NoteContentHistories, noteId, userId)
+
+	// 一个BUG, iOS删除直接调用这个API, 结果没有重新recount
+	// recount notebooks' notes number
+	notebookService.ReCountNotebookNumberNotes(note.NotebookId.Hex())
+
 	return ok, "", afterUsn
 }
 

app/service/UpgradeService.go

@@ -1,14 +1,13 @@
 package service
 
 import (
+	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"
-	"github.com/leanote/leanote/app/db"
 	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 
-
 type UpgradeService struct {
 }
 
@@ -66,7 +65,7 @@ func (this *UpgradeService) UpgradeBetaToBeta2(userId string) (ok bool, msg stri
 			data["RecommendTime"] = note.UpdatedTime
 			Log("Time " + noteId)
 		}
-		data["UrlTitle"] = GetUrTitle(note.UserId.Hex(), note.Title, "note")
+		data["UrlTitle"] = GetUrTitle(note.UserId.Hex(), note.Title, "note", noteId)
 		db.UpdateByIdAndUserIdMap2(db.Notes, note.NoteId, note.UserId, data)
 		Log(noteId)
 	}
@@ -78,7 +77,7 @@ func (this *UpgradeService) UpgradeBetaToBeta2(userId string) (ok bool, msg stri
 	for _, notebook := range notebooks {
 		notebookId := notebook.NotebookId.Hex()
 		data := bson.M{}
-		data["UrlTitle"] = GetUrTitle(notebook.UserId.Hex(), notebook.Title, "notebook")
+		data["UrlTitle"] = GetUrTitle(notebook.UserId.Hex(), notebook.Title, "notebook", notebookId)
 		db.UpdateByIdAndUserIdMap2(db.Notebooks, notebook.NotebookId, notebook.UserId, data)
 		Log(notebookId)
 	}
@@ -164,17 +163,17 @@ func (this *UpgradeService) Api(userId string) (ok bool, msg string) {
 
 	// notebook
 	db.UpdateByQField(db.Notebooks, bson.M{}, "IsDeleted", false)
-	this.setNotebookUsn();
+	this.setNotebookUsn()
 
 	// note
 	// 1-N
 	db.UpdateByQField(db.Notes, bson.M{}, "IsDeleted", false)
-	this.setNoteUsn();
+	this.setNoteUsn()
 
 	// tag
 	// 1-N
 	/// tag, 要重新插入, 将之前的Tag表迁移到NoteTag中
-	this.moveTag();
+	this.moveTag()
 
 	configService.UpdateGlobalStringConfig(userId, "UpgradeBetaToBeta4", "1")