Merge branch 'dev' of github.com:go-admin-team/go-admin into dev

This commit is contained in:
wenjianzhang committed 2021-06-11 15:26:41 +08:00
commit 52f45e362b
26 files changed
+526 -4336

No files matched your search

+1 -1
View File
@@ -11,8 +11,8 @@ type SysRole struct {
Admin bool `json:"admin" gorm:"size:4;"`
DataScope string `json:"dataScope" gorm:"size:128;"`
SysMenu []SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"`
ModelTime
ControlBy
ModelTime
}
func (SysRole) TableName() string {
@@ -40,6 +40,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
new(models.SysCategory),
new(models.SysContent),
new(models.SysApi),
new(models.SysChinaAreaData),
)
if err != nil {
return err
@@ -47,4 +48,4 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
return db.Create(&common.Migration{
Version: version,
}).Error
}
}
+5 -12
View File
@@ -13,7 +13,6 @@ import (
"github.com/spf13/cobra"
"github.com/go-admin-team/go-admin-core/sdk/config"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"go-admin/cmd/migrate/migration"
_ "go-admin/cmd/migrate/migration/version"
_ "go-admin/cmd/migrate/migration/version-local"
@@ -49,15 +48,10 @@ func run() {
if !generate {
fmt.Println(`start init`)
//1. 读取配置
config.Setup(file.NewSource(file.WithPath(configYml)))
//2. 设置日志
sdk.Runtime.SetLogger(
logger.SetupLogger(
config.LoggerConfig.Type,
config.LoggerConfig.Path,
config.LoggerConfig.Level,
config.LoggerConfig.Stdout))
_ = initDB()
config.Setup(
file.NewSource(file.WithPath(configYml)),
initDB,
)
} else {
fmt.Println(`generate migration file`)
_ = genFile()
@@ -81,14 +75,13 @@ func migrateModel() error {
migration.Migrate.Migrate()
return err
}
func initDB() error {
func initDB() {
//3. 初始化数据库链接
database.Setup()
//4. 数据库迁移
fmt.Println("数据库迁移开始")
_ = migrateModel()
fmt.Println(`数据库基础数据初始化成功`)
return nil
}
func genFile() error {