diff --git a/migrate/default.go b/migrate/default.go index 1a74b4f..bacfc7e 100644 --- a/migrate/default.go +++ b/migrate/default.go @@ -35,7 +35,7 @@ func init() { defaultUsers = append(defaultUsers, adminUser, guestUser) dashboardMenu := &models.Menu{} - dashboardMenu.Icon = "dashboard" + dashboardMenu.Icon = "iconsys-fenlei_2" dashboardMenu.Label = "系统首页" dashboardMenu.Name = "Dashboard" dashboardMenu.Public = true @@ -43,7 +43,7 @@ func init() { dashboardMenu.ViewPath = "../views/dashboard/Index.vue" orgMenu := &models.Menu{} - orgMenu.Icon = "org" + orgMenu.Icon = "iconsys-tuandui" orgMenu.Label = "组织机构" orgMenu.Name = "Organize" orgMenu.Public = true @@ -60,7 +60,7 @@ func init() { profileMenu.ViewPath = "../views/organize/user/Profile.vue" settingMenu := &models.Menu{} - settingMenu.Icon = "connect" + settingMenu.Icon = "iconsys-shezhi_2" settingMenu.Label = "系统设置" settingMenu.Name = "System" settingMenu.Public = true diff --git a/migrate/migrate.go b/migrate/migrate.go index e394eba..422d8a3 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -38,7 +38,6 @@ func Permission(db *gorm.DB, menuName string, permission string, label string) ( return } -// #2c7be5 // Default 合并初始化数据集 func Default(db *gorm.DB) (err error) { var ( diff --git a/server.go b/server.go index 180ac99..d9acabf 100644 --- a/server.go +++ b/server.go @@ -221,8 +221,10 @@ func initREST(ctx context.Context, o *options) (err error) { if err = rest.Init(opts...); err != nil { return } - if err = tx.AutoMigrate(getModels()...); err != nil { - return + if !o.disableModel { + if err = tx.AutoMigrate(getModels()...); err != nil { + return + } } return } @@ -514,8 +516,10 @@ func Init(ctx context.Context, cbs ...Option) (err error) { if err = initREST(ctx, opts); err != nil { return } - if err = initModels(ctx, opts); err != nil { - return + if !opts.disableModels { + if err = initModels(ctx, opts); err != nil { + return + } } if opts.httpServer != nil { registerRESTRoute(opts.domain, opts.db, opts.httpServer) diff --git a/types.go b/types.go index dd89c02..9eae36f 100644 --- a/types.go +++ b/types.go @@ -31,6 +31,7 @@ type ( translate Translate disableDefault bool disableRecorder bool + disableModels bool httpServer *http.Server restOpts []rest.Option } @@ -77,6 +78,12 @@ func WithoutDefault() Option { } } +func WithoutModels() Option { + return func(o *options) { + o.disableModels = true + } +} + func WithoutRecorder() Option { return func(o *options) { o.disableRecorder = true