diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs index 342e22f..a428c94 100644 --- a/ZR.Admin.WebApi/Extensions/DbExtension.cs +++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs @@ -22,9 +22,6 @@ namespace ZR.Admin.WebApi.Extensions //仅本人数据权限 public static string DATA_SCOPE_SELF = "5"; - - - public static void AddDb(IConfiguration Configuration) { string connStr = Configuration.GetConnectionString("conn_db"); @@ -49,7 +46,7 @@ namespace ZR.Admin.WebApi.Extensions { //db0数据过滤 FilterData(0); - + #region db0 db.GetConnectionScope(0).Aop.OnLogExecuting = (sql, pars) => { @@ -84,17 +81,21 @@ namespace ZR.Admin.WebApi.Extensions }; #endregion }); - + } + /// + /// 初始化db + /// + /// public static void InitDb(this IServiceProvider service) { var db = DbScoped.SugarScope; db.DbMaintenance.CreateDatabase(); //db.CodeFirst. - + var baseType = typeof(SysBase); - var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && /*p.IsAssignableTo(baseType) && */p.GetCustomAttribute()!=null).ToArray(); + var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && /*p.IsAssignableTo(baseType) && */p.GetCustomAttribute() != null).ToArray(); db.CodeFirst.SetStringDefaultLength(512).InitTables(entityes); } diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 5e21236..7c8292c 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -22,13 +22,13 @@ - - - + + + - - + + diff --git a/ZR.CodeGenerator/ZR.CodeGenerator.csproj b/ZR.CodeGenerator/ZR.CodeGenerator.csproj index fbfe4f5..e0b5be4 100644 --- a/ZR.CodeGenerator/ZR.CodeGenerator.csproj +++ b/ZR.CodeGenerator/ZR.CodeGenerator.csproj @@ -11,7 +11,7 @@ - - + + diff --git a/ZR.Common/ZR.Common.csproj b/ZR.Common/ZR.Common.csproj index 454daf7..87f4338 100644 --- a/ZR.Common/ZR.Common.csproj +++ b/ZR.Common/ZR.Common.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj index 93ca66e..dcf87b6 100644 --- a/ZR.Model/ZR.Model.csproj +++ b/ZR.Model/ZR.Model.csproj @@ -7,7 +7,7 @@ - + diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj index 03ec7d5..1744cb2 100644 --- a/ZR.Repository/ZR.Repository.csproj +++ b/ZR.Repository/ZR.Repository.csproj @@ -26,10 +26,10 @@ - + - - + + diff --git a/ZR.Tasks/ZR.Tasks.csproj b/ZR.Tasks/ZR.Tasks.csproj index e1ad408..b227540 100644 --- a/ZR.Tasks/ZR.Tasks.csproj +++ b/ZR.Tasks/ZR.Tasks.csproj @@ -6,9 +6,9 @@ - - - + + +