Skip to content

Commit bf253a8

Browse files
author
Jicheng Lu
committed
get db name
1 parent 6554e09 commit bf253a8

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

src/Infrastructure/BotSharp.Abstraction/Repositories/BotSharpDatabaseSettings.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class BotSharpDatabaseSettings : DatabaseBasicSettings
44
{
55
public string[] Assemblies { get; set; }
66
public string FileRepository { get; set; }
7-
public BotSharpMongoDbSetting BotSharpMongoDb { get; set; }
7+
public string BotSharpMongoDb { get; set; }
88
public string TablePrefix { get; set; }
99
public DbConnectionSetting BotSharp { get; set; }
1010
public string Redis { get; set; }
@@ -28,10 +28,4 @@ public DbConnectionSetting()
2828
{
2929
Slavers = new string[0];
3030
}
31-
}
32-
33-
public class BotSharpMongoDbSetting
34-
{
35-
public string ConnectionString { get; set; }
36-
public string? DbNameIndex { get; set; }
3731
}

src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ public class MongoDbContext
88
private readonly string _mongoDbDatabaseName;
99
private readonly string _collectionPrefix;
1010

11+
private const string DB_NAME_INDEX = "authSource";
12+
1113
public MongoDbContext(BotSharpDatabaseSettings dbSettings)
1214
{
13-
var mongoDbConnectionString = dbSettings.BotSharpMongoDb.ConnectionString;
14-
var dbNameIndex = dbSettings.BotSharpMongoDb.DbNameIndex;
15+
var mongoDbConnectionString = dbSettings.BotSharpMongoDb;
1516
_mongoClient = new MongoClient(mongoDbConnectionString);
16-
_mongoDbDatabaseName = GetDatabaseName(mongoDbConnectionString, dbNameIndex);
17+
_mongoDbDatabaseName = GetDatabaseName(mongoDbConnectionString);
1718
_collectionPrefix = dbSettings.TablePrefix.IfNullOrEmptyAs("BotSharp");
1819
}
1920

20-
private string GetDatabaseName(string mongoDbConnectionString, string? dbNameIndex = null)
21+
private string GetDatabaseName(string mongoDbConnectionString)
2122
{
2223
var dbName = string.Empty;
2324
if (!Uri.TryCreate(mongoDbConnectionString, UriKind.Absolute, out var conn))
@@ -28,9 +29,9 @@ private string GetDatabaseName(string mongoDbConnectionString, string? dbNameInd
2829
var query = HttpUtility.ParseQueryString(conn.Query);
2930
var keys = query.AllKeys ?? [];
3031

31-
if (!string.IsNullOrWhiteSpace(dbNameIndex) && keys.Contains(dbNameIndex))
32+
if (keys.Contains(DB_NAME_INDEX))
3233
{
33-
dbName = query[dbNameIndex];
34+
dbName = query[DB_NAME_INDEX];
3435
}
3536
else
3637
{

src/WebStarter/appsettings.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,7 @@
226226
"Database": {
227227
"Default": "FileRepository",
228228
"TablePrefix": "BotSharp",
229-
"BotSharpMongoDb": {
230-
"ConnectionString": "",
231-
"DbIndex": ""
232-
},
229+
"BotSharpMongoDb": "",
233230
"FileRepository": "data",
234231
"Assemblies": [ "BotSharp.Core" ]
235232
},

0 commit comments

Comments
 (0)