From 22124b236aee36c5af065e79da36dde66b8c5568 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Mon, 27 Jul 2020 22:43:17 +0800
Subject: [PATCH] feat : Log optimization

---
 apis/system/sysuser.go |  3 ++-
 apis/tools/gen.go      |  9 +++++----
 handler/auth.go        |  4 ++--
 pkg/logger/logger.go   | 30 +++++++++++++++++++++++++++---
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/apis/system/sysuser.go b/apis/system/sysuser.go
index d91d184d..e4dcf667 100644
--- a/apis/system/sysuser.go
+++ b/apis/system/sysuser.go
@@ -4,6 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/google/uuid"
+	"go-admin/global"
 	"go-admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
@@ -209,7 +210,7 @@ func InsetSysUserAvatar(c *gin.Context) {
 	guid := uuid.New().String()
 	filPath := "static/uploadfile/" + guid + ".jpg"
 	for _, file := range files {
-		tools.Logger.Println(file.Filename)
+		global.Logger.Debug(file.Filename)
 		// 上传文件至指定目录
 		_ = c.SaveUploadedFile(file, filPath)
 	}
diff --git a/apis/tools/gen.go b/apis/tools/gen.go
index d1dcc692..24b962f4 100644
--- a/apis/tools/gen.go
+++ b/apis/tools/gen.go
@@ -3,6 +3,7 @@ package tools
 import (
 	"bytes"
 	"github.com/gin-gonic/gin"
+	"go-admin/global"
 	"go-admin/models"
 	"go-admin/models/tools"
 	tools2 "go-admin/tools"
@@ -116,17 +117,17 @@ func GenCode(c *gin.Context) {
 		NewText: newText,
 	}
 	if helper.OldText == helper.NewText {
-		tools2.Logger.Println("error !! the NewText isEqual the OldText")
+		global.Logger.Println("error !! the NewText isEqual the OldText")
 		return
 	}
 	if err := helper.DoWrok(); err != nil {
-		tools2.Logger.Print("error:", err.Error())
+		global.Logger.Print("error:", err.Error())
 
 	} else {
-		tools2.Logger.Print("done!")
+		global.Logger.Print("done!")
 	}
 
-	app.OK(c, "", "代码生成成功！")
+	app.OK(c, "", "Code generated successfully！")
 }
 
 func GenMenuAndApi(c *gin.Context) {
diff --git a/handler/auth.go b/handler/auth.go
index 62a40157..c8c14151 100644
--- a/handler/auth.go
+++ b/handler/auth.go
@@ -88,14 +88,14 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 		msg = "登录失败"
 		status = "1"
 		LoginLogToDB(c, status, msg, username)
-		global.AccessLogger.Println(e.Error())
+		global.RequestLogger.Println(e.Error())
 	}
 	return nil, jwt.ErrFailedAuthentication
 }
 
 // Write log to database
 func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
-	if config.LoggerConfig.Enabled {
+	if config.LoggerConfig.EnabledDB {
 		var loginlog models.LoginLog
 		ua := user_agent.New(c.Request.UserAgent())
 		loginlog.Ipaddr = c.ClientIP()
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
index 760a3356..d1a52898 100644
--- a/pkg/logger/logger.go
+++ b/pkg/logger/logger.go
@@ -2,14 +2,38 @@ package logger
 
 import (
 	"github.com/gogf/gf/os/glog"
+	"go-admin/global"
+	"go-admin/tools"
 	"go-admin/tools/config"
 )
 
 var Logger *glog.Logger
+var DBLogger *glog.Logger
+var RequestLogger *glog.Logger
 
-func InitLog() {
+func Setup() {
 	Logger = glog.New()
-	Logger.Path(config.LoggerConfig.Path)
+	Logger.SetPath(config.LoggerConfig.Path + "/bus")
+	Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS)
+	Logger.SetFile("logger-{Ymd}.log")
 	_ = Logger.SetLevelStr(config.LoggerConfig.Level)
-	Logger.Info("Logger init Success!")
+
+	DBLogger = glog.New()
+	_ = DBLogger.SetPath(config.LoggerConfig.Path + "/db")
+	DBLogger.SetStdoutPrint(false)
+	DBLogger.SetFile("db-{Ymd}.log")
+	_ = DBLogger.SetLevelStr(config.LoggerConfig.Level)
+
+	RequestLogger = glog.New()
+	_ = RequestLogger.SetPath(config.LoggerConfig.Path + "/request")
+	RequestLogger.SetStdoutPrint(false)
+	RequestLogger.SetFile("access-{Ymd}.log")
+	_ = RequestLogger.SetLevelStr(config.LoggerConfig.Level)
+
+
+	Logger.Info(tools.Green("Logger init success!"))
+
+	global.Logger = Logger.Line()
+	global.DBLogger = DBLogger.Line()
+	global.RequestLogger = RequestLogger.Line()
 }