orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

代码重构：重新调整MongoDB连接字符串获取方法

This commit is contained in:
Argo-Surface 2019-01-15 12:52:09 +08:00
parent 12c53eeead
commit 7e1b8291c8
12 changed files with 66 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bootstrap.Admin/appsettings.Development.json
View File

@ -26,14 +26,14 @@
"CorsItems": [
{
"Enabled": true,
"Name": "ba",
"Key": "ba",
"Url": "CacheList.axd",
"Desc": "后台管理数据缓存接口",
"Self": true
},
{
"Enabled": true,
"Name": "APP",
"Key": "APP",
"Url": "http://localhost:49185/CacheList.axd",
"Desc": "测试系统",
"Self": false

13
Bootstrap.Admin/appsettings.json
View File

@ -15,22 +15,21 @@
"ConnectionStrings": {
"ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa"
},
"MongoDB": "BootstrapAdmin",
"DB": [
{
"Enabled": true
},
{
"Enabled": true,
"Widget": "Bootstrap.DataAccess.MySQL",
"DBProviderFactory": "MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data",
"ProviderName": "MySql",
"ConnectionStrings": {
"ba": "Server=10.211.55.2;Database=BA;Uid=argozhang;Pwd=argo@163.com;SslMode=none;"
}
},
{
"Enabled": true,
"Widget": "Bootstrap.DataAccess.SQLite",
"DBProviderFactory": "Microsoft.Data.Sqlite.SqliteFactory, Microsoft.Data.Sqlite",
"ProviderName": "Sqlite",
"ConnectionStrings": {
"ba": "Data Source=BootstrapAdmin.db;"
}
@ -39,7 +38,7 @@
"Enabled": true,
"Widget": "Bootstrap.DataAccess.MongoDB",
"ConnectionStrings": {
"ba": "mongodb://10.211.55.2:27017;Data Source=BootstrapAdmin"
"ba": "mongodb://10.211.55.2:27017"
}
}
],
@ -63,14 +62,14 @@
"CorsItems": [
{
"Enabled": true,
"Name": "ba",
"Key": "ba",
"Url": "CacheList.axd",
"Desc": "后台管理数据缓存接口",
"Self": true
},
{
"Enabled": true,
"Name": "Pallet",
"Key": "Pallet",
"Url": "http://localhost/WebConsole/CacheList.axd",
"Desc": "托盘组垛系统",
"Self": false

14
Bootstrap.DataAccess.MongoDB/MongoDbAccessManager.cs → Bootstrap.DataAccess.MongoDB/DbManager.cs
View File

@ -5,15 +5,13 @@ using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Bson.Serialization.Serializers;
using MongoDB.Driver;
using System;
using System.Linq;
namespace Bootstrap.DataAccess.MongoDB
{
/// <summary>
///
/// </summary>
public static class MongoDbAccessManager
internal static class DbManager
{
private static IMongoDatabase _db = null;
private static bool _register = false;
@ -122,14 +120,8 @@ namespace Bootstrap.DataAccess.MongoDB
private static void InitDb()
{
var connectString = DbAdapterManager.GetConnectionString("ba");
if (string.IsNullOrEmpty(connectString)) throw new InvalidOperationException("Please set the BA default value in configuration file.");
var seq = connectString.SpanSplit(";", StringSplitOptions.RemoveEmptyEntries);
if (seq.Count != 2) throw new InvalidOperationException("ConnectionString invalid in configuration file. It should be mongodb://127.0.0.1:27017;Data Source=BootstrapAdmin");
var client = new MongoClient(seq[0]);
_db = client.GetDatabase(seq[1].SpanSplit("=", StringSplitOptions.RemoveEmptyEntries).LastOrDefault());
var client = new MongoClient(Longbow.Data.DbManager.GetConnectionString());
_db = client.GetDatabase(ConfigurationManager.AppSettings["MongoDB"]);
}
private static void InitClassMap()

10
Bootstrap.DataAccess.MongoDB/Dict.cs
View File

@ -14,7 +14,7 @@ namespace Bootstrap.DataAccess.MongoDB
///
/// </summary>
/// <returns></returns>
public override IEnumerable<BootstrapDict> RetrieveDicts() => MongoDbAccessManager.Dicts.Find(FilterDefinition<BootstrapDict>.Empty).ToList();
public override IEnumerable<BootstrapDict> RetrieveDicts() => DbManager.Dicts.Find(FilterDefinition<BootstrapDict>.Empty).ToList();
/// <summary>
///
@ -28,7 +28,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
list.Add(new DeleteOneModel<BootstrapDict>(Builders<BootstrapDict>.Filter.Eq(md => md.Id, id)));
}
MongoDbAccessManager.Dicts.BulkWrite(list);
DbManager.Dicts.BulkWrite(list);
return true;
}
@ -42,12 +42,12 @@ namespace Bootstrap.DataAccess.MongoDB
if (p.Id == "0")
{
p.Id = null;
MongoDbAccessManager.Dicts.InsertOne(p);
DbManager.Dicts.InsertOne(p);
return true;
}
else
{
MongoDbAccessManager.Dicts.UpdateOne(md => md.Id == p.Id, Builders<BootstrapDict>.Update.Set(md => md.Category, p.Category)
DbManager.Dicts.UpdateOne(md => md.Id == p.Id, Builders<BootstrapDict>.Update.Set(md => md.Category, p.Category)
.Set(md => md.Define, p.Define)
.Set(md => md.Name, p.Name)
.Set(md => md.Code, p.Code));
@ -62,7 +62,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveSettings(BootstrapDict dict)
{
MongoDbAccessManager.Dicts.FindOneAndUpdate(md => md.Category == dict.Category && md.Name == dict.Name, Builders<BootstrapDict>.Update.Set(md => md.Code, dict.Code));
DbManager.Dicts.FindOneAndUpdate(md => md.Category == dict.Category && md.Name == dict.Name, Builders<BootstrapDict>.Update.Set(md => md.Code, dict.Code));
return true;
}
}

6
Bootstrap.DataAccess.MongoDB/Exceptions.cs
View File

@ -14,7 +14,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
System.Threading.Tasks.Task.Run(() =>
{
MongoDbAccessManager.Exceptions.DeleteMany(ex => ex.LogTime < DateTime.Now.AddDays(-7));
DbManager.Exceptions.DeleteMany(ex => ex.LogTime < DateTime.Now.AddDays(-7));
});
}
@ -24,7 +24,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override IEnumerable<DataAccess.Exceptions> Retrieves()
{
return MongoDbAccessManager.Exceptions.Find(ex => ex.LogTime >= DateTime.Now.AddDays(-7)).ToList();
return DbManager.Exceptions.Find(ex => ex.LogTime >= DateTime.Now.AddDays(-7)).ToList();
}
/// <summary>
@ -47,7 +47,7 @@ namespace Bootstrap.DataAccess.MongoDB
UserId = additionalInfo?["UserId"],
UserIp = additionalInfo?["UserIp"]
};
MongoDbAccessManager.Exceptions.InsertOne(excep);
DbManager.Exceptions.InsertOne(excep);
ClearExceptions();
return true;
}

18
Bootstrap.DataAccess.MongoDB/Group.cs
View File

@ -20,7 +20,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override IEnumerable<DataAccess.Group> Retrieves()
{
return MongoDbAccessManager.Groups.Find(FilterDefinition<Group>.Empty).ToList();
return DbManager.Groups.Find(FilterDefinition<Group>.Empty).ToList();
}
/// <summary>
@ -33,7 +33,7 @@ namespace Bootstrap.DataAccess.MongoDB
if (p.Id == "0")
{
p.Id = null;
MongoDbAccessManager.Groups.InsertOne(new Group() {
DbManager.Groups.InsertOne(new Group() {
GroupName = p.GroupName,
Description = p.Description,
Roles = new List<string>()
@ -42,7 +42,7 @@ namespace Bootstrap.DataAccess.MongoDB
}
else
{
MongoDbAccessManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.GroupName, p.GroupName).Set(md => md.Description, p.Description));
DbManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.GroupName, p.GroupName).Set(md => md.Description, p.Description));
return true;
}
}
@ -59,7 +59,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
list.Add(new DeleteOneModel<Group>(Builders<Group>.Filter.Eq(g => g.Id, id)));
}
MongoDbAccessManager.Groups.BulkWrite(list);
DbManager.Groups.BulkWrite(list);
return true;
}
@ -84,7 +84,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByUserId(string userId, IEnumerable<string> groupIds)
{
MongoDbAccessManager.Users.FindOneAndUpdate(u => u.Id == userId, Builders<User>.Update.Set(u => u.Groups, groupIds));
DbManager.Users.FindOneAndUpdate(u => u.Id == userId, Builders<User>.Update.Set(u => u.Groups, groupIds));
return true;
}
@ -108,23 +108,23 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByRoleId(string roleId, IEnumerable<string> groupIds)
{
var groups = MongoDbAccessManager.Groups.Find(md => md.Roles != null && md.Roles.Contains(roleId)).ToList();
var groups = DbManager.Groups.Find(md => md.Roles != null && md.Roles.Contains(roleId)).ToList();
// Remove roles
groups.ForEach(p =>
{
var roles = p.Roles == null ? new List<string>() : p.Roles.ToList();
roles.Remove(roleId);
MongoDbAccessManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.Roles, roles));
DbManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.Roles, roles));
});
groups = MongoDbAccessManager.Groups.Find(md => groupIds.Contains(md.Id)).ToList();
groups = DbManager.Groups.Find(md => groupIds.Contains(md.Id)).ToList();
// Add roles
groups.ForEach(p =>
{
var roles = p.Roles == null ? new List<string>() : p.Roles.ToList();
roles.Add(roleId);
MongoDbAccessManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.Roles, roles));
DbManager.Groups.UpdateOne(md => md.Id == p.Id, Builders<Group>.Update.Set(md => md.Roles, roles));
});
return true;
}

6
Bootstrap.DataAccess.MongoDB/Log.cs
View File

@ -13,13 +13,13 @@ namespace Bootstrap.DataAccess.MongoDB
///
/// </summary>
/// <returns></returns>
public override IEnumerable<DataAccess.Log> Retrieves() => MongoDbAccessManager.Logs.Find(l => l.LogTime >= DateTime.Now.AddDays(-7)).ToList();
public override IEnumerable<DataAccess.Log> Retrieves() => DbManager.Logs.Find(l => l.LogTime >= DateTime.Now.AddDays(-7)).ToList();
/// <summary>
/// 删除日志信息
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
private static void DeleteLogAsync() => System.Threading.Tasks.Task.Run(() => MongoDbAccessManager.Logs.DeleteMany(log => log.LogTime < DateTime.Now.AddDays(-7)));
private static void DeleteLogAsync() => System.Threading.Tasks.Task.Run(() => DbManager.Logs.DeleteMany(log => log.LogTime < DateTime.Now.AddDays(-7)));
/// <summary>
///
/// </summary>
@ -28,7 +28,7 @@ namespace Bootstrap.DataAccess.MongoDB
public override bool Save(DataAccess.Log log)
{
log.LogTime = DateTime.Now;
MongoDbAccessManager.Logs.InsertOne(log);
DbManager.Logs.InsertOne(log);
return true;
}
}

12
Bootstrap.DataAccess.MongoDB/Menu.cs
View File

@ -19,7 +19,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
var dicts = DictHelper.RetrieveDicts().Where(m => m.Category == "菜单");
var menus = MongoDbAccessManager.Menus.Find(FilterDefinition<BootstrapMenu>.Empty).ToList();
var menus = DbManager.Menus.Find(FilterDefinition<BootstrapMenu>.Empty).ToList();
menus.ForEach(m =>
{
m.CategoryName = dicts.FirstOrDefault(d => d.Code == m.Category)?.Name;
@ -38,7 +38,7 @@ namespace Bootstrap.DataAccess.MongoDB
if (p.Id == "0")
{
p.Id = null;
MongoDbAccessManager.Menus.InsertOne(p);
DbManager.Menus.InsertOne(p);
return true;
}
else
@ -52,7 +52,7 @@ namespace Bootstrap.DataAccess.MongoDB
.Set(md => md.Target, p.Target)
.Set(md => md.IsResource, p.IsResource)
.Set(md => md.Application, p.Application);
MongoDbAccessManager.Menus.UpdateOne(md => md.Id == p.Id, update);
DbManager.Menus.UpdateOne(md => md.Id == p.Id, update);
return true;
}
}
@ -69,7 +69,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
list.Add(new DeleteOneModel<BootstrapMenu>(Builders<BootstrapMenu>.Filter.Eq(g => g.Id, id)));
}
MongoDbAccessManager.Menus.BulkWrite(list);
DbManager.Menus.BulkWrite(list);
return true;
}
@ -78,7 +78,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// </summary>
/// <param name="roleId"></param>
/// <returns></returns>
public override IEnumerable<object> RetrieveMenusByRoleId(string roleId) => MongoDbAccessManager.Roles.Find(md => md.Id == roleId).FirstOrDefault().Menus.Select(m => new { Id = m });
public override IEnumerable<object> RetrieveMenusByRoleId(string roleId) => DbManager.Roles.Find(md => md.Id == roleId).FirstOrDefault().Menus.Select(m => new { Id = m });
/// <summary>
///
@ -88,7 +88,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveMenusByRoleId(string roleId, IEnumerable<string> menuIds)
{
MongoDbAccessManager.Roles.FindOneAndUpdate(md => md.Id == roleId, Builders<Role>.Update.Set(md => md.Menus, menuIds));
DbManager.Roles.FindOneAndUpdate(md => md.Id == roleId, Builders<Role>.Update.Set(md => md.Menus, menuIds));
return true;
}
}

2
Bootstrap.DataAccess.MongoDB/Message.cs
View File

@ -15,7 +15,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
protected override IEnumerable<DataAccess.Message> Retrieves(string userName)
{
var msg = MongoDbAccessManager.DBAccess.GetCollection<DataAccess.Message>("Messages");
var msg = DbManager.DBAccess.GetCollection<DataAccess.Message>("Messages");
return msg.Find(message => message.To == userName || message.From == userName).ToList();
}
}

22
Bootstrap.DataAccess.MongoDB/Role.cs
View File

@ -21,7 +21,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override IEnumerable<DataAccess.Role> Retrieves()
{
return MongoDbAccessManager.Roles.Find(FilterDefinition<Role>.Empty).ToList();
return DbManager.Roles.Find(FilterDefinition<Role>.Empty).ToList();
}
/// <summary>
@ -34,7 +34,7 @@ namespace Bootstrap.DataAccess.MongoDB
if (p.Id == "0")
{
p.Id = null;
MongoDbAccessManager.Roles.InsertOne(new Role()
DbManager.Roles.InsertOne(new Role()
{
RoleName = p.RoleName,
Description = p.Description,
@ -44,7 +44,7 @@ namespace Bootstrap.DataAccess.MongoDB
}
else
{
MongoDbAccessManager.Roles.UpdateOne(md => md.Id == p.Id, Builders<Role>.Update.Set(md => md.RoleName, p.RoleName).Set(md => md.Description, p.Description));
DbManager.Roles.UpdateOne(md => md.Id == p.Id, Builders<Role>.Update.Set(md => md.RoleName, p.RoleName).Set(md => md.Description, p.Description));
return true;
}
}
@ -61,7 +61,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
list.Add(new DeleteOneModel<Role>(Builders<Role>.Filter.Eq(g => g.Id, id)));
}
MongoDbAccessManager.Roles.BulkWrite(list);
DbManager.Roles.BulkWrite(list);
return true;
}
@ -102,7 +102,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByUserId(string userId, IEnumerable<string> roleIds)
{
MongoDbAccessManager.Users.FindOneAndUpdate(u => u.Id == userId, Builders<User>.Update.Set(u => u.Roles, roleIds));
DbManager.Users.FindOneAndUpdate(u => u.Id == userId, Builders<User>.Update.Set(u => u.Roles, roleIds));
return true;
}
@ -127,24 +127,24 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SavaByMenuId(string menuId, IEnumerable<string> roleIds)
{
var roles = MongoDbAccessManager.Roles.Find(md => md.Menus != null && md.Menus.Contains(menuId)).ToList();
var roles = DbManager.Roles.Find(md => md.Menus != null && md.Menus.Contains(menuId)).ToList();
// Remove roles
roles.ForEach(p =>
{
var menus = p.Menus == null ? new List<string>() : p.Menus.ToList();
menus.Remove(menuId);
MongoDbAccessManager.Roles.UpdateOne(md => md.Id == p.Id, Builders<Role>.Update.Set(md => md.Menus, menus));
DbManager.Roles.UpdateOne(md => md.Id == p.Id, Builders<Role>.Update.Set(md => md.Menus, menus));
});
roles = MongoDbAccessManager.Roles.Find(md => roleIds.Contains(md.Id)).ToList();
roles = DbManager.Roles.Find(md => roleIds.Contains(md.Id)).ToList();
roles.ForEach(role =>
{
var menus = role.Menus == null ? new List<string>() : role.Menus.ToList();
if (!menus.Contains(menuId))
{
menus.Add(menuId);
MongoDbAccessManager.Roles.UpdateOne(md => md.Id == role.Id, Builders<Role>.Update.Set(md => md.Menus, menus));
DbManager.Roles.UpdateOne(md => md.Id == role.Id, Builders<Role>.Update.Set(md => md.Menus, menus));
}
});
return true;
@ -171,7 +171,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByGroupId(string groupId, IEnumerable<string> roleIds)
{
MongoDbAccessManager.Groups.FindOneAndUpdate(u => u.Id == groupId, Builders<Group>.Update.Set(u => u.Roles, roleIds));
DbManager.Groups.FindOneAndUpdate(u => u.Id == groupId, Builders<Group>.Update.Set(u => u.Roles, roleIds));
return true;
}
@ -182,7 +182,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override IEnumerable<string> RetrieveRolesByUrl(string url)
{
var menu = MongoDbAccessManager.Menus.Find(md => md.Url.StartsWith(url)).FirstOrDefault();
var menu = DbManager.Menus.Find(md => md.Url.StartsWith(url)).FirstOrDefault();
var ret = RoleHelper.Retrieves().Cast<Role>().Where(md => md.Menus != null && md.Menus.Contains(menu.Id)).Select(m => m.RoleName).ToList();
if (!ret.Contains("Administrators")) ret.Add("Administrators");
return ret;

2
Bootstrap.DataAccess.MongoDB/Task.cs
View File

@ -14,7 +14,7 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override IEnumerable<DataAccess.Task> Retrieves()
{
var users = MongoDbAccessManager.DBAccess.GetCollection<DataAccess.Task>("Tasks");
var users = DbManager.DBAccess.GetCollection<DataAccess.Task>("Tasks");
return users.Find(FilterDefinition<DataAccess.Task>.Empty).SortByDescending(task => task.AssignTime).ToList();
}
}

32
Bootstrap.DataAccess.MongoDB/User.cs
View File

@ -34,7 +34,7 @@ namespace Bootstrap.DataAccess.MongoDB
.Include(u => u.DisplayName)
.Include(u => u.Icon)
.Include(u => u.Css);
return MongoDbAccessManager.Users.Find(user => user.UserName == userName).Project<DataAccess.User>(project).FirstOrDefault();
return DbManager.Users.Find(user => user.UserName == userName).Project<DataAccess.User>(project).FirstOrDefault();
}
/// <summary>
@ -47,7 +47,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
if (string.IsNullOrEmpty(userName) && string.IsNullOrEmpty(password)) return false;
var u = MongoDbAccessManager.Users.Find(user => user.UserName == userName).FirstOrDefault();
var u = DbManager.Users.Find(user => user.UserName == userName).FirstOrDefault();
return !string.IsNullOrEmpty(u.PassSalt) && u.Password == LgbCryptography.ComputeHash(password, u.PassSalt);
}
@ -55,7 +55,7 @@ namespace Bootstrap.DataAccess.MongoDB
///
/// </summary>
/// <returns></returns>
public override IEnumerable<DataAccess.User> RetrieveNewUsers() => MongoDbAccessManager.Users.Find(user => user.ApprovedTime == DateTime.MinValue).SortByDescending(user => user.RegisterTime).ToList();
public override IEnumerable<DataAccess.User> RetrieveNewUsers() => DbManager.Users.Find(user => user.ApprovedTime == DateTime.MinValue).SortByDescending(user => user.RegisterTime).ToList();
/// <summary>
///
@ -72,7 +72,7 @@ namespace Bootstrap.DataAccess.MongoDB
.Include(u => u.Description)
.Include(u => u.Groups)
.Include(u => u.Roles);
return MongoDbAccessManager.Users.Find(user => user.ApprovedTime != DateTime.MinValue).Project<User>(project).ToList();
return DbManager.Users.Find(user => user.ApprovedTime != DateTime.MinValue).Project<User>(project).ToList();
}
/// <summary>
@ -87,7 +87,7 @@ namespace Bootstrap.DataAccess.MongoDB
if (user.Description.Length > 500) user.Description = user.Description.Substring(0, 500);
if (user.UserName.Length > 50) user.UserName = user.UserName.Substring(0, 50);
MongoDbAccessManager.Users.InsertOne(new User()
DbManager.Users.InsertOne(new User()
{
UserName = user.UserName,
DisplayName = user.DisplayName,
@ -116,7 +116,7 @@ namespace Bootstrap.DataAccess.MongoDB
var passSalt = LgbCryptography.GenerateSalt();
var newPassword = LgbCryptography.ComputeHash(password, passSalt);
var update = Builders<User>.Update.Set(u => u.Password, newPassword).Set(u => u.PassSalt, passSalt).Set(u => u.DisplayName, displayName);
MongoDbAccessManager.Users.FindOneAndUpdate(u => u.Id == id, update);
DbManager.Users.FindOneAndUpdate(u => u.Id == id, update);
return true;
}
@ -135,7 +135,7 @@ namespace Bootstrap.DataAccess.MongoDB
var passSalt = LgbCryptography.GenerateSalt();
var newPassword = LgbCryptography.ComputeHash(password, passSalt);
var update = Builders<User>.Update.Set(u => u.Password, newPassword).Set(u => u.PassSalt, passSalt);
MongoDbAccessManager.Users.FindOneAndUpdate(u => u.UserName == UserName, update);
DbManager.Users.FindOneAndUpdate(u => u.UserName == UserName, update);
}
return ret;
}
@ -152,7 +152,7 @@ namespace Bootstrap.DataAccess.MongoDB
{
list.Add(new DeleteOneModel<User>(Builders<User>.Filter.Eq(u => u.Id, id)));
}
MongoDbAccessManager.Users.BulkWrite(list);
DbManager.Users.BulkWrite(list);
return true;
}
@ -176,23 +176,23 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByRoleId(string roleId, IEnumerable<string> userIds)
{
var users = MongoDbAccessManager.Users.Find(md => md.Roles != null && md.Roles.Contains(roleId)).ToList();
var users = DbManager.Users.Find(md => md.Roles != null && md.Roles.Contains(roleId)).ToList();
// Remove roles
users.ForEach(p =>
{
var roles = p.Roles == null ? new List<string>() : p.Roles.ToList();
roles.Remove(roleId);
MongoDbAccessManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Roles, roles));
DbManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Roles, roles));
});
users = MongoDbAccessManager.Users.Find(md => userIds.Contains(md.Id)).ToList();
users = DbManager.Users.Find(md => userIds.Contains(md.Id)).ToList();
// Add roles
users.ForEach(p =>
{
var roles = p.Roles == null ? new List<string>() : p.Roles.ToList();
roles.Add(roleId);
MongoDbAccessManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Roles, roles));
DbManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Roles, roles));
});
return true;
}
@ -217,23 +217,23 @@ namespace Bootstrap.DataAccess.MongoDB
/// <returns></returns>
public override bool SaveByGroupId(string groupId, IEnumerable<string> userIds)
{
var users = MongoDbAccessManager.Users.Find(md => md.Groups != null && md.Groups.Contains(groupId)).ToList();
var users = DbManager.Users.Find(md => md.Groups != null && md.Groups.Contains(groupId)).ToList();
// Remove roles
users.ForEach(p =>
{
var groups = p.Groups == null ? new List<string>() : p.Groups.ToList();
groups.Remove(groupId);
MongoDbAccessManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Groups, groups));
DbManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Groups, groups));
});
users = MongoDbAccessManager.Users.Find(md => userIds.Contains(md.Id)).ToList();
users = DbManager.Users.Find(md => userIds.Contains(md.Id)).ToList();
// Add roles
users.ForEach(p =>
{
var groups = p.Groups == null ? new List<string>() : p.Groups.ToList();
groups.Add(groupId);
MongoDbAccessManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Groups, groups));
DbManager.Users.UpdateOne(md => md.Id == p.Id, Builders<User>.Update.Set(md => md.Groups, groups));
});
return true;
}