😁1、优化sqlsugar初始化 2、升级Furion v4.9.1.48

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.47" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.47" />
-    <PackageReference Include="Furion.Pure" Version="4.9.1.47" />
+    <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="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" />

Admin.NET/Admin.NET.Core/Const/SqlSugarConst.cs

@@ -23,14 +23,4 @@ public class SqlSugarConst
     /// 默认表主键
     /// </summary>
     public const string PrimaryKey = "Id";
-
-    /// <summary>
-    /// 仓储实例
-    /// </summary>
-    public static ITenant ITenant { get; set; }
-
-    /// <summary>
-    /// 主库提供器
-    /// </summary>
-    public static SqlSugarScopeProvider MainDb { get; set; }
 }

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -7,7 +7,7 @@ namespace Admin.NET.Core;
 public static class SqlSugarSetup
 {
     // 缓存所有仓储连接实例
-    private static ConcurrentDictionary<Type, ISqlSugarClient> iClientAttrDict = new();
+    private static readonly ConcurrentDictionary<Type, ISqlSugarClient> sqlSugarClientDict = new();
 
     /// <summary>
     /// SqlSugar 上下文初始化
@@ -382,13 +382,13 @@ public static class SqlSugarSetup
     {
         // 主库仓储实例
         var iClientMain = iTenant.GetConnectionScope(SqlSugarConst.MainConfigId);
-        iClientAttrDict.TryAdd(typeof(SysTableAttribute), iClientMain);
+        sqlSugarClientDict.TryAdd(typeof(SysTableAttribute), iClientMain);
 
         // 日志库仓储实例
         var iClientLog = iTenant.IsAnyConnection(SqlSugarConst.LogConfigId)
                 ? iTenant.GetConnectionScope(SqlSugarConst.LogConfigId)
                 : iTenant.GetConnectionScope(SqlSugarConst.MainConfigId);
-        iClientAttrDict.TryAdd(typeof(LogTableAttribute), iClientLog);
+        sqlSugarClientDict.TryAdd(typeof(LogTableAttribute), iClientLog);
 
         // 其他库仓储实例
         var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
@@ -398,7 +398,7 @@ public static class SqlSugarSetup
             MethodInfo genericMethod = typeof(ITenant).GetMethod("GetConnectionScopeWithAttr");
             MethodInfo constructedMethod = genericMethod.MakeGenericMethod(entityType);
             ISqlSugarClient iClientAttr = constructedMethod.Invoke(iTenant, null) as ISqlSugarClient;
-            iClientAttrDict.TryAdd(entityType, iClientAttr);
+            sqlSugarClientDict.TryAdd(entityType, iClientAttr);
         }
     }
 
@@ -409,7 +409,8 @@ public static class SqlSugarSetup
     /// <returns></returns>
     public static ISqlSugarClient GetConnectionScope(Type type)
     {
-        iClientAttrDict.TryGetValue(type, out ISqlSugarClient iClient);
+        sqlSugarClientDict.TryGetValue(type, out ISqlSugarClient iClient);
+        _ = iClient.Aop;
         return iClient;
     }
 }