数据库连接初始化优化

权限部分修改
This commit is contained in:
linwenxiang committed 2021-02-21 14:06:13 +08:00
1 parent 4979fd659f
commit deeb82048b
37 files changed
+726 -721

No files matched your search

+4 -20
View File
@@ -17,19 +17,14 @@ import (
"go-admin/common/database"
"go-admin/common/global"
"go-admin/common/log"
mycasbin "go-admin/pkg/casbin"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/config"
"go-admin/tools/trace"
)
var (
configYml string
port string
mode string
traceStart bool
StartCmd = &cobra.Command{
configYml string
StartCmd = &cobra.Command{
Use: "server",
Short: "Start API server",
Example: "go-admin server -c config/settings.yml",
@@ -47,9 +42,6 @@ var AppRouters = make([]func(), 0)
func init() {
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on")
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
StartCmd.PersistentFlags().BoolVarP(&traceStart, "traceStart", "t", false, "start traceStart app dash")
//注册路由 fixme 其他应用的路由,在本目录新建文件放在init方法
AppRouters = append(AppRouters, router.InitRouter)
@@ -65,9 +57,7 @@ func setup() {
global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job")
global.RequestLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "request")
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
//4. 接口访问控制加载
global.CasbinEnforcer = mycasbin.Setup(global.Eloquent, "sys_")
database.Setup()
usageStr := `starting api server`
log.Info(usageStr)
@@ -85,7 +75,7 @@ func run() error {
engine = gin.New()
}
if mode == "dev" {
if config.ApplicationConfig.Mode == "dev" {
//监控
AppRouters = append(AppRouters, router.Monitor)
}
@@ -107,12 +97,6 @@ func run() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if traceStart {
//链路追踪, fixme 页面显示需要自备梯子
trace.Start()
defer trace.Stop(ctx)
}
go func() {
// 服务连接
if config.SslConfig.Enable {
+2 -2
View File
@@ -12,7 +12,6 @@ import (
var (
configYml string
mode string
StartCmd = &cobra.Command{
Use: "config",
Short: "Get Application config info",
@@ -42,7 +41,8 @@ func run() {
}
fmt.Println("jwt:", string(jwt))
database, errs := json.MarshalIndent(config.DatabaseConfig, "", " ") //转换成JSON返回的是byte[]
// todo 需要兼容
database, errs := json.MarshalIndent(config.DatabasesConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
@@ -28,7 +28,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
new(system.SysLoginLog),
new(system.SysOperaLog),
new(models.RoleMenu),
new(models.SysRoleDept),
new(system.SysRoleDept),
new(models.SysUser),
new(system.SysRole),
new(models.Post),
+1 -1
View File
@@ -72,7 +72,7 @@ func migrateModel() error {
}
func initDB() error {
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
database.Setup()
//4. 数据库迁移
fmt.Println("数据库迁移开始")
_ = migrateModel()