feat:Extract global configuration
This commit is contained in:
1 parent
a6970e9c67
commit
bfbc5081ea
15 files changed
+155
-207
No files matched your search
@@ -8,15 +8,15 @@ import (
|
||||
"go-admin/models"
|
||||
"go-admin/models/gorm"
|
||||
"go-admin/tools"
|
||||
config2 "go-admin/tools/config"
|
||||
"go-admin/tools/config"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var (
|
||||
config string
|
||||
mode string
|
||||
StartCmd = &cobra.Command{
|
||||
configYml string
|
||||
mode string
|
||||
StartCmd = &cobra.Command{
|
||||
Use: "init",
|
||||
Short: "initialize the database",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
@@ -26,7 +26,7 @@ var (
|
||||
)
|
||||
|
||||
func init() {
|
||||
StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
||||
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
||||
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
|
||||
}
|
||||
|
||||
@@ -34,11 +34,12 @@ func run() {
|
||||
usage := `start init`
|
||||
fmt.Println(usage)
|
||||
//1. 读取配置
|
||||
config2.ConfigSetup(config)
|
||||
config.ConfigSetup(configYml)
|
||||
//2. 设置日志
|
||||
tools.InitLogger()
|
||||
//3. 初始化数据库链接
|
||||
database.Setup()
|
||||
database.Setup(config.DatabaseConfig.Driver)
|
||||
|
||||
//4. 数据库迁移
|
||||
_ = migrateModel()
|
||||
log.Println("数据库结构初始化成功!")
|
||||
@@ -46,13 +47,12 @@ func run() {
|
||||
if err := models.InitDb(); err != nil {
|
||||
log.Fatal("数据库基础数据初始化失败!")
|
||||
}
|
||||
|
||||
usage = `数据库基础数据初始化成功`
|
||||
fmt.Println(usage)
|
||||
}
|
||||
|
||||
func migrateModel() error {
|
||||
if config2.DatabaseConfig.DbType == "mysql" {
|
||||
if config.DatabaseConfig.Driver == "mysql" {
|
||||
orm.Eloquent = orm.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")
|
||||
}
|
||||
return gorm.AutoMigrate(orm.Eloquent)
|
||||
|
||||
Reference in new issue
Block a user