优化mysql初始化
This commit is contained in:
parent
46ea6042fc
commit
5965faa37f
10
client.go
10
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
|
||||
)
|
||||
|
||||
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
|
||||
}
|
||||
|
@ -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,7 +49,6 @@ 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"` // 从库配置
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user