delete app.conf-default, routes-default

.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

conf/app.conf

@@ -2,38 +2,37 @@
 # 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://cc.com:9000
 
 # mongdb
 db.host=localhost
+#db.host=leanote
 db.port=27017
-db.dbname=leanote # required
+db.dbname=leanote_beta2 # required
-db.username=root # if not exists, please leave it blank
+db.username= #root
-db.password=root123 # if not exists, please leave it blank
+db.password= #abc123
-# or you can set the mongdb url for more complex needs the format is:
+# or you can set the mongdb url
 # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
 # db.url=mongodb://root:root123@localhost:27017/leanote
 
-# You Must Change It !! About Security!!
-app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y 
-
-app.name=leanote
-http.addr=
-http.ssl=false
-cookie.domain=
-cookie.httponly=false
-cookie.prefix=LEANOTE
-cookie.secure=false
-format.date=01/02/2006
-format.datetime=01/02/2006 15:04
-results.chunked=false
 
 #--------------------------------
 # revel config
 # for dev
 #--------------------------------
+app.name=leanote
+app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y
+http.addr=
+http.ssl=false
+cookie.httponly=false
+cookie.prefix=LEANOTE
+cookie.domain=cc.com #life, for share cookie with subdomain, 默认为空, 即不设置 不能设置为localhost, 要么就为空
+cookie.secure=false
+format.date=01/02/2006
+format.datetime=01/02/2006 15:04
+results.chunked=false
 
 log.trace.prefix = "TRACE "
 log.info.prefix  = "INFO  "
@@ -67,4 +66,4 @@ module.testrunner =
 log.trace.output = off
 log.info.output  = off
 log.warn.output  = %(app.name)s.log
-log.error.output = %(app.name)s.log
+log.error.output = %(app.name)s.log

conf/routes

@@ -5,7 +5,7 @@
 module:testrunner
 
 # Home is My Blog
-Get 	/											Index.Default
+Get 	/											Index.Index
 GET     /note   	                                Note.Index
 # leanote home
 GET     /index   	                                Index.Index
@@ -23,6 +23,25 @@ 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/setNote2Blog Note.SetNote2Blog
+# pjax
+GET     /note/:noteId   	                        Note.Index
 
 # blog
 
@@ -64,7 +83,6 @@ GET		/blog/:userIdOrEmail		Blog.Index
 GET		/blog						Blog.Index
 GET		/blog/*						Blog.E()
 
-
 #---------------
 # preview
 GET		/preview/tags/:userIdOrEmail	Preview.Tags
@@ -113,4 +131,4 @@ GET     /upload/*filepath                       Static.Serve("public/upload")
 # common
 *       /:controller/:action                    :controller.:action
 *       /api/:controller/:action                :controller.:action
-*       /member/:controller/:action             :controller.:action
+*       /member/:controller/:action             :controller.:action