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

app/admin/router/initrouter.go

@@ -9,22 +9,13 @@ import (
 	_ "go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
-	"gorm.io/gorm"
 )
 
-var authMiddleware = new(jwt.GinJWTMiddleware)
-
-func InitRouter() *gin.Engine {
-	var r *gin.Engine
-	if global.GinEngine == nil {
-		r = gin.New()
-	} else {
-		r = global.GinEngine
-	}
+func InitRouter(r *gin.Engine) *gin.Engine {
 	if config2.SslConfig.Enable {
 		r.Use(handler.TlsHandler())
 	}
-	r.Use(middleware.WithContextDb(map[string]*gorm.DB{"*": global.Eloquent}))
+	r.Use(middleware.WithContextDb(middleware.GetGormFromConfig(global.Cfg)))
 	middleware.InitMiddleware(r)
 	// the jwt middleware
 	var err error