From 592b43fc26ab8d7ceb905a31e5e24edc9aee0c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Wed, 21 Sep 2022 11:31:58 +0800 Subject: [PATCH] - update db --- api.go | 6 +++--- api_mongo.go | 12 ++++++------ const.go | 2 +- gin.go | 6 +++--- gin_mongo.go | 12 ++++++------ go.mod | 4 ++-- go.sum | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/api.go b/api.go index 3e8458e..dc47723 100644 --- a/api.go +++ b/api.go @@ -74,12 +74,12 @@ func NewApiClient(config *ApiClientConfig) (*ApiClient, error) { gormClient, gormTableName := config.GormClientFun() mongoClient, mongoDatabaseName, mongoCollectionName := config.MongoClientFun() - if (gormClient == nil || gormClient.Db == nil) || (mongoClient == nil || mongoClient.Db == nil) { + if (gormClient == nil || gormClient.GetDb() == nil) || (mongoClient == nil || mongoClient.GetDb() == nil) { return nil, dbClientFunNoConfig } // 配置关系数据库 - if gormClient != nil || gormClient.Db != nil { + if gormClient != nil || gormClient.GetDb() != nil { c.gormClient = gormClient @@ -96,7 +96,7 @@ func NewApiClient(config *ApiClientConfig) (*ApiClient, error) { } // 配置非关系数据库 - if mongoClient != nil || mongoClient.Db != nil { + if mongoClient != nil || mongoClient.GetDb() != nil { c.mongoClient = mongoClient diff --git a/api_mongo.go b/api_mongo.go index 5bcfb8e..05787f0 100644 --- a/api_mongo.go +++ b/api_mongo.go @@ -62,6 +62,12 @@ func (c *ApiClient) mongoCreateIndexes(ctx context.Context) { c.zapLog.WithTraceId(ctx).Sugar().Infof("创建索引：%s", indexes) } +// MongoDelete 删除 +func (c *ApiClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteResult, error) { + filter := bson.D{{"log_time", bson.D{{"$lt", primitive.NewDateTimeFromTime(gotime.Current().BeforeHour(hour).Time)}}}} + return c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).DeleteMany(ctx, filter) +} + // 记录日志 func (c *ApiClient) mongoRecord(ctx context.Context, mongoLog apiMongolLog) (err error) { @@ -81,12 +87,6 @@ func (c *ApiClient) mongoRecord(ctx context.Context, mongoLog apiMongolLog) (err return err } -// MongoDelete 删除 -func (c *ApiClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteResult, error) { - filter := bson.D{{"log_time", bson.D{{"$lt", primitive.NewDateTimeFromTime(gotime.Current().BeforeHour(hour).Time)}}}} - return c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).DeleteMany(ctx, filter) -} - // 中间件 func (c *ApiClient) mongoMiddleware(ctx context.Context, request gorequest.Response, sdkVersion string) { data := apiMongolLog{ diff --git a/const.go b/const.go index d302d0c..8af8099 100644 --- a/const.go +++ b/const.go @@ -1,5 +1,5 @@ package golog const ( - Version = "1.0.88" + Version = "1.0.89" ) diff --git a/gin.go b/gin.go index 910123d..57c4a11 100644 --- a/gin.go +++ b/gin.go @@ -72,12 +72,12 @@ func NewGinClient(config *GinClientConfig) (*GinClient, error) { gormClient, gormTableName := config.GormClientFun() mongoClient, mongoDatabaseName, mongoCollectionName := config.MongoClientFun() - if (gormClient == nil || gormClient.Db == nil) || (mongoClient == nil || mongoClient.Db == nil) { + if (gormClient == nil || gormClient.GetDb() == nil) || (mongoClient == nil || mongoClient.GetDb() == nil) { return nil, dbClientFunNoConfig } // 配置关系数据库 - if gormClient != nil || gormClient.Db != nil { + if gormClient != nil || gormClient.GetDb() != nil { c.gormClient = gormClient @@ -93,7 +93,7 @@ func NewGinClient(config *GinClientConfig) (*GinClient, error) { } // 配置非关系数据库 - if mongoClient != nil || mongoClient.Db != nil { + if mongoClient != nil || mongoClient.GetDb() != nil { c.mongoClient = mongoClient diff --git a/gin_mongo.go b/gin_mongo.go index 057dfb4..6feaa83 100644 --- a/gin_mongo.go +++ b/gin_mongo.go @@ -151,6 +151,12 @@ func (c *GinClient) mongoCreateIndexes(ctx context.Context) { c.zapLog.WithTraceId(ctx).Sugar().Infof("创建索引：%s", indexes) } +// MongoDelete 删除 +func (c *GinClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteResult, error) { + filter := bson.D{{"log_time", bson.D{{"$lt", primitive.NewDateTimeFromTime(gotime.Current().BeforeHour(hour).Time)}}}} + return c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).DeleteMany(ctx, filter) +} + // 记录日志 func (c *GinClient) mongoRecord(ctx context.Context, mongoLog ginMongoLog) (err error) { @@ -290,9 +296,3 @@ func (c *GinClient) mongoRecordXml(ginCtx *gin.Context, traceId string, requestT c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.mongoRecordXml]：%s", err) } } - -// MongoDelete 删除 -func (c *GinClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteResult, error) { - filter := bson.D{{"log_time", bson.D{{"$lt", primitive.NewDateTimeFromTime(gotime.Current().BeforeHour(hour).Time)}}}} - return c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).DeleteMany(ctx, filter) -} diff --git a/go.mod b/go.mod index 6fa0735..56ea850 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/gin-gonic/gin v1.8.1 github.com/natefinch/lumberjack v2.0.0+incompatible - go.dtapp.net/dorm v1.0.38 + go.dtapp.net/dorm v1.0.42 go.dtapp.net/goip v1.0.36 go.dtapp.net/gorequest v1.0.31 go.dtapp.net/gotime v1.0.5 @@ -77,7 +77,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220920152717-4a395b0a80a1 // indirect + golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 // indirect golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index 38b34f0..3e97790 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,8 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.dtapp.net/dorm v1.0.38 h1:9OgWY5bnar6D0Xdho62xn7RluXJNe8i7Kz/IeSUObF4= -go.dtapp.net/dorm v1.0.38/go.mod h1:z9ksZ4Y0HHH0odjEiG57d90/ZUBM51qXEWJC8fS+dEM= +go.dtapp.net/dorm v1.0.42 h1:bugzTYBr5goLDf9s8vft6xG/fAiinLm1jo+9uFD7JRM= +go.dtapp.net/dorm v1.0.42/go.mod h1:LCy6tqg7uClOhMb8zgF9x9mTFoVd9Ud40g9a2Z6bbwM= go.dtapp.net/goip v1.0.36 h1:+wexFCMnP3f+6jPYXjBLMyjnP+DfQrslWvXifndxkdc= go.dtapp.net/goip v1.0.36/go.mod h1:9/Oo1HVM4EVUsvAebdV6CaBAK4S6qQMQWT3LcJfH6jM= go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs= @@ -591,8 +591,8 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220920152717-4a395b0a80a1 h1:KPlMURVqlGj7IS5s1RR3RyiiiKAgGMrh3O4A0tpOQOg= -golang.org/x/net v0.0.0-20220920152717-4a395b0a80a1/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 h1:asZqf0wXastQr+DudYagQS8uBO8bHKeYD1vbAvGmFL8= +golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=