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

This commit is contained in:
linwenxiang committed 2021-03-05 15:13:36 +08:00
1 parent 39dd1ee6f8
commit 75711922b4
47 files changed
+267 -275

No files matched your search

+4 -4
View File
@@ -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()
+3 -3
View File
@@ -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())
+3 -4
View File
@@ -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
//检查权限