Explorar el Código

强制数据库配置ConfigId为字符串

liteap hace 2 años
padre
commit
412d2641e0

+ 4 - 0
Admin.NET/Admin.NET.Core/Option/DbConnectionOptions.cs

@@ -38,6 +38,10 @@ public sealed class DbConnectionOptions : IConfigurableOptions<DbConnectionOptio
 /// </summary>
 public sealed class DbConnectionConfig : ConnectionConfig
 {
+    /// <summary>
+    /// 数据库标识
+    /// </summary>
+    public new string ConfigId { get; set; }
     /// <summary>
     /// 数据库设置
     /// </summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -35,7 +35,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [DisplayName("获取库列表")]
-    public List<dynamic> GetList()
+    public List<string> GetList()
     {
         return App.GetOptions<DbConnectionOptions>().ConnectionConfigs.Select(u => u.ConfigId).ToList();
     }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -421,7 +421,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         // 设置租户库连接配置
         var tenantConnConfig = new DbConnectionConfig
         {
-            ConfigId = tenant.Id,
+            ConfigId = tenant.Id.ToString(),
             DbType = tenant.DbType,
             IsAutoCloseConnection = true,
             ConnectionString = tenant.Connection,