😎1、代码优化 2、升级依赖及升级.NET9.0

Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>

Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -22,8 +22,7 @@
     "ThrowBah": true, // 是否将 Oops.Oh 默认抛出为业务异常
     "LogError": false // 是否输出异常日志
   },
-  // 静态资源处理方式(允许这些文件被访问)
+  // 静态资源处理方式(允许这些文件被访问)，包含".*": "application/octet-stream"允许访问所有静态资源
-  // 包含".*": "application/octet-stream"允许访问所有静态资源
   "StaticContentTypeMappings": {
     ".dll": "application/octet-stream",
     ".exe": "application/octet-stream",

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.10" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.18" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.21" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.18" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.21" />
-    <PackageReference Include="Furion.Pure" Version="4.9.5.18" />
+    <PackageReference Include="Furion.Pure" Version="4.9.5.21" />
     <PackageReference Include="Hardware.Info" Version="101.0.0" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -43,9 +43,9 @@
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.9.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
-    <PackageReference Include="SSH.NET" Version="2024.1.0" />
+    <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1120" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1123" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
@@ -54,9 +54,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.36" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.36" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.36" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
   </ItemGroup>
 
@@ -64,9 +64,19 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.3.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.11" />
+    <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.0.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.0.0" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
   </ItemGroup>
 

Admin.NET/Admin.NET.Core/Service/DataBase/Dto/CreateEntityInput.cs

@@ -11,25 +11,21 @@ public class CreateEntityInput
     /// <summary>
     /// 表名
     /// </summary>
-    /// <example>student</example>
     public string TableName { get; set; }
 
     /// <summary>
     /// 实体名
     /// </summary>
-    /// <example>Student</example>
     public string EntityName { get; set; }
 
     /// <summary>
     /// 基类名
     /// </summary>
-    /// <example>AutoIncrementEntity</example>
     public string BaseClassName { get; set; }
 
     /// <summary>
     /// 导出位置
     /// </summary>
-    /// <example>Web.Application</example>
     public string Position { get; set; }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/DataBase/Dto/CreateSeedDataInput.cs

@@ -16,38 +16,33 @@ public class CreateSeedDataInput
     /// <summary>
     /// 表名
     /// </summary>
-    /// <example>student</example>
     public string TableName { get; set; }
 
     /// <summary>
     /// 实体名称
     /// </summary>
-    /// <example>Student</example>
     public string EntityName { get; set; }
 
     /// <summary>
     /// 种子名称
     /// </summary>
-    /// <example>Student</example>
     public string SeedDataName { get; set; }
 
     /// <summary>
     /// 导出位置
     /// </summary>
-    /// <example>Web.Application</example>
     public string Position { get; set; }
 
     /// <summary>
     /// 后缀
     /// </summary>
-    /// <example>Web.Application</example>
     public string Suffix { get; set; }
 
     /// <summary>
     /// 过滤已有数据
     /// </summary>
     /// <remarks>
-    /// 如果数据在其它不同名的已有的种子类型的数据中出现过，就不生成这个数据
+    /// 如果数据在其它不同名的已有的种子类型的数据中出现过，就不生成这个数据。
     /// 主要用于生成菜单功能，菜单功能往往与子项目绑定，如果生成完整数据就会导致菜单项多处理重复。
     /// </remarks>
     public bool FilterExistingData { get; set; }

Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -4,11 +4,9 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-using Mapster.Adapters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Npgsql;
-using System.Linq;
 
 namespace Admin.NET.Core.Service;
 
@@ -358,29 +356,24 @@ public class SysDatabaseService : IDynamicApiController, ITransient
             query.OrderBy(orderField.DbColumnName);
         IEnumerable recordsTmp = (IEnumerable)query.ToList();
         List<dynamic> records = recordsTmp.ToDynamicList();
-        //这里要过滤已存在的数据
+        // 过滤已存在的数据
         if (input.FilterExistingData && records.Count() > 0)
         {
-            //获取实体类型
+            // 获取实体类型
-            //获取所有种数据数据类型
             var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) && u.FullName.EndsWith("." + input.EntityName))
-                .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
+                .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any()).ToList();
-                .ToList();
+            // 只有一个实体匹配才能过滤
-            if (entityTypes.Count == 1) //只有一个实体匹配才能过滤
+            if (entityTypes.Count == 1)
             {
-                //获取实体的主键对应的属性名称
+                // 获取实体的主键对应的属性名称
                 var pkInfo = entityTypes[0].GetProperties().Where(u => u.GetCustomAttribute<SugarColumn>() != null && u.GetCustomAttribute<SugarColumn>().IsPrimaryKey).First();
                 if (pkInfo != null)
                 {
-                    var seedDataTypes = App.EffectiveTypes
+                    var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
-                        .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(
+                        && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)) && i.GenericTypeArguments[0] == entityTypes[0])).ToList();
-                            i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)) && i.GenericTypeArguments[0] == entityTypes[0]
+                    // 可能会重名的种子数据不作为过滤项
-                            )
-                        )
-                        .ToList();
-                    //可能会重名的种子数据不作为过滤项
                     string doNotFilterfullName1 = $"{input.Position}.SeedData.{input.SeedDataName}";
-                    string doNotFilterfullName2 = $"{input.Position}.{input.SeedDataName}"; //Core中的命名空间没有SeedData
+                    string doNotFilterfullName2 = $"{input.Position}.{input.SeedDataName}"; // Core中的命名空间没有SeedData
 
                     PropertyInfo idPropertySeedData = records[0].GetType().GetProperty("Id");
 
@@ -389,13 +382,13 @@ public class SysDatabaseService : IDynamicApiController, ITransient
                         string fullName = seedDataTypes[i].FullName;
                         if ((fullName == doNotFilterfullName1) || (fullName == doNotFilterfullName2))
                             continue;
-                        //开始删除重复数据
+                        // 开始删除重复数据
                         var instance = Activator.CreateInstance(seedDataTypes[i]);
                         var hasDataMethod = seedDataTypes[i].GetMethod("HasData");
                         var seedData = ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast<object>();
                         if (seedData == null) continue;
 
-                        List<object> recordsToRemove = new List<object>();
+                        var recordsToRemove = new List<object>();
                         foreach (var record in records)
                         {
                             object recordId = pkInfo.GetValue(record);

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591</NoWarn>
     <DocumentationFile></DocumentationFile>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -285,18 +285,16 @@ public class Startup : AppStartup
                 app.UseStaticFiles(new StaticFileOptions
                 {
                     FileProvider = new PhysicalFileProvider(Path.Combine(env.ContentRootPath, "wwwroot")),
-                    //RequestPath = "/static",
+                    // RequestPath = "/static",
                     ServeUnknownFileTypes = true,  // 允许服务未知文件类型，以便能处理.dll这种非默认的静态文件类型
-                    //DefaultContentType = "application/octet-stream" // 为未知文件类型设置一个通用的内容类型
+                    // DefaultContentType = "application/octet-stream" // 为未知文件类型设置一个通用的内容类型
                     DefaultContentType = cpMappings[".*"]
                 });
             }
             else
             {
                 foreach (var key in cpMappings.Keys)
-                {
                     contentTypeProvider.Mappings[key] = cpMappings[key];
-                }
                 app.UseStaticFiles(new StaticFileOptions
                 {
                     ContentTypeProvider = contentTypeProvider
@@ -311,7 +309,6 @@ public class Startup : AppStartup
             });
         }
 
-
         //// 启用HTTPS
         //app.UseHttpsRedirection();
 

Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>

Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Admin.NET.Plugin.ApprovalFlow.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Admin.NET.Plugin.DingTalk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.GoView/Admin.NET.Plugin.GoView.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.K3Cloud/Admin.NET.Plugin.K3Cloud.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>