调整整体架构写法

调整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

+28 -10
View File
@@ -1,6 +1,8 @@
package logger
import (
"github.com/gin-gonic/gin"
"go-admin/tools"
"os"
"github.com/go-admin-team/go-admin-core/logger"
@@ -23,52 +25,68 @@ func (l *Logger) Infof(template string, args ...interface{}) {
// Trace trace级日志输出
func (l *Logger) Trace(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
l.Log(logger.TraceLevel, args...)
}
// Tracef trace级日志输出
func (l *Logger) Tracef(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
l.Logf(logger.TraceLevel, template, args...)
}
// Debug debug级日志输出
func (l *Logger) Debug(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
l.Log(logger.DebugLevel, args...)
}
// Debugf debug级日志输出
func (l *Logger) Debugf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
l.Logf(logger.DebugLevel, template, args...)
}
// Warn warn级日志输出
func (l *Logger) Warn(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
l.Log(logger.WarnLevel, args...)
}
// Warnf warn级日志输出
func (l *Logger) Warnf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
l.Logf(logger.WarnLevel, template, args...)
}
// Error error级日志输出
func (l *Logger) Error(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
l.Log(logger.ErrorLevel, args...)
}
// Errorf error级日志输出
func (l *Logger) Errorf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
l.Logf(logger.ErrorLevel, template, args...)
}
// Fatal fatal级日志输出
func (l *Logger) Fatal(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
l.Log(logger.FatalLevel, args...)
os.Exit(1)
}
// Fatalf fatal级日志输出
func (l *Logger) Fatalf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
l.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
}
+32 -5
View File
@@ -1,15 +1,19 @@
package logger
import (
"io"
"os"
"github.com/go-admin-team/go-admin-core/debug/writer"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/plugins/logger/zap"
"go-admin/common/log"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/tools"
)
// SetupLogger 日志
func SetupLogger(path string, prefix string) logger.Logger {
func SetupLogger(logType, path, levelStr, outputType string) logger.Logger {
var setLogger logger.Logger
if !tools.PathExist(path) {
err := tools.PathCreate(path)
@@ -17,10 +21,33 @@ func SetupLogger(path string, prefix string) logger.Logger {
log.Fatalf("create dir error: %s", err.Error())
}
}
output, err := writer.NewFileWriter(path, "log")
var err error
var output io.Writer
switch outputType {
case "file":
output, err = writer.NewFileWriter(path, "log")
if err != nil {
log.Fatal("logger setup error: %s", err.Error())
}
default:
output = os.Stdout
}
var level logger.Level
level, err = logger.GetLevel(levelStr)
if err != nil {
log.Fatal("%s logger setup error: %s", prefix, err.Error())
log.Fatalf("get logger level error, %s", err.Error())
}
switch logType {
case "zap":
setLogger, err = zap.NewLogger(logger.WithLevel(level), logger.WithOutput(output), zap.WithCallerSkip(2))
if err != nil {
log.Fatalf("new zap logger error, %s", err.Error())
}
//case "logrus":
// setLogger = logrus.NewLogger(logger.WithLevel(level), logger.WithOutput(output), logrus.ReportCaller())
default:
setLogger = logger.NewLogger(logger.WithLevel(level), logger.WithOutput(output))
}
setLogger = logger.NewHelper(logger.NewLogger(logger.WithOutput(output), logger.WithName(prefix)))
return setLogger
}