近期bug修复,迁移go-admin-core库, Fixed #272 Fixed #261

This commit is contained in:
linwenxiang committed 2020-10-21 10:09:47 +08:00
1 parent f2703f16d5
commit 52f42616a2
24 files changed
+150 -85

No files matched your search

+19 -6
View File
@@ -3,24 +3,27 @@ package migrate
import (
"bytes"
"fmt"
tools2 "go-admin/tools"
"strconv"
"text/template"
"time"
"github.com/spf13/cobra"
"go-admin/cmd/migrate/migration"
_ "go-admin/cmd/migrate/migration/version"
_ "go-admin/cmd/migrate/migration/version-local"
"go-admin/common/database"
"go-admin/common/global"
"go-admin/common/models"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools/config"
)
var (
configYml string
generate bool
goAdmin bool
StartCmd = &cobra.Command{
Use: "migrate",
Short: "Initialize the database",
@@ -34,16 +37,18 @@ var (
func init() {
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
StartCmd.PersistentFlags().BoolVarP(&generate, "generate", "g", false, "generate migration file")
StartCmd.PersistentFlags().BoolVarP(&goAdmin, "goAdmin", "a", false, "generate go-admin migration file")
}
func run() {
usage := `start init`
fmt.Println(usage)
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
if !generate {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
_ = initDB()
} else {
_ = genFile()
@@ -79,8 +84,16 @@ func genFile() error {
}
m := map[string]string{}
m["GenerateTime"] = strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
m["Package"] = "version_local"
if goAdmin {
m["Package"] = "version"
}
var b1 bytes.Buffer
err = t1.Execute(&b1, m)
tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
if goAdmin {
tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
} else {
tools2.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
}
return nil
}