mirror of
https://github.com/go-admin-team/go-admin.git
synced 2026-09-20 17:57:54 +00:00
日志生效,
调整路由注册方式
This commit is contained in:
+5
-12
@@ -3,6 +3,7 @@ package api
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"go-admin/app/admin/router"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -13,7 +14,6 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
|
||||
"go-admin/app/admin/router"
|
||||
"go-admin/app/jobs"
|
||||
"go-admin/common/database"
|
||||
"go-admin/common/global"
|
||||
@@ -41,7 +41,7 @@ var (
|
||||
}
|
||||
)
|
||||
|
||||
var echoTimes int
|
||||
var AppRouters = make([]func(), 0)
|
||||
|
||||
func init() {
|
||||
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
|
||||
@@ -74,18 +74,11 @@ func run() error {
|
||||
engine = gin.New()
|
||||
}
|
||||
|
||||
var r *gin.Engine
|
||||
switch engine.(type) {
|
||||
case *gin.Engine:
|
||||
r = engine.(*gin.Engine)
|
||||
default:
|
||||
panic("not support this engine")
|
||||
AppRouters = append(AppRouters, router.InitRouter)
|
||||
for _, f := range AppRouters {
|
||||
f()
|
||||
}
|
||||
|
||||
r = router.InitRouter(r)
|
||||
//defer global.Eloquent.Close()
|
||||
global.Cfg.SetEngine(r)
|
||||
|
||||
srv := &http.Server{
|
||||
Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port,
|
||||
Handler: global.Cfg.GetEngine(),
|
||||
|
||||
Reference in New Issue
Block a user