siteurl, adminUsername config in configService

app/controllers/admin/AdminUpgradeController.go

@@ -3,7 +3,7 @@ package admin
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
-//	. "github.com/leanote/leanote/app/lea"
+	"github.com/leanote/leanote/app/info"
 //	"io/ioutil"
 )
 
@@ -15,4 +15,10 @@ type AdminUpgrade struct {
 func (c AdminUpgrade) UpgradeBlog() revel.Result {
 	upgradeService.UpgradeBlog()
 	return nil;
-}
+}
+
+func (c AdminUpgrade) UpgradeBetaToSelfBlog() revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = upgradeService.UpgradeBetaToSelfBlog(c.GetUserId())
+	return c.RenderJson(re)
+}

app/controllers/admin/init.go

@@ -28,7 +28,6 @@ var configService *service.ConfigService
 var emailService *service.EmailService
 var upgradeService *service.UpgradeService
 
-var adminUsername = "admin"
 // 拦截器
 // 不需要拦截的url
 // Index 除了Note之外都不需要
@@ -83,7 +82,7 @@ func AuthInterceptor(c *revel.Controller) revel.Result {
 	
 	// 验证是否已登录
 	// 必须是管理员
-	if username, ok := c.Session["Username"]; ok && username == adminUsername {
+	if username, ok := c.Session["Username"]; ok && username == configService.GetAdminUsername() {
 		return nil // 已登录
 	}
 	
@@ -129,4 +128,4 @@ func init() {
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminEmail{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminUpgrade{})
 	revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminData{})
-}
+}