zhangdeman/database
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化mysql初始化

Browse Source
This commit is contained in:
白茶清欢 2022-07-15 00:38:20 +08:00
parent 46ea6042fc
commit 5965faa37f
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client.go
View File

@ -260,23 +260,17 @@ func (c *client) getGormClient() (*gorm.DB, error) {
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 18:41 2022/6/11 // 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 ( var (
instance *gorm.DB instance *gorm.DB
err error err error
loggerInstance *zap.Logger
) )
if instance, err = gorm.Open(mysql.Open(c.buildConnectionDSN(conf)), &gorm.Config{}); nil != err { if instance, err = gorm.Open(mysql.Open(c.buildConnectionDSN(conf)), &gorm.Config{}); nil != err {
return nil, err return nil, err
} }
if nil != logConf { instance.Logger = wrapper.NewGormLoggerWithInstance(nil, instance, logInstance, "", nil)
if loggerInstance, err = c.getLogInstance(logConf); nil != err {
return nil, err
}
instance.Logger = wrapper.NewGormLoggerWithInstance(nil, instance, loggerInstance, "", nil)
}
return instance, nil return instance, nil
} }

5
define.go
View File

@ -7,10 +7,6 @@
// Date : 2021-03-01 9:27 下午 // Date : 2021-03-01 9:27 下午
package mysql package mysql
import (
"git.zhangdeman.cn/zhangdeman/logger"
)
// DBConfig 数据库连接的配置 // DBConfig 数据库连接的配置
// //
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
@ -53,7 +49,6 @@ const (
// //
// Date : 15:19 2022/6/9 // Date : 15:19 2022/6/9
type Database struct { type Database struct {
Logger *logger.InputLogConfig `json:"logger" yaml:"logger"` // 日志配置
Master *Mysql `json:"master" yaml:"master"` // 主库配置 Master *Mysql `json:"master" yaml:"master"` // 主库配置
Slave *Mysql `json:"slave" yaml:"slave"` // 从库配置 Slave *Mysql `json:"slave" yaml:"slave"` // 从库配置
} }