优化-代码生成增加多库模式、数据库管理UI优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -4103,17 +4103,19 @@
             </summary>
             <param name="input"></param>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataBaseManager.GetColumnInfosByTableName(System.String)">
+        <member name="M:Admin.NET.Core.Service.DataBaseManager.GetColumnInfosByTableName(System.String,System.String)">
             <summary>
             获取表字段
             </summary>
-            <param name="tableName"></param>
+            <param name="tableName">表名</param>
+            <param name="configId">ConfigId</param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataBaseManager.GetTableInfoList">
+        <member name="M:Admin.NET.Core.Service.DataBaseManager.GetTableInfoList(System.String)">
             <summary>
-            获取所有表
+            获取表信息
             </summary>
+            <param name="configId">ConfigId</param>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.DataBaseManager.TableAdd(Admin.NET.Core.Service.DbTableInfoInput)">
@@ -4177,6 +4179,11 @@
              </summary>
              <example>Magic.Application</example>
         </member>
+        <member name="P:Admin.NET.Core.Service.CreateEntityInput.ConfigId">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.Service.DataResourceInput.Pid">
             <summary>
             父Id

Admin.NET/Admin.NET.Core/Service/DataBase/DataBaseManager.cs

@@ -6,12 +6,12 @@
 [ApiDescriptionSettings(Name = "数据库管理", Order = 145)]
 public class DataBaseManager : IDynamicApiController, ITransient
 {
-    private readonly ISqlSugarClient _sqlSugarClient;
+    private readonly ISqlSugarClient _db;
     private readonly IViewEngine _viewEngine;
 
-    public DataBaseManager(ISqlSugarClient sqlSugarClient, IViewEngine viewEngine)
+    public DataBaseManager(ISqlSugarClient db, IViewEngine viewEngine)
     {
-        _sqlSugarClient = sqlSugarClient;
+        _db = db;
         _viewEngine = viewEngine;
     }
 
@@ -33,11 +33,11 @@ public class DataBaseManager : IDynamicApiController, ITransient
             DecimalDigits = input.DecimalDigits,
             DataType = input.DataType
         };
-        _sqlSugarClient.DbMaintenance.AddColumn(input.TableName, column);
-        _sqlSugarClient.DbMaintenance.AddColumnRemark(input.DbColumnName, input.TableName, input.ColumnDescription);
+        _db.DbMaintenance.AddColumn(input.TableName, column);
+        _db.DbMaintenance.AddColumnRemark(input.DbColumnName, input.TableName, input.ColumnDescription);
         if (column.IsPrimarykey)
         {
-            _sqlSugarClient.DbMaintenance.AddPrimaryKey(input.TableName, input.DbColumnName);
+            _db.DbMaintenance.AddPrimaryKey(input.TableName, input.DbColumnName);
         }
     }
 
@@ -48,7 +48,7 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/column/delete")]
     public void ColumnDelete(DbColumnInfoOutput input)
     {
-        _sqlSugarClient.DbMaintenance.DropColumn(input.TableName, input.DbColumnName);
+        _db.DbMaintenance.DropColumn(input.TableName, input.DbColumnName);
     }
 
     /// <summary>
@@ -58,12 +58,12 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/column/edit")]
     public void ColumnEdit(EditColumnInput input)
     {
-        _sqlSugarClient.DbMaintenance.RenameColumn(input.TableName, input.OldName, input.DbColumnName);
-        if (_sqlSugarClient.DbMaintenance.IsAnyColumnRemark(input.DbColumnName, input.TableName))
+        _db.DbMaintenance.RenameColumn(input.TableName, input.OldName, input.DbColumnName);
+        if (_db.DbMaintenance.IsAnyColumnRemark(input.DbColumnName, input.TableName))
         {
-            _sqlSugarClient.DbMaintenance.DeleteColumnRemark(input.DbColumnName, input.TableName);
+            _db.DbMaintenance.DeleteColumnRemark(input.DbColumnName, input.TableName);
         }
-        _sqlSugarClient.DbMaintenance.AddColumnRemark(input.DbColumnName, input.TableName, string.IsNullOrWhiteSpace(input.ColumnDescription) ? input.DbColumnName : input.ColumnDescription);
+        _db.DbMaintenance.AddColumnRemark(input.DbColumnName, input.TableName, string.IsNullOrWhiteSpace(input.ColumnDescription) ? input.DbColumnName : input.ColumnDescription);
     }
 
     /// <summary>
@@ -75,11 +75,12 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpGet("/dataBase/columnInfoList")]
     public List<DbColumnInfoOutput> GetColumnInfosByTableName(string tableName, string configId = SqlSugarConst.ConfigId)
     {
-        var provider = _sqlSugarClient.AsTenant().GetConnectionScope(configId);
+        var provider = _db.AsTenant().GetConnectionScope(configId);
         if (string.IsNullOrWhiteSpace(tableName))
             return new List<DbColumnInfoOutput>();
         return provider.DbMaintenance.GetColumnInfosByTableName(tableName, false).Adapt<List<DbColumnInfoOutput>>();
     }
+
     /// <summary>
     /// 获取表信息
     /// </summary>
@@ -88,9 +89,10 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpGet("/dataBase/tableInfoList")]
     public List<DbTableInfo> GetTableInfoList(string configId = SqlSugarConst.ConfigId)
     {
-        var provider = _sqlSugarClient.AsTenant().GetConnectionScope(configId);
+        var provider = _db.AsTenant().GetConnectionScope(configId);
         return provider.DbMaintenance.GetTableInfoList(false);
     }
+
     /// <summary>
     /// 新增表
     /// </summary>
@@ -117,15 +119,15 @@ public class DataBaseManager : IDynamicApiController, ITransient
                 DecimalDigits = m.DecimalDigits
             });
         });
-        _sqlSugarClient.DbMaintenance.CreateTable(input.Name, columns, false);
-        _sqlSugarClient.DbMaintenance.AddTableRemark(input.Name, input.Description);
+        _db.DbMaintenance.CreateTable(input.Name, columns, false);
+        _db.DbMaintenance.AddTableRemark(input.Name, input.Description);
         if (columns.Any(m => m.IsPrimarykey))
         {
-            _sqlSugarClient.DbMaintenance.AddPrimaryKey(input.Name, columns.FirstOrDefault(m => m.IsPrimarykey).DbColumnName);
+            _db.DbMaintenance.AddPrimaryKey(input.Name, columns.FirstOrDefault(m => m.IsPrimarykey).DbColumnName);
         }
         input.DbColumnInfoList.ForEach(m =>
         {
-            _sqlSugarClient.DbMaintenance.AddColumnRemark(m.DbColumnName, input.Name, string.IsNullOrWhiteSpace(m.ColumnDescription) ? m.DbColumnName : m.ColumnDescription);
+            _db.DbMaintenance.AddColumnRemark(m.DbColumnName, input.Name, string.IsNullOrWhiteSpace(m.ColumnDescription) ? m.DbColumnName : m.ColumnDescription);
         });
     }
 
@@ -136,7 +138,7 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/table/delete")]
     public void TableDelete(DbTableInfo input)
     {
-        _sqlSugarClient.DbMaintenance.DropTable(input.Name);
+        _db.DbMaintenance.DropTable(input.Name);
     }
 
     /// <summary>
@@ -146,12 +148,12 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/table/edit")]
     public void TableEdit(EditTableInput input)
     {
-        _sqlSugarClient.DbMaintenance.RenameTable(input.OldName, input.Name);
-        if (_sqlSugarClient.DbMaintenance.IsAnyTableRemark(input.Name))
+        _db.DbMaintenance.RenameTable(input.OldName, input.Name);
+        if (_db.DbMaintenance.IsAnyTableRemark(input.Name))
         {
-            _sqlSugarClient.DbMaintenance.DeleteTableRemark(input.Name);
+            _db.DbMaintenance.DeleteTableRemark(input.Name);
         }
-        _sqlSugarClient.DbMaintenance.AddTableRemark(input.Name, input.Description);
+        _db.DbMaintenance.AddTableRemark(input.Name, input.Description);
     }
 
     /// <summary>
@@ -161,7 +163,7 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/table/createEntity")]
     public void CreateEntity(CreateEntityInput input)
     {
-        var provider = _sqlSugarClient.AsTenant().GetConnectionScope(input.ConfigId);
+        var provider = _db.AsTenant().GetConnectionScope(input.ConfigId);
         input.Position = string.IsNullOrWhiteSpace(input.Position) ? "Admin.NET.Application" : input.Position;
         input.BaseClassName = string.IsNullOrWhiteSpace(input.BaseClassName) ? "" : $" : {input.BaseClassName}";
         var templatePath = GetTemplatePath();
@@ -174,21 +176,21 @@ public class DataBaseManager : IDynamicApiController, ITransient
         if (input.BaseClassName.Contains("EntityTenant"))
         {
             dbColumnInfos = dbColumnInfos.Where(c => c.DbColumnName != "Id"
-                 && c.DbColumnName != "TenantId"
-                 && c.DbColumnName != "CreateTime"
-                 && c.DbColumnName != "UpdateTime"
-                 && c.DbColumnName != "CreateUserId"
-                 && c.DbColumnName != "UpdateUserId"
-                 && c.DbColumnName != "IsDelete").ToList();
+                && c.DbColumnName != "TenantId"
+                && c.DbColumnName != "CreateTime"
+                && c.DbColumnName != "UpdateTime"
+                && c.DbColumnName != "CreateUserId"
+                && c.DbColumnName != "UpdateUserId"
+                && c.DbColumnName != "IsDelete").ToList();
         }
         else if (input.BaseClassName.Contains("EntityBase"))
         {
             dbColumnInfos = dbColumnInfos.Where(c => c.DbColumnName != "Id"
-                 && c.DbColumnName != "CreateTime"
-                 && c.DbColumnName != "UpdateTime"
-                 && c.DbColumnName != "CreateUserId"
-                 && c.DbColumnName != "UpdateUserId"
-                 && c.DbColumnName != "IsDelete").ToList();
+                && c.DbColumnName != "CreateTime"
+                && c.DbColumnName != "UpdateTime"
+                && c.DbColumnName != "CreateUserId"
+                && c.DbColumnName != "UpdateUserId"
+                && c.DbColumnName != "IsDelete").ToList();
         }
         else if (input.BaseClassName.Contains("EntityBaseId"))
         {

Admin.NET/Admin.NET.Core/Service/DataBase/Dto/CreateEntityInput.cs

@@ -26,5 +26,8 @@ public class CreateEntityInput
     /// <example>Magic.Application</example>
     public string Position { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
     public string ConfigId { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -10,22 +10,22 @@ public class SysFileService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysFile> _sysFileRep;
     private readonly OSSProviderOptions _OSSProviderOptions;
-    private readonly IOSSService _OSSService;
     private readonly UploadOptions _uploadOptions;
     private readonly ICommonService _commonService;
+    private readonly IOSSService _OSSService;
 
     public SysFileService(SqlSugarRepository<SysFile> sysFileRep,
         IOptions<OSSProviderOptions> oSSProviderOptions,
-        IOSSServiceFactory ossServiceFactory,
+        IOptions<UploadOptions> uploadOptions,
         ICommonService commonService,
-        IOptions<UploadOptions> uploadOptions)
+        IOSSServiceFactory ossServiceFactory)
     {
         _sysFileRep = sysFileRep;
         _OSSProviderOptions = oSSProviderOptions.Value;
+        _uploadOptions = uploadOptions.Value;
         _commonService = commonService;
         if (_OSSProviderOptions.IsEnable)
             _OSSService = ossServiceFactory.Create(_OSSProviderOptions.Provider.ToString());
-        _uploadOptions = uploadOptions.Value;
     }
 
     /// <summary>
@@ -158,7 +158,8 @@ public class SysFileService : IDynamicApiController, ITransient
             throw Oops.Oh(ErrorCodeEnum.D8001);
 
         var sizeKb = (long)(file.Length / 1024.0); // 大小KB
-        if (sizeKb > _uploadOptions.MaxSize) throw Oops.Oh(ErrorCodeEnum.D8002);
+        if (sizeKb > _uploadOptions.MaxSize)
+            throw Oops.Oh(ErrorCodeEnum.D8002);
 
         var suffix = Path.GetExtension(file.FileName).ToLower(); // 后缀