mongodb测试通过

factory/mongodb/mongodb_factory.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-base/config/subconfigs"
 	"git.x2erp.com/qdy/go-base/logger"
 	"go.mongodb.org/mongo-driver/bson"
@@ -21,7 +22,7 @@ type MongoDBFactory struct {
 	client *mongo.Client
 	db     *mongo.Database
 	config *subconfigs.MongoDBConfig
-	//mu     sync.RWMutex // 添加读写锁保护
+	mu     sync.RWMutex // 添加读写锁保护
 }
 
 var (
@@ -30,8 +31,10 @@ var (
 	initErr             error
 )
 
-// GetMongoDBFactory 获取MongoDB工厂单例
-func GetMongoDBFactory(config *subconfigs.MongoDBConfig) *MongoDBFactory {
+// CreateFactory 获取MongoDB工厂单例
+func CreateFactory(cfg config.IConfig) *MongoDBFactory {
+
+	config := cfg.GetMongoDBConfig()
 
 	instanceMongodbOnce.Do(func() {
 		if config == nil {
@@ -40,7 +43,7 @@ func GetMongoDBFactory(config *subconfigs.MongoDBConfig) *MongoDBFactory {
 
 		// 设置默认值
 		if config.Timeout == 0 {
-			config.Timeout = 20 * time.Second
+			config.Timeout = 30
 		}
 		if config.MaxPoolSize == 0 {
 			config.MaxPoolSize = 100
@@ -66,14 +69,14 @@ func GetMongoDBFactory(config *subconfigs.MongoDBConfig) *MongoDBFactory {
 
 		// 创建客户端选项
 		clientOptions := options.Client().
-			ApplyURI(config.URI).
-			SetConnectTimeout(config.Timeout).
-			SetSocketTimeout(config.Timeout).
-			SetServerSelectionTimeout(config.Timeout).
-			SetMaxPoolSize(config.MaxPoolSize).
-			SetMinPoolSize(config.MinPoolSize).
-			SetMaxConnIdleTime(5 * time.Minute).
-			SetHeartbeatInterval(10 * time.Second)
+			ApplyURI(config.URI)
+			//SetConnectTimeout(config.Timeout).
+			//SetSocketTimeout(config.Timeout).
+			//SetServerSelectionTimeout(config.Timeout).
+			//SetMaxPoolSize(config.MaxPoolSize).
+			//SetMinPoolSize(config.MinPoolSize).
+			//SetMaxConnIdleTime(5 * time.Minute).
+			//SetHeartbeatInterval(10 * time.Second)
 
 		// 设置认证
 		if config.Username != "" && config.Password != "" {
@@ -92,7 +95,7 @@ func GetMongoDBFactory(config *subconfigs.MongoDBConfig) *MongoDBFactory {
 		}
 
 		// 创建上下文
-		ctx, cancel := context.WithTimeout(context.Background(), config.Timeout)
+		ctx, cancel := context.WithTimeout(context.Background(), config.GetTimeout())
 		defer cancel()
 
 		log.Printf(" context.WithTimeout ... successfully.")
@@ -133,6 +136,23 @@ func GetMongoDBFactory(config *subconfigs.MongoDBConfig) *MongoDBFactory {
 	return instanceMongodb
 }
 
+func (c *MongoDBFactory) GetTimeout() time.Duration {
+	return c.config.GetTimeout()
+}
+
+// TestConnection 测试连接
+func (f *MongoDBFactory) TestConnection() {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	if err := f.client.Ping(ctx, readpref.Primary()); err != nil {
+		log.Printf("MongoDB连接测试失败: %v", err)
+	} else {
+		log.Printf("MongoDB连接测试通过.")
+	}
+
+}
+
 // ========== MongoDBFactory 实例方法 ==========
 
 // GetClient 获取MongoDB客户端
@@ -150,6 +170,10 @@ func (f *MongoDBFactory) GetCollection(collectionName string) *mongo.Collection
 	return f.db.Collection(collectionName)
 }
 
+func (f *MongoDBFactory) GetName() string {
+	return "MongoDBFactory"
+}
+
 // Close 关闭MongoDB连接
 func (f *MongoDBFactory) Close() {
 	if f.client != nil {
@@ -174,20 +198,12 @@ func (f *MongoDBFactory) GetConfig() subconfigs.MongoDBConfig {
 	return *f.config
 }
 
-// TestConnection 测试连接
-func (f *MongoDBFactory) TestConnection() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	return f.client.Ping(ctx, readpref.Primary())
-}
-
 // ========== 快捷操作方法（增强版） ==========
 
 // InsertOne 插入单个文档，返回是否成功
 func (f *MongoDBFactory) InsertOne(collectionName string, document interface{}) bool {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	_, err := collection.InsertOne(ctx, document)
@@ -201,7 +217,7 @@ func (f *MongoDBFactory) InsertOne(collectionName string, document interface{})
 // InsertOneWithResult 插入单个文档并返回结果
 func (f *MongoDBFactory) InsertOneWithResult(collectionName string, document interface{}) (*mongo.InsertOneResult, bool) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.InsertOne(ctx, document)
@@ -215,7 +231,7 @@ func (f *MongoDBFactory) InsertOneWithResult(collectionName string, document int
 // InsertMany 插入多个文档，返回是否成功
 func (f *MongoDBFactory) InsertMany(collectionName string, documents []interface{}) bool {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	_, err := collection.InsertMany(ctx, documents)
@@ -229,7 +245,7 @@ func (f *MongoDBFactory) InsertMany(collectionName string, documents []interface
 // InsertManyWithResult 插入多个文档并返回结果
 func (f *MongoDBFactory) InsertManyWithResult(collectionName string, documents []interface{}) (*mongo.InsertManyResult, bool) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.InsertMany(ctx, documents)
@@ -243,7 +259,7 @@ func (f *MongoDBFactory) InsertManyWithResult(collectionName string, documents [
 // FindOne 查询单个文档，返回解码后的对象
 func (f *MongoDBFactory) FindOne(collectionName string, filter interface{}, result interface{}) error {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	err := collection.FindOne(ctx, filter).Decode(result)
@@ -259,7 +275,7 @@ func (f *MongoDBFactory) FindOne(collectionName string, filter interface{}, resu
 // FindOneAndDecode 查询单个文档并自动解码（简化版）
 func (f *MongoDBFactory) FindOneAndDecode(collectionName string, filter interface{}) (interface{}, error) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	var result map[string]interface{}
@@ -276,7 +292,7 @@ func (f *MongoDBFactory) FindOneAndDecode(collectionName string, filter interfac
 // Find 查询多个文档，返回对象数组
 func (f *MongoDBFactory) Find(collectionName string, filter interface{}, results interface{}, opts ...*options.FindOptions) error {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	cursor, err := collection.Find(ctx, filter, opts...)
@@ -302,7 +318,7 @@ func (f *MongoDBFactory) FindAll(collectionName string, results interface{}) err
 // UpdateOneWithResult 更新单个文档并返回结果
 func (f *MongoDBFactory) UpdateOneWithResult(collectionName string, filter interface{}, update interface{}) (*mongo.UpdateResult, bool) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.UpdateOne(ctx, filter, update)
@@ -316,7 +332,7 @@ func (f *MongoDBFactory) UpdateOneWithResult(collectionName string, filter inter
 // CountDocuments 统计文档数量，返回数量
 func (f *MongoDBFactory) CountDocuments(collectionName string, filter interface{}) (int64, error) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	count, err := collection.CountDocuments(ctx, filter)
@@ -330,7 +346,7 @@ func (f *MongoDBFactory) CountDocuments(collectionName string, filter interface{
 // Aggregate 聚合查询，返回对象数组
 func (f *MongoDBFactory) Aggregate(collectionName string, pipeline interface{}, results interface{}) error {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	cursor, err := collection.Aggregate(ctx, pipeline)
@@ -350,7 +366,7 @@ func (f *MongoDBFactory) Aggregate(collectionName string, pipeline interface{},
 // FindOneAndUpdate 查找并更新，返回更新后的文档
 func (f *MongoDBFactory) FindOneAndUpdate(collectionName string, filter interface{}, update interface{}, result interface{}) error {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	err := collection.FindOneAndUpdate(ctx, filter, update).Decode(result)
@@ -366,7 +382,7 @@ func (f *MongoDBFactory) FindOneAndUpdate(collectionName string, filter interfac
 // FindOneAndDelete 查找并删除，返回删除的文档
 func (f *MongoDBFactory) FindOneAndDelete(collectionName string, filter interface{}, result interface{}) error {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	err := collection.FindOneAndDelete(ctx, filter).Decode(result)
@@ -382,7 +398,7 @@ func (f *MongoDBFactory) FindOneAndDelete(collectionName string, filter interfac
 // BulkWrite 批量写入操作，返回是否成功
 func (f *MongoDBFactory) BulkWrite(collectionName string, operations []mongo.WriteModel) bool {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	_, err := collection.BulkWrite(ctx, operations)
@@ -396,7 +412,7 @@ func (f *MongoDBFactory) BulkWrite(collectionName string, operations []mongo.Wri
 // CreateIndex 创建索引，返回是否成功
 func (f *MongoDBFactory) CreateIndex(collectionName string, keys interface{}, opts ...*options.IndexOptions) bool {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	indexModel := mongo.IndexModel{
@@ -478,7 +494,7 @@ func (f *MongoDBFactory) FindAndCount(
 // UpdateOne 更新单个文档，返回是否执行成功和影响记录数
 func (f *MongoDBFactory) UpdateOne(collectionName string, filter interface{}, update interface{}) (bool, int64) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.UpdateOne(ctx, filter, update)
@@ -500,7 +516,7 @@ func (f *MongoDBFactory) UpdateOneWithMatch(collectionName string, filter interf
 // UpdateMany 更新多个文档，返回是否执行成功和影响记录数
 func (f *MongoDBFactory) UpdateMany(collectionName string, filter interface{}, update interface{}) (bool, int64) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.UpdateMany(ctx, filter, update)
@@ -515,7 +531,7 @@ func (f *MongoDBFactory) UpdateMany(collectionName string, filter interface{}, u
 // DeleteOne 删除单个文档，返回是否执行成功和删除的记录数
 func (f *MongoDBFactory) DeleteOne(collectionName string, filter interface{}) (bool, int64) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.DeleteOne(ctx, filter)
@@ -537,7 +553,7 @@ func (f *MongoDBFactory) DeleteOneWithMatch(collectionName string, filter interf
 // DeleteMany 删除多个文档，返回是否执行成功和删除的记录数
 func (f *MongoDBFactory) DeleteMany(collectionName string, filter interface{}) (bool, int64) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	result, err := collection.DeleteMany(ctx, filter)
@@ -552,7 +568,7 @@ func (f *MongoDBFactory) DeleteMany(collectionName string, filter interface{}) (
 // UpsertOne 更新或插入文档（upsert操作）
 func (f *MongoDBFactory) UpsertOne(collectionName string, filter interface{}, update interface{}) (bool, interface{}) {
 	collection := f.GetCollection(collectionName)
-	ctx, cancel := context.WithTimeout(context.Background(), f.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
 	// 设置 upsert 选项