Procházet zdrojové kódy

😉1、优化默认租户种子数据(与默认数据库保持一致) 2、升级Furion v4.8.5.6

zuohuaijun před 3 roky
rodič
revize
eb0d985ea4

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -17,9 +17,9 @@
     <PackageReference Include="AngleSharp" Version="1.0.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.5.5" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.5.5" />
-    <PackageReference Include="Furion.Pure" Version="4.8.5.5" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.5.6" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.5.6" />
+    <PackageReference Include="Furion.Pure" Version="4.8.5.6" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.1" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.2" />

+ 3 - 1
Admin.NET/Admin.NET.Core/SeedData/SysTenantSeedData.cs

@@ -12,9 +12,11 @@ public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
     [IgnoreUpdate]
     public IEnumerable<SysTenant> HasData()
     {
+        var defaultDbConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs[0];
+
         return new[]
         {
-            new SysTenant{ Id=1300000000001, OrgId=1300000000101, UserId=1300000000111, Host="www.dilon.vip", TenantType=TenantTypeEnum.Id, DbType=SqlSugar.DbType.Sqlite, Connection="DataSource=./Admin.NET.db", ConfigId=SqlSugarConst.ConfigId, Remark="系统默认", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysTenant{ Id=1300000000001, OrgId=1300000000101, UserId=1300000000111, Host="www.dilon.vip", TenantType=TenantTypeEnum.Id, DbType=defaultDbConfig.DbType, Connection=defaultDbConfig.ConnectionString, ConfigId=SqlSugarConst.ConfigId, Remark="系统默认", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }
 }