😁升级所有依赖及其他优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.38" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.38" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.38" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.40" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.40" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.40" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />
@@ -29,12 +29,12 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.20" />
     <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="NewLife.Redis" Version="5.4.2023.601" />
+    <PackageReference Include="NewLife.Redis" Version="5.5.2023.803" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.30.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.94-preview01" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.3" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.95" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatInput.cs

@@ -77,11 +77,11 @@ public class MessageTemplateSendInput
     [Required(ErrorMessage = "接收者的OpenId不能为空")]
     public string ToUserOpenId { get; set; }
 
-    /// <summary>
-    /// 模板数据，格式形如 { "key1": { "value": any }, "key2": { "value": any } }
-    /// </summary>
-    [Required(ErrorMessage = "模板数据不能为空")]
-    public Dictionary<string, object> Data { get; set; }
+    ///// <summary>
+    ///// 模板数据，格式形如 { "key1": { "value": any }, "key2": { "value": any } }
+    ///// </summary>
+    //[Required(ErrorMessage = "模板数据不能为空")]
+    //public Dictionary<string, object> Data { get; set; }
 
     /// <summary>
     /// 模板跳转链接

Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs

@@ -78,7 +78,7 @@ public class SendSubscribeMessageInput
     /// 模板内容，格式形如 { "key1": { "value": any }, "key2": { "value": any } }
     /// </summary>
     [Required(ErrorMessage = "模板内容不能为空")]
-    public Dictionary<string, object> Data { get; set; }
+    public Dictionary<string, CgibinMessageSubscribeSendRequest.Types.DataItem> Data { get; set; }
 
     /// <summary>
     /// 跳转小程序类型

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatService.cs

@@ -160,7 +160,7 @@ public class SysWechatService : IDynamicApiController, ITransient
                 AppId = _wechatApiHttpClient._wechatOptions.WechatAppId,
                 PagePath = input.MiniProgramPagePath,
             },
-            Data = (IDictionary<string, CgibinMessageTemplateSendRequest.Types.DataItem>)input.Data
+            // Data = input.Data.ToDictionary(k => k.Key, k => (CgibinMessageTemplateSendRequest.Types.DataItem)k.Value)
         };
         var resMessage = await _wechatApiClient.ExecuteCgibinMessageTemplateSendAsync(reqMessage);
         return resMessage;

Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs

@@ -145,7 +145,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient
             AccessToken = accessToken,
             TemplateId = input.TemplateId,
             ToUserOpenId = input.ToUserOpenId,
-            Data = (IDictionary<string, CgibinMessageSubscribeSendRequest.Types.DataItem>)input.Data,
+            Data = input.Data,
             MiniProgramState = input.MiniprogramState,
             Language = input.Language,
             MiniProgramPagePath = input.MiniProgramPagePath

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarRepository.cs

@@ -39,12 +39,9 @@ public class SqlSugarRepository<T> : SimpleClient<T> where T : class, new()
         var tenantId = App.GetRequiredService<UserManager>().TenantId;
         if (tenantId < 1 || tenantId.ToString() == SqlSugarConst.ConfigId) return;
 
-        var tenant = App.GetRequiredService<SysCacheService>().Get<List<SysTenant>>(CacheConst.KeyTenant)
-               .FirstOrDefault(u => u.Id == tenantId);
-        if (tenant is null || tenant is { TenantType: TenantTypeEnum.Id })
-        {
-            return;
-        }
+        var tenant = App.GetRequiredService<SysCacheService>().Get<List<SysTenant>>(CacheConst.KeyTenant).FirstOrDefault(u => u.Id == tenantId);
+        if (tenant is null || tenant is { TenantType: TenantTypeEnum.Id }) return;
+
         // 根据租户Id切库
         if (!iTenant.IsAnyConnection(tenantId.ToString()))
         {

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.14" />
+    <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
   </ItemGroup>