register open option

app/controllers/AuthController.go

@@ -18,6 +18,8 @@ func (c Auth) Login(email string) revel.Result {
 	c.RenderArgs["title"] = c.Message("login")
 	c.RenderArgs["subTitle"] = c.Message("login")
 	c.RenderArgs["email"] = email
+	c.RenderArgs["openRegister"] = openRegister
+	
 	if c.Has("demo") {
 		c.RenderArgs["demo"] = true
 		c.RenderArgs["email"] = "demo@leanote.com"
@@ -38,8 +40,9 @@ func (c Auth) DoLogin(email, pwd string) revel.Result {
 // 注销
 func (c Auth) Logout() revel.Result {
 	c.ClearSession()
-	return c.Redirect("login")
+	return c.Redirect("/login")
 }
+
 // 体验一下
 func (c Auth) Demo() revel.Result {
 	c.DoLogin("demo@leanote.com", "demo@leanote.com")
@@ -49,11 +52,19 @@ func (c Auth) Demo() revel.Result {
 //--------
 // 注册
 func (c Auth) Register() revel.Result {
+	if !openRegister {
+		return c.Redirect("/index")
+	}
+	
 	c.RenderArgs["title"] = c.Message("register")
 	c.RenderArgs["subTitle"] = c.Message("register")
 	return c.RenderTemplate("home/register.html")
 }
 func (c Auth) DoRegister(email, pwd string) revel.Result {
+	if !openRegister {
+		return c.Redirect("/index")
+	}
+	
 	re := info.NewRe();
 	
 	if email == "" {

app/controllers/IndexController.go

@@ -14,8 +14,9 @@ type Index struct {
 
 // leanote展示页, 没有登录的, 或已登录明确要进该页的
 func (c Index) Index() revel.Result {
-	c.SetUserInfo();
-	c.RenderArgs["title"] = "leanote";
+	c.SetUserInfo()
+	c.RenderArgs["title"] = "leanote"
+	c.RenderArgs["openRegister"] = openRegister
 	c.SetLocale()
 	
 	return c.RenderTemplate("home/index.html");

app/controllers/NoteController.go

@@ -32,6 +32,8 @@ func (c Note) Index() revel.Result {
 		return c.Redirect("/login")
 	}
 	
+	c.RenderArgs["openRegister"] = openRegister
+	
 	// 已登录了, 那么得到所有信息
 	notebooks := notebookService.GetNotebooks(userId)
 	shareNotebooks, sharedUserInfos := shareService.GetShareNotebooks(userId)

app/controllers/init.go

@@ -27,6 +27,7 @@ var pageSize = 1000
 var defaultSortField = "UpdatedTime"
 var leanoteUserId = "52d26b4e99c37b609a000001"
 var siteUrl = "http://leanote.com"
+var openRegister = true
 
 // 拦截器
 // 不需要拦截的url
@@ -72,6 +73,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	var controller = strings.Title(c.Name)
 	var method = strings.Title(c.MethodName)
 	
+	
 	// 是否需要验证?
 	if !needValidate(controller, method) {
 		return nil
@@ -122,5 +124,6 @@ func init() {
 	revel.OnAppStart(func() {
 		leanoteUserId, _ = revel.Config.String("adminUsername")
 		siteUrl, _ = revel.Config.String("site.url")
+		openRegister, _ = revel.Config.Bool("register.open")
 	})
 }

app/routes/routes.go

@@ -75,129 +75,82 @@ func (_ tStatic) ServeModule(
 }
 
 
-type tBlog struct {}
-var Blog tBlog
+type tFile struct {}
+var File tFile
 
 
-func (_ tBlog) SetNote2Blog(
-		noteId string,
-		isBlog bool,
-		isTop bool,
+func (_ tFile) UploadImage(
+		renderHtml string,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "noteId", noteId)
-	revel.Unbind(args, "isBlog", isBlog)
-	revel.Unbind(args, "isTop", isTop)
-	return revel.MainRouter.Reverse("Blog.SetNote2Blog", args).Url
+	revel.Unbind(args, "renderHtml", renderHtml)
+	return revel.MainRouter.Reverse("File.UploadImage", args).Url
 }
 
-func (_ tBlog) SetNotebook2Blog(
-		notebookId string,
-		isBlog bool,
+func (_ tFile) UploadBlogLogo(
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "notebookId", notebookId)
-	revel.Unbind(args, "isBlog", isBlog)
-	return revel.MainRouter.Reverse("Blog.SetNotebook2Blog", args).Url
+	return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url
 }
 
-func (_ tBlog) Index(
-		userId string,
+func (_ tFile) UploadImageJson(
+		renderHtml string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "renderHtml", renderHtml)
+	return revel.MainRouter.Reverse("File.UploadImageJson", args).Url
+}
+
+
+type tNotebook struct {}
+var Notebook tNotebook
+
+
+func (_ tNotebook) Index(
+		notebook interface{},
+		i int,
+		name string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "notebook", notebook)
+	revel.Unbind(args, "i", i)
+	revel.Unbind(args, "name", name)
+	return revel.MainRouter.Reverse("Notebook.Index", args).Url
+}
+
+func (_ tNotebook) DeleteNotebook(
 		notebookId string,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "userId", userId)
 	revel.Unbind(args, "notebookId", notebookId)
-	return revel.MainRouter.Reverse("Blog.Index", args).Url
+	return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url
 }
 
-func (_ tBlog) View(
-		noteId string,
+func (_ tNotebook) AddNotebook(
+		notebookId string,
+		title string,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "noteId", noteId)
-	return revel.MainRouter.Reverse("Blog.View", args).Url
+	revel.Unbind(args, "notebookId", notebookId)
+	revel.Unbind(args, "title", title)
+	return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url
 }
 
-func (_ tBlog) SearchBlog(
-		userId string,
-		key string,
+func (_ tNotebook) UpdateNotebookTitle(
+		notebookId string,
+		title string,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "userId", userId)
-	revel.Unbind(args, "key", key)
-	return revel.MainRouter.Reverse("Blog.SearchBlog", args).Url
-}
-
-func (_ tBlog) Set(
-		) string {
-	args := make(map[string]string)
-	
-	return revel.MainRouter.Reverse("Blog.Set", args).Url
-}
-
-func (_ tBlog) SetUserBlogBase(
-		userBlog interface{},
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "userBlog", userBlog)
-	return revel.MainRouter.Reverse("Blog.SetUserBlogBase", args).Url
-}
-
-func (_ tBlog) SetUserBlogComment(
-		userBlog interface{},
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "userBlog", userBlog)
-	return revel.MainRouter.Reverse("Blog.SetUserBlogComment", args).Url
-}
-
-func (_ tBlog) SetUserBlogStyle(
-		userBlog interface{},
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "userBlog", userBlog)
-	return revel.MainRouter.Reverse("Blog.SetUserBlogStyle", args).Url
-}
-
-func (_ tBlog) AboutMe(
-		userId string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "userId", userId)
-	return revel.MainRouter.Reverse("Blog.AboutMe", args).Url
-}
-
-
-type tIndex struct {}
-var Index tIndex
-
-
-func (_ tIndex) Index(
-		) string {
-	args := make(map[string]string)
-	
-	return revel.MainRouter.Reverse("Index.Index", args).Url
-}
-
-func (_ tIndex) Suggestion(
-		addr string,
-		suggestion string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "addr", addr)
-	revel.Unbind(args, "suggestion", suggestion)
-	return revel.MainRouter.Reverse("Index.Suggestion", args).Url
+	revel.Unbind(args, "notebookId", notebookId)
+	revel.Unbind(args, "title", title)
+	return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url
 }
 
 
@@ -331,20 +284,6 @@ func (_ tNote) Html2Image(
 }
 
 
-type tOauth struct {}
-var Oauth tOauth
-
-
-func (_ tOauth) GithubCallback(
-		code string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "code", code)
-	return revel.MainRouter.Reverse("Oauth.GithubCallback", args).Url
-}
-
-
 type tShare struct {}
 var Share tShare
 
@@ -698,33 +637,129 @@ func (_ tAuth) FindPasswordUpdate(
 }
 
 
-type tFile struct {}
-var File tFile
+type tBlog struct {}
+var Blog tBlog
 
 
-func (_ tFile) UploadImage(
-		renderHtml string,
+func (_ tBlog) SetNote2Blog(
+		noteId string,
+		isBlog bool,
+		isTop bool,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "renderHtml", renderHtml)
-	return revel.MainRouter.Reverse("File.UploadImage", args).Url
+	revel.Unbind(args, "noteId", noteId)
+	revel.Unbind(args, "isBlog", isBlog)
+	revel.Unbind(args, "isTop", isTop)
+	return revel.MainRouter.Reverse("Blog.SetNote2Blog", args).Url
 }
 
-func (_ tFile) UploadBlogLogo(
+func (_ tBlog) SetNotebook2Blog(
+		notebookId string,
+		isBlog bool,
 		) string {
 	args := make(map[string]string)
 	
-	return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url
+	revel.Unbind(args, "notebookId", notebookId)
+	revel.Unbind(args, "isBlog", isBlog)
+	return revel.MainRouter.Reverse("Blog.SetNotebook2Blog", args).Url
 }
 
-func (_ tFile) UploadImageJson(
-		renderHtml string,
+func (_ tBlog) Index(
+		userId string,
+		notebookId string,
 		) string {
 	args := make(map[string]string)
 	
-	revel.Unbind(args, "renderHtml", renderHtml)
-	return revel.MainRouter.Reverse("File.UploadImageJson", args).Url
+	revel.Unbind(args, "userId", userId)
+	revel.Unbind(args, "notebookId", notebookId)
+	return revel.MainRouter.Reverse("Blog.Index", args).Url
+}
+
+func (_ tBlog) View(
+		noteId string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "noteId", noteId)
+	return revel.MainRouter.Reverse("Blog.View", args).Url
+}
+
+func (_ tBlog) SearchBlog(
+		userId string,
+		key string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "userId", userId)
+	revel.Unbind(args, "key", key)
+	return revel.MainRouter.Reverse("Blog.SearchBlog", args).Url
+}
+
+func (_ tBlog) Set(
+		) string {
+	args := make(map[string]string)
+	
+	return revel.MainRouter.Reverse("Blog.Set", args).Url
+}
+
+func (_ tBlog) SetUserBlogBase(
+		userBlog interface{},
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "userBlog", userBlog)
+	return revel.MainRouter.Reverse("Blog.SetUserBlogBase", args).Url
+}
+
+func (_ tBlog) SetUserBlogComment(
+		userBlog interface{},
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "userBlog", userBlog)
+	return revel.MainRouter.Reverse("Blog.SetUserBlogComment", args).Url
+}
+
+func (_ tBlog) SetUserBlogStyle(
+		userBlog interface{},
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "userBlog", userBlog)
+	return revel.MainRouter.Reverse("Blog.SetUserBlogStyle", args).Url
+}
+
+func (_ tBlog) AboutMe(
+		userId string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "userId", userId)
+	return revel.MainRouter.Reverse("Blog.AboutMe", args).Url
+}
+
+
+type tIndex struct {}
+var Index tIndex
+
+
+func (_ tIndex) Index(
+		) string {
+	args := make(map[string]string)
+	
+	return revel.MainRouter.Reverse("Index.Index", args).Url
+}
+
+func (_ tIndex) Suggestion(
+		addr string,
+		suggestion string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "addr", addr)
+	revel.Unbind(args, "suggestion", suggestion)
+	return revel.MainRouter.Reverse("Index.Suggestion", args).Url
 }
 
 
@@ -747,55 +782,6 @@ func (_ tMobile) Logout(
 }
 
 
-type tNotebook struct {}
-var Notebook tNotebook
-
-
-func (_ tNotebook) Index(
-		notebook interface{},
-		i int,
-		name string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "notebook", notebook)
-	revel.Unbind(args, "i", i)
-	revel.Unbind(args, "name", name)
-	return revel.MainRouter.Reverse("Notebook.Index", args).Url
-}
-
-func (_ tNotebook) DeleteNotebook(
-		notebookId string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "notebookId", notebookId)
-	return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url
-}
-
-func (_ tNotebook) AddNotebook(
-		notebookId string,
-		title string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "notebookId", notebookId)
-	revel.Unbind(args, "title", title)
-	return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url
-}
-
-func (_ tNotebook) UpdateNotebookTitle(
-		notebookId string,
-		title string,
-		) string {
-	args := make(map[string]string)
-	
-	revel.Unbind(args, "notebookId", notebookId)
-	revel.Unbind(args, "title", title)
-	return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url
-}
-
-
 type tNoteContentHistory struct {}
 var NoteContentHistory tNoteContentHistory
 
@@ -810,3 +796,17 @@ func (_ tNoteContentHistory) ListHistories(
 }
 
 
+type tOauth struct {}
+var Oauth tOauth
+
+
+func (_ tOauth) GithubCallback(
+		code string,
+		) string {
+	args := make(map[string]string)
+	
+	revel.Unbind(args, "code", code)
+	return revel.MainRouter.Reverse("Oauth.GithubCallback", args).Url
+}
+
+

app/service/AuthService.go

@@ -4,6 +4,7 @@ import (
 	"labix.org/v2/mgo/bson"
 //	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
+	"github.com/revel/revel"
 	. "github.com/leanote/leanote/app/lea"
 	"fmt"
 )
@@ -53,11 +54,13 @@ func (this *AuthService) register(user info.User) (bool, string) {
 		}
 		
 		email := user.Email
-		// 添加leanote -> 该用户的共享
-		leanoteUserId := "5368c1aa99c37b029d000001";
-		nk1 := "5368c1aa99c37b029d000002" // leanote
-		welcomeNoteId := "5368c1b919807a6f95000000" // 欢迎来到leanote
 		
+		// 添加leanote -> 该用户的共享
+		leanoteUserId, _ := revel.Config.String("register.sharedUserId"); // "5368c1aa99c37b029d000001";
+		nk1, _ := revel.Config.String("register.sharedUserShareNotebookId"); // 5368c1aa99c37b029d000002" // leanote
+		welcomeNoteId, _ := revel.Config.String("register.welcomeNoteId") // "5368c1b919807a6f95000000" // 欢迎来到leanote
+		
+		if leanoteUserId != "" && nk1 != "" && welcomeNoteId != "" {
 			shareService.AddShareNotebook(nk1, 0, leanoteUserId, email);
 			shareService.AddShareNote(welcomeNoteId, 0, leanoteUserId, email);
 			
@@ -67,6 +70,7 @@ func (this *AuthService) register(user info.User) (bool, string) {
 			// 公开为博客
 			noteUpdate := bson.M{"IsBlog": true}
 			noteService.UpdateNote(user.UserId.Hex(), user.UserId.Hex(), note.NoteId.Hex(), noteUpdate)
+		}
 		
 		//---------------
 		// 添加一条userBlog

app/tmp/main.go

@@ -102,88 +102,27 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.Blog)(nil),
+	revel.RegisterController((*controllers.File)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
-				Name: "SetNote2Blog",
+				Name: "UploadImage",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) },
-					&revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) },
+					&revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
 			},
 			&revel.MethodType{
-				Name: "SetNotebook2Blog",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "Index",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "View",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "SearchBlog",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "Set",
+				Name: "UploadBlogLogo",
 				Args: []*revel.MethodArg{ 
 				},
 				RenderArgNames: map[int][]string{ 
 				},
 			},
 			&revel.MethodType{
-				Name: "SetUserBlogBase",
+				Name: "UploadImageJson",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogBase)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "SetUserBlogComment",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogComment)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "SetUserBlogStyle",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogStyle)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "AboutMe",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
@@ -191,20 +130,40 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.Index)(nil),
+	revel.RegisterController((*controllers.Notebook)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
 				Name: "Index",
 				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) },
+					&revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) },
+					&revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
 			},
 			&revel.MethodType{
-				Name: "Suggestion",
+				Name: "DeleteNotebook",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "AddNotebook",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "UpdateNotebookTitle",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
@@ -325,19 +284,6 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.Oauth)(nil),
-		[]*revel.MethodType{
-			&revel.MethodType{
-				Name: "GithubCallback",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "code", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			
-		})
-	
 	revel.RegisterController((*controllers.Share)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
@@ -641,27 +587,109 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.File)(nil),
+	revel.RegisterController((*controllers.Blog)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
-				Name: "UploadImage",
+				Name: "SetNote2Blog",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) },
+					&revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
 			},
 			&revel.MethodType{
-				Name: "UploadBlogLogo",
+				Name: "SetNotebook2Blog",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "Index",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "View",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "SearchBlog",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "Set",
 				Args: []*revel.MethodArg{ 
 				},
 				RenderArgNames: map[int][]string{ 
 				},
 			},
 			&revel.MethodType{
-				Name: "UploadImageJson",
+				Name: "SetUserBlogBase",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogBase)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "SetUserBlogComment",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogComment)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "SetUserBlogStyle",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogStyle)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "AboutMe",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) },
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			
+		})
+	
+	revel.RegisterController((*controllers.Index)(nil),
+		[]*revel.MethodType{
+			&revel.MethodType{
+				Name: "Index",
+				Args: []*revel.MethodArg{ 
+				},
+				RenderArgNames: map[int][]string{ 
+				},
+			},
+			&revel.MethodType{
+				Name: "Suggestion",
+				Args: []*revel.MethodArg{ 
+					&revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
@@ -688,40 +716,12 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.Notebook)(nil),
+	revel.RegisterController((*controllers.NoteContentHistory)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
-				Name: "Index",
+				Name: "ListHistories",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) },
-					&revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) },
-					&revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "DeleteNotebook",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "AddNotebook",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) },
-				},
-				RenderArgNames: map[int][]string{ 
-				},
-			},
-			&revel.MethodType{
-				Name: "UpdateNotebookTitle",
-				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) },
-					&revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},
@@ -729,12 +729,12 @@ func main() {
 			
 		})
 	
-	revel.RegisterController((*controllers.NoteContentHistory)(nil),
+	revel.RegisterController((*controllers.Oauth)(nil),
 		[]*revel.MethodType{
 			&revel.MethodType{
-				Name: "ListHistories",
+				Name: "GithubCallback",
 				Args: []*revel.MethodArg{ 
-					&revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) },
+					&revel.MethodArg{Name: "code", Type: reflect.TypeOf((*string)(nil)) },
 				},
 				RenderArgNames: map[int][]string{ 
 				},

app/views/Errors/404.html

@@ -3,11 +3,6 @@
 {{else}}
 {{template "home/header_box.html" .}}
 
-<style>
-html, body {
-	height: 100%;
-}
-</style>
 <section id="box">
 	<div>
 		<h1>error-404</h1>

app/views/Home/header.html

@@ -39,8 +39,10 @@ function log(o) {
 				<a href="/logout">{{msg . "logout"}}</a>
 			{{else}}
 			<a href="/login">{{msg . "login"}}</a>
+				{{if .openRegister}}
 				<a href="/register" class="btn-register">{{msg . "register"}}</a>
 				{{end}}
+			{{end}}
 		</div>
 			
 		<ul id="blogNav" class="pull-right">

app/views/Home/index.html

@@ -12,12 +12,14 @@
 			 
 			 
 			<a class="btn btn-default" href="/demo">Try it</a>
+			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
 			OR			
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
+			{{end}}
 		</div>
 	</div>
 	

app/views/Home/login.html

@@ -25,13 +25,17 @@
 						<button id="loginBtn" class="btn btn-success" style="width: 100%">{{msg . "login"}}</button> 
 						<br />
 						<a href="/findPassword">{{msg . "forgetPassword"}}</a>
+						{{if .openRegister}}
 						<br />
-						<a href="/register">{{msg . "register"}}</a> {{msg . "or"}}
+						<a href="/register">{{msg . "register"}}</a> 
+						{{msg . "or"}}
 						<a href="/demo">{{msg . "try"}}</a>
 						<div style="border-top: 1px dashed #666;margin:2px 0">
 						  {{msg . "3th"}}: <a id="github">github<i class="fa fa-github"></i></a>
 						  <span id="thirdLoginLoading" style="display: none"> <img src="/images/loading-a-20-2.gif" />正在登录...</span> 
 						</div>
+						{{end}}
+						
 					</td>
 				</tr>
 			</table>

app/views/Note/note-dev.html

@@ -97,11 +97,14 @@ function log(o) {
 				<div class="pull-left" style="line-height: 40px; margin-top: 10px; margin-left: 10px;" id="leanoteMsg">
 					<span id="msg" style="display: inline-block;"></span>
 					<img id="loading" style="visibility: hidden" src="/images/loading-a-20.gif" />
+					
+					{{if .openRegister}}					
 						{{if eq .userInfo.Email "demo@leanote.com"}}
 						<span>
 							{{msg . "demoRegister"}}
 						</span>
 						{{end}}
+					{{end}}
 				</div>
 				
 				<!-- 

app/views/Note/note.html

@@ -97,11 +97,14 @@ function log(o) {
 				<div class="pull-left" style="line-height: 40px; margin-top: 10px; margin-left: 10px;" id="leanoteMsg">
 					<span id="msg" style="display: inline-block;"></span>
 					<img id="loading" style="visibility: hidden" src="/images/loading-a-20.gif" />
+					
+					{{if .openRegister}}					
 						{{if eq .userInfo.Email "demo@leanote.com"}}
 						<span>
 							{{msg . "demoRegister"}}
 						</span>
 						{{end}}
+					{{end}}
 				</div>
 				
 				<!-- 

conf/app-default.conf

@@ -4,6 +4,9 @@
 
 http.port=80
 
+# open for register?
+open=true
+
 site.url=http://localhost
 
 # the administrator username
@@ -25,6 +28,12 @@ email.port=25
 email.username=
 email.password=
 
+# open for register?
+register.open=true
+register.sharedUserId=5368c1aa99c37b029d000001
+register.sharedUserShareNotebookId=5368c1aa99c37b029d000002
+register.welcomeNoteId=5368c1b919807a6f95000000
+
 #--------------------------------
 # revel config
 # for dev

public/js/common.js

@@ -706,7 +706,7 @@ function hideLoading() {
 
 // 注销, 先清空cookie
 function logout() {
-	$.removeCookie("REVEL_SESSION");
+	$.removeCookie("LEANOTE_SESSION");
 	location.href = "/logout?id=1";
 }