From a7e10e966133711c1e95dfb0a439202c6b0162a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Wed, 21 Sep 2022 11:39:09 +0800
Subject: [PATCH] - update db

---
 api_gorm.go  | 6 +++---
 api_mongo.go | 3 +--
 const.go     | 2 +-
 gin_gorm.go  | 6 +++---
 gin_mongo.go | 3 +--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/api_gorm.go b/api_gorm.go
index 24ac455..2015df2 100644
--- a/api_gorm.go
+++ b/api_gorm.go
@@ -38,7 +38,7 @@ type apiPostgresqlLog struct {
 
 // 创建模型
 func (c *ApiClient) gormAutoMigrate(ctx context.Context) {
-	err := c.gormClient.Db.Table(c.gormConfig.tableName).AutoMigrate(&apiPostgresqlLog{})
+	err := c.gormClient.GetDb().Table(c.gormConfig.tableName).AutoMigrate(&apiPostgresqlLog{})
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建模型：%s", err)
 	}
@@ -59,7 +59,7 @@ func (c *ApiClient) gormRecord(ctx context.Context, data apiPostgresqlLog) (err
 	data.SystemOs = c.config.systemOs                //【系统】系统类型
 	data.SystemArch = c.config.systemArch            //【系统】系统架构
 
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&data).Error
+	err = c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录日志失败：%s", err)
 	}
@@ -68,7 +68,7 @@ func (c *ApiClient) gormRecord(ctx context.Context, data apiPostgresqlLog) (err
 
 // GormDelete 删除
 func (c *ApiClient) GormDelete(ctx context.Context, hour int64) error {
-	return c.gormClient.Db.Table(c.gormConfig.tableName).Where("request_time < ?", gotime.Current().BeforeHour(hour).Format()).Delete(&apiPostgresqlLog{}).Error
+	return c.gormClient.GetDb().Table(c.gormConfig.tableName).Where("request_time < ?", gotime.Current().BeforeHour(hour).Format()).Delete(&apiPostgresqlLog{}).Error
 }
 
 // 中间件
diff --git a/api_mongo.go b/api_mongo.go
index 05787f0..fda1282 100644
--- a/api_mongo.go
+++ b/api_mongo.go
@@ -49,7 +49,7 @@ func (c *ApiClient) mongoCreateCollection(ctx context.Context) {
 
 // 创建索引
 func (c *ApiClient) mongoCreateIndexes(ctx context.Context) {
-	indexes, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).CreateManyIndexes(ctx, []mongo.IndexModel{
+	_, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).CreateManyIndexes(ctx, []mongo.IndexModel{
 		{
 			Keys: bson.D{{
 				Key:   "log_time",
@@ -59,7 +59,6 @@ func (c *ApiClient) mongoCreateIndexes(ctx context.Context) {
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建索引：%s", err)
 	}
-	c.zapLog.WithTraceId(ctx).Sugar().Infof("创建索引：%s", indexes)
 }
 
 // MongoDelete 删除
diff --git a/const.go b/const.go
index 8af8099..7fdabb9 100644
--- a/const.go
+++ b/const.go
@@ -1,5 +1,5 @@
 package golog
 
 const (
-	Version = "1.0.89"
+	Version = "1.0.90"
 )
diff --git a/gin_gorm.go b/gin_gorm.go
index dff60a1..61e6014 100644
--- a/gin_gorm.go
+++ b/gin_gorm.go
@@ -46,7 +46,7 @@ type ginPostgresqlLog struct {
 
 // 创建模型
 func (c *GinClient) gormAutoMigrate(ctx context.Context) {
-	err := c.gormClient.Db.Table(c.gormConfig.tableName).AutoMigrate(&ginPostgresqlLog{})
+	err := c.gormClient.GetDb().Table(c.gormConfig.tableName).AutoMigrate(&ginPostgresqlLog{})
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建模型：%s", err)
 	}
@@ -62,7 +62,7 @@ func (c *GinClient) gormRecord(data ginPostgresqlLog) (err error) {
 	data.SystemOs = c.config.systemOs             //【系统】系统类型
 	data.SystemArch = c.config.systemArch         //【系统】系统架构
 
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&data).Error
+	err = c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error
 	if err != nil {
 		c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("记录日志失败：%s", err)
 	}
@@ -182,5 +182,5 @@ func (c *GinClient) gormRecordXml(ginCtx *gin.Context, traceId string, requestTi
 
 // GormDelete 删除
 func (c *GinClient) GormDelete(ctx context.Context, hour int64) error {
-	return c.gormClient.Db.Table(c.gormConfig.tableName).Where("request_time < ?", gotime.Current().BeforeHour(hour).Format()).Delete(&ginPostgresqlLog{}).Error
+	return c.gormClient.GetDb().Table(c.gormConfig.tableName).Where("request_time < ?", gotime.Current().BeforeHour(hour).Format()).Delete(&ginPostgresqlLog{}).Error
 }
diff --git a/gin_mongo.go b/gin_mongo.go
index 6feaa83..3aa03c6 100644
--- a/gin_mongo.go
+++ b/gin_mongo.go
@@ -67,7 +67,7 @@ func (c *GinClient) mongoCreateCollection(ctx context.Context) {
 
 // 创建索引
 func (c *GinClient) mongoCreateIndexes(ctx context.Context) {
-	indexes, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).CreateManyIndexes(ctx, []mongo.IndexModel{
+	_, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).CreateManyIndexes(ctx, []mongo.IndexModel{
 		{
 			Keys: bson.D{{
 				Key:   "trace_id",
@@ -148,7 +148,6 @@ func (c *GinClient) mongoCreateIndexes(ctx context.Context) {
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建索引：%s", err)
 	}
-	c.zapLog.WithTraceId(ctx).Sugar().Infof("创建索引：%s", indexes)
 }
 
 // MongoDelete 删除