日志生效,

调整路由注册方式
This commit is contained in:
linwenxiang
2020-09-21 23:23:40 +08:00
parent 2fe2c96e82
commit 7d8a267da7
8 changed files with 148 additions and 33 deletions
+2 -2
View File
@@ -22,7 +22,7 @@ type SysJob struct {
// RemoveJobForService 调用service实现
func (e *SysJob) RemoveJobForService(c *gin.Context) {
msgID := e.GenerateMsgIDFromContext(c)
msgID := apis.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
@@ -49,7 +49,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) {
// StartJobForService 启动job service实现
func (e *SysJob) StartJobForService(c *gin.Context) {
msgID := e.GenerateMsgIDFromContext(c)
msgID := apis.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
+2 -1
View File
@@ -8,7 +8,8 @@ func InitMiddleware(r *gin.Engine) {
// 日志处理
r.Use(LoggerToFile())
// 自定义错误处理
r.Use(CustomError)
//todo 上线改回
//r.Use(CustomError)
// NoCache is a middleware function that appends headers
r.Use(NoCache)
// 跨域处理
+17 -3
View File
@@ -2,16 +2,30 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/middleware"
"go-admin/app/admin/middleware/handler"
"go-admin/common/global"
"go-admin/common/log"
_ "go-admin/pkg/jwtauth"
"go-admin/tools"
"go-admin/tools/config"
"os"
)
func InitRouter(r *gin.Engine) *gin.Engine {
func InitRouter() {
var r *gin.Engine
h := global.Cfg.GetEngine()
if h == nil {
h = gin.New()
global.Cfg.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())
}
@@ -29,5 +43,5 @@ func InitRouter(r *gin.Engine) *gin.Engine {
// TODO: 这里可存放业务路由,里边并无实际路由只有演示代码
InitExamplesRouter(r, authMiddleware)
return r
//return r
}