diff --git a/app/cms/router/init_router.go b/app/cms/router/init_router.go index c3952c79..783669a3 100644 --- a/app/cms/router/init_router.go +++ b/app/cms/router/init_router.go @@ -1,7 +1,7 @@ package router import ( - "github.com/go-admin-team/go-admin-core/sdk/pkg" + _ "github.com/go-admin-team/go-admin-core/sdk/pkg" "os" "github.com/gin-gonic/gin" @@ -15,8 +15,8 @@ func InitRouter() { var r *gin.Engine h := sdk.Runtime.GetEngine() if h == nil { - h = gin.New() - sdk.Runtime.SetEngine(h) + log.Fatal("not found engine...") + os.Exit(-1) } switch h.(type) { case *gin.Engine: @@ -25,10 +25,6 @@ func InitRouter() { log.Fatal("not support other engine") os.Exit(-1) } - r.Use(common.Sentinel()). - Use(common.RequestId(pkg.TrafficKey)) - common.InitMiddleware(r) - // the jwt middleware authMiddleware, err := common.AuthInit() if err != nil { @@ -36,6 +32,5 @@ func InitRouter() { } // 注册业务路由 - // TODO: 这里可存放业务路由,里边并无实际路由只有演示代码 initRouter(r, authMiddleware) } diff --git a/app/jobs/router/int_router.go b/app/jobs/router/int_router.go index 8daa5dd8..ab65faa5 100644 --- a/app/jobs/router/int_router.go +++ b/app/jobs/router/int_router.go @@ -1,7 +1,7 @@ package router import ( - "github.com/go-admin-team/go-admin-core/sdk/pkg" + //"github.com/go-admin-team/go-admin-core/sdk/pkg" "os" "github.com/gin-gonic/gin" @@ -15,8 +15,8 @@ func InitRouter() { var r *gin.Engine h := sdk.Runtime.GetEngine() if h == nil { - h = gin.New() - sdk.Runtime.SetEngine(h) + log.Fatal("not found engine...") + os.Exit(-1) } switch h.(type) { case *gin.Engine: @@ -26,16 +26,11 @@ func InitRouter() { os.Exit(-1) } - r.Use(common.Sentinel()). - Use(common.RequestId(pkg.TrafficKey)) - common.InitMiddleware(r) - // the jwt middleware authMiddleware, err := common.AuthInit() if err != nil { log.Fatalf("JWT Init Error, %s", err.Error()) } // 注册业务路由 - // TODO: 这里可存放业务路由,里边并无实际路由只有演示代码 initRouter(r, authMiddleware) } diff --git a/app/other/router/init_router.go b/app/other/router/init_router.go index 63c916d4..708f93ec 100644 --- a/app/other/router/init_router.go +++ b/app/other/router/init_router.go @@ -6,7 +6,6 @@ import ( "github.com/gin-gonic/gin" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk" - "github.com/go-admin-team/go-admin-core/sdk/middleware" common "go-admin/common/middleware" ) @@ -15,8 +14,8 @@ func InitRouter() { var r *gin.Engine h := sdk.Runtime.GetEngine() if h == nil { - h = gin.New() - sdk.Runtime.SetEngine(h) + log.Fatal("not found engine...") + os.Exit(-1) } switch h.(type) { case *gin.Engine: @@ -25,12 +24,6 @@ func InitRouter() { log.Fatal("not support other engine") os.Exit(-1) } - - r.Use(middleware.Metrics()) - - //r.Use(common.Sentinel()). - // Use(common.RequestId(pkg.TrafficKey)) - common.InitMiddleware(r) // the jwt middleware authMiddleware, err := common.AuthInit() if err != nil { diff --git a/cmd/api/server.go b/cmd/api/server.go index 6d405474..b5769d6d 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -12,6 +12,7 @@ import ( "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/config/source/file" "github.com/go-admin-team/go-admin-core/sdk" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/config" "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/runtime" @@ -19,8 +20,11 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/router" + "go-admin/app/jobs" "go-admin/common/database" "go-admin/common/global" + common "go-admin/common/middleware" + "go-admin/common/middleware/handler" "go-admin/common/storage" ext "go-admin/config" ) @@ -76,10 +80,7 @@ func run() error { if config.ApplicationConfig.Mode == pkg.ModeProd.String() { gin.SetMode(gin.ReleaseMode) } - engine := sdk.Runtime.GetEngine() - if engine == nil { - engine = gin.New() - } + initRouter() for _, f := range AppRouters { f() @@ -90,6 +91,12 @@ func run() error { Handler: sdk.Runtime.GetEngine(), } + go func() { + jobs.InitJob() + jobs.Setup(sdk.Runtime.GetDb()) + + }() + if apiCheck { var routers = sdk.Runtime.GetRouter() q := sdk.Runtime.GetMemoryQueue("") @@ -150,3 +157,29 @@ func tip() { usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令` fmt.Printf("%s \n\n", usageStr) } + +func initRouter() { + var r *gin.Engine + h := sdk.Runtime.GetEngine() + if h == nil { + h = gin.New() + sdk.Runtime.SetEngine(h) + } + switch h.(type) { + case *gin.Engine: + r = h.(*gin.Engine) + default: + log.Fatal("not support other engine") + os.Exit(-1) + } + if config.SslConfig.Enable { + r.Use(handler.TlsHandler()) + } + //r.Use(middleware.Metrics()) + r.Use(common.Sentinel()). + Use(common.RequestId(pkg.TrafficKey)). + Use(api.SetRequestLogger) + + common.InitMiddleware(r) + +}