调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+10 -9
View File
@@ -3,18 +3,19 @@ package router
import (
"os"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/middleware"
"go-admin/app/admin/middleware/handler"
"go-admin/common/global"
"go-admin/common/log"
common "go-admin/common/middleware"
_ "go-admin/pkg/jwtauth"
//_ "go-admin/pkg/jwtauth"
"go-admin/tools"
"go-admin/tools/config"
"github.com/gin-gonic/gin"
)
// InitRouter 路由初始化,不要怀疑,这里用到了
func InitRouter() {
var r *gin.Engine
h := global.Cfg.GetEngine()
@@ -33,12 +34,14 @@ func InitRouter() {
r.Use(handler.TlsHandler())
}
r.Use(common.Sentinel())
r.Use(common.Sentinel()).
Use(common.RequestIdLogger(tools.TrafficKey, tools.LoggerKey))
middleware.InitMiddleware(r)
// the jwt middleware
var err error
authMiddleware, err := middleware.AuthInit()
tools.HasError(err, "JWT Init Error", 500)
if err != nil {
log.Fatalf("JWT Init Error, %s", err.Error())
}
// 注册系统路由
InitSysRouter(r, authMiddleware)
@@ -46,6 +49,4 @@ func InitRouter() {
// 注册业务路由
// TODO: 这里可存放业务路由,里边并无实际路由只有演示代码
InitExamplesRouter(r, authMiddleware)
//return r
}