feat:完善项目信息

This commit is contained in:
henry
2021-12-28 10:38:02 +08:00
parent 76ca837fd6
commit 7eb8e5c48b
13 changed files with 161 additions and 137 deletions

View File

@ -28,10 +28,12 @@ var (
},
}
configFile string
engineFile string
)
func init() {
Cmd.PersistentFlags().StringVarP(&configFile, "config_file", "c", "./config.yaml", "项目配置文件,默认./config.yaml")
Cmd.PersistentFlags().StringVarP(&configFile, "setting", "s", "./default_setting.yaml", "项目配置文件,默认./default_setting.yaml")
Cmd.PersistentFlags().StringVarP(&engineFile, "engine", "e", "./default_engine.yaml", "项目数据配置文件,默认./default_engine.yaml")
}
func run() {
@ -42,21 +44,25 @@ func run() {
obj.Upload.Exts = strings.Split(obj.Upload.Ext, ",")
logger.NewLogger().Init(&logger.Option{File: obj.Log.File, LeastDay: obj.Log.LeastDay, Level: obj.Log.Level, IsStdout: false}).Load()
})
orm.NewInstance(orm.WithDebug(config.SettingInfo.Engine.Debug),
orm.WithDBMode(config.SettingInfo.Engine.DBMode),
orm.WithTablePrefix(config.SettingInfo.Engine.TablePrefix),
orm.WithSingularTable(!config.SettingInfo.Engine.Complex),
orm.WithMaxIdleConns(config.SettingInfo.Engine.MaxIdleConns),
orm.WithMaxOpenConns(config.SettingInfo.Engine.MaxOpenConns),
orm.WithMaxLifetime(config.SettingInfo.Engine.MaxLifetime),
orm.WithMysqlOption(&logic.Mysql{
User: config.SettingInfo.Engine.Mysql.User, Password: config.SettingInfo.Engine.Mysql.Password,
Host: config.SettingInfo.Engine.Mysql.Host, Port: config.SettingInfo.Engine.Mysql.Port,
DBName: config.SettingInfo.Engine.Mysql.DBName, Parameters: config.SettingInfo.Engine.Mysql.Parameters,
}),
orm.WithSqliteOption(&logic.Sqlite{Path: config.SettingInfo.Engine.Sqlite.Path, Name: config.SettingInfo.Engine.Sqlite.Name}),
).Init().Local()
fmt.Println(engineFile)
utils.LoadConfig(engineFile, config.EngineInfo, func(i interface{}) {
fmt.Println(utils.AnyToJSON(i))
obj := i.(*config.Engine)
orm.NewInstance(
orm.WithDebug(obj.Debug),
orm.WithDBMode(obj.Mode),
orm.WithMaxIdleConns(obj.MaxIdleConns),
orm.WithMaxOpenConns(obj.MaxOpenConns),
orm.WithMaxLifetime(obj.MaxLifetime),
orm.WithMysqlOption(&logic.Mysql{
Host: obj.Engines.Mysql.Host, Port: obj.Engines.Mysql.Port,
Username: obj.Engines.Mysql.Username, Password: obj.Engines.Mysql.Password,
Database: obj.Engines.Mysql.Database, Parameters: obj.Engines.Mysql.Parameters,
}),
orm.WithSqliteOption(&logic.Sqlite{Path: obj.Engines.Sqlite.Path, Name: obj.Engines.Sqlite.Name}),
).Init().Local()
})
cache.Init()
cron.Init()
app.Init()