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

增加新的添加数据库实例的方式

This commit is contained in:
白茶清欢 2023-04-18 20:47:57 +08:00
parent f68424bdae
commit ba8c73985c
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client.go
View File

@ -53,9 +53,8 @@ type client struct {
// Date : 19:19 2022/6/5 // Date : 19:19 2022/6/5
func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger) error { func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger) error {
var ( var (
err error err error
cfg *cfgFile cfg *cfgFile
dbClient *DBClient
) )
if cfg, err = c.getCfg(cfgFilePath); nil != err { if cfg, err = c.getCfg(cfgFilePath); nil != err {
@ -65,18 +64,28 @@ func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger)
// 不支持的配置文件格式 // 不支持的配置文件格式
return nil return nil
} }
dbClient = &DBClient{ return c.AddWithConfig(cfg.Flag, logInstance, cfg.Config)
dbFlag: cfg.Flag, }
// AddWithConfig ...
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 20:41 2023/4/18
func (c *client) AddWithConfig(flag string, logInstance *zap.Logger, databaseConfig *Database) error {
dbClient := &DBClient{
dbFlag: flag,
loggerInstance: logInstance, loggerInstance: logInstance,
master: nil, master: nil,
slave: nil, slave: nil,
extraFieldList: nil, extraFieldList: nil,
cfg: Driver{}, cfg: Driver{},
} }
if dbClient.master, err = c.GetDatabaseClient(cfg.Config.Master, logInstance); nil != err { var err error
if dbClient.master, err = c.GetDatabaseClient(databaseConfig.Master, logInstance); nil != err {
return err return err
} }
if dbClient.slave, err = c.GetDatabaseClient(cfg.Config.Slave, logInstance); nil != err { if dbClient.slave, err = c.GetDatabaseClient(databaseConfig.Slave, logInstance); nil != err {
return err return err
} }
c.lock.Lock() c.lock.Lock()
@ -117,7 +126,7 @@ func (c *client) getCfg(cfgPath string) (*cfgFile, error) {
Path: cfgPath, Path: cfgPath,
Type: "", Type: "",
Flag: fileFlagArr[len(fileFlagArr)-1], Flag: fileFlagArr[len(fileFlagArr)-1],
Config: Database{}, Config: &Database{},
} }
var ( var (
err error err error

8
define.go
View File

@ -28,10 +28,10 @@ type DBConfig struct {
// //
// Date : 14:47 2022/6/9 // Date : 14:47 2022/6/9
type cfgFile struct { type cfgFile struct {
Flag string `json:"flag"` // 数据库标识 Flag string `json:"flag"` // 数据库标识
Path string `json:"path"` // 配置文件路径 Path string `json:"path"` // 配置文件路径
Type string `json:"type"` // 配置文件类型 Type string `json:"type"` // 配置文件类型
Config Database `json:"config"` // 解析之后的配置文件 Config *Database `json:"config"` // 解析之后的配置文件
} }
const ( const (