From b9e8759ef152a68574c0445053f2cdcecdae047d Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Thu, 10 Jun 2021 11:54:02 +0800 Subject: [PATCH] =?UTF-8?q?feature=20:sparkles:=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=A7=E6=96=87=E4=BB=B6=E5=88=86=E5=89=B2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/api/server.go | 10 ++++++---- cmd/migrate/server.go | 10 ++++++---- go.mod | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cmd/api/server.go b/cmd/api/server.go index f0c9d28e..cf6a8bca 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -61,10 +61,12 @@ func setup() { //2. 设置日志 sdk.Runtime.SetLogger( logger.SetupLogger( - config.LoggerConfig.Type, - config.LoggerConfig.Path, - config.LoggerConfig.Level, - config.LoggerConfig.Stdout)) + logger.WithType(config.LoggerConfig.Type), + logger.WithPath(config.LoggerConfig.Path), + logger.WithLevel(config.LoggerConfig.Level), + logger.WithStdout(config.LoggerConfig.Stdout), + logger.WithCap(config.LoggerConfig.Cap), + )) //3. 初始化数据库链接 database.Setup() diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index bc252d19..9d1a224a 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -53,10 +53,12 @@ func run() { //2. 设置日志 sdk.Runtime.SetLogger( logger.SetupLogger( - config.LoggerConfig.Type, - config.LoggerConfig.Path, - config.LoggerConfig.Level, - config.LoggerConfig.Stdout)) + logger.WithType(config.LoggerConfig.Type), + logger.WithPath(config.LoggerConfig.Path), + logger.WithLevel(config.LoggerConfig.Level), + logger.WithStdout(config.LoggerConfig.Stdout), + logger.WithCap(config.LoggerConfig.Cap), + )) _ = initDB() } else { fmt.Println(`generate migration file`) diff --git a/go.mod b/go.mod index e41fc596..672f9f01 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.7.1 - github.com/go-admin-team/go-admin-core v1.3.5-rc.3.0.20210609131805-5526c5244c52 - github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210609131805-5526c5244c52 + github.com/go-admin-team/go-admin-core v1.3.5-rc.3.0.20210610024144-50a6fbefd01b + github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210610024144-50a6fbefd01b github.com/google/uuid v1.2.0 github.com/mssola/user_agent v0.5.2 github.com/opentracing/opentracing-go v1.1.0