From 63ed784a3002e3afa9d2ba7316d6a0ba11beb13d Mon Sep 17 00:00:00 2001
From: igeekfan <igeekfan@foxmail.com>
Date: Thu, 22 Aug 2024 00:36:29 +0800
Subject: [PATCH] =?UTF-8?q?update=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LinCms.IdentityServer4.csproj                  |  1 -
 src/LinCms.Core/LinCms.Core.csproj                 |  2 +-
 .../FreeSql/FreeSqlExtension.cs                    |  4 ----
 .../LinCms.Infrastructure.csproj                   | 14 ++++++++------
 src/LinCms.Web/LinCms.Web.xml                      |  2 +-
 .../Startup/ServiceProviderExtensions.cs           |  2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
index 98b58988..4842535a 100644
--- a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
+++ b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
@@ -32,7 +32,6 @@
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
 		<PackageReference Include="IdentityServer4" Version="4.1.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
-		<PackageReference Include="FreeSql.Provider.MySqlConnector" Version="3.2.822" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
 		<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
diff --git a/src/LinCms.Core/LinCms.Core.csproj b/src/LinCms.Core/LinCms.Core.csproj
index 54abaced..fde5fbb4 100644
--- a/src/LinCms.Core/LinCms.Core.csproj
+++ b/src/LinCms.Core/LinCms.Core.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
 		<PackageReference Include="DotNetCore.Security" Version="17.3.0" />
 		<PackageReference Include="IGeekFan.FreeKit.Email" Version="0.0.540" />
-		<PackageReference Include="FreeSql.Extensions.JsonMap" Version="3.2.822" />
+		<PackageReference Include="FreeSql.Extensions.JsonMap" Version="3.5.100-preview20240821" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
 		<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
diff --git a/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs b/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs
index 46e93b45..638da5dc 100644
--- a/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs
+++ b/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs
@@ -64,14 +64,10 @@ public static FreeSqlBuilder CreateDatabaseIfNotExists(this FreeSqlBuilder @this
                 break;
             case DataType.Odbc:
                 break;
-            case DataType.OdbcDameng:
-                break;
             case DataType.MsAccess:
                 break;
             case DataType.Dameng:
                 break;
-            case DataType.OdbcKingbaseES:
-                break;
             case DataType.ShenTong:
                 break;
             case DataType.KingbaseES:
diff --git a/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj b/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
index c26d2ad9..6b5028b7 100644
--- a/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
+++ b/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
@@ -9,12 +9,14 @@
 	<ItemGroup>
 
 		<ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
-		<PackageReference Include="FreeSql.Provider.MySqlConnector" Version="3.2.822" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.822" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.822" />
-		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.822" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.822" />
-		<PackageReference Include="FreeSql.Provider.Odbc" Version="3.2.822" />
+
+		<PackageReference Include="FreeSql.Extensions.JsonMap" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.MySqlConnector" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.Odbc" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.5.100-preview20240821" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.5.100-preview20240821" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/LinCms.Web/LinCms.Web.xml b/src/LinCms.Web/LinCms.Web.xml
index 118777bf..a5bda630 100644
--- a/src/LinCms.Web/LinCms.Web.xml
+++ b/src/LinCms.Web/LinCms.Web.xml
@@ -89,7 +89,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Controllers.Blog.ArticleController.GetAllArticles(LinCms.Blog.Articles.ArticleSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.GetAllArticleAsync(LinCms.Blog.Articles.ArticleSearchDto)">
             <summary>
             得到所有的随笔
             </summary>
diff --git a/src/LinCms.Web/Startup/ServiceProviderExtensions.cs b/src/LinCms.Web/Startup/ServiceProviderExtensions.cs
index 4a33661d..06460578 100644
--- a/src/LinCms.Web/Startup/ServiceProviderExtensions.cs
+++ b/src/LinCms.Web/Startup/ServiceProviderExtensions.cs
@@ -52,8 +52,8 @@ public static IServiceProvider RunFreeSqlSyncStructure(this IServiceProvider ser
         //在运行时直接生成表结构,初始化数据
         try
         {
-            fsql.CodeFirst.SyncStructure(ReflexHelper.GetTypesByTableAttribute(typeof(LinUser)));
             fsql.CodeFirst.SeedData();
+            fsql.CodeFirst.SyncStructure(ReflexHelper.GetTypesByTableAttribute(typeof(LinUser)));
         }
         catch (Exception e)
         {