From 30082e0084fb69ec1acf30d446a5ae8699e1195f Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Tue, 20 Aug 2024 21:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/Admin.NET.Core.csproj | 2 +- .../Entity/SysCodeGenTemplate.cs | 16 +++++++------ .../SeedData/SysCodeGenTemplate.cs | 4 ++-- .../CodeGen/SysCodeGenConfigService.cs | 4 +--- .../Service/CodeGen/SysCodeGenService.cs | 6 ++--- Admin.NET/Admin.NET.Core/Util/BaseInput.cs | 2 +- Admin.NET/Admin.NET.Core/Util/BaseOutput.cs | 24 +++++++++---------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 25c51ba5..3f0635be 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -39,7 +39,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs index e3137261..75b00476 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs @@ -7,9 +7,9 @@ namespace Admin.NET.Core; /// -/// 代码生成模板配置 +/// 代码生成模板配置表 /// -[SugarTable(null, "代码生成模板配置")] +[SugarTable(null, "代码生成模板配置表")] [SysTable] public partial class SysCodeGenTemplate : EntityBase { @@ -21,27 +21,29 @@ public partial class SysCodeGenTemplate : EntityBase public string Name { get; set; } /// - /// 是否是内置模板（Y-是，N-否） + /// 代码生成类型 /// - [SugarColumn(ColumnDescription = "是否是内置模板")] - public CodeGenTypeEnum Type { get; set; } + [SugarColumn(ColumnDescription = "代码生成类型")] + public CodeGenTypeEnum Type { get; set; } = CodeGenTypeEnum.Backend; /// /// 是否是内置模板（Y-是，N-否） /// [SugarColumn(ColumnDescription = "是否是内置模板")] - public YesNoEnum SysFlag { get; set; } + public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y; /// /// 输出位置 /// [SugarColumn(ColumnDescription = "输出位置", Length = 256)] + [Required, MaxLength(256)] public string OutputFile { get; set; } /// /// 描述 /// - [SugarColumn(ColumnDescription = "描述", Length = 200)] + [SugarColumn(ColumnDescription = "描述", Length = 256)] + [Required, MaxLength(256)] public string Describe { get; set; } /// diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs index 1adc98aa..d5c51776 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs @@ -7,7 +7,7 @@ namespace Admin.NET.Core; /// -/// 系统配置表种子数据 +/// 代码生成模板配置表种子数据 /// public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData { @@ -25,7 +25,7 @@ public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData @@ -137,7 +135,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient orderNo += 10; // 每个配置排序间隔10 } // 多库代码生成---这里要切回主库 - var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.MainConfigId); + var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.MainConfigId); provider.Insertable(codeGenConfigs).ExecuteCommand(); } diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs index 673ddcda..e5a596fc 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs @@ -84,7 +84,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient var codeGen = input.Adapt(); await _db.Updateable(codeGen).ExecuteCommandAsync(); - // 更新配置表 + // 更新配置表 _codeGenConfigService.AddList(GetColumnList(input.Adapt()), codeGen); } @@ -377,13 +377,13 @@ public class SysCodeGenService : IDynamicApiController, ITransient if (templateList[i].Type == CodeGenTypeEnum.Frontend) tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.Parent!.FullName, _codeGenOptions.FrontRootPath, "src"); else - tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.FullName, input.NameSpace); + tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.FullName, input.NameSpace); } else { tmpPath = templateList[i].Type == CodeGenTypeEnum.Frontend ? Path.Combine(outputPath, _codeGenOptions.FrontRootPath, "src") : Path.Combine(outputPath, input!.NameSpace!); } - targetFile = Path.Combine( tmpPath, targetFile); + targetFile = Path.Combine(tmpPath, targetFile); var dirPath = new DirectoryInfo(targetFile).Parent!.FullName; if (!Directory.Exists(dirPath)) diff --git a/Admin.NET/Admin.NET.Core/Util/BaseInput.cs b/Admin.NET/Admin.NET.Core/Util/BaseInput.cs index df81c995..9e81e0f7 100644 --- a/Admin.NET/Admin.NET.Core/Util/BaseInput.cs +++ b/Admin.NET/Admin.NET.Core/Util/BaseInput.cs @@ -64,7 +64,7 @@ public class PhoneInput /// /// 手机号码 /// - /// 13980134216 + /// 13980134216 [Required(ErrorMessage = "手机号码不能为空")] [DataValidation(ValidationTypes.PhoneNumber, ErrorMessage = "手机号码不正确")] public string Phone { get; set; } diff --git a/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs b/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs index 204c9251..809d97a1 100644 --- a/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs +++ b/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs @@ -13,37 +13,37 @@ public class BaseOutput { /// /// 创建时间 - /// + /// public virtual DateTime CreateTime { get; set; } - + /// /// 更新时间 - /// + /// public virtual DateTime UpdateTime { get; set; } - + ///// ///// 创建者Id - ///// + ///// //public virtual long CreateUserId { get; set; } - + ///// ///// 创建者部门Id - ///// + ///// //public virtual long CreateOrgId { get; set; } - + /// /// 创建者名称 - /// + /// public virtual string CreateUserName { get; set; } - + ///// ///// 修改者Id - ///// + ///// //public virtual long UpdateUserId { get; set; } /// /// 修改者名称 - /// + /// public virtual string UpdateUserName { get; set; } }