⚡ codeFirst实体建表

ZR.Admin.WebApi/Extensions/AppServiceExtensions.cs

@@ -1,7 +1,5 @@
 using Infrastructure;
 using Infrastructure.Attribute;
-using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
 using System.Reflection;
 
 namespace ZR.Admin.WebApi.Extensions

ZR.Admin.WebApi/Extensions/DbExtension.cs

@@ -24,16 +24,14 @@ namespace ZR.Admin.WebApi.Extensions
         //仅本人数据权限
         public static long DATA_SCOPE_SELF = 5;
 
-        private static XmlCommentHelper commentHelper = new XmlCommentHelper();
-        
         /// <summary>
         /// 初始化db
         /// </summary>
         /// <param name="services"></param>
         /// <param name="Configuration"></param>
-        public static void AddDb(this IServiceCollection services, IConfiguration Configuration)
+        /// <param name="environment"></param>
+        public static void AddDb(this IServiceCollection services, IConfiguration Configuration, IWebHostEnvironment environment)
         {
-            commentHelper.LoadAll();
             List<DbConfigs> dbConfigs = Configuration.GetSection("DbConfigs").Get<List<DbConfigs>>();
 
             var iocList = new List<IocConfig>();
@@ -64,6 +62,11 @@ namespace ZR.Admin.WebApi.Extensions
                     SetSugarAop(db, iocConfig, cache);
                 });
             });
+
+            if(Configuration["InitDb"].ParseToBool() == true && environment.IsDevelopment())
+            {
+                InitDb();
+            }
         }
 
         /// <summary>
@@ -74,8 +77,8 @@ namespace ZR.Admin.WebApi.Extensions
         /// <param name="cache"></param>
         private static void SetSugarAop(SqlSugarClient db, IocConfig iocConfig, ICacheService cache)
         {
-            var config = db.GetConnection(iocConfig.ConfigId).CurrentConnectionConfig;
+            var config = db.GetConnectionScope(iocConfig.ConfigId).CurrentConnectionConfig;
-
+            
             string configId = config.ConfigId;
             db.GetConnectionScope(configId).Aop.OnLogExecuting = (sql, pars) =>
             {
@@ -107,6 +110,9 @@ namespace ZR.Admin.WebApi.Extensions
                 logger.Error(ex, $"{sql}\r\n{ex.Message}\r\n{ex.StackTrace}");
             };
 
+            db.GetConnectionScope(configId).Aop.DataExecuting = (oldValue, entiyInfo) =>
+            {
+            };
             db.GetConnectionScope(configId).CurrentConnectionConfig.MoreSettings = new ConnMoreSettings()
             {
                 IsAutoRemoveDataCache = true
@@ -118,11 +124,6 @@ namespace ZR.Admin.WebApi.Extensions
                 {
                     p.DbTableName = p.DbTableName.FirstLowerCase();
                     p.DbColumnName = p.DbColumnName.FirstLowerCase();
-                    var des = commentHelper.GetFieldOrPropertyComment(c);
-                    if (des.IsNotEmpty())
-                    {
-                        p.ColumnDescription = des;
-                    }
 
                     if (db.GetConnectionScope(configId).CurrentConnectionConfig.DbType == DbType.PostgreSQL)
                     {
@@ -149,26 +150,20 @@ namespace ZR.Admin.WebApi.Extensions
                     }
                 }
             };
-
-            db.GetConnectionScope(configId).Aop.DataExecuting = (oldValue, entiyInfo) =>
-            {
-                
-            };
         }
 
         /// <summary>
         /// 创建db、表
         /// </summary>
-        /// <param name="service"></param>
+        public static void InitDb()
-        public static void InitDb(this IServiceProvider service)
         {
             var db = DbScoped.SugarScope;
             //建库：如果不存在创建数据库存在不会重复创建 
             db.DbMaintenance.CreateDatabase();// 注意 ：Oracle和个别国产库需不支持该方法，需要手动建库 
 
             var baseType = typeof(SysBase);
-            var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && /*p.IsAssignableTo(baseType) && */p.GetCustomAttribute<SugarTable>() != null).ToArray();
+            var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && p.GetCustomAttribute<SugarTable>() != null).ToArray();
-
+            
             //23个表
             db.CodeFirst.InitTables(entityes);
         }

ZR.Admin.WebApi/Extensions/SwaggerExtension.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.Filters;
+using System.Reflection;
 
 namespace ZR.Admin.WebApi.Extensions
 {
@@ -52,9 +53,12 @@ namespace ZR.Admin.WebApi.Extensions
                 {
                     //var tempPath = hostEnvironment.ContentRootPath;
                     //添加文档注释
-                    c.IncludeXmlComments(Path.Combine("ZRAdmin.xml"), true);
+                    var baseDir = AppContext.BaseDirectory;
-                    c.IncludeXmlComments(Path.Combine("ZRModel.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Model.xml"), true);
-                    //c.IncludeXmlComments(Path.Combine(Directory.GetParent(tempPath).FullName, "ZR.Model", "ZRModel.xml"), true);
+
+                    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+                    var xmlPath = Path.Combine(baseDir, xmlFile);
+                    c.IncludeXmlComments(xmlPath);
                 }
                 catch (Exception ex)
                 {

ZR.Admin.WebApi/Program.cs

@@ -1,15 +1,14 @@
+using AspNetCoreRateLimit;
 using Infrastructure;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.DataProtection;
-using ZR.Admin.WebApi.Framework;
+using Microsoft.IdentityModel.Tokens;
-using Infrastructure.Extensions;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
-using ZR.Admin.WebApi.Middleware;
+using ZR.Admin.WebApi.Framework;
 using ZR.Admin.WebApi.Hubs;
+using ZR.Admin.WebApi.Middleware;
 using ZR.Common.Cache;
-using AspNetCoreRateLimit;
-using Microsoft.IdentityModel.Tokens;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -68,8 +67,6 @@ builder.Services.AddSingleton(new AppSettings(builder.Configuration));
 builder.Services.AddAppService();
 //开启计划任务
 builder.Services.AddTaskSchedulers();
-//初始化db
-builder.Services.AddDb(builder.Configuration);
 
 //注册REDIS 服务
 var openRedis = builder.Configuration["RedisServer:open"];
@@ -92,10 +89,8 @@ builder.Services.AddSwaggerConfig();
 
 var app = builder.Build();
 InternalApp.ServiceProvider = app.Services;
-if (builder.Configuration["InitDb"].ParseToBool() == true && app.Environment.IsDevelopment())
+//初始化db
-{
+builder.Services.AddDb(builder.Configuration, app.Environment);
-    app.Services.InitDb();
-}
 
 app.UseSwagger();
 

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -3,10 +3,9 @@
 		<TargetFramework>net7.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<DocumentationFile>ZRAdmin.xml</DocumentationFile>
 		<NoWarn>1701;1702;1591,8603,8602,8604,8600</NoWarn>
 	</PropertyGroup>
 

ZR.CodeGenerator/ZR.CodeGenerator.csproj

@@ -12,6 +12,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="JinianNet.JNTemplate" Version="2.3.3" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview01" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview08" />
 	</ItemGroup>
 </Project>

ZR.Model/ZR.Model.csproj

@@ -2,15 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<DocumentationFile>../ZR.Admin.WebApi/ZRModel.xml</DocumentationFile>
 		<NoWarn>1701;1702;1591;1570</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="MiniExcel" Version="1.30.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview01" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview08" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 	</ItemGroup>
 </Project>

ZR.Repository/ZR.Repository.csproj

@@ -15,6 +15,6 @@
 		<PackageReference Include="MySqlConnector" Version="2.2.6" />
 		<PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
 		<PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview01" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.84-preview08" />
 	</ItemGroup>
 </Project>