diff --git a/Masuit.Tools.Core.UnitTest/Masuit.Tools.Core.UnitTest.csproj b/Masuit.Tools.Core.UnitTest/Masuit.Tools.Core.UnitTest.csproj index 592b270..05fc9e6 100644 --- a/Masuit.Tools.Core.UnitTest/Masuit.Tools.Core.UnitTest.csproj +++ b/Masuit.Tools.Core.UnitTest/Masuit.Tools.Core.UnitTest.csproj @@ -8,7 +8,7 @@ - + all diff --git a/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest.csproj b/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest.csproj deleted file mode 100644 index 5569057..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netcoreapp2.1 - - false - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - diff --git a/Masuit.Tools.NoSQL.MongoDBClient.Core/Masuit.Tools.NoSQL.MongoDBClient.Core.csproj b/Masuit.Tools.NoSQL.MongoDBClient.Core/Masuit.Tools.NoSQL.MongoDBClient.Core.csproj deleted file mode 100644 index 347fd26..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.Core/Masuit.Tools.NoSQL.MongoDBClient.Core.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - netstandard2.0 - 1.8.6 - 懒得勤快 - masuit.com - 包含MongoDB的所有的增删查改。 -客户端类采用单例模式进行封装，所以只需要调用MongoDbClient.GetInstance()即可使用。 - Copyright © 懒得勤快 - - https://github.com/ldqk/Masuit.Tools - Masuit.Tools - 如有问题请联系QQ:3444764617，或者到项目的github反馈问题。 - true - 1.8.6.0 - 1.8.6.0 - - - - - - - - - - - - - - - - - diff --git a/Masuit.Tools.NoSQL.MongoDBClient.Core/MongoDbClient.cs b/Masuit.Tools.NoSQL.MongoDBClient.Core/MongoDbClient.cs deleted file mode 100644 index 824e30c..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.Core/MongoDbClient.cs +++ /dev/null @@ -1,1179 +0,0 @@ -using Masuit.Tools.NoSQL.MongoDBClient.Core; -using MongoDB.Bson; -using MongoDB.Driver; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; - -namespace Masuit.Tools.NoSQL.MongoDBClient -{ - public class MongoDbClient - { - public MongoClient Client { get; set; } - public IMongoDatabase Database { get; set; } - private static ConcurrentDictionary InstancePool { get; set; } = new ConcurrentDictionary(); - private static ConcurrentDictionary> InstanceQueue { get; set; } = new ConcurrentDictionary>(); - private MongoDbClient(string url, string database) - { - Client = new MongoClient(url); - Database = Client.GetDatabase(database); - } - - private MongoDbClient(MongoClientSettings settings, string database) - { - Client = new MongoClient(settings); - Database = Client.GetDatabase(database); - } - - /// - /// 获取mongo单例 - /// - /// 连接字符串 - /// 数据库 - /// - public static MongoDbClient GetInstance(string url, string database) - { - InstancePool.TryGetValue(url + database, out var instance); - if (instance is null) - { - instance = new MongoDbClient(url, database); - InstancePool.TryAdd(url + database, instance); - } - return instance; - } - - /// - /// 获取mongo线程内唯一对象 - /// - /// 连接字符串 - /// 数据库 - /// - public static MongoDbClient ThreadLocalInstance(string url, string database) - { - var queue = InstanceQueue.GetOrAdd(url + database, new ConcurrentLimitedQueue(32)); - if (queue.IsEmpty) - { - Parallel.For(0, queue.Limit, i => - { - queue.Enqueue(new MongoDbClient(url, database)); - }); - } - MongoDbClient instance; - if (CallContext.GetData(url + database) == null) - { - queue.TryDequeue(out instance); - CallContext.SetData(url + database, instance); - } - instance = CallContext.GetData(url + database); - return instance; - } - - /// - /// 获取表 - /// - /// - /// 表名 - /// - public IMongoCollection GetCollection(string collection) - { - return Database.GetCollection(collection); - } - - #region 插入 - - /// - /// 插入一条数据 - /// - /// - /// 表名 - /// 数据 - public void InsertOne(string collection, T t) - { - Database.GetCollection(collection).InsertOne(t); - } - - /// - /// 插入一条数据 - /// - /// 表名 - /// 文档 - public void InsertOne(string collection, BsonDocument doc) - { - Database.GetCollection(collection).InsertOne(doc); - } - - /// - /// 插入一条数据 - /// - /// - /// 表名 - /// 数据 - public void InsertOneAsync(string collection, T t) - { - Database.GetCollection(collection).InsertOneAsync(t); - } - - /// - /// 插入一条数据 - /// - /// 表名 - /// 文档 - public void InsertOneAsync(string collection, BsonDocument doc) - { - Database.GetCollection(collection).InsertOneAsync(doc); - } - - /// - /// 插入多条数据 - /// - /// - /// 表名 - /// 集合 - public void InsertMany(string collection, IEnumerable list) - { - Database.GetCollection(collection).InsertMany(list); - } - - /// - /// 插入多条数据 - /// - /// 表名 - /// Bson集合 - public void InsertMany(string collection, IEnumerable list) - { - Database.GetCollection(collection).InsertMany(list); - } - - /// - /// 插入多条数据 - /// - /// - /// 表名 - /// 集合 - public void InsertManyAsync(string collection, IEnumerable list) - { - Database.GetCollection(collection).InsertManyAsync(list); - } - - /// - /// 插入多条数据 - /// - /// 表名 - /// Bson集合 - public void InsertManyAsync(string collection, IEnumerable list) - { - Database.GetCollection(collection).InsertManyAsync(list); - } - - /// - /// 大批量插入数据 - /// - /// - /// 表名 - /// 数据集合 - /// - public List> BulkInsert(string collection, IEnumerable> list) - { - BulkWriteResult result = Database.GetCollection(collection).BulkWrite(list); - return result.ProcessedRequests.ToList(); - } - - /// - /// 大批量插入数据 - /// - /// 表名 - /// Bson数据集合 - /// - public List> BulkInsert(string collection, IEnumerable> list) - { - BulkWriteResult result = Database.GetCollection(collection).BulkWrite(list); - return result.ProcessedRequests.ToList(); - } - - /// - /// 大批量插入数据 - /// - /// - /// 表名 - /// 数据集合 - /// - public async Task>> BulkInsertAsync(string collection, IEnumerable> list) - { - BulkWriteResult result = await Database.GetCollection(collection).BulkWriteAsync(list); - return result.ProcessedRequests.ToList(); - } - - /// - /// 大批量插入数据 - /// - /// 表名 - /// Bson数据集合 - /// - public async Task>> BulkInsertAsync(string collection, IEnumerable> list) - { - BulkWriteResult result = await Database.GetCollection(collection).BulkWriteAsync(list); - return result.ProcessedRequests.ToList(); - } - - #endregion - - #region 更新 - - /// - /// 修改一条数据 - /// - /// - /// 表名 - /// 条件 - /// 更新的数据 - /// 如果它不存在是否插入文档 - /// - public string UpdateOne(string collection, Expression> filter, UpdateDefinition update, bool upsert) - { - UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() { IsUpsert = upsert }); - return result.ToJson(); - } - - /// - /// 修改一条数据 - /// - /// 表名 - /// 条件 - /// 更新的数据 - /// 如果它不存在是否插入文档 - /// - public string UpdateOne(string collection, Expression> filter, UpdateDefinition update, bool upsert) - { - UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() { IsUpsert = upsert }); - return result.ToJson(); - } - - /// - /// 修改一条数据 - /// - /// - /// 表名 - /// 条件 - /// 更新的数据 - /// 如果它不存在是否插入文档 - /// - public async Task UpdateOneAsync(string collection, Expression> filter, UpdateDefinition update, bool upsert) - { - UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() { IsUpsert = upsert }); - return result.ToJson(); - } - - /// - /// 修改一条数据 - /// - /// 表名 - /// 条件 - /// 更新的数据 - /// 如果它不存在是否插入文档 - /// - public async Task UpdateOneAsync(string collection, Expression> filter, UpdateDefinition update, bool upsert) - { - UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() { IsUpsert = upsert }); - return result.ToJson(); - } - - /// - /// 修改文档 - /// - /// 集合名称 - /// 修改条件 - /// 修改结果 - /// 是否插入新文档（filter条件满足就更新，否则插入新文档） - /// - public Int64 UpdateMany(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) - { - UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions { IsUpsert = upsert }); - return result.ModifiedCount; - } - - /// - /// 修改文档 - /// - /// 集合名称 - /// 修改条件 - /// 修改结果 - /// 是否插入新文档（filter条件满足就更新，否则插入新文档） - /// - public Int64 UpdateMany(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) - { - UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions { IsUpsert = upsert }); - return result.ModifiedCount; - } - - /// - /// 修改多个文档 - /// - /// - /// 集合名称 - /// 修改条件 - /// 修改结果 - /// 是否插入新文档（filter条件满足就更新，否则插入新文档） - /// - public async Task UpdateManyAsync(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) - { - UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions { IsUpsert = upsert }); - return result.ModifiedCount; - } - - /// - /// 修改多个文档 - /// - /// 集合名称 - /// 修改条件 - /// 修改结果 - /// 是否插入新文档（filter条件满足就更新，否则插入新文档） - /// - public async Task UpdateManyAsync(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) - { - UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions { IsUpsert = upsert }); - return result.ModifiedCount; - } - - /// - /// 修改文档 - /// - /// - /// 表名 - /// 条件 - /// 更新后的数据 - /// - public T UpdateOne(String collName, Expression> filter, UpdateDefinition update) - { - T result = Database.GetCollection(collName).FindOneAndUpdate(filter, update); - return result; - } - - /// - /// 修改文档 - /// - /// 表名 - /// 条件 - /// 更新后的Bson数据 - /// - public BsonDocument UpdateOne(String collName, Expression> filter, UpdateDefinition update) - { - BsonDocument result = Database.GetCollection(collName).FindOneAndUpdate(filter, update); - return result; - } - - /// - /// 修改文档 - /// - /// - /// 表名 - /// 条件 - /// 更新后的数据 - /// - public async Task UpdateOneAsync(String collName, Expression> filter, UpdateDefinition update) - { - T result = await Database.GetCollection(collName).FindOneAndUpdateAsync(filter, update); - return result; - } - - /// - /// 修改文档 - /// - /// 表名 - /// 条件 - /// 更新后的Bson数据 - /// - public async Task UpdateOneAsync(String collName, Expression> filter, UpdateDefinition update) - { - BsonDocument result = await Database.GetCollection(collName).FindOneAndUpdateAsync(filter, update); - return result; - } - - #endregion - - #region 删除 - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public Int64 Delete(String collection, BsonDocument document) - { - DeleteResult result = Database.GetCollection(collection).DeleteOne(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public Int64 DeleteMany(String collection, BsonDocument document) - { - DeleteResult result = Database.GetCollection(collection).DeleteMany(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public Int64 Delete(String collection, BsonDocument document) - { - DeleteResult result = Database.GetCollection(collection).DeleteOne(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public Int64 DeleteMany(String collection, BsonDocument document) - { - DeleteResult result = Database.GetCollection(collection).DeleteMany(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public async Task DeleteAsync(String collection, BsonDocument document) - { - DeleteResult result = await Database.GetCollection(collection).DeleteOneAsync(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public async Task DeleteManyAsync(String collection, BsonDocument document) - { - DeleteResult result = await Database.GetCollection(collection).DeleteManyAsync(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public async Task DeleteAsync(String collection, BsonDocument document) - { - DeleteResult result = await Database.GetCollection(collection).DeleteOneAsync(document); - return result.DeletedCount; - } - - /// - /// 按BsonDocument条件删除 - /// - /// 集合名称 - /// 文档 - /// - public async Task DeleteManyAsync(String collection, BsonDocument document) - { - DeleteResult result = await Database.GetCollection(collection).DeleteManyAsync(document); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public Int64 Delete(String collName, String json) - { - var result = Database.GetCollection(collName).DeleteOne(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public Int64 DeleteMany(String collName, String json) - { - var result = Database.GetCollection(collName).DeleteMany(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public Int64 Delete(String collName, String json) - { - var result = Database.GetCollection(collName).DeleteOne(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public Int64 DeleteMany(String collName, String json) - { - var result = Database.GetCollection(collName).DeleteMany(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public async Task DeleteAsync(String collName, String json) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public async Task DeleteManyAsync(String collName, String json) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public async Task DeleteAsync(String collName, String json) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(json); - return result.DeletedCount; - } - - /// - /// 按json字符串删除 - /// - /// 集合名称 - /// json字符串 - /// - public async Task DeleteManyAsync(String collName, String json) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(json); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public Int64 Delete(String collName, Expression> predicate) - { - var result = Database.GetCollection(collName).DeleteOne(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public Int64 DeleteMany(String collName, Expression> predicate) - { - var result = Database.GetCollection(collName).DeleteMany(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public Int64 Delete(String collName, Expression> predicate) - { - var result = Database.GetCollection(collName).DeleteOne(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public Int64 DeleteMany(String collName, Expression> predicate) - { - var result = Database.GetCollection(collName).DeleteMany(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public async Task DeleteAsync(String collName, Expression> predicate) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public async Task DeleteManyAsync(String collName, Expression> predicate) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public async Task DeleteAsync(String collName, Expression> predicate) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(predicate); - return result.DeletedCount; - } - - /// - /// 按条件表达式删除 - /// - /// 集合名称 - /// 条件表达式 - /// - public async Task DeleteManyAsync(String collName, Expression> predicate) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(predicate); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public Int64 Delete(String collName, FilterDefinition filter) - { - var result = Database.GetCollection(collName).DeleteOne(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public Int64 DeleteMany(String collName, FilterDefinition filter) - { - var result = Database.GetCollection(collName).DeleteMany(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public Int64 Delete(String collName, FilterDefinition filter) - { - var result = Database.GetCollection(collName).DeleteOne(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public Int64 DeleteMany(String collName, FilterDefinition filter) - { - var result = Database.GetCollection(collName).DeleteMany(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public async Task DeleteAsync(String collName, FilterDefinition filter) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public async Task DeleteManyAsync(String collName, FilterDefinition filter) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public async Task DeleteAsync(String collName, FilterDefinition filter) - { - var result = await Database.GetCollection(collName).DeleteOneAsync(filter); - return result.DeletedCount; - } - - /// - /// 按检索条件删除 - /// 建议用Builders<T>构建复杂的查询条件 - /// - /// 集合名称 - /// 条件 - /// - public async Task DeleteManyAsync(String collName, FilterDefinition filter) - { - var result = await Database.GetCollection(collName).DeleteManyAsync(filter); - return result.DeletedCount; - } - - /// - /// 删除一条记录 - /// - /// - /// 表名 - /// 条件 - /// - public T DeleteOne(String collName, Expression> filter) - { - T result = Database.GetCollection(collName).FindOneAndDelete(filter); - return result; - } - - /// - /// 删除一条记录 - /// - /// 表名 - /// 条件 - /// - public BsonDocument DeleteOne(String collName, Expression> filter) - { - BsonDocument result = Database.GetCollection(collName).FindOneAndDelete(filter); - return result; - } - - /// - /// 删除一条记录 - /// - /// - /// 表名 - /// 条件 - /// - public async Task DeleteOneAsync(String collName, Expression> filter) - { - T result = await Database.GetCollection(collName).FindOneAndDeleteAsync(filter); - return result; - } - - /// - /// 删除一条记录 - /// - /// 表名 - /// 条件 - /// - public async Task DeleteOneAsync(String collName, Expression> filter) - { - BsonDocument result = await Database.GetCollection(collName).FindOneAndDeleteAsync(filter); - return result; - } - - #endregion - - #region 查询 - - /// - /// 查询，复杂查询直接用Linq处理 - /// - /// 集合名称 - /// 要查询的对象 - public IQueryable GetQueryable(String collName) - { - return Database.GetCollection(collName).AsQueryable(); - } - - /// - /// 查询，复杂查询直接用Linq处理 - /// - /// 集合名称 - /// 要查询的对象 - public IQueryable GetQueryable(String collName) - { - return Database.GetCollection(collName).AsQueryable(); - } - - /// - /// 获取一条数据 - /// - /// - /// 表名 - /// 条件 - /// - public T Get(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.FirstOrDefault(); - } - - /// - /// 获取一条数据 - /// - /// 表名 - /// 条件 - /// - public BsonDocument Get(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.FirstOrDefault(); - } - - /// - /// 获取一条数据 - /// - /// - /// 表名 - /// 条件 - /// - public async Task GetAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return await find.FirstOrDefaultAsync(); - } - - /// - /// 获取一条数据 - /// - /// 表名 - /// 条件 - /// - public async Task GetAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return await find.FirstOrDefaultAsync(); - } - - /// - /// 获取多条数据 - /// - /// - /// 表名 - /// 条件 - /// - public IEnumerable GetMany(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.ToEnumerable(); - } - - /// - /// 获取多条数据 - /// - /// 表名 - /// 条件 - /// - public IEnumerable GetMany(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.ToEnumerable(); - } - - /// - /// 获取多条数据 - /// - /// - /// 表名 - /// 条件 - /// - public async Task> GetManyAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return find.ToEnumerable(); - } - - /// - /// 获取多条数据 - /// - /// 表名 - /// 条件 - /// - public async Task> GetManyAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return find.ToEnumerable(); - } - - /// - /// 判断是否存在符合条件的数据 - /// - /// - /// 表名 - /// 条件 - /// - public bool Any(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.Any(); - } - - /// - /// 判断是否存在符合条件的数据 - /// - /// 表名 - /// 条件 - /// - public bool Any(String collName, FilterDefinition filter) - { - IFindFluent find = Database.GetCollection(collName).Find(filter); - return find.Any(); - } - - /// - /// 判断是否存在符合条件的数据 - /// - /// 表名 - /// 条件 - /// - public async Task AnyAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return await find.AnyAsync(); - } - - /// - /// 判断是否存在符合条件的数据 - /// - /// 表名 - /// 条件 - /// - public async Task AnyAsync(String collName, FilterDefinition filter) - { - IAsyncCursor find = await Database.GetCollection(collName).FindAsync(filter); - return await find.AnyAsync(); - } - - #endregion - - #region 索引 - - /// - /// 创建索引 - /// - /// 集合名 - /// 索引键 - /// - /// - public string CreateIndex(string collection, string index, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - var list = mgr.List(); - while (list.MoveNext()) - { - if (!list.Current.Any(doc => doc["name"].AsString.StartsWith(index))) - { - return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); - } - } - return string.Empty; - } - - /// - /// 创建索引 - /// - /// 集合名 - /// 索引键 - /// - /// - public async Task CreateIndexAsync(string collection, string index, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - var list = mgr.List(); - while (list.MoveNext()) - { - if (!list.Current.Any(doc => doc["name"].AsString.StartsWith(index))) - { - return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); - } - } - return string.Empty; - } - - /// - /// 更新索引 - /// - /// 集合名 - /// 索引键 - /// - /// - public string UpdateIndex(string collection, string index, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); - } - - /// - /// 更新索引 - /// - /// 集合名 - /// 索引键 - /// - /// - public async Task UpdateIndexAsync(string collection, string index, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); - } - - /// - /// 删除索引 - /// - /// 集合名 - /// 索引键 - /// - public void DropIndex(string collection, string index) - { - Database.GetCollection(collection).Indexes.DropOne(index); - } - - /// - /// 删除索引 - /// - /// 集合名 - /// 索引键 - /// - public void DropIndexAsync(string collection, string index) - { - Database.GetCollection(collection).Indexes.DropOneAsync(index); - } - - /// - /// 创建索引 - /// - /// 集合名 - /// 索引键 - /// - /// - /// - public string CreateIndex(string collection, string index, Expression> key, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - var list = mgr.List(); - while (list.MoveNext()) - { - if (!list.Current.Any(doc => doc["name"].AsString.StartsWith(index))) - { - return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); - } - } - return String.Empty; - } - - /// - /// 创建索引 - /// - /// 集合名 - /// 索引键 - /// - /// - /// - public async Task CreateIndexAsync(string collection, string index, Expression> key, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - var list = mgr.List(); - while (list.MoveNext()) - { - if (!list.Current.Any(doc => doc["name"].AsString.StartsWith(index))) - { - return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); - } - } - return String.Empty; - } - - /// - /// 更新索引 - /// - /// 集合名 - /// - /// - /// - public string UpdateIndex(string collection, Expression> key, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); - } - - /// - /// 更新索引 - /// - /// 集合名 - /// - /// - /// - public async Task UpdateIndexAsync(string collection, Expression> key, bool asc = true) - { - IMongoIndexManager mgr = Database.GetCollection(collection).Indexes; - return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); - } - - #endregion - } -} \ No newline at end of file diff --git a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.UnitTest.csproj b/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.UnitTest.csproj deleted file mode 100644 index dfdc52b..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Masuit.Tools.NoSQL.MongoDBClient.UnitTest.csproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Debug - AnyCPU - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F} - Library - Properties - Masuit.Tools.NoSQL.MongoDBClient.UnitTest - Masuit.Tools.NoSQL.MongoDBClient.UnitTest - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - - - - - - - - {1d45bdc4-74c4-4356-8b93-7f7a09106bb8} - Masuit.Tools.NoSQL.MongoDBClient - - - - - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - \ No newline at end of file diff --git a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Properties/AssemblyInfo.cs b/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Properties/AssemblyInfo.cs deleted file mode 100644 index df782c7..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Masuit.Tools.NoSQL.MongoDBClient.UnitTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Masuit.Tools.NoSQL.MongoDBClient.UnitTest")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("6ca28b75-2f2d-401a-bdf7-ee314c14c95f")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/app.config b/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/app.config deleted file mode 100644 index cceab30..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/packages.config b/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/packages.config deleted file mode 100644 index e17ebef..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient.UnitTest/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Masuit.Tools.NoSQL.MongoDBClient.Core/CallContext.cs b/Masuit.Tools.NoSQL.MongoDBClient/CallContext.cs similarity index 92% rename from Masuit.Tools.NoSQL.MongoDBClient.Core/CallContext.cs rename to Masuit.Tools.NoSQL.MongoDBClient/CallContext.cs index 312256b..3359a09 100644 --- a/Masuit.Tools.NoSQL.MongoDBClient.Core/CallContext.cs +++ b/Masuit.Tools.NoSQL.MongoDBClient/CallContext.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Threading; -namespace Masuit.Tools.NoSQL.MongoDBClient.Core +namespace Masuit.Tools.NoSQL.MongoDBClient { /// /// 取线程内唯一对象 diff --git a/Masuit.Tools.NoSQL.MongoDBClient.Core/ConcurrentLimitedQueue.cs b/Masuit.Tools.NoSQL.MongoDBClient/ConcurrentLimitedQueue.cs similarity index 93% rename from Masuit.Tools.NoSQL.MongoDBClient.Core/ConcurrentLimitedQueue.cs rename to Masuit.Tools.NoSQL.MongoDBClient/ConcurrentLimitedQueue.cs index a461d38..801465f 100644 --- a/Masuit.Tools.NoSQL.MongoDBClient.Core/ConcurrentLimitedQueue.cs +++ b/Masuit.Tools.NoSQL.MongoDBClient/ConcurrentLimitedQueue.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Masuit.Tools.NoSQL.MongoDBClient.Core +namespace Masuit.Tools.NoSQL.MongoDBClient { /// /// 定长队列 diff --git a/Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj b/Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj index bdb546a..576884e 100644 --- a/Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj +++ b/Masuit.Tools.NoSQL.MongoDBClient/Masuit.Tools.NoSQL.MongoDBClient.csproj @@ -1,81 +1,34 @@ - - - + + - Debug - AnyCPU - {1D45BDC4-74C4-4356-8B93-7F7A09106BB8} - Library - Properties - Masuit.Tools.NoSQL.MongoDBClient - Masuit.Tools.NoSQL.MongoDBClient - v4.5 - 512 + netstandard2.0 + 1.8.6 + 懒得勤快 + masuit.com + 包含MongoDB的所有的增删查改。 +客户端类采用单例模式进行封装，所以只需要调用MongoDbClient.GetInstance()即可使用。 + Copyright © 懒得勤快 + + https://github.com/ldqk/Masuit.Tools + Masuit.Tools + 如有问题请联系QQ:3444764617，或者到项目的github反馈问题。 + true + 1.8.6.0 + 1.8.6.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + + - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Masuit.Tools.NoSQL.MongoDBClient.xml + + + - - ..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll - - - ..\packages\HtmlSanitizer.4.0.207\lib\net45\HtmlSanitizer.dll - - - - ..\packages\MongoDB.Bson.2.7.3\lib\net45\MongoDB.Bson.dll - - - ..\packages\MongoDB.Driver.2.7.3\lib\net45\MongoDB.Driver.dll - - - ..\packages\MongoDB.Driver.Core.2.7.3\lib\net45\MongoDB.Driver.Core.dll - - - ..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll - - - - ..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll - - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - + + + - - - - - - - - - - - {275D5A0D-C49C-497E-A4B5-F40285C2495F} - Masuit.Tools - - - - \ No newline at end of file + + diff --git a/Masuit.Tools.NoSQL.MongoDBClient/MongoDbClient.cs b/Masuit.Tools.NoSQL.MongoDBClient/MongoDbClient.cs index 3ce9b12..5684d01 100644 --- a/Masuit.Tools.NoSQL.MongoDBClient/MongoDbClient.cs +++ b/Masuit.Tools.NoSQL.MongoDBClient/MongoDbClient.cs @@ -1,32 +1,21 @@ -using Masuit.Tools.Systems; -using MongoDB.Bson; +using MongoDB.Bson; using MongoDB.Driver; using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Configuration; using System.Linq; using System.Linq.Expressions; -using System.Runtime.Remoting.Messaging; using System.Threading.Tasks; namespace Masuit.Tools.NoSQL.MongoDBClient { - /// - /// MongoDB客户端类 - /// public class MongoDbClient { - /// - /// 客户端对象 - /// public MongoClient Client { get; set; } - /// - /// 数据库对象 - /// public IMongoDatabase Database { get; set; } private static ConcurrentDictionary InstancePool { get; set; } = new ConcurrentDictionary(); private static ConcurrentDictionary> InstanceQueue { get; set; } = new ConcurrentDictionary>(); + private MongoDbClient(string url, string database) { Client = new MongoClient(url); @@ -53,23 +42,7 @@ namespace Masuit.Tools.NoSQL.MongoDBClient instance = new MongoDbClient(url, database); InstancePool.TryAdd(url + database, instance); } - return instance; - } - /// - /// 获取mongo默认单例 - /// - /// 数据库 - /// - public static MongoDbClient GetDefaultInstance(string database) - { - string cs = ConfigurationManager.ConnectionStrings["MongoDB"].ConnectionString ?? "mongodb://127.0.0.1:27017"; - InstancePool.TryGetValue(cs + database, out var instance); - if (instance is null) - { - instance = new MongoDbClient(cs, database); - InstancePool.TryAdd(cs + database, instance); - } return instance; } @@ -89,13 +62,15 @@ namespace Masuit.Tools.NoSQL.MongoDBClient queue.Enqueue(new MongoDbClient(url, database)); }); } + MongoDbClient instance; - if (CallContext.GetData(url + database) == null) + if (CallContext.GetData(url + database) == null) { queue.TryDequeue(out instance); - CallContext.SetData(url + database, instance); + CallContext.SetData(url + database, instance); } - instance = (MongoDbClient)CallContext.GetData(url + database); + + instance = CallContext.GetData(url + database); return instance; } @@ -261,7 +236,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public string UpdateOne(string collection, Expression> filter, UpdateDefinition update, bool upsert) { - UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() { IsUpsert = upsert }); + UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() + { + IsUpsert = upsert + }); return result.ToJson(); } @@ -275,7 +253,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public string UpdateOne(string collection, Expression> filter, UpdateDefinition update, bool upsert) { - UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() { IsUpsert = upsert }); + UpdateResult result = Database.GetCollection(collection).UpdateOne(filter, update, new UpdateOptions() + { + IsUpsert = upsert + }); return result.ToJson(); } @@ -290,7 +271,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public async Task UpdateOneAsync(string collection, Expression> filter, UpdateDefinition update, bool upsert) { - UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() { IsUpsert = upsert }); + UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() + { + IsUpsert = upsert + }); return result.ToJson(); } @@ -304,7 +288,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public async Task UpdateOneAsync(string collection, Expression> filter, UpdateDefinition update, bool upsert) { - UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() { IsUpsert = upsert }); + UpdateResult result = await Database.GetCollection(collection).UpdateOneAsync(filter, update, new UpdateOptions() + { + IsUpsert = upsert + }); return result.ToJson(); } @@ -318,7 +305,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public Int64 UpdateMany(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) { - UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions { IsUpsert = upsert }); + UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions + { + IsUpsert = upsert + }); return result.ModifiedCount; } @@ -332,7 +322,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public Int64 UpdateMany(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) { - UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions { IsUpsert = upsert }); + UpdateResult result = Database.GetCollection(collName).UpdateMany(filter, update, new UpdateOptions + { + IsUpsert = upsert + }); return result.ModifiedCount; } @@ -347,7 +340,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public async Task UpdateManyAsync(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) { - UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions { IsUpsert = upsert }); + UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions + { + IsUpsert = upsert + }); return result.ModifiedCount; } @@ -361,7 +357,10 @@ namespace Masuit.Tools.NoSQL.MongoDBClient /// public async Task UpdateManyAsync(String collName, Expression> filter, UpdateDefinition update, Boolean upsert = false) { - UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions { IsUpsert = upsert }); + UpdateResult result = await Database.GetCollection(collName).UpdateManyAsync(filter, update, new UpdateOptions + { + IsUpsert = upsert + }); return result.ModifiedCount; } @@ -1060,6 +1059,7 @@ namespace Masuit.Tools.NoSQL.MongoDBClient return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); } } + return string.Empty; } @@ -1081,6 +1081,7 @@ namespace Masuit.Tools.NoSQL.MongoDBClient return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(doc => doc[index]) : Builders.IndexKeys.Descending(doc => doc[index]))); } } + return string.Empty; } @@ -1151,6 +1152,7 @@ namespace Masuit.Tools.NoSQL.MongoDBClient return mgr.CreateOne(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); } } + return String.Empty; } @@ -1173,6 +1175,7 @@ namespace Masuit.Tools.NoSQL.MongoDBClient return await mgr.CreateOneAsync(new CreateIndexModel(asc ? Builders.IndexKeys.Ascending(key) : Builders.IndexKeys.Descending(key))); } } + return String.Empty; } diff --git a/Masuit.Tools.NoSQL.MongoDBClient/Properties/AssemblyInfo.cs b/Masuit.Tools.NoSQL.MongoDBClient/Properties/AssemblyInfo.cs deleted file mode 100644 index 5c13b7e..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("Masuit.Tools.NoSQL.MongoDBClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("masuit.com")] -[assembly: AssemblyProduct("Masuit.Tools.NoSQL.MongoDBClient")] -[assembly: AssemblyCopyright("Copyright © 懒得勤快")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("1d45bdc4-74c4-4356-8b93-7f7a09106bb8")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 -//通过使用 "*"，如下所示: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.6.0")] -[assembly: AssemblyFileVersion("1.8.6.0")] diff --git a/Masuit.Tools.NoSQL.MongoDBClient/app.config b/Masuit.Tools.NoSQL.MongoDBClient/app.config deleted file mode 100644 index 8f59a54..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient/app.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Masuit.Tools.NoSQL.MongoDBClient/packages.config b/Masuit.Tools.NoSQL.MongoDBClient/packages.config deleted file mode 100644 index cb33215..0000000 --- a/Masuit.Tools.NoSQL.MongoDBClient/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Masuit.Tools.sln b/Masuit.Tools.sln index 77a30dc..f303c28 100644 --- a/Masuit.Tools.sln +++ b/Masuit.Tools.sln @@ -5,22 +5,14 @@ VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools", "Masuit.Tools\Masuit.Tools.csproj", "{275D5A0D-C49C-497E-A4B5-F40285C2495F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.NoSQL.MongoDBClient", "Masuit.Tools.NoSQL.MongoDBClient\Masuit.Tools.NoSQL.MongoDBClient.csproj", "{1D45BDC4-74C4-4356-8B93-7F7A09106BB8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Core", "Masuit.Tools.Core\Masuit.Tools.Core.csproj", "{149E6872-CE95-493B-B136-535E64C65A49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.NoSQL.MongoDBClient.Core", "Masuit.Tools.NoSQL.MongoDBClient.Core\Masuit.Tools.NoSQL.MongoDBClient.Core.csproj", "{85EEA76D-CDAB-44CB-A08C-A49FDBA4659D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.UnitTest", "Masuit.Tools.UnitTest\Masuit.Tools.UnitTest.csproj", "{174474CB-0C9A-4C99-B461-1A2158F00A98}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Core.UnitTest", "Masuit.Tools.Core.UnitTest\Masuit.Tools.Core.UnitTest.csproj", "{82383331-259E-4FB8-BA90-47C0E1AFB4FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.NoSQL.MongoDBClient.UnitTest", "Masuit.Tools.NoSQL.MongoDBClient.UnitTest\Masuit.Tools.NoSQL.MongoDBClient.UnitTest.csproj", "{6CA28B75-2F2D-401A-BDF7-EE314C14C95F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "测试", "测试", "{E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest", "Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest\Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest.csproj", "{9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{91954D82-A5FC-417B-8FD9-D9C165C8F16C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCoreTest", "NetCoreTest\NetCoreTest.csproj", "{ABEC3F65-6556-44FD-BECE-33F7927FB3AE}" @@ -29,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.AspNetCore.Res EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.ExpressionMapperBenchmark", "Masuit.Tools.ExpressionMapperBenchmark\Masuit.Tools.ExpressionMapperBenchmark.csproj", "{1D51DC49-6626-41AF-B1B5-085C83307FF2}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.NoSQL.MongoDBClient", "Masuit.Tools.NoSQL.MongoDBClient\Masuit.Tools.NoSQL.MongoDBClient.csproj", "{2C4FF8E9-2662-4618-ABA4-BA55AA5EA9AB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,18 +33,10 @@ Global {275D5A0D-C49C-497E-A4B5-F40285C2495F}.Debug|Any CPU.Build.0 = Debug|Any CPU {275D5A0D-C49C-497E-A4B5-F40285C2495F}.Release|Any CPU.ActiveCfg = Release|Any CPU {275D5A0D-C49C-497E-A4B5-F40285C2495F}.Release|Any CPU.Build.0 = Release|Any CPU - {1D45BDC4-74C4-4356-8B93-7F7A09106BB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D45BDC4-74C4-4356-8B93-7F7A09106BB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D45BDC4-74C4-4356-8B93-7F7A09106BB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D45BDC4-74C4-4356-8B93-7F7A09106BB8}.Release|Any CPU.Build.0 = Release|Any CPU {149E6872-CE95-493B-B136-535E64C65A49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {149E6872-CE95-493B-B136-535E64C65A49}.Debug|Any CPU.Build.0 = Debug|Any CPU {149E6872-CE95-493B-B136-535E64C65A49}.Release|Any CPU.ActiveCfg = Release|Any CPU {149E6872-CE95-493B-B136-535E64C65A49}.Release|Any CPU.Build.0 = Release|Any CPU - {85EEA76D-CDAB-44CB-A08C-A49FDBA4659D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85EEA76D-CDAB-44CB-A08C-A49FDBA4659D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85EEA76D-CDAB-44CB-A08C-A49FDBA4659D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85EEA76D-CDAB-44CB-A08C-A49FDBA4659D}.Release|Any CPU.Build.0 = Release|Any CPU {174474CB-0C9A-4C99-B461-1A2158F00A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {174474CB-0C9A-4C99-B461-1A2158F00A98}.Debug|Any CPU.Build.0 = Debug|Any CPU {174474CB-0C9A-4C99-B461-1A2158F00A98}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -59,14 +45,6 @@ Global {82383331-259E-4FB8-BA90-47C0E1AFB4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {82383331-259E-4FB8-BA90-47C0E1AFB4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {82383331-259E-4FB8-BA90-47C0E1AFB4FA}.Release|Any CPU.Build.0 = Release|Any CPU - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6}.Release|Any CPU.Build.0 = Release|Any CPU {91954D82-A5FC-417B-8FD9-D9C165C8F16C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {91954D82-A5FC-417B-8FD9-D9C165C8F16C}.Debug|Any CPU.Build.0 = Debug|Any CPU {91954D82-A5FC-417B-8FD9-D9C165C8F16C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -83,6 +61,10 @@ Global {1D51DC49-6626-41AF-B1B5-085C83307FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D51DC49-6626-41AF-B1B5-085C83307FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D51DC49-6626-41AF-B1B5-085C83307FF2}.Release|Any CPU.Build.0 = Release|Any CPU + {2C4FF8E9-2662-4618-ABA4-BA55AA5EA9AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C4FF8E9-2662-4618-ABA4-BA55AA5EA9AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C4FF8E9-2662-4618-ABA4-BA55AA5EA9AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C4FF8E9-2662-4618-ABA4-BA55AA5EA9AB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -90,8 +72,6 @@ Global GlobalSection(NestedProjects) = preSolution {174474CB-0C9A-4C99-B461-1A2158F00A98} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} {82383331-259E-4FB8-BA90-47C0E1AFB4FA} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} - {6CA28B75-2F2D-401A-BDF7-EE314C14C95F} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} - {9D2E3A00-9E94-4C3D-AAAE-70B0DA236FE6} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} {49E16577-01CD-4104-B73E-449B2960D956} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} {1D51DC49-6626-41AF-B1B5-085C83307FF2} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC} EndGlobalSection diff --git a/Masuit.Tools.sln.DotSettings b/Masuit.Tools.sln.DotSettings deleted file mode 100644 index 3e5a2f9..0000000 --- a/Masuit.Tools.sln.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="NetCoreTest" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="Masuit.Tools.UnitTest" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="Masuit.Tools.NoSQL.MongoDBClient.Core.UnitTest" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="Masuit.Tools.Core.UnitTest" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /></ExcludeFilters></data> \ No newline at end of file diff --git a/NetCoreTest/Controllers/HomeController.cs b/NetCoreTest/Controllers/HomeController.cs index 9923df3..ec307b3 100644 --- a/NetCoreTest/Controllers/HomeController.cs +++ b/NetCoreTest/Controllers/HomeController.cs @@ -1,17 +1,9 @@ -using Masuit.Tools.Core.NoSQL; -using Masuit.Tools.NoSQL; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace NetCoreTest.Controllers { public class HomeController : Controller { - public RedisHelper RedisHelper { get; set; } - public HomeController(RedisHelperFactory redisHelperFactory) - { - RedisHelper = redisHelperFactory.Create("aa", 0);// 创建命名为aa的RedisHelper，指定数据库0 - RedisHelper = redisHelperFactory.CreateDefault(0); // 创建默认的RedisHelper，指定数据库0 - RedisHelper = redisHelperFactory.CreateLocal(0); // 创建连接本机的RedisHelper，指定数据库0 - } + } } diff --git a/Test/Test.csproj b/Test/Test.csproj index e61afa0..dfaaec3 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -38,26 +38,9 @@ - - ..\packages\MongoDB.Bson.2.7.3\lib\net45\MongoDB.Bson.dll - - - ..\packages\MongoDB.Driver.2.7.3\lib\net45\MongoDB.Driver.dll - - - ..\packages\MongoDB.Driver.Core.2.7.3\lib\net45\MongoDB.Driver.Core.dll - - - False - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll - - - ..\packages\SharpCompress.0.23.0\lib\net45\SharpCompress.dll - - @@ -65,7 +48,6 @@ - diff --git a/Test/packages.config b/Test/packages.config deleted file mode 100644 index c607270..0000000 --- a/Test/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file