From 5965faa37fde51552e80b50992d6d089f0d103f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Fri, 15 Jul 2022 00:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96mysql=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client.go | 14 ++++---------- define.go | 9 ++------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/client.go b/client.go index 12e2ddf..a3e9907 100644 --- a/client.go +++ b/client.go @@ -260,23 +260,17 @@ func (c *client) getGormClient() (*gorm.DB, error) { // Author : go_developer@163.com<白茶清欢> // // Date : 18:41 2022/6/11 -func (c *client) GetDatabaseClient(conf *Mysql, logConf *logger.InputLogConfig) (*gorm.DB, error) { +func (c *client) GetDatabaseClient(conf *Mysql, logInstance *zap.Logger) (*gorm.DB, error) { var ( - instance *gorm.DB - err error - loggerInstance *zap.Logger + instance *gorm.DB + err error ) if instance, err = gorm.Open(mysql.Open(c.buildConnectionDSN(conf)), &gorm.Config{}); nil != err { return nil, err } - if nil != logConf { - if loggerInstance, err = c.getLogInstance(logConf); nil != err { - return nil, err - } - instance.Logger = wrapper.NewGormLoggerWithInstance(nil, instance, loggerInstance, "", nil) - } + instance.Logger = wrapper.NewGormLoggerWithInstance(nil, instance, logInstance, "", nil) return instance, nil } diff --git a/define.go b/define.go index 13aaaa0..3e5e4f8 100644 --- a/define.go +++ b/define.go @@ -7,10 +7,6 @@ // Date : 2021-03-01 9:27 下午 package mysql -import ( - "git.zhangdeman.cn/zhangdeman/logger" -) - // DBConfig 数据库连接的配置 // // Author : go_developer@163.com<白茶清欢> @@ -53,9 +49,8 @@ const ( // // Date : 15:19 2022/6/9 type Database struct { - Logger *logger.InputLogConfig `json:"logger" yaml:"logger"` // 日志配置 - Master *Mysql `json:"master" yaml:"master"` // 主库配置 - Slave *Mysql `json:"slave" yaml:"slave"` // 从库配置 + Master *Mysql `json:"master" yaml:"master"` // 主库配置 + Slave *Mysql `json:"slave" yaml:"slave"` // 从库配置 } // Mysql ...