调整log代码，兼容zap扩展支持fields

app/admin/apis/sys_job/sys_job.go

@@ -7,7 +7,6 @@ import (
 	"go-admin/app/admin/service"
 	"go-admin/common/apis"
 	"go-admin/common/dto"
-	"go-admin/common/global"
 	"go-admin/tools/app"
 )
 
@@ -33,7 +32,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) {
 	s := service.SysJob{}
 	s.Log = log
 	s.Orm = db
-	s.Cron = global.Runtime.GetCrontabKey(c.Request.Host)
+	s.Cron = app.Runtime.GetCrontabKey(c.Request.Host)
 	err = s.RemoveJob(&v)
 	if err != nil {
 		log.Errorf("RemoveJob error, %s", err.Error())
@@ -61,7 +60,7 @@ func (e *SysJob) StartJobForService(c *gin.Context) {
 	s := service.SysJob{}
 	s.Orm = db
 	s.Log = log
-	s.Cron = global.Runtime.GetCrontabKey(c.Request.Host)
+	s.Cron = app.Runtime.GetCrontabKey(c.Request.Host)
 	err = s.StartJob(&v)
 	if err != nil {
 		log.Errorf("GetCrontabKey error, %s", err.Error())

app/admin/apis/tools/dbcolumns.go

@@ -1,12 +1,12 @@
 package tools
 
 import (
+	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 
 	"go-admin/app/admin/models/tools"
-	"go-admin/pkg/logger"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 )
@@ -20,7 +20,7 @@ import (
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/db/columns/page [get]
 func GetDBColumnList(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	var data tools.DBColumns
 	var err error
 	var pageSize = 10

app/admin/apis/tools/dbtables.go

@@ -1,12 +1,12 @@
 package tools
 
 import (
+	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 
 	"go-admin/app/admin/models/tools"
-	"go-admin/pkg/logger"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"
@@ -26,7 +26,7 @@ func GetDBTableList(c *gin.Context) {
 	var err error
 	var pageSize = 10
 	var pageIndex = 1
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" {
 		res.Msg = "对不起，sqlite3 或 postgres 不支持代码生成！"
 		c.JSON(http.StatusOK, res.ReturnError(500))

app/admin/apis/tools/gen.go

@@ -2,6 +2,7 @@ package tools
 
 import (
 	"bytes"
+	"go-admin/common/apis"
 	"net/http"
 	"text/template"
 
@@ -9,14 +10,13 @@ import (
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/models/tools"
-	"go-admin/pkg/logger"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"
 )
 
 func Preview(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	table := tools.SysTables{}
 	id, err := tools2.StringToInt(c.Param("tableId"))
 	tools2.HasError(err, "", -1)
@@ -69,7 +69,7 @@ func Preview(c *gin.Context) {
 }
 
 func GenCodeV3(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	table := tools.SysTables{}
 	id, err := tools2.StringToInt(c.Param("tableId"))
 	tools2.HasError(err, "", -1)
@@ -192,7 +192,7 @@ func ActionsGenV3(tab tools.SysTables) {
 }
 
 func GenMenuAndApi(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 
 	table := tools.SysTables{}
 	timeNow := tools2.GetCurrentTime()

app/admin/apis/tools/systables.go

@@ -1,7 +1,7 @@
 package tools
 
 import (
-	"go-admin/pkg/logger"
+	"go-admin/common/apis"
 	"gorm.io/gorm"
 	"net/http"
 	"strings"
@@ -22,7 +22,7 @@ import (
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/page [get]
 func GetSysTableList(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	var data tools.SysTables
 	var err error
 	var pageSize = 10
@@ -68,7 +68,7 @@ func GetSysTableList(c *gin.Context) {
 // @Router /api/v1/sys/tables/info/{tableId} [get]
 // @Security Bearer
 func GetSysTables(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
@@ -91,7 +91,7 @@ func GetSysTables(c *gin.Context) {
 }
 
 func GetSysTablesInfo(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
@@ -116,7 +116,7 @@ func GetSysTablesInfo(c *gin.Context) {
 }
 
 func GetSysTablesTree(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
@@ -144,7 +144,7 @@ func GetSysTablesTree(c *gin.Context) {
 // @Router /api/v1/sys/tables/info [post]
 // @Security Bearer
 func InsertSysTable(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
@@ -246,7 +246,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 		if strings.Contains(dbcolumn[i].ColumnType, "int") {
 			if strings.Contains(dbcolumn[i].ColumnKey, "PR") {
 				column.GoType = "int"
-			}  else {
+			} else {
 				column.GoType = "string"
 			}
 			column.HtmlType = "input"
@@ -281,7 +281,7 @@ func UpdateSysTable(c *gin.Context) {
 	err := c.Bind(&data)
 	tools2.HasError(err, "数据解析失败", 500)
 
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
@@ -307,7 +307,7 @@ func UpdateSysTable(c *gin.Context) {
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
 func DeleteSysTables(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools2.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())

app/admin/middleware/handler/auth.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -10,7 +11,6 @@ import (
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	jwt "go-admin/pkg/jwtauth"
-	"go-admin/pkg/logger"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"
@@ -59,7 +59,7 @@ func IdentityHandler(c *gin.Context) interface{} {
 // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }"
 // @Router /login [post]
 func Authenticator(c *gin.Context) (interface{}, error) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db error, %s", err.Error())
@@ -106,7 +106,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 
 // LoginLogToDB Write log to database
 func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	if config.LoggerConfig.EnabledDB {
 		var loginLog system.SysLoginLog
 		db, err := tools.GetOrm(c)
@@ -142,7 +142,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
 // @Router /logout [post]
 // @Security Bearer
 func LogOut(c *gin.Context) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	var loginLog system.SysLoginLog
 	ua := user_agent.New(c.Request.UserAgent())
 	loginLog.Ipaddr = c.ClientIP()

app/admin/middleware/logger.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"fmt"
+	"go-admin/common/apis"
 	"net/http"
 	"strings"
 	"time"
@@ -11,7 +12,6 @@ import (
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
-	"go-admin/pkg/logger"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"
@@ -24,7 +24,7 @@ func LoggerToFile() gin.HandlerFunc {
 		if c.Request.Method == http.MethodOptions {
 			return
 		}
-		log := logger.GetRequestLogger(c)
+		log := apis.GetRequestLogger(c)
 		// 开始时间
 		startTime := time.Now()
 		// 处理请求
@@ -78,7 +78,7 @@ func LoggerToFile() gin.HandlerFunc {
 
 // SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用
 func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) {
-	log := logger.GetRequestLogger(c)
+	log := apis.GetRequestLogger(c)
 	db, err := tools.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())

app/admin/middleware/permission.go

@@ -1,12 +1,11 @@
 package middleware
 
 import (
-	"go-admin/pkg/logger"
+	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/common/global"
 	"go-admin/pkg/jwtauth"
 	"go-admin/tools/app"
 )
@@ -14,10 +13,10 @@ import (
 //权限检查中间件
 func AuthCheckRole() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		log := logger.GetRequestLogger(c)
+		log := apis.GetRequestLogger(c)
 		data, _ := c.Get(jwtauth.JwtPayloadKey)
 		v := data.(jwtauth.MapClaims)
-		e := global.Runtime.GetCasbinKey(c.Request.Host)
+		e := app.Runtime.GetCasbinKey(c.Request.Host)
 		var res bool
 		var err error
 		//检查权限

app/admin/models/initdb.go

@@ -2,18 +2,17 @@ package models
 
 import (
 	"fmt"
+	"go-admin/tools/app"
 	"gorm.io/gorm"
 	"io/ioutil"
 	"log"
 	"strings"
-
-	"go-admin/common/global"
 )
 
 func InitDb(db *gorm.DB) (err error) {
 	filePath := "config/db.sql"
 	err = ExecSql(db, filePath)
-	if global.Driver == "postgres" {
+	if app.Driver == "postgres" {
 		filePath = "config/pg.sql"
 		err = ExecSql(db, filePath)
 	}

app/admin/router/init_router.go

@@ -1,6 +1,7 @@
 package router
 
 import (
+	"go-admin/tools/app"
 	"os"
 
 	"github.com/gin-gonic/gin"
@@ -8,7 +9,6 @@ import (
 
 	"go-admin/app/admin/middleware"
 	"go-admin/app/admin/middleware/handler"
-	"go-admin/common/global"
 	common "go-admin/common/middleware"
 	//_ "go-admin/pkg/jwtauth"
 	"go-admin/tools"
@@ -18,10 +18,10 @@ import (
 // InitRouter 路由初始化，不要怀疑，这里用到了
 func InitRouter() {
 	var r *gin.Engine
-	h := global.Runtime.GetEngine()
+	h := app.Runtime.GetEngine()
 	if h == nil {
 		h = gin.New()
-		global.Runtime.SetEngine(h)
+		app.Runtime.SetEngine(h)
 	}
 	switch h.(type) {
 	case *gin.Engine:
@@ -35,7 +35,7 @@ func InitRouter() {
 	}
 
 	r.Use(common.Sentinel()).
-		Use(common.RequestIdLogger(tools.TrafficKey, tools.LoggerKey))
+		Use(common.RequestId(tools.TrafficKey))
 	middleware.InitMiddleware(r)
 	// the jwt middleware
 	authMiddleware, err := middleware.AuthInit()

app/admin/router/monitor.go

@@ -1,22 +1,21 @@
 package router
 
 import (
+	"go-admin/tools/app"
 	"net/http"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/common/global"
-
 	"github.com/gin-gonic/gin"
+	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/tools/transfer"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 func Monitor() {
 	var r *gin.Engine
-	h := global.Runtime.GetEngine()
+	h := app.Runtime.GetEngine()
 	if h == nil {
 		h = gin.New()
-		global.Runtime.SetEngine(h)
+		app.Runtime.SetEngine(h)
 	}
 	switch h.(type) {
 	case *gin.Engine:

app/admin/service/dto/sys_category.go

@@ -2,11 +2,11 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"go-admin/common/apis"
+
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 type SysCategorySearch struct {
@@ -21,10 +21,10 @@ func (m *SysCategorySearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysCategorySearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -49,15 +49,15 @@ type SysCategoryControl struct {
 }
 
 func (s *SysCategoryControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_config.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	log "github.com/go-admin-team/go-admin-core/logger"
 	"go-admin/app/admin/models/system"
+	"go-admin/common/apis"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 // SysConfigSearch 列表或者搜索使用结构体
@@ -25,10 +24,10 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -45,20 +44,20 @@ type SysConfigControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysConfigControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err
@@ -97,15 +96,15 @@ func (s *SysConfigById) GetId() interface{} {
 }
 
 func (s *SysConfigById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_content.go

@@ -2,11 +2,11 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"go-admin/common/apis"
+
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 type SysContentSearch struct {
@@ -18,10 +18,10 @@ func (m *SysContentSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysContentSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -43,15 +43,15 @@ type SysContentControl struct {
 }
 
 func (s *SysContentControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_dept.go

@@ -2,12 +2,13 @@ package dto
 
 import (
 	"encoding/json"
+	"go-admin/common/apis"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
-	"go-admin/tools"
 )
 
 // SysConfigSearch 列表或者搜索使用结构体
@@ -30,10 +31,10 @@ func (m *SysDeptSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysDeptSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -53,20 +54,20 @@ type SysDeptControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysDeptControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err
@@ -108,15 +109,15 @@ func (s *SysDeptById) GetId() interface{} {
 }
 
 func (s *SysDeptById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_dict_data.go

@@ -1,14 +1,14 @@
 package dto
 
 import (
-	"github.com/gin-gonic/gin"
+	"go-admin/common/apis"
 	"net/http"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/gin-gonic/gin"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 type SysDictDataSearch struct {
@@ -25,10 +25,10 @@ func (m *SysDictDataSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysDictDataSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -53,15 +53,15 @@ type SysDictDataControl struct {
 }
 
 func (s *SysDictDataControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_dict_type.go

@@ -2,12 +2,11 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/app/admin/models/system"
+	"go-admin/common/apis"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 type SysDictTypeSearch struct {
@@ -23,10 +22,10 @@ func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysDictTypeSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -49,15 +48,15 @@ type SysDictTypeControl struct {
 }
 
 func (s *SysDictTypeControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_file_dir.go

@@ -1,13 +1,12 @@
 package dto
 
 import (
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/gin-gonic/gin"
+	"go-admin/common/apis"
+
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
-
-	"github.com/gin-gonic/gin"
 )
 
 type SysFileDirSearch struct {
@@ -25,10 +24,10 @@ func (m *SysFileDirSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysFileDirSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -49,15 +48,15 @@ type SysFileDirControl struct {
 }
 
 func (s *SysFileDirControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_job.go

@@ -2,8 +2,8 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
+	"go-admin/common/apis"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
@@ -24,9 +24,10 @@ func (m *SysJobSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysJobSearch) Bind(ctx *gin.Context) error {
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Errorf("MsgID[%s] Bind error: %s", err)
+		log.Errorf("Bind error: %s", err)
 	}
 	return err
 }

app/admin/service/dto/sys_login_log.go

@@ -1,14 +1,14 @@
 package dto
 
 import (
+	"go-admin/common/apis"
+	"time"
+
 	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
-
-	"time"
 )
 
 type SysLoginLogSearch struct {
@@ -24,10 +24,10 @@ func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -47,15 +47,15 @@ type SysLoginLogControl struct {
 }
 
 func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -90,15 +90,15 @@ func (s *SysLoginLogById) GetId() interface{} {
 }
 
 func (s *SysLoginLogById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(&s.Ids)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_menu.go

@@ -2,12 +2,13 @@ package dto
 
 import (
 	"encoding/json"
+	"go-admin/common/apis"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
-	"go-admin/tools"
 )
 
 // SysMenuSearch 列表或者搜索使用结构体
@@ -29,10 +30,10 @@ func (m *SysMenuSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -59,20 +60,20 @@ type SysMenuControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysMenuControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err
@@ -121,15 +122,15 @@ func (s *SysMenuById) GetId() interface{} {
 }
 
 func (s *SysMenuById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_opera_log.go

@@ -1,14 +1,14 @@
 package dto
 
 import (
+	"go-admin/common/apis"
+	"time"
+
 	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/tools"
-
-	"time"
 )
 
 type SysOperaLogSearch struct {
@@ -26,10 +26,10 @@ func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -57,15 +57,15 @@ type SysOperaLogControl struct {
 }
 
 func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -112,15 +112,15 @@ func (s *SysOperaLogById) GetId() interface{} {
 }
 
 func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(&s.Ids)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_post.go

@@ -2,12 +2,13 @@ package dto
 
 import (
 	"encoding/json"
+	"go-admin/common/apis"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
-	"go-admin/tools"
 )
 
 // SysPostSearch 列表或者搜索使用结构体
@@ -27,10 +28,10 @@ func (m *SysPostSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysPostSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -47,20 +48,20 @@ type SysPostControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysPostControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err
@@ -99,15 +100,15 @@ func (s *SysPostById) GetId() interface{} {
 }
 
 func (s *SysPostById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_role.go

@@ -2,12 +2,13 @@ package dto
 
 import (
 	"encoding/json"
+	"go-admin/common/apis"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
-	"go-admin/tools"
 )
 
 // SysRoleSearch 列表或者搜索使用结构体
@@ -31,10 +32,10 @@ func (m *SysRoleSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysRoleSearch) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -55,20 +56,20 @@ type SysRoleControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysRoleControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	err = ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err

app/admin/service/dto/sys_setting.go

@@ -2,10 +2,11 @@ package dto
 
 import (
 	"encoding/json"
+	"go-admin/common/apis"
+
 	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
+
 	"go-admin/app/admin/models"
-	"go-admin/tools"
 )
 
 // SysConfigControl 增、改使用的结构体
@@ -17,23 +18,23 @@ type SysSettingControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysSettingControl) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 
 	err := ctx.ShouldBind(s)
 	if err != nil {
-		log.Errorf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Errorf("ShouldBind error: %s", err.Error())
 		return err
 	}
 
 	err = ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Errorf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Errorf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	ctx.Set("body", string(jsonStr))
 	return err
@@ -69,15 +70,15 @@ func (s *SysSettingById) GetId() interface{} {
 }
 
 func (s *SysSettingById) Bind(ctx *gin.Context) error {
-	msgID := tools.GenerateMsgIDFromContext(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		log.Debugf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/admin/service/dto/sys_user.go

@@ -2,11 +2,11 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
+	"go-admin/common/apis"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/pkg/logger"
 )
 
 type SysUserSearch struct {
@@ -28,7 +28,7 @@ func (m *SysUserSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysUserSearch) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -58,10 +58,10 @@ type SysUserControl struct {
 }
 
 func (s *SysUserControl) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	//err := ctx.ShouldBindUri(s)
 	//if err != nil {
-	//	log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+	//	log.Debugf("ShouldBindUri error: %s", err.Error())
 	//	return err
 	//}
 	err := ctx.ShouldBind(s)

app/admin/service/dto/syschinaareadata.go

@@ -1,6 +1,7 @@
 package dto
 
 import (
+	"go-admin/common/apis"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -8,7 +9,6 @@ import (
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
-	"go-admin/pkg/logger"
 )
 
 type SysChinaAreaDataSearch struct {
@@ -22,7 +22,7 @@ func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -40,7 +40,7 @@ type SysChinaAreaDataControl struct {
 }
 
 func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -83,7 +83,7 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
 }
 
 func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/wf_classify.go

@@ -2,9 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/pkg/logger"
-
-	//"gorm.io/gorm"
+	"go-admin/common/apis"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -21,7 +19,7 @@ func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
 }
 
 func (m *WfProcessClassifySearch) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -36,7 +34,7 @@ type WfProcessClassifyControl struct {
 }
 
 func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -44,7 +42,7 @@ func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("ShouldBind error: %#v", err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }
@@ -75,7 +73,7 @@ func (s *WfProcessClassifyById) GetId() interface{} {
 }
 
 func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
-	log := logger.GetRequestLogger(ctx)
+	log := apis.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -83,7 +81,7 @@ func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
 	}
 	err = ctx.ShouldBind(s)
 	if err != nil {
-		log.Debugf("ShouldBind error: %#v", err.Error())
+		log.Debugf("ShouldBind error: %s", err.Error())
 	}
 	return err
 }

app/jobs/jobbase.go

@@ -3,6 +3,7 @@ package jobs
 import (
 	"fmt"
 	log "github.com/go-admin-team/go-admin-core/logger"
+	"go-admin/tools/app"
 	"gorm.io/gorm"
 	"sync"
 	"time"
@@ -10,7 +11,6 @@ import (
 	"github.com/robfig/cron/v3"
 
 	"go-admin/app/admin/models"
-	"go-admin/common/global"
 	"go-admin/pkg"
 	"go-admin/pkg/cronjob"
 )
@@ -101,13 +101,13 @@ func Setup(dbs map[string]*gorm.DB) {
 	fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...")
 
 	for k, db := range dbs {
-		global.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
+		app.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
 		setup(k, db)
 	}
 }
 
 func setup(key string, db *gorm.DB) {
-	crontab := global.Runtime.GetCrontabKey(key)
+	crontab := app.Runtime.GetCrontabKey(key)
 	sysJob := models.SysJob{}
 	jobList := make([]models.SysJob, 0)
 	err := sysJob.GetList(db, &jobList)

cmd/api/server.go

@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"fmt"
+	"go-admin/tools/app"
 	"log"
 	"net/http"
 	"os"
@@ -53,7 +54,7 @@ func setup() {
 	config.Setup(file.NewSource, file.WithPath(configYml))
 	go config.Watch()
 	//2. 设置日志
-	global.Runtime.SetLogger(
+	app.Runtime.SetLogger(
 		logger.SetupLogger(
 			config.LoggerConfig.Type,
 			config.LoggerConfig.Path,
@@ -72,7 +73,7 @@ func run() error {
 	if config.ApplicationConfig.Mode == tools.ModeProd.String() {
 		gin.SetMode(gin.ReleaseMode)
 	}
-	engine := global.Runtime.GetEngine()
+	engine := app.Runtime.GetEngine()
 	if engine == nil {
 		engine = gin.New()
 	}
@@ -88,11 +89,11 @@ func run() error {
 
 	srv := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
-		Handler: global.Runtime.GetEngine(),
+		Handler: app.Runtime.GetEngine(),
 	}
 	go func() {
 		jobs.InitJob()
-		jobs.Setup(global.Runtime.GetDb())
+		jobs.Setup(app.Runtime.GetDb())
 
 	}()
 
@@ -135,6 +136,6 @@ func run() error {
 }
 
 func tip() {
-	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+global.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
+	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+app.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
 	fmt.Printf("%s \n\n", usageStr)
 }

cmd/cobra.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"go-admin/tools/app"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -11,7 +12,6 @@ import (
 	"go-admin/cmd/config"
 	"go-admin/cmd/migrate"
 	"go-admin/cmd/version"
-	"go-admin/common/global"
 	"go-admin/tools"
 )
 
@@ -34,7 +34,7 @@ var rootCmd = &cobra.Command{
 }
 
 func tip() {
-	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+global.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
+	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+app.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
 	usageStr1 := `也可以参考 http://doc.zhangwj.com/go-admin-site/guide/ksks.html 里边的【启动】章节`
 	fmt.Printf("%s\n", usageStr)
 	fmt.Printf("%s\n", usageStr1)

cmd/migrate/server.go

@@ -3,6 +3,7 @@ package migrate
 import (
 	"bytes"
 	"fmt"
+	"go-admin/tools/app"
 	"strconv"
 	"text/template"
 	"time"
@@ -14,7 +15,6 @@ import (
 	_ "go-admin/cmd/migrate/migration/version"
 	_ "go-admin/cmd/migrate/migration/version-local"
 	"go-admin/common/database"
-	"go-admin/common/global"
 	"go-admin/common/models"
 	"go-admin/pkg/logger"
 	"go-admin/tools"
@@ -51,7 +51,7 @@ func run() {
 		//1. 读取配置
 		config.Setup(file.NewSource, file.WithPath(configYml))
 		//2. 设置日志
-		global.Runtime.SetLogger(
+		app.Runtime.SetLogger(
 			logger.SetupLogger(
 				config.LoggerConfig.Type,
 				config.LoggerConfig.Path,
@@ -68,7 +68,7 @@ func migrateModel() error {
 	if host == "" {
 		host = "*"
 	}
-	db := global.Runtime.GetDbByKey(host)
+	db := app.Runtime.GetDbByKey(host)
 	if config.DatabasesConfig[host].Driver == "mysql" {
 		//初始化数据库时候用
 		db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")

cmd/version/server.go

@@ -2,10 +2,9 @@ package version
 
 import (
 	"fmt"
+	"go-admin/tools/app"
 
 	"github.com/spf13/cobra"
-
-	"go-admin/common/global"
 )
 
 var (
@@ -23,6 +22,6 @@ var (
 )
 
 func run() error {
-	fmt.Println(global.Version)
+	fmt.Println(app.Version)
 	return nil
 }

common/actions/create.go

@@ -1,13 +1,13 @@
 package actions
 
 import (
+	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 
 	"go-admin/common/dto"
 	"go-admin/common/models"
-	"go-admin/pkg/logger"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )
@@ -15,7 +15,7 @@ import (
 // CreateAction 通用新增动作
 func CreateAction(control dto.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		log := logger.GetRequestLogger(c)
+		log := apis.GetRequestLogger(c)
 		db, err := tools.GetOrm(c)
 		if err != nil {
 			log.Error(err)

common/apis/api.go

@@ -16,8 +16,8 @@ type Api struct {
 }
 
 // GetLogger 获取上下文提供的日志
-func (e *Api) GetLogger(c *gin.Context) logger.Logger {
-	return logger.GetRequestLogger(c)
+func (e *Api) GetLogger(c *gin.Context) *logger.Logger {
+	return GetRequestLogger(c)
 }
 
 // GetOrm 获取Orm DB

common/apis/request_logger.go

@@ -0,0 +1,18 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/pkg/logger"
+	"go-admin/tools"
+	"go-admin/tools/app"
+	"strings"
+)
+
+// GetRequestLogger 获取上下文提供的日志
+func GetRequestLogger(c *gin.Context) *logger.Logger {
+	requestId := tools.GenerateMsgIDFromContext(c)
+	log := app.Runtime.GetLogger().Fields(map[string]interface{}{
+		strings.ToLower(tools.TrafficKey): requestId,
+	})
+	return &logger.Logger{Logger: log}
+}

common/database/initialize.go

@@ -1,6 +1,7 @@
 package database
 
 import (
+	"go-admin/tools/app"
 	. "log"
 	"time"
 
@@ -11,7 +12,6 @@ import (
 	"gorm.io/gorm/schema"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/common/global"
 	mycasbin "go-admin/pkg/casbin"
 	"go-admin/tools"
 	toolsConfig "go-admin/tools/config"
@@ -25,8 +25,8 @@ func Setup() {
 }
 
 func setupSimpleDatabase(host string, c *toolsConfig.Database) {
-	if global.Driver == "" {
-		global.Driver = c.Driver
+	if app.Driver == "" {
+		app.Driver = c.Driver
 	}
 	log.Infof("%s => %s", host, tools.Green(c.Source))
 	registers := make([]toolsDB.ResolverConfigure, len(c.Registers))
@@ -65,6 +65,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
 	//	global.Eloquent = db
 	//}
 
-	global.Runtime.SetDb(host, db)
-	global.Runtime.SetCasbin(host, e)
+	app.Runtime.SetDb(host, db)
+	app.Runtime.SetCasbin(host, e)
 }

common/dto/search.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/go-admin-team/go-admin-core/tools/search"
-	"go-admin/common/global"
+	"go-admin/tools/app"
 	"gorm.io/gorm"
 )
 
@@ -44,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
 			GormPublic: search.GormPublic{},
 			Join:       make([]*search.GormJoin, 0),
 		}
-		search.ResolveSearchQuery(global.Driver, q, condition)
+		search.ResolveSearchQuery(app.Driver, q, condition)
 		for _, join := range condition.Join {
 			if join == nil {
 				continue

common/global/casbin.go

@@ -3,13 +3,14 @@ package global
 import (
 	"github.com/casbin/casbin/v2"
 	"github.com/gin-gonic/gin"
-	"go-admin/pkg/logger"
+	"go-admin/common/apis"
+	"go-admin/tools/app"
 )
 
 func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
-	log := logger.GetRequestLogger(c)
-	if err := Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
-		return Runtime.GetCasbinKey(c.Request.Host), err
+	log := apis.GetRequestLogger(c)
+	if err := app.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
+		return app.Runtime.GetCasbinKey(c.Request.Host), err
 	} else {
 		log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
 		return nil, err

common/middleware/db.go

@@ -2,11 +2,10 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-
-	"go-admin/common/global"
+	"go-admin/tools/app"
 )
 
 func WithContextDb(c *gin.Context) {
-	c.Set("db", global.Runtime.GetDbByKey(c.Request.Host))
+	c.Set("db", app.Runtime.GetDbByKey(c.Request.Host))
 	c.Next()
 }

common/middleware/request_id.go

@@ -4,12 +4,11 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/logger"
 	"github.com/google/uuid"
 )
 
-// RequestIdLogger 自动增加requestId
-func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc {
+// RequestId 自动增加requestId
+func RequestId(trafficKey string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		requestId := c.GetHeader(trafficKey)
 		if requestId == "" {
@@ -19,9 +18,6 @@ func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc {
 			requestId = uuid.New().String()
 		}
 		c.Header(trafficKey, requestId)
-		c.Set(loggerKey, logger.DefaultLogger.Fields(map[string]interface{}{
-			strings.ToLower(trafficKey): requestId,
-		}))
 		c.Next()
 	}
 }

common/service/service.go

@@ -9,5 +9,5 @@ type Service struct {
 	Orm   *gorm.DB
 	Msg   string
 	MsgID string
-	Log   logger.Logger
+	Log   *logger.Logger
 }

examples/run.go

@@ -3,12 +3,12 @@
 package main
 
 import (
+	"go-admin/tools/app"
 	"log"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 
-	"go-admin/common/global"
 	myCasbin "go-admin/pkg/casbin"
 	"gorm.io/driver/mysql"
 )
@@ -19,10 +19,10 @@ func main() {
 		panic(err)
 	}
 	syncEnforce := myCasbin.Setup(db, "sys_")
-	global.Runtime.SetDb("*", db)
-	global.Runtime.SetCasbin("*", syncEnforce)
+	app.Runtime.SetDb("*", db)
+	app.Runtime.SetCasbin("*", syncEnforce)
 
 	e := gin.Default()
-	global.Runtime.SetEngine(e)
+	app.Runtime.SetEngine(e)
 	log.Fatal(e.Run(":8000"))
 }

go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/casbin/gorm-adapter/v3 v3.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173
-	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b
+	github.com/go-admin-team/go-admin-core v1.2.3-0.20210305064904-6d101c8bc904
+	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210305064904-6d101c8bc904
 	github.com/go-redis/redis/v7 v7.4.0
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/websocket v1.4.2

go.sum

@@ -179,10 +179,10 @@ github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f/go.mod h1:Dc
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M=
 github.com/go-admin-team/go-admin-core v1.2.3-0.20210225031955-e373f5bcdf3f/go.mod h1:hNfmIFc75XLFdfWGeGV1ted94FGnozbKfXXVLTDJKMM=
-github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173 h1:7N87rJTMylXxO+hI1khNTlwRFcuUbO2R+OXanyZ+2rY=
-github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173/go.mod h1:ovPTQZXwSsq8Hd/brQsPPD/vwL7/altQa+l+78AJjhE=
-github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b h1:weBy1iEvCNnowYIRvy66eFNaroZv8jB9G4bCNHWqklc=
-github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b/go.mod h1:U4GEXHDPRUv6Z5OQWzdkwrIZUZ8JIpWPPfyYsUICXWo=
+github.com/go-admin-team/go-admin-core v1.2.3-0.20210305064904-6d101c8bc904 h1:/ceH+zpFwLzuEpn0uvvG3BVXKxbYvO4TU5b1AnP237Y=
+github.com/go-admin-team/go-admin-core v1.2.3-0.20210305064904-6d101c8bc904/go.mod h1:ovPTQZXwSsq8Hd/brQsPPD/vwL7/altQa+l+78AJjhE=
+github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210305064904-6d101c8bc904 h1:tRfUHqpG/GldzthSDMrHN+oWRmqZRlIyMooizskHAzE=
+github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210305064904-6d101c8bc904/go.mod h1:U4GEXHDPRUv6Z5OQWzdkwrIZUZ8JIpWPPfyYsUICXWo=
 github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=

pkg/logger/logger.go

@@ -1,11 +1,8 @@
 package logger
 
 import (
-	"github.com/gin-gonic/gin"
-	"go-admin/tools"
-	"os"
-
 	"github.com/go-admin-team/go-admin-core/logger"
+	"os"
 )
 
 // Logger 通用log个性化实现
@@ -15,78 +12,62 @@ type Logger struct {
 
 // Info info级日志输出
 func (l *Logger) Info(args ...interface{}) {
-	l.Log(logger.InfoLevel, args...)
+	l.Logger.Log(logger.InfoLevel, args...)
 }
 
 // Infof info级日志输出
 func (l *Logger) Infof(template string, args ...interface{}) {
-	l.Logf(logger.InfoLevel, template, args...)
+	l.Logger.Logf(logger.InfoLevel, template, args...)
 }
 
 // Trace trace级日志输出
 func (l *Logger) Trace(args ...interface{}) {
-	l.Log(logger.TraceLevel, args...)
+	l.Logger.Log(logger.TraceLevel, args...)
 }
 
 // Tracef trace级日志输出
 func (l *Logger) Tracef(template string, args ...interface{}) {
-	l.Logf(logger.TraceLevel, template, args...)
+	l.Logger.Logf(logger.TraceLevel, template, args...)
 }
 
 // Debug debug级日志输出
 func (l *Logger) Debug(args ...interface{}) {
-	l.Log(logger.DebugLevel, args...)
+	l.Logger.Log(logger.DebugLevel, args...)
 }
 
 // Debugf debug级日志输出
 func (l *Logger) Debugf(template string, args ...interface{}) {
-	l.Logf(logger.DebugLevel, template, args...)
+	l.Logger.Logf(logger.DebugLevel, template, args...)
 }
 
 // Warn warn级日志输出
 func (l *Logger) Warn(args ...interface{}) {
-	l.Log(logger.WarnLevel, args...)
+	l.Logger.Log(logger.WarnLevel, args...)
 }
 
 // Warnf warn级日志输出
 func (l *Logger) Warnf(template string, args ...interface{}) {
-	l.Logf(logger.WarnLevel, template, args...)
+	l.Logger.Logf(logger.WarnLevel, template, args...)
 }
 
 // Error error级日志输出
 func (l *Logger) Error(args ...interface{}) {
-	l.Log(logger.ErrorLevel, args...)
+	l.Logger.Log(logger.ErrorLevel, args...)
 }
 
 // Errorf error级日志输出
 func (l *Logger) Errorf(template string, args ...interface{}) {
-	l.Logf(logger.ErrorLevel, template, args...)
+	l.Logger.Logf(logger.ErrorLevel, template, args...)
 }
 
 // Fatal fatal级日志输出
 func (l *Logger) Fatal(args ...interface{}) {
-	l.Log(logger.FatalLevel, args...)
+	l.Logger.Log(logger.FatalLevel, args...)
 	os.Exit(1)
 }
 
 // Fatalf fatal级日志输出
 func (l *Logger) Fatalf(template string, args ...interface{}) {
-	l.Logf(logger.FatalLevel, template, args...)
+	l.Logger.Logf(logger.FatalLevel, template, args...)
 	os.Exit(1)
 }
-
-// GetRequestLogger 获取上下文提供的日志
-func GetRequestLogger(c *gin.Context) Logger {
-	if c == nil {
-		return Logger{Logger: logger.DefaultLogger}
-	}
-	l, ok := c.Get(tools.LoggerKey)
-	if !ok {
-		return Logger{Logger: logger.DefaultLogger}
-	}
-	requestLogger, ok := l.(Logger)
-	if !ok {
-		return Logger{Logger: logger.DefaultLogger}
-	}
-	return requestLogger
-}

tools/app/adm.go

@@ -1,4 +1,4 @@
-package global
+package app
 
 import (
 	"github.com/go-admin-team/go-admin-core/tools/runtime"