Jelajahi Sumber

😁1、优化仓储 2、升级Furion和SqlSugar最新版本

zuohuaijun 2 tahun lalu
induk
melakukan
a0e12a3625

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

@@ -21,9 +21,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.48" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.48" />
-    <PackageReference Include="Furion.Pure" Version="4.9.1.48" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.49" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.49" />
+    <PackageReference Include="Furion.Pure" Version="4.9.1.49" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
@@ -39,7 +39,7 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.1" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.0.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.1.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.146-preview10" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.146" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.10" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 1 - 1
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarRepository.cs

@@ -12,7 +12,7 @@ public class SqlSugarRepository<T> : SimpleClient<T> where T : class, new()
 {
     public SqlSugarRepository()
     {
-        var iTenant = App.GetRequiredService<ISqlSugarClient>().AsTenant();
+        var iTenant = SqlSugarSetup.ITenant;
         base.Context = iTenant.GetConnectionScope(SqlSugarConst.MainConfigId);
 
         // 若实体贴有多库特性,则返回指定库连接

+ 4 - 0
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -6,6 +6,9 @@ namespace Admin.NET.Core;
 
 public static class SqlSugarSetup
 {
+    // 多租户实例
+    public static ITenant ITenant { get; set; }
+
     /// <summary>
     /// SqlSugar 上下文初始化
     /// </summary>
@@ -39,6 +42,7 @@ public static class SqlSugarSetup
                 SetDbDiffLog(dbProvider, config);
             });
         });
+        ITenant = sqlSugar.AsTenant();
 
         services.AddSingleton<ISqlSugarClient>(sqlSugar); // 单例注册
         services.AddScoped(typeof(SqlSugarRepository<>)); // 仓储注册