Эх сурвалжийг харах

😉升级所有依赖及其他调整

zuohuaijun 3 жил өмнө
parent
commit
1d3546715c

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

@@ -15,13 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.3" />
     <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.23" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.23" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.23" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.24" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.24" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.24" />
     <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.4" />
@@ -32,7 +32,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.29.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.81" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.83" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/BaseService.cs

@@ -29,7 +29,7 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// </summary>
     /// <returns></returns>
     [DisplayName("获取实体集合")]
-    public async Task<List<TEntity>> GetList()
+    public virtual async Task<List<TEntity>> GetList()
     {
         return await _rep.GetListAsync();
     }

+ 5 - 5
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -64,14 +64,14 @@ public class Startup : AppStartup
             .AddNewtonsoftJson(options =>
             {
                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local;
-                options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); // 首字母小写(驼峰样式)
                 options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; // 时间格式化
-                // options.SerializerSettings.MetadataPropertyHandling = MetadataPropertyHandling.Ignore;
-                // options.SerializerSettings.DateParseHandling = DateParseHandling.None;
-                // options.SerializerSettings.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal });
                 options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; // 忽略循环引用
-                // options.SerializerSettings.Converters.AddLongTypeConverters(); // long转string(防止js精度溢出) 超过16位开启
+                // options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); // 解决动态对象属性名大写
                 // options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore; // 忽略空值
+                // options.SerializerSettings.Converters.AddLongTypeConverters(); // long转string(防止js精度溢出) 超过16位开启
+                // options.SerializerSettings.MetadataPropertyHandling = MetadataPropertyHandling.Ignore; // 解决DateTimeOffset异常
+                // options.SerializerSettings.DateParseHandling = DateParseHandling.None; // 解决DateTimeOffset异常
+                // options.SerializerSettings.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
             })
             //.AddXmlSerializerFormatters()
             //.AddXmlDataContractSerializerFormatters()