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

+6 -5
View File
@@ -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)
}
+2 -2
View File
@@ -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)
+3 -3
View File
@@ -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")
+2 -3
View File
@@ -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
}