From ba8c73985cca7887e1132b639411e83c451d603f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Tue, 18 Apr 2023 20:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=9E=E4=BE=8B=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client.go | 25 +++++++++++++++++--------
 define.go |  8 ++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/client.go b/client.go
index def9d80..3244e8a 100644
--- a/client.go
+++ b/client.go
@@ -53,9 +53,8 @@ type client struct {
 // Date : 19:19 2022/6/5
 func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger) error {
 	var (
-		err      error
-		cfg      *cfgFile
-		dbClient *DBClient
+		err error
+		cfg *cfgFile
 	)
 
 	if cfg, err = c.getCfg(cfgFilePath); nil != err {
@@ -65,18 +64,28 @@ func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger)
 		// 不支持的配置文件格式
 		return nil
 	}
-	dbClient = &DBClient{
-		dbFlag:         cfg.Flag,
+	return c.AddWithConfig(cfg.Flag, logInstance, cfg.Config)
+}
+
+// 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,
 		master:         nil,
 		slave:          nil,
 		extraFieldList: nil,
 		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
 	}
-	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
 	}
 	c.lock.Lock()
@@ -117,7 +126,7 @@ func (c *client) getCfg(cfgPath string) (*cfgFile, error) {
 		Path:   cfgPath,
 		Type:   "",
 		Flag:   fileFlagArr[len(fileFlagArr)-1],
-		Config: Database{},
+		Config: &Database{},
 	}
 	var (
 		err     error
diff --git a/define.go b/define.go
index 8b0f3e8..9db9e3d 100644
--- a/define.go
+++ b/define.go
@@ -28,10 +28,10 @@ type DBConfig struct {
 //
 // Date : 14:47 2022/6/9
 type cfgFile struct {
-	Flag   string   `json:"flag"`   // 数据库标识
-	Path   string   `json:"path"`   // 配置文件路径
-	Type   string   `json:"type"`   // 配置文件类型
-	Config Database `json:"config"` // 解析之后的配置文件
+	Flag   string    `json:"flag"`   // 数据库标识
+	Path   string    `json:"path"`   // 配置文件路径
+	Type   string    `json:"type"`   // 配置文件类型
+	Config *Database `json:"config"` // 解析之后的配置文件
 }
 
 const (