😁1、调整代码生成相关代码 2、调整全局过滤器（禁止超管看到软删除） 3、升级SqlSugar最新版本

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.32.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.104" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.105" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -1,157 +1,158 @@
-// 麻省理工学院许可证
-//
-// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
-//
-// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-//
-// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
-// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
-
-namespace Admin.NET.Core.Service;
-
-/// <summary>
-/// 系统代码生成配置服务
-/// </summary>
-[ApiDescriptionSettings(Order = 260)]
-public class SysCodeGenConfigService : IDynamicApiController, ITransient
-{
-    private readonly ISqlSugarClient _db;
-
-    public SysCodeGenConfigService(ISqlSugarClient db)
-    {
-        _db = db;
-    }
-
-    /// <summary>
-    /// 获取代码生成配置列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取代码生成配置列表")]
-    public async Task<List<CodeGenConfig>> GetList([FromQuery] CodeGenConfig input)
-    {
-        var whetherCommon = YesNoEnum.Y.ToString();
-        return await _db.Queryable<SysCodeGenConfig>()
-            .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != whetherCommon)
-            .Select<CodeGenConfig>()
-            .Mapper(u =>
-            {
-                u.NetType = (u.EffectType == "EnumSelector" || u.EffectType == "ConstSelector" ? u.DictTypeCode : u.NetType);
-            })
-
-            .OrderBy(u => u.OrderNo)
-            .ToListAsync();
-    }
-
-    /// <summary>
-    /// 更新代码生成配置
-    /// </summary>
-    /// <param name="inputList"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Update"), HttpPost]
-    [DisplayName("更新代码生成配置")]
-    public async Task UpdateCodeGenConfig(List<CodeGenConfig> inputList)
-    {
-        if (inputList == null || inputList.Count < 1) return;
-        await _db.Updateable(inputList.Adapt<List<SysCodeGenConfig>>()).ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 删除代码生成配置
-    /// </summary>
-    /// <param name="codeGenId"></param>
-    /// <returns></returns>
-    [NonAction]
-    public async Task DeleteCodeGenConfig(long codeGenId)
-    {
-        await _db.Deleteable<SysCodeGenConfig>().Where(u => u.CodeGenId == codeGenId).ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 获取代码生成配置详情
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取代码生成配置详情")]
-    public async Task<SysCodeGenConfig> GetDetail([FromQuery] CodeGenConfig input)
-    {
-        return await _db.Queryable<SysCodeGenConfig>().FirstAsync(u => u.Id == input.Id);
-    }
-
-    /// <summary>
-    /// 批量增加代码生成配置
-    /// </summary>
-    /// <param name="tableColumnOuputList"></param>
-    /// <param name="codeGenerate"></param>
-    [NonAction]
-    public void AddList(List<ColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
-    {
-        if (tableColumnOuputList == null) return;
-
-        var codeGenConfigs = new List<SysCodeGenConfig>();
-        int orderNo = 100;
-        foreach (var tableColumn in tableColumnOuputList)
-        {
-            var codeGenConfig = new SysCodeGenConfig();
-
-            var YesOrNo = YesNoEnum.Y.ToString();
-            if (Convert.ToBoolean(tableColumn.ColumnKey))
-            {
-                YesOrNo = YesNoEnum.N.ToString();
-            }
-
-            if (CodeGenUtil.IsCommonColumn(tableColumn.ColumnName))
-            {
-                codeGenConfig.WhetherCommon = YesNoEnum.Y.ToString();
-                YesOrNo = YesNoEnum.N.ToString();
-            }
-            else
-            {
-                codeGenConfig.WhetherCommon = YesNoEnum.N.ToString();
-            }
-
-            codeGenConfig.CodeGenId = codeGenerate.Id;
-            codeGenConfig.ColumnName = tableColumn.ColumnName;
-            codeGenConfig.ColumnComment = tableColumn.ColumnComment;
-            codeGenConfig.NetType = tableColumn.DataType;
-            codeGenConfig.WhetherRetract = YesNoEnum.N.ToString();
-
-            codeGenConfig.WhetherRequired = YesNoEnum.N.ToString();
-            codeGenConfig.QueryWhether = YesOrNo;
-            codeGenConfig.WhetherAddUpdate = YesOrNo;
-            codeGenConfig.WhetherTable = YesOrNo;
-
-            codeGenConfig.ColumnKey = tableColumn.ColumnKey;
-
-            codeGenConfig.DataType = tableColumn.DataType;
-            codeGenConfig.EffectType = CodeGenUtil.DataTypeToEff(codeGenConfig.NetType);
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
+
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统代码生成配置服务
+/// </summary>
+[ApiDescriptionSettings(Order = 260)]
+public class SysCodeGenConfigService : IDynamicApiController, ITransient
+{
+    private readonly ISqlSugarClient _db;
+
+    public SysCodeGenConfigService(ISqlSugarClient db)
+    {
+        _db = db;
+    }
+
+    /// <summary>
+    /// 获取代码生成配置列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("获取代码生成配置列表")]
+    public async Task<List<CodeGenConfig>> GetList([FromQuery] CodeGenConfig input)
+    {
+        var whetherCommon = YesNoEnum.Y.ToString();
+        return await _db.Queryable<SysCodeGenConfig>()
+            .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != whetherCommon)
+            .Select<CodeGenConfig>()
+            .Mapper(u =>
+            {
+                u.NetType = (u.EffectType == "EnumSelector" || u.EffectType == "ConstSelector" ? u.DictTypeCode : u.NetType);
+            })
+
+            .OrderBy(u => u.OrderNo)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// 更新代码生成配置
+    /// </summary>
+    /// <param name="inputList"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Update"), HttpPost]
+    [DisplayName("更新代码生成配置")]
+    public async Task UpdateCodeGenConfig(List<CodeGenConfig> inputList)
+    {
+        if (inputList == null || inputList.Count < 1) return;
+        await _db.Updateable(inputList.Adapt<List<SysCodeGenConfig>>()).ExecuteCommandAsync();
+    }
+
+    /// <summary>
+    /// 删除代码生成配置
+    /// </summary>
+    /// <param name="codeGenId"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task DeleteCodeGenConfig(long codeGenId)
+    {
+        await _db.Deleteable<SysCodeGenConfig>().Where(u => u.CodeGenId == codeGenId).ExecuteCommandAsync();
+    }
+
+    /// <summary>
+    /// 获取代码生成配置详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("获取代码生成配置详情")]
+    public async Task<SysCodeGenConfig> GetDetail([FromQuery] CodeGenConfig input)
+    {
+        return await _db.Queryable<SysCodeGenConfig>().FirstAsync(u => u.Id == input.Id);
+    }
+
+    /// <summary>
+    /// 批量增加代码生成配置
+    /// </summary>
+    /// <param name="tableColumnOuputList"></param>
+    /// <param name="codeGenerate"></param>
+    [NonAction]
+    public void AddList(List<ColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
+    {
+        if (tableColumnOuputList == null) return;
+
+        var codeGenConfigs = new List<SysCodeGenConfig>();
+        var orderNo = 100;
+        foreach (var tableColumn in tableColumnOuputList)
+        {
+            var codeGenConfig = new SysCodeGenConfig();
+
+            var YesOrNo = YesNoEnum.Y.ToString();
+            if (Convert.ToBoolean(tableColumn.ColumnKey))
+            {
+                YesOrNo = YesNoEnum.N.ToString();
+            }
+
+            if (CodeGenUtil.IsCommonColumn(tableColumn.ColumnName))
+            {
+                codeGenConfig.WhetherCommon = YesNoEnum.Y.ToString();
+                YesOrNo = YesNoEnum.N.ToString();
+            }
+            else
+            {
+                codeGenConfig.WhetherCommon = YesNoEnum.N.ToString();
+            }
+
+            codeGenConfig.CodeGenId = codeGenerate.Id;
+            codeGenConfig.ColumnName = tableColumn.ColumnName;
+            codeGenConfig.ColumnComment = tableColumn.ColumnComment;
+            codeGenConfig.NetType = tableColumn.DataType;
+            codeGenConfig.WhetherRetract = YesNoEnum.N.ToString();
+
+            codeGenConfig.WhetherRequired = YesNoEnum.N.ToString();
+            codeGenConfig.QueryWhether = YesOrNo;
+            codeGenConfig.WhetherAddUpdate = YesOrNo;
+            codeGenConfig.WhetherTable = YesOrNo;
+
+            codeGenConfig.ColumnKey = tableColumn.ColumnKey;
+
+            codeGenConfig.DataType = tableColumn.DataType;
+            codeGenConfig.EffectType = CodeGenUtil.DataTypeToEff(codeGenConfig.NetType);
             codeGenConfig.QueryType = GetDefaultQueryType(codeGenConfig); // QueryTypeEnum.eq.ToString();
             codeGenConfig.OrderNo = orderNo;
-            orderNo += 3;//这里加3，方便调整个别控件的排序时，需要配置太多的不相关控件，加3后，每个控件之前预留了两个位置给其它控件“插队”
-            codeGenConfigs.Add(codeGenConfig);
-        }
-        // 多库代码生成---这里要切回主库
-        var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.ConfigId);
-        provider.Insertable(codeGenConfigs).ExecuteCommand();
-    }
-
-    /// <summary>
-    /// 默认查询类型
-    /// </summary>
-    /// <param name="codeGenConfig"></param>
-    /// <returns></returns>
-    private string GetDefaultQueryType(SysCodeGenConfig codeGenConfig)
-    {
-        switch (codeGenConfig.NetType?.TrimEnd('?'))
-        {
-            case "string":
-                return "like";
-
-            case "DateTime":
-                return "~";
-
-            default:
-                return "==";
-        }
-    }
+            codeGenConfigs.Add(codeGenConfig);
+
+            orderNo += 10; // 每个配置排序间隔10
+        }
+        // 多库代码生成---这里要切回主库
+        var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.ConfigId);
+        provider.Insertable(codeGenConfigs).ExecuteCommand();
+    }
+
+    /// <summary>
+    /// 默认查询类型
+    /// </summary>
+    /// <param name="codeGenConfig"></param>
+    /// <returns></returns>
+    private string GetDefaultQueryType(SysCodeGenConfig codeGenConfig)
+    {
+        switch (codeGenConfig.NetType?.TrimEnd('?'))
+        {
+            case "string":
+                return "like";
+
+            case "DateTime":
+                return "~";
+
+            default:
+                return "==";
+        }
+    }
 }

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -1,636 +1,636 @@
-// 麻省理工学院许可证
-//
-// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
-//
-// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-//
-// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
-// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
-
-using System.IO.Compression;
-
-namespace Admin.NET.Core.Service;
-
-/// <summary>
-/// 系统代码生成器服务
-/// </summary>
-[ApiDescriptionSettings(Order = 270)]
-public class SysCodeGenService : IDynamicApiController, ITransient
-{
-    private readonly ISqlSugarClient _db;
-
-    private readonly SysCodeGenConfigService _codeGenConfigService;
-    private readonly IViewEngine _viewEngine;
-    private readonly CodeGenOptions _codeGenOptions;
-
-    public SysCodeGenService(ISqlSugarClient db,
-        SysCodeGenConfigService codeGenConfigService,
-        IViewEngine viewEngine,
-        IOptions<CodeGenOptions> codeGenOptions)
-    {
-        _db = db;
-        _codeGenConfigService = codeGenConfigService;
-        _viewEngine = viewEngine;
-        _codeGenOptions = codeGenOptions.Value;
-    }
-
-    /// <summary>
-    /// 获取代码生成分页列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取代码生成分页列表")]
-    public async Task<SqlSugarPagedList<SysCodeGen>> Page(CodeGenInput input)
-    {
-        return await _db.Queryable<SysCodeGen>()
-            .WhereIF(!string.IsNullOrWhiteSpace(input.TableName), u => u.TableName.Contains(input.TableName.Trim()))
-            .WhereIF(!string.IsNullOrWhiteSpace(input.BusName), u => u.BusName.Contains(input.BusName.Trim()))
-            .ToPagedListAsync(input.Page, input.PageSize);
-    }
-
-    /// <summary>
-    /// 增加代码生成
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Add"), HttpPost]
-    [DisplayName("增加代码生成")]
-    public async Task AddCodeGen(AddCodeGenInput input)
-    {
-        var isExist = await _db.Queryable<SysCodeGen>().Where(u => u.TableName == input.TableName).AnyAsync();
-        if (isExist)
-            throw Oops.Oh(ErrorCodeEnum.D1400);
-
-        var codeGen = input.Adapt<SysCodeGen>();
-        var newCodeGen = await _db.Insertable(codeGen).ExecuteReturnEntityAsync();
-        // 加入配置表中
-        _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
-    }
-
-    /// <summary>
-    /// 更新代码生成
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Update"), HttpPost]
-    [DisplayName("更新代码生成")]
-    public async Task UpdateCodeGen(UpdateCodeGenInput input)
-    {
-        var isExist = await _db.Queryable<SysCodeGen>().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
-        if (isExist)
-            throw Oops.Oh(ErrorCodeEnum.D1400);
-
-        await _db.Updateable(input.Adapt<SysCodeGen>()).ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 删除代码生成
-    /// </summary>
-    /// <param name="inputs"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
-    [DisplayName("删除代码生成")]
-    public async Task DeleteCodeGen(List<DeleteCodeGenInput> inputs)
-    {
-        if (inputs == null || inputs.Count < 1) return;
-
-        var codeGenConfigTaskList = new List<Task>();
-        inputs.ForEach(u =>
-        {
-            _db.Deleteable<SysCodeGen>().In(u.Id).ExecuteCommand();
-
-            // 删除配置表中
-            codeGenConfigTaskList.Add(_codeGenConfigService.DeleteCodeGenConfig(u.Id));
-        });
-        await Task.WhenAll(codeGenConfigTaskList);
-    }
-
-    /// <summary>
-    /// 获取代码生成详情
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取代码生成详情")]
-    public async Task<SysCodeGen> GetDetail([FromQuery] QueryCodeGenInput input)
-    {
-        return await _db.Queryable<SysCodeGen>().SingleAsync(m => m.Id == input.Id);
-    }
-
-    /// <summary>
-    /// 获取数据库库集合
-    /// </summary>
-    /// <returns></returns>
-    [DisplayName("获取数据库库集合")]
-    public async Task<List<DatabaseOutput>> GetDatabaseList()
-    {
-        var dbCongigs = App.GetOptions<DbConnectionOptions>().ConnectionConfigs;
-        return await Task.FromResult(dbCongigs.Adapt<List<DatabaseOutput>>());
-    }
-
-    /// <summary>
-    /// 获取数据库表(实体)集合
-    /// </summary>
-    /// <returns></returns>
-    [DisplayName("获取数据库表(实体)集合")]
-    public async Task<List<TableOutput>> GetTableList(string configId = SqlSugarConst.ConfigId)
-    {
-        var provider = _db.AsTenant().GetConnectionScope(configId);
-        var dbTableInfos = provider.DbMaintenance.GetTableInfoList(false); // 不能走缓存,否则切库不起作用
-
-        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == configId);
-
-        var dbTableNames = dbTableInfos.Select(u => u.Name.ToLower()).ToList();
-        IEnumerable<EntityInfo> entityInfos = await GetEntityInfos();
-
-        var tableOutputList = new List<TableOutput>();
-        foreach (var item in entityInfos)
-        {
-            var table = dbTableInfos.FirstOrDefault(x => x.Name.ToLower() == (config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(item.DbTableName) : item.DbTableName).ToLower());
-            if (table == null) continue;
-            tableOutputList.Add(new TableOutput
-            {
-                ConfigId = configId,
-                EntityName = item.EntityName,
-                TableName = table.Name,
-                TableComment = item.TableDescription
-            });
-        }
-        return tableOutputList;
-        //return entityInfos.Where(u => dbTableNames.Contains(config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName.ToLower())).Select(u => new TableOutput()
-        //{
-        //    ConfigId = configId,
-        //    EntityName = u.EntityName,
-        //    TableName = config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName,
-        //    TableComment = u.TableDescription
-        //}).ToList();
-    }
-
-    /// <summary>
-    /// 根据表名获取列集合
-    /// </summary>
-    /// <returns></returns>
-    [DisplayName("根据表名获取列集合")]
-    public List<ColumnOuput> GetColumnListByTableName([Required] string tableName, string configId = SqlSugarConst.ConfigId)
-    {
-        // 切库---多库代码生成用
-        var provider = _db.AsTenant().GetConnectionScope(configId);
-
-        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == configId);
-        // 获取实体类型属性
-        var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName);
-        if (entityType == null) return null;
-        var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
-        // 按原始类型的顺序获取所有实体类型属性（不包含导航属性，会返回null）
-        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new ColumnOuput
-        {
-            ColumnName = config.DbSettings.EnableUnderLine ? CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames) : u.DbColumnName,
-            ColumnKey = u.IsPrimarykey.ToString(),
-            DataType = u.DataType.ToString(),
-            NetType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
-            ColumnComment = u.ColumnDescription
-        }).ToList();
-    }
-
-    /// <summary>
-    /// 获取数据表列（实体属性）集合
-    /// </summary>
-    /// <returns></returns>
-    private List<ColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
-    {
-        var entityType = GetEntityInfos().GetAwaiter().GetResult().FirstOrDefault(m => m.EntityName == input.TableName);
-        if (entityType == null)
-            return null;
-
-        // 切库---多库代码生成用
-        var provider = _db.AsTenant().GetConnectionScope(!string.IsNullOrEmpty(input.ConfigId) ? input.ConfigId : SqlSugarConst.ConfigId);
-
-        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
-        var dbTableName = config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(entityType.DbTableName) : entityType.DbTableName;
-        var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
-        return provider.DbMaintenance.GetColumnInfosByTableName(dbTableName, false).Select(u => new ColumnOuput
-        {
-            // 转下划线后的列名需要再转回来
-            ColumnName = config.DbSettings.EnableUnderLine ? CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames) : u.DbColumnName,
-            ColumnKey = u.IsPrimarykey.ToString(),
-            NetType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
-            DataType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
-            ColumnComment = string.IsNullOrWhiteSpace(u.ColumnDescription) ? u.DbColumnName : u.ColumnDescription
-        }).ToList();
-    }
-
-    /// <summary>
-    /// 获取库表信息
-    /// </summary>
-    /// <returns></returns>
-    private async Task<IEnumerable<EntityInfo>> GetEntityInfos()
-    {
-        var entityInfos = new List<EntityInfo>();
-
-        var type = typeof(SugarTable);
-        var types = new List<Type>();
-        if (_codeGenOptions.EntityAssemblyNames != null)
-        {
-            foreach (var assemblyName in _codeGenOptions.EntityAssemblyNames)
-            {
-                Assembly asm = Assembly.Load(assemblyName);
-                types.AddRange(asm.GetExportedTypes().ToList());
-            }
-        }
-        bool IsMyAttribute(Attribute[] o)
-        {
-            foreach (Attribute a in o)
-            {
-                if (a.GetType() == type)
-                    return true;
-            }
-            return false;
-        }
-        Type[] cosType = types.Where(o =>
-        {
-            return IsMyAttribute(Attribute.GetCustomAttributes(o, true));
-        }
-        ).ToArray();
-
-        foreach (var c in cosType)
-        {
-            var sugarAttribute = c.GetCustomAttributes(type, true)?.FirstOrDefault();
-
-            var des = c.GetCustomAttributes(typeof(DescriptionAttribute), true);
-            var description = "";
-            if (des.Length > 0)
-            {
-                description = ((DescriptionAttribute)des[0]).Description;
-            }
-            entityInfos.Add(new EntityInfo()
-            {
-                EntityName = c.Name,
-                DbTableName = sugarAttribute == null ? c.Name : ((SugarTable)sugarAttribute).TableName,
-                TableDescription = description
-            });
-        }
-        return await Task.FromResult(entityInfos);
-    }
-
-    /// <summary>
-    /// 代码生成到本地
-    /// </summary>
-    /// <returns></returns>
-    [DisplayName("代码生成到本地")]
-    public async Task<dynamic> RunLocal(SysCodeGen input)
-    {
-        if (string.IsNullOrEmpty(input.GenerateType))
-            input.GenerateType = "200";
-
-        // 先删除该表已生成的菜单列表
-        var templatePathList = GetTemplatePathList(input);
-        List<string> targetPathList;
-        var zipPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "CodeGen", input.TableName);
-        if (input.GenerateType.StartsWith('1'))
-        {
-            targetPathList = GetZipPathList(input);
-            if (Directory.Exists(zipPath))
-                Directory.Delete(zipPath, true);
-        }
-        else
-            targetPathList = GetTargetPathList(input);
-
-        var tableFieldList = await _codeGenConfigService.GetList(new CodeGenConfig() { CodeGenId = input.Id }); // 字段集合
-
-        var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
-        var joinTableList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "fk").ToList(); // 需要连表查询的字段
-        (string joinTableNames, string lowerJoinTableNames) = GetJoinTableStr(joinTableList); // 获取连表的实体名和别名
-
-        var data = new CustomViewEngine(_db)
-        {
-            ConfigId = input.ConfigId,
-            AuthorName = input.AuthorName,
-            BusName = input.BusName,
-            NameSpace = input.NameSpace,
-            ClassName = input.TableName,
-            ProjectLastName = input.NameSpace.Split('.').Last(),
-            QueryWhetherList = queryWhetherList,
-            TableField = tableFieldList,
-            IsJoinTable = joinTableList.Count > 0,
-            IsUpload = joinTableList.Where(u => u.EffectType == "Upload").Any(),
-        };
-
-        for (var i = 0; i < templatePathList.Count; i++)
-        {
-            var tContent = File.ReadAllText(templatePathList[i]);
-            var tResult = _viewEngine.RunCompile<CustomViewEngine>(tContent, data, builderAction: builder =>
-            {
-                builder.AddAssemblyReferenceByName("System.Linq");
-                builder.AddAssemblyReferenceByName("System.Collections");
-                builder.AddUsing("System.Collections.Generic");
-                builder.AddUsing("System.Linq");
-            });
-            var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;
-            if (!Directory.Exists(dirPath))
-                Directory.CreateDirectory(dirPath);
-            File.WriteAllText(targetPathList[i], tResult, Encoding.UTF8);
-        }
-
-        await AddMenu(input.TableName, input.BusName, input.MenuPid);
-        // 非ZIP压缩返回空
-        if (!input.GenerateType.StartsWith('1'))
-            return null;
-        else
-        {
-            string downloadPath = zipPath + ".zip";
-            // 判断是否存在同名称文件
-            if (File.Exists(downloadPath))
-                File.Delete(downloadPath);
-            ZipFile.CreateFromDirectory(zipPath, downloadPath);
-            return new { url = $"{CommonUtil.GetLocalhost()}/CodeGen/{input.TableName}.zip" };
-        }
-    }
-
-    /// <summary>
-    /// 获取连表的实体名和别名
-    /// </summary>
-    /// <param name="configs"></param>
-    /// <returns></returns>
-    private (string, string) GetJoinTableStr(List<CodeGenConfig> configs)
-    {
-        var uploads = configs.Where(u => u.EffectType == "Upload").ToList();
-        var fks = configs.Where(u => u.EffectType == "fk").ToList();
-        string str = ""; // <Order, OrderItem, Custom>
-        string lowerStr = ""; //(o, i, c)
-        foreach (var item in uploads)
-        {
-            lowerStr += "sysFile_FK_" + item.LowerColumnName + ",";
-            str += "SysFile,";
-        }
-        foreach (var item in fks)
-        {
-            lowerStr += item.LowerFkEntityName + "_FK_" + item.LowerFkColumnName + ",";
-            str += item.FkEntityName + ",";
-        }
-        return (str.TrimEnd(','), lowerStr.TrimEnd(','));
-    }
-
-    /// <summary>
-    /// 增加菜单
-    /// </summary>
-    /// <param name="className"></param>
-    /// <param name="busName"></param>
-    /// <param name="pid"></param>
-    /// <returns></returns>
-    private async Task AddMenu(string className, string busName, long pid)
-    {
-        var pPath = string.Empty;
-        // 若 pid=0 为顶级则创建菜单目录
-        if (pid == 0)
-        {
-            // 目录
-            var menuType0 = new SysMenu
-            {
-                Pid = 0,
-                Title = busName + "管理",
-                Type = MenuTypeEnum.Dir,
-                Icon = "robot",
-                Path = "/" + className.ToLower(),
-                Component = "LAYOUT",
-            };
-            // 若先前存在则删除本级和下级
-            var menuList0 = await _db.Queryable<SysMenu>().Where(e => e.Title == menuType0.Title && e.Type == menuType0.Type).ToListAsync();
-            if (menuList0.Count > 0)
-            {
-                var listIds = menuList0.Select(f => f.Id).ToList();
-                var childlistIds = new List<long>();
-                foreach (var item in listIds)
-                {
-                    var childlist = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
-                    childlistIds.AddRange(childlist.Select(f => f.Id).ToList());
-                }
-                listIds.AddRange(childlistIds);
-                await _db.Deleteable<SysMenu>().Where(e => listIds.Contains(e.Id)).ExecuteCommandAsync();
-                await _db.Deleteable<SysRoleMenu>().Where(e => listIds.Contains(e.MenuId)).ExecuteCommandAsync();
-            }
-            pid = (await _db.Insertable(menuType0).ExecuteReturnEntityAsync()).Id;
-        }
-        else
-        {
-            var pMenu = await _db.Queryable<SysMenu>().FirstAsync(e => e.Id == pid) ?? throw Oops.Oh(ErrorCodeEnum.D1505);
-            pPath = pMenu.Path;
-        }
-
-        // 菜单
-        var menuType1 = new SysMenu
-        {
-            Pid = pid,
-            Title = busName + "管理",
-            Name = className[..1].ToLower() + className[1..],
-            Type = MenuTypeEnum.Menu,
-            Path = pPath + "/" + className.ToLower(),
-            Component = "/main/" + className[..1].ToLower() + className[1..] + "/index",
-        };
-        // 若先前存在则删除本级和下级
-        var menuList1 = await _db.Queryable<SysMenu>().Where(e => e.Title == menuType1.Title && e.Type == menuType1.Type).ToListAsync();
-        if (menuList1.Count > 0)
-        {
-            var listIds = menuList1.Select(f => f.Id).ToList();
-            var childlistIds = new List<long>();
-            foreach (var item in listIds)
-            {
-                var childlist = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
-                childlistIds.AddRange(childlist.Select(f => f.Id).ToList());
-            }
-            listIds.AddRange(childlistIds);
-            await _db.Deleteable<SysMenu>().Where(e => listIds.Contains(e.Id)).ExecuteCommandAsync();
-            await _db.Deleteable<SysRoleMenu>().Where(e => listIds.Contains(e.MenuId)).ExecuteCommandAsync();
-        }
-        var pid1 = (await _db.Insertable(menuType1).ExecuteReturnEntityAsync()).Id;
-
-        // 按钮-page
-        var menuType2 = new SysMenu
-        {
-            Pid = pid1,
-            Title = busName + "查询",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":page",
-        };
-
-        // 按钮-detail
-        var menuType2_1 = new SysMenu
-        {
-            Pid = pid1,
-            Title = busName + "详情",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":detail",
-        };
-
-        // 按钮-add
-        var menuType2_2 = new SysMenu
-        {
-            Pid = pid1,
-            Title = busName + "增加",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":add",
-        };
-
-        // 按钮-delete
-        var menuType2_3 = new SysMenu
-        {
-            Pid = pid1,
-            Title = busName + "删除",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":delete",
-        };
-
-        // 按钮-edit
-        var menuType2_4 = new SysMenu
-        {
-            Pid = pid1,
-            Title = busName + "编辑",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":edit",
-        };
-
-        var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
-        await _db.Insertable(menuList).ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 获取模板文件路径集合
-    /// </summary>
-    /// <returns></returns>
-    private static List<string> GetTemplatePathList(SysCodeGen input)
-    {
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
-        if (input.GenerateType.Substring(1, 1).Contains('1'))
-        {
-            return new List<string>()
-            {
-                Path.Combine(templatePath , "index.vue.vm"),
-                Path.Combine(templatePath , "editDialog.vue.vm"),
-                Path.Combine(templatePath , "manage.js.vm"),
-            };
-        }
-        else if (input.GenerateType.Substring(1, 1).Contains('2'))
-        {
-            return new List<string>()
-            {
-                Path.Combine(templatePath , "Service.cs.vm"),
-                Path.Combine(templatePath , "Input.cs.vm"),
-                Path.Combine(templatePath , "Output.cs.vm"),
-                Path.Combine(templatePath , "Dto.cs.vm"),
-            };
-        }
-        else
-        {
-            return new List<string>()
-            {
-                Path.Combine(templatePath , "Service.cs.vm"),
-                Path.Combine(templatePath , "Input.cs.vm"),
-                Path.Combine(templatePath , "Output.cs.vm"),
-                Path.Combine(templatePath , "Dto.cs.vm"),
-                Path.Combine(templatePath , "index.vue.vm"),
-                Path.Combine(templatePath , "editDialog.vue.vm"),
-                Path.Combine(templatePath , "manage.js.vm"),
-            };
-        }
-    }
-
-    /// <summary>
-    /// 获取模板文件路径集合
-    /// </summary>
-    /// <returns></returns>
-    private static List<string> GetTemplatePathList()
-    {
-        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
-        return new List<string>()
-        {
-            Path.Combine(templatePath , "Service.cs.vm"),
-            Path.Combine(templatePath , "Input.cs.vm"),
-            Path.Combine(templatePath , "Output.cs.vm"),
-            Path.Combine(templatePath , "Dto.cs.vm"),
-            Path.Combine(templatePath , "index.vue.vm"),
-            Path.Combine(templatePath , "editDialog.vue.vm"),
-            Path.Combine(templatePath , "manage.js.vm"),
-        };
-    }
-
-    /// <summary>
-    /// 设置生成文件路径
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    private List<string> GetTargetPathList(SysCodeGen input)
-    {
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
+
+using System.IO.Compression;
+
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统代码生成器服务
+/// </summary>
+[ApiDescriptionSettings(Order = 270)]
+public class SysCodeGenService : IDynamicApiController, ITransient
+{
+    private readonly ISqlSugarClient _db;
+
+    private readonly SysCodeGenConfigService _codeGenConfigService;
+    private readonly IViewEngine _viewEngine;
+    private readonly CodeGenOptions _codeGenOptions;
+
+    public SysCodeGenService(ISqlSugarClient db,
+        SysCodeGenConfigService codeGenConfigService,
+        IViewEngine viewEngine,
+        IOptions<CodeGenOptions> codeGenOptions)
+    {
+        _db = db;
+        _codeGenConfigService = codeGenConfigService;
+        _viewEngine = viewEngine;
+        _codeGenOptions = codeGenOptions.Value;
+    }
+
+    /// <summary>
+    /// 获取代码生成分页列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("获取代码生成分页列表")]
+    public async Task<SqlSugarPagedList<SysCodeGen>> Page(CodeGenInput input)
+    {
+        return await _db.Queryable<SysCodeGen>()
+            .WhereIF(!string.IsNullOrWhiteSpace(input.TableName), u => u.TableName.Contains(input.TableName.Trim()))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.BusName), u => u.BusName.Contains(input.BusName.Trim()))
+            .ToPagedListAsync(input.Page, input.PageSize);
+    }
+
+    /// <summary>
+    /// 增加代码生成
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Add"), HttpPost]
+    [DisplayName("增加代码生成")]
+    public async Task AddCodeGen(AddCodeGenInput input)
+    {
+        var isExist = await _db.Queryable<SysCodeGen>().Where(u => u.TableName == input.TableName).AnyAsync();
+        if (isExist)
+            throw Oops.Oh(ErrorCodeEnum.D1400);
+
+        var codeGen = input.Adapt<SysCodeGen>();
+        var newCodeGen = await _db.Insertable(codeGen).ExecuteReturnEntityAsync();
+        // 加入配置表中
+        _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
+    }
+
+    /// <summary>
+    /// 更新代码生成
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Update"), HttpPost]
+    [DisplayName("更新代码生成")]
+    public async Task UpdateCodeGen(UpdateCodeGenInput input)
+    {
+        var isExist = await _db.Queryable<SysCodeGen>().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
+        if (isExist)
+            throw Oops.Oh(ErrorCodeEnum.D1400);
+
+        await _db.Updateable(input.Adapt<SysCodeGen>()).ExecuteCommandAsync();
+    }
+
+    /// <summary>
+    /// 删除代码生成
+    /// </summary>
+    /// <param name="inputs"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
+    [DisplayName("删除代码生成")]
+    public async Task DeleteCodeGen(List<DeleteCodeGenInput> inputs)
+    {
+        if (inputs == null || inputs.Count < 1) return;
+
+        var codeGenConfigTaskList = new List<Task>();
+        inputs.ForEach(u =>
+        {
+            _db.Deleteable<SysCodeGen>().In(u.Id).ExecuteCommand();
+
+            // 删除配置表中
+            codeGenConfigTaskList.Add(_codeGenConfigService.DeleteCodeGenConfig(u.Id));
+        });
+        await Task.WhenAll(codeGenConfigTaskList);
+    }
+
+    /// <summary>
+    /// 获取代码生成详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [DisplayName("获取代码生成详情")]
+    public async Task<SysCodeGen> GetDetail([FromQuery] QueryCodeGenInput input)
+    {
+        return await _db.Queryable<SysCodeGen>().SingleAsync(m => m.Id == input.Id);
+    }
+
+    /// <summary>
+    /// 获取数据库库集合
+    /// </summary>
+    /// <returns></returns>
+    [DisplayName("获取数据库库集合")]
+    public async Task<List<DatabaseOutput>> GetDatabaseList()
+    {
+        var dbCongigs = App.GetOptions<DbConnectionOptions>().ConnectionConfigs;
+        return await Task.FromResult(dbCongigs.Adapt<List<DatabaseOutput>>());
+    }
+
+    /// <summary>
+    /// 获取数据库表(实体)集合
+    /// </summary>
+    /// <returns></returns>
+    [DisplayName("获取数据库表(实体)集合")]
+    public async Task<List<TableOutput>> GetTableList(string configId = SqlSugarConst.ConfigId)
+    {
+        var provider = _db.AsTenant().GetConnectionScope(configId);
+        var dbTableInfos = provider.DbMaintenance.GetTableInfoList(false); // 不能走缓存,否则切库不起作用
+
+        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == configId);
+
+        var dbTableNames = dbTableInfos.Select(u => u.Name.ToLower()).ToList();
+        IEnumerable<EntityInfo> entityInfos = await GetEntityInfos();
+
+        var tableOutputList = new List<TableOutput>();
+        foreach (var item in entityInfos)
+        {
+            var table = dbTableInfos.FirstOrDefault(x => x.Name.ToLower() == (config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(item.DbTableName) : item.DbTableName).ToLower());
+            if (table == null) continue;
+            tableOutputList.Add(new TableOutput
+            {
+                ConfigId = configId,
+                EntityName = item.EntityName,
+                TableName = table.Name,
+                TableComment = item.TableDescription
+            });
+        }
+        return tableOutputList;
+        //return entityInfos.Where(u => dbTableNames.Contains(config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName.ToLower())).Select(u => new TableOutput()
+        //{
+        //    ConfigId = configId,
+        //    EntityName = u.EntityName,
+        //    TableName = config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName,
+        //    TableComment = u.TableDescription
+        //}).ToList();
+    }
+
+    /// <summary>
+    /// 根据表名获取列集合
+    /// </summary>
+    /// <returns></returns>
+    [DisplayName("根据表名获取列集合")]
+    public List<ColumnOuput> GetColumnListByTableName([Required] string tableName, string configId = SqlSugarConst.ConfigId)
+    {
+        // 切库---多库代码生成用
+        var provider = _db.AsTenant().GetConnectionScope(configId);
+
+        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == configId);
+        // 获取实体类型属性
+        var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName);
+        if (entityType == null) return null;
+        var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
+        // 按原始类型的顺序获取所有实体类型属性（不包含导航属性，会返回null）
+        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new ColumnOuput
+        {
+            ColumnName = config.DbSettings.EnableUnderLine ? CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames) : u.DbColumnName,
+            ColumnKey = u.IsPrimarykey.ToString(),
+            DataType = u.DataType.ToString(),
+            NetType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
+            ColumnComment = u.ColumnDescription
+        }).ToList();
+    }
+
+    /// <summary>
+    /// 获取数据表列（实体属性）集合
+    /// </summary>
+    /// <returns></returns>
+    private List<ColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
+    {
+        var entityType = GetEntityInfos().GetAwaiter().GetResult().FirstOrDefault(m => m.EntityName == input.TableName);
+        if (entityType == null)
+            return null;
+
+        // 切库---多库代码生成用
+        var provider = _db.AsTenant().GetConnectionScope(!string.IsNullOrEmpty(input.ConfigId) ? input.ConfigId : SqlSugarConst.ConfigId);
+
+        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
+        var dbTableName = config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(entityType.DbTableName) : entityType.DbTableName;
+        var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
+        return provider.DbMaintenance.GetColumnInfosByTableName(dbTableName, false).Select(u => new ColumnOuput
+        {
+            // 转下划线后的列名需要再转回来
+            ColumnName = config.DbSettings.EnableUnderLine ? CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames) : u.DbColumnName,
+            ColumnKey = u.IsPrimarykey.ToString(),
+            NetType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
+            DataType = CodeGenUtil.ConvertDataType(u, provider.CurrentConnectionConfig.DbType),
+            ColumnComment = string.IsNullOrWhiteSpace(u.ColumnDescription) ? u.DbColumnName : u.ColumnDescription
+        }).ToList();
+    }
+
+    /// <summary>
+    /// 获取库表信息
+    /// </summary>
+    /// <returns></returns>
+    private async Task<IEnumerable<EntityInfo>> GetEntityInfos()
+    {
+        var entityInfos = new List<EntityInfo>();
+
+        var type = typeof(SugarTable);
+        var types = new List<Type>();
+        if (_codeGenOptions.EntityAssemblyNames != null)
+        {
+            foreach (var assemblyName in _codeGenOptions.EntityAssemblyNames)
+            {
+                Assembly asm = Assembly.Load(assemblyName);
+                types.AddRange(asm.GetExportedTypes().ToList());
+            }
+        }
+        bool IsMyAttribute(Attribute[] o)
+        {
+            foreach (Attribute a in o)
+            {
+                if (a.GetType() == type)
+                    return true;
+            }
+            return false;
+        }
+        Type[] cosType = types.Where(o =>
+        {
+            return IsMyAttribute(Attribute.GetCustomAttributes(o, true));
+        }
+        ).ToArray();
+
+        foreach (var c in cosType)
+        {
+            var sugarAttribute = c.GetCustomAttributes(type, true)?.FirstOrDefault();
+
+            var des = c.GetCustomAttributes(typeof(DescriptionAttribute), true);
+            var description = "";
+            if (des.Length > 0)
+            {
+                description = ((DescriptionAttribute)des[0]).Description;
+            }
+            entityInfos.Add(new EntityInfo()
+            {
+                EntityName = c.Name,
+                DbTableName = sugarAttribute == null ? c.Name : ((SugarTable)sugarAttribute).TableName,
+                TableDescription = description
+            });
+        }
+        return await Task.FromResult(entityInfos);
+    }
+
+    /// <summary>
+    /// 代码生成到本地
+    /// </summary>
+    /// <returns></returns>
+    [DisplayName("代码生成到本地")]
+    public async Task<dynamic> RunLocal(SysCodeGen input)
+    {
+        if (string.IsNullOrEmpty(input.GenerateType))
+            input.GenerateType = "200";
+
+        // 先删除该表已生成的菜单列表
+        var templatePathList = GetTemplatePathList(input);
+        List<string> targetPathList;
+        var zipPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "CodeGen", input.TableName);
+        if (input.GenerateType.StartsWith('1'))
+        {
+            targetPathList = GetZipPathList(input);
+            if (Directory.Exists(zipPath))
+                Directory.Delete(zipPath, true);
+        }
+        else
+            targetPathList = GetTargetPathList(input);
+
+        var tableFieldList = await _codeGenConfigService.GetList(new CodeGenConfig() { CodeGenId = input.Id }); // 字段集合
+
+        var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
+        var joinTableList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "fk").ToList(); // 需要连表查询的字段
+        (string joinTableNames, string lowerJoinTableNames) = GetJoinTableStr(joinTableList); // 获取连表的实体名和别名
+
+        var data = new CustomViewEngine(_db)
+        {
+            ConfigId = input.ConfigId,
+            AuthorName = input.AuthorName,
+            BusName = input.BusName,
+            NameSpace = input.NameSpace,
+            ClassName = input.TableName,
+            ProjectLastName = input.NameSpace.Split('.').Last(),
+            QueryWhetherList = queryWhetherList,
+            TableField = tableFieldList,
+            IsJoinTable = joinTableList.Count > 0,
+            IsUpload = joinTableList.Where(u => u.EffectType == "Upload").Any(),
+        };
+
+        for (var i = 0; i < templatePathList.Count; i++)
+        {
+            var tContent = File.ReadAllText(templatePathList[i]);
+            var tResult = _viewEngine.RunCompile<CustomViewEngine>(tContent, data, builderAction: builder =>
+            {
+                builder.AddAssemblyReferenceByName("System.Linq");
+                builder.AddAssemblyReferenceByName("System.Collections");
+                builder.AddUsing("System.Collections.Generic");
+                builder.AddUsing("System.Linq");
+            });
+            var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;
+            if (!Directory.Exists(dirPath))
+                Directory.CreateDirectory(dirPath);
+            File.WriteAllText(targetPathList[i], tResult, Encoding.UTF8);
+        }
+
+        await AddMenu(input.TableName, input.BusName, input.MenuPid);
+        // 非ZIP压缩返回空
+        if (!input.GenerateType.StartsWith('1'))
+            return null;
+        else
+        {
+            string downloadPath = zipPath + ".zip";
+            // 判断是否存在同名称文件
+            if (File.Exists(downloadPath))
+                File.Delete(downloadPath);
+            ZipFile.CreateFromDirectory(zipPath, downloadPath);
+            return new { url = $"{CommonUtil.GetLocalhost()}/CodeGen/{input.TableName}.zip" };
+        }
+    }
+
+    /// <summary>
+    /// 获取连表的实体名和别名
+    /// </summary>
+    /// <param name="configs"></param>
+    /// <returns></returns>
+    private (string, string) GetJoinTableStr(List<CodeGenConfig> configs)
+    {
+        var uploads = configs.Where(u => u.EffectType == "Upload").ToList();
+        var fks = configs.Where(u => u.EffectType == "fk").ToList();
+        string str = ""; // <Order, OrderItem, Custom>
+        string lowerStr = ""; //(o, i, c)
+        foreach (var item in uploads)
+        {
+            lowerStr += "sysFile_FK_" + item.LowerColumnName + ",";
+            str += "SysFile,";
+        }
+        foreach (var item in fks)
+        {
+            lowerStr += item.LowerFkEntityName + "_FK_" + item.LowerFkColumnName + ",";
+            str += item.FkEntityName + ",";
+        }
+        return (str.TrimEnd(','), lowerStr.TrimEnd(','));
+    }
+
+    /// <summary>
+    /// 增加菜单
+    /// </summary>
+    /// <param name="className"></param>
+    /// <param name="busName"></param>
+    /// <param name="pid"></param>
+    /// <returns></returns>
+    private async Task AddMenu(string className, string busName, long pid)
+    {
+        var pPath = string.Empty;
+        // 若 pid=0 为顶级则创建菜单目录
+        if (pid == 0)
+        {
+            // 目录
+            var menuType0 = new SysMenu
+            {
+                Pid = 0,
+                Title = busName + "管理",
+                Type = MenuTypeEnum.Dir,
+                Icon = "robot",
+                Path = "/" + className.ToLower(),
+                Component = "LAYOUT",
+            };
+            // 若先前存在则删除本级和下级
+            var menuList0 = await _db.Queryable<SysMenu>().Where(e => e.Title == menuType0.Title && e.Type == menuType0.Type).ToListAsync();
+            if (menuList0.Count > 0)
+            {
+                var listIds = menuList0.Select(f => f.Id).ToList();
+                var childlistIds = new List<long>();
+                foreach (var item in listIds)
+                {
+                    var childlist = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
+                    childlistIds.AddRange(childlist.Select(f => f.Id).ToList());
+                }
+                listIds.AddRange(childlistIds);
+                await _db.Deleteable<SysMenu>().Where(e => listIds.Contains(e.Id)).ExecuteCommandAsync();
+                await _db.Deleteable<SysRoleMenu>().Where(e => listIds.Contains(e.MenuId)).ExecuteCommandAsync();
+            }
+            pid = (await _db.Insertable(menuType0).ExecuteReturnEntityAsync()).Id;
+        }
+        else
+        {
+            var pMenu = await _db.Queryable<SysMenu>().FirstAsync(e => e.Id == pid) ?? throw Oops.Oh(ErrorCodeEnum.D1505);
+            pPath = pMenu.Path;
+        }
+
+        // 菜单
+        var menuType1 = new SysMenu
+        {
+            Pid = pid,
+            Title = busName + "管理",
+            Name = className[..1].ToLower() + className[1..],
+            Type = MenuTypeEnum.Menu,
+            Path = pPath + "/" + className.ToLower(),
+            Component = "/main/" + className[..1].ToLower() + className[1..] + "/index",
+        };
+        // 若先前存在则删除本级和下级
+        var menuList1 = await _db.Queryable<SysMenu>().Where(e => e.Title == menuType1.Title && e.Type == menuType1.Type).ToListAsync();
+        if (menuList1.Count > 0)
+        {
+            var listIds = menuList1.Select(f => f.Id).ToList();
+            var childlistIds = new List<long>();
+            foreach (var item in listIds)
+            {
+                var childlist = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
+                childlistIds.AddRange(childlist.Select(f => f.Id).ToList());
+            }
+            listIds.AddRange(childlistIds);
+            await _db.Deleteable<SysMenu>().Where(e => listIds.Contains(e.Id)).ExecuteCommandAsync();
+            await _db.Deleteable<SysRoleMenu>().Where(e => listIds.Contains(e.MenuId)).ExecuteCommandAsync();
+        }
+        var pid1 = (await _db.Insertable(menuType1).ExecuteReturnEntityAsync()).Id;
+
+        // 按钮-page
+        var menuType2 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "查询",
+            Type = MenuTypeEnum.Btn,
+            Permission = className[..1].ToLower() + className[1..] + ":page",
+        };
+
+        // 按钮-detail
+        var menuType2_1 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "详情",
+            Type = MenuTypeEnum.Btn,
+            Permission = className[..1].ToLower() + className[1..] + ":detail",
+        };
+
+        // 按钮-add
+        var menuType2_2 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "增加",
+            Type = MenuTypeEnum.Btn,
+            Permission = className[..1].ToLower() + className[1..] + ":add",
+        };
+
+        // 按钮-delete
+        var menuType2_3 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "删除",
+            Type = MenuTypeEnum.Btn,
+            Permission = className[..1].ToLower() + className[1..] + ":delete",
+        };
+
+        // 按钮-edit
+        var menuType2_4 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "编辑",
+            Type = MenuTypeEnum.Btn,
+            Permission = className[..1].ToLower() + className[1..] + ":edit",
+        };
+
+        var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
+        await _db.Insertable(menuList).ExecuteCommandAsync();
+    }
+
+    /// <summary>
+    /// 获取模板文件路径集合
+    /// </summary>
+    /// <returns></returns>
+    private static List<string> GetTemplatePathList(SysCodeGen input)
+    {
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        if (input.GenerateType.Substring(1, 1).Contains('1'))
+        {
+            return new List<string>()
+            {
+                Path.Combine(templatePath , "index.vue.vm"),
+                Path.Combine(templatePath , "editDialog.vue.vm"),
+                Path.Combine(templatePath , "manage.js.vm"),
+            };
+        }
+        else if (input.GenerateType.Substring(1, 1).Contains('2'))
+        {
+            return new List<string>()
+            {
+                Path.Combine(templatePath , "Service.cs.vm"),
+                Path.Combine(templatePath , "Input.cs.vm"),
+                Path.Combine(templatePath , "Output.cs.vm"),
+                Path.Combine(templatePath , "Dto.cs.vm"),
+            };
+        }
+        else
+        {
+            return new List<string>()
+            {
+                Path.Combine(templatePath , "Service.cs.vm"),
+                Path.Combine(templatePath , "Input.cs.vm"),
+                Path.Combine(templatePath , "Output.cs.vm"),
+                Path.Combine(templatePath , "Dto.cs.vm"),
+                Path.Combine(templatePath , "index.vue.vm"),
+                Path.Combine(templatePath , "editDialog.vue.vm"),
+                Path.Combine(templatePath , "manage.js.vm"),
+            };
+        }
+    }
+
+    /// <summary>
+    /// 获取模板文件路径集合
+    /// </summary>
+    /// <returns></returns>
+    private static List<string> GetTemplatePathList()
+    {
+        var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template");
+        return new List<string>()
+        {
+            Path.Combine(templatePath , "Service.cs.vm"),
+            Path.Combine(templatePath , "Input.cs.vm"),
+            Path.Combine(templatePath , "Output.cs.vm"),
+            Path.Combine(templatePath , "Dto.cs.vm"),
+            Path.Combine(templatePath , "index.vue.vm"),
+            Path.Combine(templatePath , "editDialog.vue.vm"),
+            Path.Combine(templatePath , "manage.js.vm"),
+        };
+    }
+
+    /// <summary>
+    /// 设置生成文件路径
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private List<string> GetTargetPathList(SysCodeGen input)
+    {
         //var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, _codeGenOptions.BackendApplicationNamespace, "Service", input.TableName);
-        var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, input.NameSpace, "Service", input.TableName);
-        var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
-        var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
-        var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
-        var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
-        var frontendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, _codeGenOptions.FrontRootPath, "src", "views", "main");
-        var indexPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "index.vue");//
-        var formModalPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "component", "editDialog.vue");
-        var apiJsPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, _codeGenOptions.FrontRootPath, "src", "api", "main", input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
-
-        return new List<string>()
-        {
-            servicePath,
-            inputPath,
-            outputPath,
-            viewPath,
-            indexPath,
-            formModalPath,
-            apiJsPath
-        };
-    }
-
-    /// <summary>
-    /// 设置生成文件路径
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    private List<string> GetZipPathList(SysCodeGen input)
-    {
+        var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, input.NameSpace, "Service", input.TableName);
+        var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
+        var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
+        var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
+        var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
+        var frontendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, _codeGenOptions.FrontRootPath, "src", "views", "main");
+        var indexPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "index.vue");//
+        var formModalPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "component", "editDialog.vue");
+        var apiJsPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, _codeGenOptions.FrontRootPath, "src", "api", "main", input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
+
+        return new List<string>()
+        {
+            servicePath,
+            inputPath,
+            outputPath,
+            viewPath,
+            indexPath,
+            formModalPath,
+            apiJsPath
+        };
+    }
+
+    /// <summary>
+    /// 设置生成文件路径
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private List<string> GetZipPathList(SysCodeGen input)
+    {
         var zipPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "CodeGen", input.TableName);
 
         //var backendPath = Path.Combine(zipPath, _codeGenOptions.BackendApplicationNamespace, "Service", input.TableName);
-        var backendPath = Path.Combine(zipPath, input.NameSpace, "Service", input.TableName);
-        var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
-        var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
-        var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
-        var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
-        var frontendPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "views", "main");
-        var indexPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "index.vue");
-        var formModalPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "component", "editDialog.vue");
-        var apiJsPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "api", "main", input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
-        if (input.GenerateType.StartsWith("11"))
-        {
-            return new List<string>()
-            {
-                indexPath,
-                formModalPath,
-                apiJsPath
-            };
-        }
-        else if (input.GenerateType.StartsWith("12"))
-        {
-            return new List<string>()
-            {
-                servicePath,
-                inputPath,
-                outputPath,
-                viewPath
-            };
-        }
-        else
-        {
-            return new List<string>()
-            {
-                servicePath,
-                inputPath,
-                outputPath,
-                viewPath,
-                indexPath,
-                formModalPath,
-                apiJsPath
-            };
-        }
-    }
+        var backendPath = Path.Combine(zipPath, input.NameSpace, "Service", input.TableName);
+        var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
+        var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
+        var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
+        var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
+        var frontendPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "views", "main");
+        var indexPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "index.vue");
+        var formModalPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "component", "editDialog.vue");
+        var apiJsPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "api", "main", input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
+        if (input.GenerateType.StartsWith("11"))
+        {
+            return new List<string>()
+            {
+                indexPath,
+                formModalPath,
+                apiJsPath
+            };
+        }
+        else if (input.GenerateType.StartsWith("12"))
+        {
+            return new List<string>()
+            {
+                servicePath,
+                inputPath,
+                outputPath,
+                viewPath
+            };
+        }
+        else
+        {
+            return new List<string>()
+            {
+                servicePath,
+                inputPath,
+                outputPath,
+                viewPath,
+                indexPath,
+                formModalPath,
+                apiJsPath
+            };
+        }
+    }
 }

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -206,12 +206,13 @@ public static class SqlSugarSetup
             }
         };
 
-        // 超管时排除各种过滤器
+        // 配置假删除过滤器
+        db.QueryFilter.AddTableFilter<IDeletedFilter>(u => u.IsDelete == false);
+
+        // 超管排除其他过滤器
         if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString())
             return;
 
-        // 配置实体假删除过滤器
-        db.QueryFilter.AddTableFilter<IDeletedFilter>(u => u.IsDelete == false);
         // 配置租户过滤器
         var tenantId = App.User?.FindFirst(ClaimConst.TenantId)?.Value;
         if (!string.IsNullOrWhiteSpace(tenantId))
@@ -219,6 +220,7 @@ public static class SqlSugarSetup
 
         // 配置用户机构（数据范围）过滤器
         SqlSugarFilter.SetOrgEntityFilter(db);
+
         // 配置自定义过滤器
         SqlSugarFilter.SetCustomEntityFilter(db);
     }

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -2,7 +2,7 @@
 <template>
 	<div class="@(@Model.LowerClassName)-container">
 		<el-dialog v-model="isShowDialog" :title="props.title" :width="800" draggable="">
-			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="130px" :rules="rules">
+			<el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules">
 				<el-row :gutter="35">
 					@foreach (var column in Model.TableField){
 					if(@column.ColumnKey == "True"){
@@ -133,8 +133,8 @@
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button @@click="cancel" size="default">取 消</el-button>
-					<el-button type="primary" @@click="submit" size="default">确 定</el-button>
+					<el-button @@click="cancel">取 消</el-button>
+					<el-button type="primary" @@click="submit">确 定</el-button>
 				</span>
 			</template>
 		</el-dialog>