1、重新实现数据库初始化

2、新增超级管理员可以转让项目
3、新增超级管理员可以公开项目

commands/command.go

@@ -1,23 +1,22 @@
 package commands
 
 import (
+	"encoding/gob"
 	"fmt"
 	"net/url"
-	"time"
 	"os"
-	"encoding/gob"
+	"time"
 
-	"github.com/lifei6671/godoc/models"
 	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/logs"
-	"github.com/lifei6671/godoc/conf"
+	"github.com/astaxie/beego/orm"
 	"github.com/lifei6671/gocaptcha"
-
+	"github.com/lifei6671/godoc/conf"
+	"github.com/lifei6671/godoc/models"
 )
 
 // RegisterDataBase 注册数据库
-func RegisterDataBase()  {
+func RegisterDataBase() {
 	host := beego.AppConfig.String("db_host")
 	database := beego.AppConfig.String("db_database")
 	username := beego.AppConfig.String("db_username")
@@ -26,22 +25,21 @@ func RegisterDataBase()  {
 
 	port := beego.AppConfig.String("db_port")
 
-	dataSource := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true&loc=%s",username,password,host,port,database,url.QueryEscape(timezone))
-
+	dataSource := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true&loc=%s", username, password, host, port, database, url.QueryEscape(timezone))
 
 	orm.RegisterDataBase("default", "mysql", dataSource)
 
-	location , err := time.LoadLocation(timezone);
+	location, err := time.LoadLocation(timezone)
 	if err == nil {
 		orm.DefaultTimeLoc = location
-	}else{
+	} else {
 		fmt.Println(err)
 	}
 
 }
 
 // RegisterModel 注册Model
-func RegisterModel()  {
+func RegisterModel() {
 	orm.RegisterModelWithPrefix(conf.GetDatabasePrefix(),
 		new(models.Member),
 		new(models.Book),
@@ -57,88 +55,20 @@ func RegisterModel()  {
 
 }
 
-//初始化数据
-func Initialization()  {
-
-	o := orm.NewOrm()
-
-	_,err := o.Raw(`INSERT INTO md_options (option_title, option_name, option_value) SELECT '是否启用注册','ENABLED_REGISTER','false' FROM dual WHERE NOT exists(SELECT * FROM md_options WHERE option_name = 'ENABLED_REGISTER');`).Exec()
-
-	if err != nil {
-		panic("ENABLED_REGISTER => " + err.Error())
-		os.Exit(1)
-	}
-	_,err = o.Raw(`INSERT INTO md_options (option_title, option_name, option_value) SELECT '是否启用验证码','ENABLED_CAPTCHA','false' FROM dual WHERE NOT exists(SELECT * FROM md_options WHERE option_name = 'ENABLED_CAPTCHA');`).Exec()
-
-	if err != nil {
-		panic("ENABLED_CAPTCHA => " + err.Error())
-		os.Exit(1)
-	}
-	_,err = o.Raw(`INSERT INTO md_options (option_title, option_name, option_value) SELECT '启用匿名访问','ENABLE_ANONYMOUS','true' FROM dual WHERE NOT exists(SELECT * FROM md_options WHERE option_name = 'ENABLE_ANONYMOUS');`).Exec()
-
-	if err != nil {
-		panic("ENABLE_ANONYMOUS => " + err.Error())
-		os.Exit(1)
-	}
-	_,err = o.Raw(`INSERT INTO md_options (option_title, option_name, option_value) SELECT '站点名称','SITE_NAME','MinDoc' FROM dual WHERE NOT exists(SELECT * FROM md_options WHERE option_name = 'SITE_NAME');`).Exec()
-
-	if err != nil {
-		panic("SITE_NAME => " + err.Error())
-		os.Exit(1)
-	}
-
-	member,err := models.NewMember().FindByFieldFirst("account","admin")
-	if err == orm.ErrNoRows {
-
-		member.Account = "admin"
-		member.Avatar = "/static/images/headimgurl.jpg"
-		member.Password = "123456"
-		member.Role = 0
-		member.Email = "admin@iminho.me"
-
-		if err := member.Add(); err != nil {
-			panic("Member.Add => " + err.Error())
-			os.Exit(0)
-		}
-
-		book := models.NewBook()
-
-		book.MemberId = member.MemberId
-		book.BookName = "MinDoc演示项目"
-		book.Status = 0
-		book.Description = "这是一个MinDoc演示项目，该项目是由系统初始化时自动创建。"
-		book.CommentCount = 0
-		book.PrivatelyOwned = 0
-		book.CommentStatus = "closed"
-		book.Identify = "mindoc"
-		book.DocCount = 0
-		book.CommentCount = 0
-		book.Version = time.Now().Unix()
-		book.Cover = conf.GetDefaultCover()
-		book.Editor = "markdown"
-		book.Theme = "default"
-
-		if err := book.Insert(); err != nil {
-			panic("Book.Insert => " + err.Error())
-			os.Exit(0)
-		}
-	}
-}
-
 // RegisterLogger 注册日志
-func RegisterLogger()  {
+func RegisterLogger() {
 
 	logs.SetLogFuncCall(true)
 	logs.SetLogger("console")
 	logs.EnableFuncCallDepth(true)
 	logs.Async()
 
-	if _,err := os.Stat("logs/log.log"); os.IsNotExist(err) {
-		os.MkdirAll("./logs",0777)
+	if _, err := os.Stat("logs/log.log"); os.IsNotExist(err) {
+		os.MkdirAll("./logs", 0777)
 
-		if f,err := os.Create("logs/log.log");err == nil {
+		if f, err := os.Create("logs/log.log"); err == nil {
 			f.Close()
-			beego.SetLogger("file",`{"filename":"logs/log.log"}`)
+			beego.SetLogger("file", `{"filename":"logs/log.log"}`)
 		}
 	}
 
@@ -149,26 +79,16 @@ func RegisterLogger()  {
 // RunCommand 注册orm命令行工具
 func RegisterCommand() {
 
-	if _,err := os.Stat("install.lock"); os.IsNotExist(err){
-		err = orm.RunSyncdb("default",false,true)
-		if err == nil {
-			Initialization()
-			f, _ := os.Create("install.lock")
-			defer f.Close()
-		}else{
-			panic(err.Error())
-			os.Exit(0)
-		}
-	}
-
+	Install()
+	Update()
 	CheckUpdate()
 }
 
-func RegisterFunction()  {
-	beego.AddFuncMap("config",models.GetOptionValue)
+func RegisterFunction() {
+	beego.AddFuncMap("config", models.GetOptionValue)
 }
 
-func init()  {
+func init() {
 	gocaptcha.ReadFonts("./static/fonts", ".ttf")
 	gob.Register(models.Member{})
-}
+}