wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级包

Browse Source
This commit is contained in:
不做码农 2022-10-25 08:12:15 +08:00
parent 9c1bcd155b
commit 4b0d4a3e74
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ZR.Admin.WebApi/Extensions/DbExtension.cs
View File

@ -22,9 +22,6 @@ namespace ZR.Admin.WebApi.Extensions
//仅本人数据权限 //仅本人数据权限
public static string DATA_SCOPE_SELF = "5"; public static string DATA_SCOPE_SELF = "5";
public static void AddDb(IConfiguration Configuration) public static void AddDb(IConfiguration Configuration)
{ {
string connStr = Configuration.GetConnectionString("conn_db"); string connStr = Configuration.GetConnectionString("conn_db");
@ -87,6 +84,10 @@ namespace ZR.Admin.WebApi.Extensions
} }
/// <summary>
/// 初始化db
/// </summary>
/// <param name="service"></param>
public static void InitDb(this IServiceProvider service) public static void InitDb(this IServiceProvider service)
{ {
var db = DbScoped.SugarScope; var db = DbScoped.SugarScope;
@ -94,7 +95,7 @@ namespace ZR.Admin.WebApi.Extensions
//db.CodeFirst. //db.CodeFirst.
var baseType = typeof(SysBase); 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.IsAssignableTo(baseType) && */p.GetCustomAttribute<SugarTable>() != null).ToArray();
db.CodeFirst.SetStringDefaultLength(512).InitTables(entityes); db.CodeFirst.SetStringDefaultLength(512).InitTables(entityes);
} }

10
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@ -22,13 +22,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" /> <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.6" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
<PackageReference Include="NLog" Version="5.0.1" /> <PackageReference Include="NLog" Version="5.0.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
<PackageReference Include="Mapster" Version="7.3.0" /> <PackageReference Include="Mapster" Version="7.3.0" />
<PackageReference Include="EPPlus" Version="6.0.5" /> <PackageReference Include="EPPlus" Version="6.0.5" />
<PackageReference Include="Hei.Captcha" Version="0.3.0" /> <PackageReference Include="Hei.Captcha" Version="0.3.0" />

4
ZR.CodeGenerator/ZR.CodeGenerator.csproj
View File

@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JinianNet.JNTemplate" Version="2.3.0" /> <PackageReference Include="JinianNet.JNTemplate" Version="2.3.1" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.2.1" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.28" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
ZR.Common/ZR.Common.csproj
View File

@ -8,8 +8,8 @@
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" /> <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
<PackageReference Include="CSRedisCore" Version="3.8.3" /> <PackageReference Include="CSRedisCore" Version="3.8.3" />
<PackageReference Include="EPPlus" Version="6.0.5" /> <PackageReference Include="EPPlus" Version="6.0.5" />
<PackageReference Include="JinianNet.JNTemplate" Version="2.3.0" /> <PackageReference Include="JinianNet.JNTemplate" Version="2.3.1" />
<PackageReference Include="MailKit" Version="3.3.0" /> <PackageReference Include="MailKit" Version="3.4.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
</ItemGroup> </ItemGroup>

2
ZR.Model/ZR.Model.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EPPlus" Version="6.0.5" /> <PackageReference Include="EPPlus" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.2.1" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.28" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup> </ItemGroup>

6
ZR.Repository/ZR.Repository.csproj
View File

@ -26,10 +26,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="MySql.Data" Version="8.0.29" /> <PackageReference Include="MySql.Data" Version="8.0.31" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.0" /> <PackageReference Include="NETCore.Encrypt" Version="2.1.0" />
<PackageReference Include="SqlSugar.IOC" Version="1.8.0" /> <PackageReference Include="SqlSugar.IOC" Version="1.9.0" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.2.1" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.28" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
ZR.Tasks/ZR.Tasks.csproj
View File

@ -6,9 +6,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Include="NLog" Version="5.0.1" /> <PackageReference Include="NLog" Version="5.0.4" />
<PackageReference Include="Quartz" Version="3.4.0" /> <PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.4.0" /> <PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>