Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/refine-json-format
This commit is contained in:
commit
22871f19cc
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Web;
|
using System.Web;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace BotSharp.Plugin.MongoStorage;
|
namespace BotSharp.Plugin.MongoStorage;
|
||||||
|
|
||||||
|
|
@ -20,27 +21,14 @@ public class MongoDbContext
|
||||||
|
|
||||||
private string GetDatabaseName(string mongoDbConnectionString)
|
private string GetDatabaseName(string mongoDbConnectionString)
|
||||||
{
|
{
|
||||||
var dbName = string.Empty;
|
var databaseName = mongoDbConnectionString.Substring(mongoDbConnectionString.LastIndexOf("/", StringComparison.InvariantCultureIgnoreCase) + 1);
|
||||||
if (!Uri.TryCreate(mongoDbConnectionString, UriKind.Absolute, out var conn))
|
if (databaseName.Contains("?"))
|
||||||
{
|
{
|
||||||
return dbName;
|
databaseName = databaseName.Substring(0, databaseName.IndexOf("?", StringComparison.InvariantCultureIgnoreCase));
|
||||||
}
|
}
|
||||||
|
return databaseName;
|
||||||
var query = HttpUtility.ParseQueryString(conn.Query);
|
|
||||||
var keys = query.AllKeys ?? [];
|
|
||||||
|
|
||||||
if (keys.Contains(DB_NAME_INDEX))
|
|
||||||
{
|
|
||||||
dbName = query[DB_NAME_INDEX];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
dbName = conn.Segments?.FirstOrDefault(x => x != "/") ?? string.Empty;
|
|
||||||
}
|
|
||||||
return dbName;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private IMongoDatabase Database { get { return _mongoClient.GetDatabase(_mongoDbDatabaseName); } }
|
private IMongoDatabase Database { get { return _mongoClient.GetDatabase(_mongoDbDatabaseName); } }
|
||||||
|
|
||||||
#region Indexes
|
#region Indexes
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue