From 9aacba4c31e83d64348ae709ec51b3beb1ac2290 Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Tue, 31 Mar 2015 14:39:03 +0800
Subject: [PATCH] conf

---
 .gitignore                          |  2 --
 conf/{app.conf-default => app.conf} |  8 ++++----
 conf/{routes-default => routes}     | 22 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)
 rename conf/{app.conf-default => app.conf} (87%)
 rename conf/{routes-default => routes} (85%)

diff --git a/.gitignore b/.gitignore
index 348dea1..7663c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,6 @@ bin/release
 bin/tmp
 bin/test
 bin/src
-conf/app.conf
-conf/routes
 public/upload
 app/routes/routes.go
 app/tmp/main.go
diff --git a/conf/app.conf-default b/conf/app.conf
similarity index 87%
rename from conf/app.conf-default
rename to conf/app.conf
index 649c8b5..fca2f95 100644
--- a/conf/app.conf-default
+++ b/conf/app.conf
@@ -2,16 +2,16 @@
 # leanote config
 #------------------------
 
-http.port=80
+http.port=9000
 
-site.url=http://localhost # or http://x.com:8080, http://www.xx.com:9000
+site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 
 # mongdb
 db.host=localhost
 db.port=27017
 db.dbname=leanote # required
-db.username=root # if not exists, please leave it blank
-db.password=root123 # if not exists, please leave it blank
+db.username= # if not exists, please leave it blank
+db.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:
 # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
 # db.url=mongodb://root:root123@localhost:27017/leanote
diff --git a/conf/routes-default b/conf/routes
similarity index 85%
rename from conf/routes-default
rename to conf/routes
index a94c0d0..e8e6bbd 100644
--- a/conf/routes-default
+++ b/conf/routes
@@ -23,6 +23,26 @@ GET 	/findPassword								Auth.FindPassword
 POST 	/doFindPassword								Auth.DoFindPassword
 POST	/findPasswordUpdate							Auth.FindPasswordUpdate
 
+#####
+# 这么多列表, 只是为了最后一句pjax
+# note
+* /note/listNotes Note.ListNotes
+* /note/listTrashNotes Note.ListTrashNotes
+* /note/getNoteAndContent Note.GetNoteAndContent
+* /note/getNoteContent Note.GetNoteContent
+* /note/updateNoteOrContent Note.UpdateNoteOrContent
+* /note/deleteNote Note.DeleteNote
+* /note/deleteTrash Note.DeleteTrash
+* /note/moveNote Note.MoveNote
+* /note/copyNote Note.CopyNote
+* /note/copySharedNote Note.CopySharedNote
+* /note/searchNoteByTags Note.SearchNoteByTags
+* /note/toImage Note.ToImage
+* /note/html2Image Note.Html2Image
+* /note/exportPdf Note.ExportPDF
+* /note/setNote2Blog Note.SetNote2Blog
+# pjax
+GET     /note/:noteId   	                        Note.Index
 
 # blog
 
@@ -113,4 +133,4 @@ GET     /upload/*filepath                       Static.Serve("public/upload")
 # common
 *       /:controller/:action                    :controller.:action
 *       /api/:controller/:action                :controller.:action
-*       /member/:controller/:action             :controller.:action
\ No newline at end of file
+*       /member/:controller/:action             :controller.:action