Merge pull request #2125 from d4ilys/master

优化QuestDb RestApi 相关逻辑

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestInsertAndUpdate.cs

@@ -17,7 +17,7 @@ namespace FreeSql.Tests.QuestDb.Crud
         [Fact,Order(1)]
         public async Task TestInsertAsync()
         {
-            var result = await fsql.Insert(new QuestDb_Model_Test01()
+            var result = await Db.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = Guid.NewGuid().ToString(),
                 CreateTime = DateTime.Now,
@@ -66,7 +66,7 @@ namespace FreeSql.Tests.QuestDb.Crud
                     NameUpdate = "NameUpdate"
                 },
             };
-            var result = await fsql.Insert(list).ExecuteAffrowsAsync();
+            var result = await Db.Insert(list).ExecuteAffrowsAsync();
             Assert.True(result > 0);
         }
 
@@ -106,14 +106,14 @@ namespace FreeSql.Tests.QuestDb.Crud
                     NameUpdate = "NameUpdate"
                 },
             };
-            var result = await fsql.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync();
+            var result = await Db.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync();
             Assert.True(result > 0);
         }
 
         [Fact]
         public async Task TestRestInsertAsync()
         {
-            var result = await restFsql.Insert(new QuestDb_Model_Test01()
+            var result = await RestApiDb.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = Guid.NewGuid().ToString(),
                 CreateTime = DateTime.Now,
@@ -162,7 +162,7 @@ namespace FreeSql.Tests.QuestDb.Crud
                     NameUpdate = "NameUpdate"
                 },
             };
-            var result = await restFsql.Insert(list).ExecuteAffrowsAsync();
+            var result = await RestApiDb.Insert(list).ExecuteAffrowsAsync();
             Assert.True(result > 0);
         }
 
@@ -202,7 +202,7 @@ namespace FreeSql.Tests.QuestDb.Crud
                     NameUpdate = "NameUpdate"
                 },
             };
-            var result = await restFsql.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync();
+            var result = await RestApiDb.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync();
             Assert.True(result > 0);
         }
 
@@ -224,7 +224,7 @@ namespace FreeSql.Tests.QuestDb.Crud
                 });
             }
 
-            var result = await restFsql.Insert(list).ExecuteQuestDbBulkCopyAsync();
+            var result = await RestApiDb.Insert(list).ExecuteQuestDbBulkCopyAsync();
             Assert.True(result > 0);
         }
 
@@ -233,7 +233,7 @@ namespace FreeSql.Tests.QuestDb.Crud
         public void TestNormalUpdate()
         {
             var updateTime = DateTime.Now;
-            var updateObj = fsql.Update<QuestDb_Model_Test01>()
+            var updateObj = Db.Update<QuestDb_Model_Test01>()
                 .Set(q => q.NameUpdate, "UpdateNow")
                 //     .Set(q => q.CreateTime, DateTime.Now)   分表的时间不可以随便改
                 .Where(q => q.Id == "1");
@@ -253,7 +253,7 @@ WHERE (""Id"" = '1')";
         {
             var primary = Guid.NewGuid().ToString();
             //先插入
-            fsql.Insert(new QuestDb_Model_Test01()
+            Db.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = primary,
                 CreateTime = DateTime.Now,
@@ -269,11 +269,11 @@ WHERE (""Id"" = '1')";
                 Id = primary,
                 Activos = 12.65,
             };
-            var updateObj = fsql.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null);
+            var updateObj = Db.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null);
             var sql = updateObj.ToSql();
             Debug.WriteLine(sql);
             var result = updateObj.ExecuteAffrows();
-            var resultAsync = fsql.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null)
+            var resultAsync = Db.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null)
                 .ExecuteAffrows();
             Assert.True(result > 0);
             Assert.True(resultAsync > 0);
@@ -288,7 +288,7 @@ WHERE (""Id"" = '{primary}')", sql);
             var primary = Guid.NewGuid().ToString();
             var updateTime = DateTime.Now;
             //先插入
-            fsql.Insert(new QuestDb_Model_Test01()
+            Db.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = primary,
                 CreateTime = DateTime.Now,
@@ -298,6 +298,7 @@ WHERE (""Id"" = '{primary}')", sql);
                 NameInsert = "NameInsert",
                 NameUpdate = "NameUpdate"
             }).ExecuteAffrows();
+            
             var updateModel = new QuestDb_Model_Test01
             {
                 Id = primary,
@@ -305,12 +306,12 @@ WHERE (""Id"" = '{primary}')", sql);
                 IsCompra = true,
                 CreateTime = DateTime.Now
             };
-            var updateObj = fsql.Update<QuestDb_Model_Test01>().SetSource(updateModel)
+            var updateObj = Db.Update<QuestDb_Model_Test01>().SetSource(updateModel)
                 .IgnoreColumns(q => new { q.Id, q.CreateTime });
             var sql = updateObj.ToSql();
             Debug.WriteLine(sql);
             var result = updateObj.ExecuteAffrows();
-            var resultAsync = await fsql.Update<QuestDb_Model_Test01>().SetSource(updateModel)
+            var resultAsync = await Db.Update<QuestDb_Model_Test01>().SetSource(updateModel)
                 .IgnoreColumns(q => new { q.Id, q.CreateTime }).ExecuteAffrowsAsync();
             Assert.True(result > 0);
             Assert.True(resultAsync > 0);
@@ -323,7 +324,7 @@ WHERE (""Id"" = '{primary}')", sql);
         public async Task TestUpdateToUpdateAsync()
         {
             //官网demo有问题，暂时放弃此功能
-            var result = await fsql.Select<QuestDb_Model_Test01>().Where(q => q.Id == "IdAsync" && q.NameInsert == null)
+            var result = await Db.Select<QuestDb_Model_Test01>().Where(q => q.Id == "IdAsync" && q.NameInsert == null)
                 .ToUpdate()
                 .Set(q => q.UpdateTime, DateTime.Now)
                 .ExecuteAffrowsAsync();

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestSelect.cs

@@ -6,7 +6,6 @@ using System.Text;
 using System.Threading.Tasks;
 using FreeSql.DataAnnotations;
 using FreeSql.Tests.QuestDb.QuestDbTestModel;
-using NetTopologySuite.Operation.Valid;
 using Xunit;
 using static FreeSql.Tests.QuestDb.QuestDbTest;
 
@@ -17,13 +16,13 @@ namespace FreeSql.Tests.QuestDb.Crud
         [Fact]
         public void TestNormal()
         {
-            var sql = fsql.Select<QuestDb_Model_Test01>().ToSql();
+            var sql = Db.Select<QuestDb_Model_Test01>().ToSql();
             Debug.WriteLine(sql);
             Assert.Equal(
                 @"SELECT a.""Primarys"", a.""Id"", a.""NameUpdate"", a.""NameInsert"", a.""Activos"", a.""CreateTime"", a.""UpdateTime"", a.""IsCompra"" 
 FROM ""QuestDb_Model_Test01"" a", sql);
 
-            var sqlWhere = fsql.Select<QuestDb_Model_Test01>().Where(q =>
+            var sqlWhere = Db.Select<QuestDb_Model_Test01>().Where(q =>
                 q.UpdateTime.Value.BetweenEnd(DateTime.Parse("2023-02-17 09:35:00"),
                     DateTime.Parse("2023-02-17 10:20:00"))).ToSql();
             Debug.WriteLine(sqlWhere);
@@ -41,7 +40,7 @@ WHERE (a.""UpdateTime"" >= '2023-02-17 09:35:00.000000' and a.""UpdateTime"" < '
         public void TestPageAndCount(int page)
         {
             var pageSize = 5;
-            var select = fsql.Select<QuestDb_Model_Test01>().Count(out var total).Page(page, pageSize);
+            var select = Db.Select<QuestDb_Model_Test01>().Count(out var total).Page(page, pageSize);
             var sql = select.ToSql();
             Debug.WriteLine(sql);
             switch (page)
@@ -70,7 +69,7 @@ limit 10,15", sql);
         [Fact]
         public void TestNavigation()
         {
-            var select = fsql.Select<Topic>()
+            var select = Db.Select<Topic>()
                 .LeftJoin(a => a.Category.Id == a.CategoryId)
                 .LeftJoin(a => a.Category.Parent.Id == a.Category.ParentId)
                 .Where(a => a.Category.Parent.Id > 0);
@@ -88,7 +87,7 @@ WHERE (a__Category__Parent.""Id"" > 0)", sql);
         [Fact]
         public void TestComplexJoin()
         {
-            var select = fsql.Select<Topic, Category, CategoryType>()
+            var select = Db.Select<Topic, Category, CategoryType>()
                 .LeftJoin(w => w.t1.CategoryId == w.t2.Id)
                 .LeftJoin(w => w.t2.ParentId == w.t3.Id)
                 .Where(w => w.t3.Id > 0);
@@ -106,10 +105,10 @@ WHERE (c.""Id"" > 0)", sql);
         [Fact]
         public void TestUnionAll()
         {
-            var select = fsql.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true)
+            var select = Db.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true)
                 .UnionAll(
-                    fsql.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true),
+                    Db.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true),
-                    fsql.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true)
+                    Db.Select<QuestDb_Model_Test01>().Where(a => a.IsCompra == true)
                 )
                 .Where(a => a.IsCompra == true);
             var sql = select.ToSql();
@@ -134,7 +133,7 @@ WHERE (a.""IsCompra"" = True)", sql);
         [Fact]
         public void TestSampleBy()
         {
-            var selectSql = fsql.Select<QuestDb_Model_Test01>()
+            var selectSql = Db.Select<QuestDb_Model_Test01>()
                 .SampleBy(1, SampleUnit.day)
                 .WithTempQuery(q => new { q.Id, q.Activos, count = SqlExt.Count(q.Id).ToValue() })
                 .Where(q => q.Id != "1")
@@ -153,7 +152,7 @@ WHERE (a.""Id"" <> '1')";
         [Fact]
         public void TestLatestOn()
         {
-            var selectSql = fsql.Select<QuestDb_Model_Test01>()
+            var selectSql = Db.Select<QuestDb_Model_Test01>()
                 .LatestOn(q => q.CreateTime, q => new { q.Id, q.NameUpdate })
                 .ToSql();
             Debug.WriteLine(selectSql);
@@ -168,7 +167,7 @@ LATEST ON CreateTime PARTITION BY Id,NameUpdate ";
         public void TestGroup()
         {
             //QUEDTDB的GroupBy PostgrSql有所不同
-            var selectSql = fsql.Select<QuestDb_Model_Test01>()
+            var selectSql = Db.Select<QuestDb_Model_Test01>()
                 .WithTempQuery(q => new { q.Id, q.Activos, count = SqlExt.Count(q.Id).ToValue() })
                 .Where(q => q.Id != "1" && q.count > 1)
                 .ToSql();

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestUpdate.cs

@@ -18,7 +18,7 @@ namespace FreeSql.Tests.QuestDb.Crud
         public void TestNormalRestUpdate()
         {
             var updateTime = DateTime.Now;
-            var updateObj = restFsql.Update<QuestDb_Model_Test01>()
+            var updateObj = RestApiDb.Update<QuestDb_Model_Test01>()
                 .Set(q => q.NameUpdate, "UpdateNow")
                 //     .Set(q => q.CreateTime, DateTime.Now)   分表的时间不可以随便改
                 .Where(q => q.Id == "1");
@@ -38,7 +38,7 @@ WHERE (""Id"" = '1')";
         {
             var primary = Guid.NewGuid().ToString();
             //先插入
-            restFsql.Insert(new QuestDb_Model_Test01()
+            RestApiDb.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = primary,
                 CreateTime = DateTime.Now,
@@ -54,11 +54,11 @@ WHERE (""Id"" = '1')";
                 Id = primary,
                 Activos = 12.65,
             };
-            var updateObj = restFsql.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null);
+            var updateObj = RestApiDb.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null);
             var sql = updateObj.ToSql();
             Debug.WriteLine(sql);
             var result = updateObj.ExecuteAffrows();
-            var resultAsync = restFsql.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null)
+            var resultAsync = RestApiDb.Update<QuestDb_Model_Test01>().SetSourceIgnore(updateModel, o => o == null)
                 .ExecuteAffrows();
             Assert.True(result > 0);
             Assert.True(resultAsync > 0);
@@ -73,7 +73,7 @@ WHERE (""Id"" = '{primary}')", sql);
             var primary = Guid.NewGuid().ToString();
             var updateTime = DateTime.Now;
             //先插入
-            restFsql.Insert(new QuestDb_Model_Test01()
+            RestApiDb.Insert(new QuestDb_Model_Test01()
             {
                 Primarys = primary,
                 CreateTime = DateTime.Now,
@@ -90,12 +90,12 @@ WHERE (""Id"" = '{primary}')", sql);
                 IsCompra = true,
                 CreateTime = DateTime.Now
             };
-            var updateObj = restFsql.Update<QuestDb_Model_Test01>().SetSource(updateModel)
+            var updateObj = RestApiDb.Update<QuestDb_Model_Test01>().SetSource(updateModel)
                 .IgnoreColumns(q => new { q.Id, q.CreateTime });
             var sql = updateObj.ToSql();
             Debug.WriteLine(sql);
             var result = updateObj.ExecuteAffrows();
-            var resultAsync = await restFsql.Update<QuestDb_Model_Test01>().SetSource(updateModel)
+            var resultAsync = await RestApiDb.Update<QuestDb_Model_Test01>().SetSource(updateModel)
                 .IgnoreColumns(q => new { q.Id, q.CreateTime }).ExecuteAffrowsAsync();
             Assert.True(result > 0);
             Assert.True(resultAsync > 0);
@@ -108,7 +108,7 @@ WHERE (""Id"" = '{primary}')", sql);
         public async Task TestUpdateToUpdateAsync()
         {
             //官网demo有问题，暂时放弃此功能
-            var result = await restFsql.Select<QuestDb_Model_Test01>().Where(q => q.Id == "IdAsync" && q.NameInsert == null)
+            var result = await RestApiDb.Select<QuestDb_Model_Test01>().Where(q => q.Id == "IdAsync" && q.NameInsert == null)
                 .ToUpdate()
                 .Set(q => q.UpdateTime, DateTime.Now)
                 .ExecuteAffrowsAsync();

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/FreeSql.Tests.Provider.QuestDb.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="xunit" Version="2.5.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\..\Providers\FreeSql.Provider.QuestDb\FreeSql.Provider.QuestDb.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="Xunit" />
+	</ItemGroup>
+
+</Project>

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbCodeFirstTest.cs

@@ -16,17 +16,17 @@ namespace FreeSql.Tests.QuestDb
         [Fact]
         public void Test_SyncStructure()
         {
-            fsql.CodeFirst.SyncStructure<QuestDb_Model_Test01>();
+            Db.CodeFirst.SyncStructure<QuestDb_Model_Test01>();
-            fsql.CodeFirst.SyncStructure(typeof(Topic));
+            Db.CodeFirst.SyncStructure(typeof(Topic));
-            fsql.CodeFirst.SyncStructure(typeof(Category));
+            Db.CodeFirst.SyncStructure(typeof(Category));
-            fsql.CodeFirst.SyncStructure(typeof(CategoryType));
+            Db.CodeFirst.SyncStructure(typeof(CategoryType));
         }
 
         [Fact]
         public void Test_SyncStructure_Type()
         {
-            fsql.CodeFirst.SyncStructure<QuestDb_Model_Type01>();
+            Db.CodeFirst.SyncStructure<QuestDb_Model_Type01>();
-            var result = fsql.Insert(new QuestDb_Model_Type01()
+            var result = Db.Insert(new QuestDb_Model_Type01()
             {
                 TestBool = false,
                 TestDecimal = (decimal?)153.02,

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbDbFirstTest.cs

@@ -14,13 +14,13 @@ namespace FreeSql.Tests.QuestDb
         [Fact]
         public void Test_ExistsTable()
         {
-            var existsTable = QuestDbTest.fsql.DbFirst.ExistsTable(nameof(QuestDb_Model_Test01));
+            var existsTable = QuestDbTest.Db.DbFirst.ExistsTable(nameof(QuestDb_Model_Test01));
         }
 
         [Fact]
         public void Test_GetTablesByDatabase()
         {
-            var tablesByDatabase = QuestDbTest.fsql.DbFirst.GetTablesByDatabase("");
+            var tablesByDatabase = QuestDbTest.Db.DbFirst.GetTablesByDatabase("");
             tablesByDatabase.ForEach(d =>
             {
                 Debug.WriteLine(d.Name);

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbIssue/QuestDbIssue.cs

@@ -12,8 +12,8 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue
         [Fact]
         public void Issue1757()
         {
-            restFsql.CodeFirst.SyncStructure<Test0111>();
+            RestApiDb.CodeFirst.SyncStructure<Test0111>();
-            var count = fsql.Insert(new List<Test0111>()
+            var count = Db.Insert(new List<Test0111>()
             {
                 new()
                 {
@@ -26,15 +26,15 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue
 
             Assert.True(count > 0);
 
-            var list = fsql.Select<Test0111>().ToList();
+            var list = Db.Select<Test0111>().ToList();
         }
 
 
         [Fact]
         public void Issue1757Many()
         {
-            restFsql.CodeFirst.SyncStructure<Test0111>();
+            RestApiDb.CodeFirst.SyncStructure<Test0111>();
-            var count = fsql.Insert(new List<Test0111>()
+            var count = Db.Insert(new List<Test0111>()
             {
                 new()
                 {
@@ -61,7 +61,7 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue
 
             Assert.True(count > 0);
 
-            var list = fsql.Select<Test0111>().ToList();
+            var list = Db.Select<Test0111>().ToList();
         }
     }
 

FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTest.cs

@@ -10,18 +10,18 @@ namespace FreeSql.Tests.QuestDb
 {
     public class QuestDbTest
     {
-        public static IFreeSql fsql = new FreeSql.FreeSqlBuilder()
+        public static IFreeSql Db = new FreeSql.FreeSqlBuilder()
             .UseConnectionString(FreeSql.DataType.QuestDb,
-                @"host=192.168.1.114;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;")
+                @"host=localhost;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;")
             .UseMonitorCommand(cmd => Debug.WriteLine($"Sql：{cmd.CommandText}")) //监听SQL语句
             .UseNoneCommandParameter(true)
             .Build();
 
-        public static IFreeSql restFsql = new FreeSql.FreeSqlBuilder()
+        public static IFreeSql RestApiDb = new FreeSql.FreeSqlBuilder()
             .UseConnectionString(FreeSql.DataType.QuestDb,
-                @"host=192.168.1.114;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;")
+                @"host=localhost;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;")
             .UseMonitorCommand(cmd => Debug.WriteLine($"Sql：{cmd.CommandText}")) //监听SQL语句
-            .UseQuestDbRestAPI("192.168.1.114:9000")
+            .UseQuestDbRestAPI("localhost:9000") 
             .Build();
 
     }

FreeSql.sln

@@ -137,6 +137,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.TDen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.EFModel", "Extensions\FreeSql.Extensions.EFModel\FreeSql.Extensions.EFModel.csproj", "{4281AC48-6FE7-49C3-BE7B-D029058646BC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Tests.Provider.QuestDb", "FreeSql.Tests\FreeSql.Tests.Provider.QuestDb\FreeSql.Tests.Provider.QuestDb.csproj", "{5A59200F-9757-4E0B-B4CF-2E846F25A69A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -831,6 +833,18 @@ Global
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x64.Build.0 = Release|Any CPU
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x64.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x86.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x64.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x64.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x86.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -877,8 +891,8 @@ Global
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
-		RESX_PrefixTranslations = True
 		RESX_NeutralResourcesLanguage = en-US
+		RESX_PrefixTranslations = True
+		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
 	EndGlobalSection
 EndGlobal

FreeSql/FreeSql.xml

@@ -1097,6 +1097,93 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
+            <summary>
+            动态创建实体类型
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
+            <summary>
+            配置Class
+            </summary>
+            <param name="className">类名</param>
+            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
+            <returns></returns>
+        </member>
+        <member name="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
+            <summary>
+            获取类型构建器，可作为要构建的Type来引用
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="defaultValue">属性默认值</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
+            <summary>
+            配置父类
+            </summary>
+            <param name="superClass">父类类型</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
+            <summary>
+            Override属性
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
+            <summary>
+            Emit动态创建出Class - Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
+            <summary>
+            Emit动态创建出Class - Type，不附带获取TableInfo
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
+            <summary>
+            首字母小写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
+            <summary>
+            首字母大写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -5903,6 +5990,28 @@
             对象池
             </summary>
         </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
+            <summary>
+            动态构建Class Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            根据字典，创建 table 对应的实体对象
+            </summary>
+            <param name="table"></param>
+            <param name="dict"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
+            <summary>
+            根据实体对象，创建 table 对应的字典
+            </summary>
+            <param name="table"></param>
+            <param name="instance"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>
@@ -6510,126 +6619,3 @@
         </member>
     </members>
 </doc>
-<returns></returns>
-        </member>
-        <member name="M:IFreeSql.Insert``1(System.Collections.Generic.List{``0})">
-            <summary>
-            插入数据，传入实体集合
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Insert``1(System.Collections.Generic.IEnumerable{``0})">
-            <summary>
-            插入数据，传入实体集合
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.InsertOrUpdate``1">
-            <summary>
-            插入或更新数据，此功能依赖数据库特性（低版本可能不支持），参考如下：<para></para>
-            MySql 5.6+: on duplicate key update<para></para>
-            PostgreSQL 9.4+: on conflict do update<para></para>
-            SqlServer 2008+: merge into<para></para>
-            Oracle 11+: merge into<para></para>
-            Sqlite: replace into<para></para>
-            DuckDB: on conflict do update<para></para>
-            达梦: merge into<para></para>
-            人大金仓：on conflict do update<para></para>
-            神通：merge into<para></para>
-            MsAccess：不支持<para></para>
-            注意区别：FreeSql.Repository 仓储也有 InsertOrUpdate 方法（不依赖数据库特性）
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1">
-            <summary>
-            修改数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1(System.Object)">
-            <summary>
-            修改数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1">
-            <summary>
-            查询数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1(System.Object)">
-            <summary>
-            查询数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1">
-            <summary>
-            删除数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1(System.Object)">
-            <summary>
-            删除数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="isolationLevel"></param>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="P:IFreeSql.Ado">
-            <summary>
-            数据库访问对象
-            </summary>
-        </member>
-        <member name="P:IFreeSql.Aop">
-            <summary>
-            所有拦截方法都在这里
-            </summary>
-        </member>
-        <member name="P:IFreeSql.CodeFirst">
-            <summary>
-            CodeFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.DbFirst">
-            <summary>
-            DbFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.GlobalFilter">
-            <summary>
-            全局过滤设置，可默认附加为 Select/Update/Delete 条件
-            </summary>
-        </member>
-    </members>
-</doc>

Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs

@@ -1,5 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections;
@@ -7,6 +9,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -32,15 +35,16 @@ namespace FreeSql.QuestDb.Curd
         internal void InternalClearData() => ClearData();
         internal string InternalTableRuleInvoke() => TableRuleInvoke();
 
-        private int InternelExecuteAffrows()
+        private async Task<int> RestApiExecuteAffrowsAsync()
         {
             //如果设置了RestAPI的Url则走HTTP
+            var apiFeatures =  ServiceContainer.GetService<QuestResetApiFeatures>();
             var sql = ToSql();
-            var execAsync = RestAPIExtension.ExecAsync(sql).GetAwaiter().GetResult();
+            var execAsync = await apiFeatures.ExecAsync(sql);
-            var resultHash = new Hashtable();
+            var result = new RestApiExecResponseJsonBody();
             try
             {
-                resultHash = JsonConvert.DeserializeObject<Hashtable>(execAsync);
+                result = JsonConvert.DeserializeObject<RestApiExecResponseJsonBody>(execAsync);
             }
             catch
             {
@@ -49,18 +53,20 @@ namespace FreeSql.QuestDb.Curd
                     throw new Exception("请确认new FreeSqlBuilder().UseQuestDbRestAPI()中设置的用户名密码是否正确.");
                 }
             }
-            var ddl = resultHash["ddl"]?.ToString();
+
-            return ddl?.ToLower() == "ok" ? 1 : 0;
+            return result.IsSuccessful ? 1 : 0;
         }
 
         public override int ExecuteAffrows()
         {
-            if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl))
+            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : 5000,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
             }
-            return InternelExecuteAffrows();
+
+            return RestApiExecuteAffrowsAsync().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public override long ExecuteIdentity() => base.SplitExecuteIdentity(
@@ -170,12 +176,14 @@ namespace FreeSql.QuestDb.Curd
 #else
         public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl))
+            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 5000,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
             }
-            return Task.FromResult(InternelExecuteAffrows());
+
+            return RestApiExecuteAffrowsAsync();
         }
 
 
@@ -187,7 +195,7 @@ namespace FreeSql.QuestDb.Curd
             base.SplitExecuteInsertedAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 5000,
                 _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
 
-        async protected override Task<long> RawExecuteIdentityAsync(CancellationToken cancellationToken = default)
+        protected override async Task<long> RawExecuteIdentityAsync(CancellationToken cancellationToken = default)
         {
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return 0;
@@ -243,7 +251,7 @@ namespace FreeSql.QuestDb.Curd
             return ret;
         }
 
-        async protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToken cancellationToken = default)
+        protected override async Task<List<T1>> RawExecuteInsertedAsync(CancellationToken cancellationToken = default)
         {
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();

Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs

@@ -1,5 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections;
@@ -31,14 +33,16 @@ namespace FreeSql.QuestDb.Curd
 
         internal void InternalToSqlCaseWhenEnd(StringBuilder sb, ColumnInfo col) => ToSqlCaseWhenEnd(sb, col);
 
-        private int InternelExecuteAffrows()
+        private async Task<int> RestApiExecuteAffrowsAsync()
         {
+            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
             var sql = ToSql();
-            var execAsync = RestAPIExtension.ExecAsync(sql).GetAwaiter().GetResult();
+
-            var resultHash = new Hashtable();
+            var execAsync = await apiFeatures.ExecAsync(sql);
+            var result = new RestApiExecResponseJsonBody();
             try
             {
-                resultHash = JsonConvert.DeserializeObject<Hashtable>(execAsync);
+                result = JsonConvert.DeserializeObject<RestApiExecResponseJsonBody>(execAsync);
             }
             catch
             {
@@ -47,26 +51,29 @@ namespace FreeSql.QuestDb.Curd
                     throw new Exception("请确认new FreeSqlBuilder().UseQuestDbRestAPI()中设置的用户名密码是否正确.");
                 }
             }
-            var ddl = resultHash["ddl"]?.ToString();
+
-            var updated = Convert.ToInt32(resultHash["updated"]);
+            return result.IsSuccessful ? result.Updated : 0;
-            return ddl?.ToLower() == "ok" ? updated : 0;
         }
 
         public override int ExecuteAffrows()
         {
-            //如果设置了RestAPI中Url则走HTTP
+            //如果设置了RestApi 则走HTTP执行Sql
-            if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl))
+            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 500,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
             }
-            return InternelExecuteAffrows();
+
+            return RestApiExecuteAffrowsAsync().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
-		protected override List<TReturn> ExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns) => base.SplitExecuteUpdated<TReturn>(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, columns);
+        protected override List<TReturn> ExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns) =>
+            base.SplitExecuteUpdated<TReturn>(_batchRowsLimit > 0 ? _batchRowsLimit : 500,
+                _batchParameterLimit > 0 ? _batchParameterLimit : 3000, columns);
 
-		protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns)
+        protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns)
-		{
+        {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
             StringBuilder sbret = null;
@@ -94,10 +101,11 @@ namespace FreeSql.QuestDb.Curd
 
                 Exception exception = null;
                 try
-				{
+                {
-					var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-					var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms);
+                    var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql,
-					ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
+                        _commandTimeout, dbParms);
+                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
                     ret.AddRange(rettmp);
                 }
                 catch (Exception ex)
@@ -178,20 +186,25 @@ namespace FreeSql.QuestDb.Curd
 #else
         public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl))
+            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrowsAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 500,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
             }
 
-            return Task.FromResult(InternelExecuteAffrows());
+            return RestApiExecuteAffrowsAsync();
         }
 
 
-		protected override Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default) => base.SplitExecuteUpdatedAsync<TReturn>(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, columns, cancellationToken);
+        protected override Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns,
+            CancellationToken cancellationToken = default) => base.SplitExecuteUpdatedAsync<TReturn>(
+            _batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000,
+            columns, cancellationToken);
 
-		async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default)
+        protected override async Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns,
-		{
+            CancellationToken cancellationToken = default)
+        {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
             StringBuilder sbret = null;
@@ -219,10 +232,11 @@ namespace FreeSql.QuestDb.Curd
 
                 Exception exception = null;
                 try
-				{
+                {
-					var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-					var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
+                    var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction,
-					ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
+                        CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
+                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
                     ret.AddRange(rettmp);
                 }
                 catch (Exception ex)

Providers/FreeSql.Provider.QuestDb/Models/QuestResetApiFeatures.cs

@@ -0,0 +1,26 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace FreeSql.Provider.QuestDb.Models
+{
+    internal class QuestResetApiFeatures
+    {
+        internal string BaseAddress { get; set; }
+
+        internal string BasicToken { get; set; }
+
+        internal HttpClient HttpClient => ServiceContainer.GetService<IHttpClientFactory>().CreateClient("QuestDb");
+
+        internal async Task<string> ExecAsync(string sql)
+        {
+            //HTTP GET 执行SQL
+            var url = $"exec?query={HttpUtility.UrlEncode(sql)}";
+            if (!string.IsNullOrWhiteSpace(BasicToken))
+                HttpClient.DefaultRequestHeaders.Add("Authorization", BasicToken);
+            var httpResponseMessage = await HttpClient.GetAsync(url);
+            var result = await httpResponseMessage.Content.ReadAsStringAsync();
+            return result;
+        }
+    }
+}

Providers/FreeSql.Provider.QuestDb/Models/RestApiExecResponseJsonBody.cs

@@ -0,0 +1,21 @@
+using System;
+using Newtonsoft.Json;
+
+namespace FreeSql.Provider.QuestDb.Models
+{
+    internal class RestApiExecResponseJsonBody
+    {
+        [JsonProperty("ddl")]
+        public string Ddl { get; set; }
+
+        [JsonProperty("dml")]
+        public string Dml { get; set; }
+
+        [JsonProperty("updated")]
+        public int Updated { get; set; }
+
+        [JsonIgnore]
+        public bool IsSuccessful => string.Equals(Ddl, "ok", StringComparison.CurrentCultureIgnoreCase) ||
+                                    string.Equals(Dml, "ok", StringComparison.CurrentCultureIgnoreCase);
+    }
+}

Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FreeSql.Provider.QuestDb
-{
-    internal class QuestDbContainer
-    {
-        //作用于HttpClientFatory
-        private static IServiceCollection Services;
-        internal static IServiceProvider ServiceProvider { get; private set; }
-
-        internal static void Initialize(Action<IServiceCollection> service)
-        {
-            Services = new ServiceCollection();
-            service?.Invoke(Services);
-            ServiceProvider = Services.BuildServiceProvider();
-        }
-
-        internal static T GetService<T>()
-        {
-            return ServiceProvider.GetService<T>();
-        }
-    }
-}

Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs

@@ -1,15 +1,14 @@
 using CsvHelper;
 using FreeSql;
-using FreeSql.Internal.CommonProvider;
+using FreeSql.Provider.QuestDb;
-using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb.Models;
 using FreeSql.QuestDb;
 using FreeSql.QuestDb.Curd;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using Npgsql;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -18,9 +17,6 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
-using FreeSql.Provider.QuestDb;
-using System.Net;
 
 public static partial class QuestDbGlobalExtensions
 {
@@ -35,8 +31,51 @@ public static partial class QuestDbGlobalExtensions
 
     private static readonly QuestDbAdo _questDbAdo = new QuestDbAdo();
 
-    public static FreeSqlBuilder UseQuestDbRestAPI(this FreeSqlBuilder build, string host, string username = "",
+    /// <summary>
-        string password = "") => RestAPIExtension.UseQuestDbRestAPI(build, host, username, password);
+    /// 启动QuestDb Http功能
+    /// </summary>
+    /// <param name="builder"></param>
+    /// <param name="host"></param>
+    /// <param name="username"></param>
+    /// <param name="password"></param>
+    /// <returns></returns>
+    public static FreeSqlBuilder UseQuestDbRestAPI(this FreeSqlBuilder builder, string host, string username = "",
+        string password = "")
+    {
+        //初始化容器，添加HttpClient
+        ServiceContainer.Initialize(service =>
+        {
+            var apiFeatures = new QuestResetApiFeatures
+            {
+                BaseAddress = host.StartsWith("http") ? host : $"http://{host}"
+            };
+
+            service.AddHttpClient("QuestDb", client => client.BaseAddress = new Uri(apiFeatures.BaseAddress))
+                .ConfigurePrimaryHttpMessageHandler(handlerBuilder =>
+                {
+                    //忽略SSL验证
+                    return new HttpClientHandler
+                    {
+                        ClientCertificateOptions = ClientCertificateOption.Manual,
+                        ServerCertificateCustomValidationCallback =
+                            (httpRequestMessage, cert, certChain, policyErrors) => true
+                    };
+                });
+
+            if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
+            {
+                var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"));
+                apiFeatures.BasicToken = $"Basic {base64}";
+            }
+
+            service.AddSingleton(apiFeatures);
+        });
+
+        //RestApi需要无参数
+        builder.UseNoneCommandParameter(true);
+
+        return builder;
+    }
 
     /// <summary>
     /// 对于多个时间序列存储在同一个表中的场景，根据时间戳检索给定键或键组合的最新项。
@@ -50,7 +89,7 @@ public static partial class QuestDbGlobalExtensions
     public static ISelect<T1> LatestOn<T1, TKey>(this ISelect<T1> select, Expression<Func<T1, DateTime?>> timestamp,
         Expression<Func<T1, TKey>> partition)
     {
-        LatestOnExtension.InternelImpl(timestamp, partition);
+        LatestOnExtension.InternalImpl(timestamp, partition);
         return select;
     }
 
@@ -67,7 +106,7 @@ public static partial class QuestDbGlobalExtensions
         Expression<Func<T1, DateTime?>> timestamp,
         Expression<Func<T1, TKey>> partition) where T2 : class
     {
-        LatestOnExtension.InternelImpl(timestamp, partition);
+        LatestOnExtension.InternalImpl(timestamp, partition);
         return select;
     }
 
@@ -84,7 +123,7 @@ public static partial class QuestDbGlobalExtensions
         Expression<Func<T1, DateTime?>> timestamp,
         Expression<Func<T1, TKey>> partition) where T2 : class where T3 : class
     {
-        LatestOnExtension.InternelImpl(timestamp, partition);
+        LatestOnExtension.InternalImpl(timestamp, partition);
         return select;
     }
 
@@ -101,7 +140,7 @@ public static partial class QuestDbGlobalExtensions
         Expression<Func<T1, DateTime?>> timestamp,
         Expression<Func<T1, TKey>> partition) where T2 : class where T3 : class where T4 : class
     {
-        LatestOnExtension.InternelImpl(timestamp, partition);
+        LatestOnExtension.InternalImpl(timestamp, partition);
         return select;
     }
 
@@ -162,19 +201,19 @@ public static partial class QuestDbGlobalExtensions
     public static async Task<int> ExecuteQuestDbBulkCopyAsync<T>(this IInsert<T> that,
         string dateFormat = "yyyy/M/d H:mm:ss") where T : class
     {
-        //思路：通过提供的RestAPI imp，实现快速复制
+        var features = ServiceContainer.GetService<QuestResetApiFeatures>();
-        if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl))
+
+        if (string.IsNullOrWhiteSpace(features.BaseAddress))
         {
             throw new Exception(
-                "BulkCopy功能需要启用RestAPI，启用方式：new FreeSqlBuilder().UseQuestDbRestAPI(\"localhost:9000\", \"username\", \"password\")");
+                @"BulkCopy功能需要启用RestAPI，启用方式：new FreeSqlBuilder().UseQuestDbRestAPI(""localhost:9000"", ""username"", ""password"")");
         }
 
         var result = 0;
 
         try
         {
-            var client = QuestDbContainer.GetService<IHttpClientFactory>().CreateClient();
+            var boundary = $"---------------{DateTime.Now.Ticks:x}";
-            var boundary = "---------------" + DateTime.Now.Ticks.ToString("x");
             var list = new List<Hashtable>();
             var insert = that as QuestDbInsert<T>;
             var name = insert.InternalTableRuleInvoke(); //获取表名
@@ -199,7 +238,7 @@ public static partial class QuestDbGlobalExtensions
                 }
             });
             var schema = JsonConvert.SerializeObject(list);
-            using (MemoryStream stream = new MemoryStream())
+            using (var stream = new MemoryStream())
             {
                 //写入CSV文件
                 using (var writer = new StreamWriter(stream))
@@ -208,29 +247,27 @@ public static partial class QuestDbGlobalExtensions
                     await csv.WriteRecordsAsync(insert._source);
                 }
 
+                var client = features.HttpClient;
                 var httpContent = new MultipartFormDataContent(boundary);
-                if (!string.IsNullOrWhiteSpace(RestAPIExtension.authorization))
+                if (!string.IsNullOrWhiteSpace(features.BasicToken))
-                    client.DefaultRequestHeaders.Add("Authorization", RestAPIExtension.authorization);
+                    client.DefaultRequestHeaders.Add("Authorization", features.BasicToken);
                 httpContent.Add(new StringContent(schema), "schema");
                 httpContent.Add(new ByteArrayContent(stream.ToArray()), "data");
-                //boundary带双引号 可能导致服务器错误情况
                 httpContent.Headers.Remove("Content-Type");
                 httpContent.Headers.TryAddWithoutValidation("Content-Type",
-                    "multipart/form-data; boundary=" + boundary);
+                    $"multipart/form-data; boundary={boundary}");
                 var httpResponseMessage =
-                    await client.PostAsync($"{RestAPIExtension.BaseUrl}/imp?name={name}", httpContent);
+                    await client.PostAsync($"imp?name={name}", httpContent);
                 var readAsStringAsync = await httpResponseMessage.Content.ReadAsStringAsync();
                 var splitByLine = SplitByLine(readAsStringAsync);
-                foreach (var s in splitByLine)
+                foreach (var strings in from s in splitByLine
+                         where s.Contains("Rows")
+                         select s.Split('|')
+                         into strings
+                         where strings[1].Trim() == "Rows imported"
+                         select strings)
                 {
-                    if (s.Contains("Rows"))
+                    result = Convert.ToInt32(strings[2].Trim());
-                    {
-                        var strings = s.Split('|');
-                        if (strings[1].Trim() == "Rows imported")
-                        {
-                            result = Convert.ToInt32(strings[2].Trim());
-                        }
-                    }
                 }
             }
         }
@@ -249,7 +286,8 @@ public static partial class QuestDbGlobalExtensions
     /// <param name="insert"></param>
     /// <param name="dateFormat">导入时，时间格式 默认:yyyy/M/d H:mm:ss</param>
     /// <returns></returns>
-    public static int ExecuteQuestDbBulkCopy<T>(this IInsert<T> insert, string dateFormat = "yyyy/M/d H:mm:ss") where T : class
+    public static int ExecuteQuestDbBulkCopy<T>(this IInsert<T> insert, string dateFormat = "yyyy/M/d H:mm:ss")
+        where T : class
     {
         return ExecuteQuestDbBulkCopyAsync(insert, dateFormat).ConfigureAwait(false).GetAwaiter().GetResult();
     }
@@ -294,7 +332,7 @@ static class LatestOnExtension
         LatestOnString.Value = string.Empty;
     }
 
-    internal static void InternelImpl<T1, TKey>(Expression<Func<T1, DateTime?>> timestamp,
+    internal static void InternalImpl<T1, TKey>(Expression<Func<T1, DateTime?>> timestamp,
         Expression<Func<T1, TKey>> partition)
     {
         IsExistence.Value = true;
@@ -307,43 +345,3 @@ static class LatestOnExtension
         LatestOnString.Value = string.Format(latestOnTemple, _timestamp, _partition);
     }
 }
-
-static class RestAPIExtension
-{
-    internal static string BaseUrl = string.Empty;
-    internal static string authorization = string.Empty;
-
-    internal static async Task<string> ExecAsync(string sql)
-    {
-        //HTTP GET 执行SQL
-        var result = string.Empty;
-        var client = QuestDbContainer.GetService<IHttpClientFactory>().CreateClient();
-        var url = $"{BaseUrl}/exec?query={HttpUtility.UrlEncode(sql)}";
-        if (!string.IsNullOrWhiteSpace(authorization))
-            client.DefaultRequestHeaders.Add("Authorization", authorization);
-        var httpResponseMessage = await client.GetAsync(url);
-        result = await httpResponseMessage.Content.ReadAsStringAsync();
-        return result;
-    }
-
-    internal static FreeSqlBuilder UseQuestDbRestAPI(FreeSqlBuilder buider, string host, string username = "",
-        string password = "")
-    {
-        BaseUrl = host;
-        if (BaseUrl.EndsWith("/"))
-            BaseUrl = BaseUrl.Remove(BaseUrl.Length - 1);
-
-        if (!BaseUrl.ToLower().StartsWith("http"))
-            BaseUrl = $"http://{BaseUrl}";
-        //生成TOKEN
-        if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
-        {
-            var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"));
-            authorization = $"Basic {base64}";
-        }
-
-        //RestApi需要无参数
-        buider.UseNoneCommandParameter(true);
-        return buider;
-    }
-}

Providers/FreeSql.Provider.QuestDb/QuestDbProvider.cs

@@ -118,10 +118,6 @@ namespace FreeSql.QuestDb
                 Select0Provider._dicMethodDataReaderGetValue[typeof(Guid)] =
                     typeof(DbDataReader).GetMethod("GetGuid", new Type[] { typeof(int) });
 
-                QuestDbContainer.Initialize(service =>
-                {
-                    service.AddHttpClient();
-                });
             }
         }
 

Providers/FreeSql.Provider.QuestDb/ServiceContainer.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FreeSql.Provider.QuestDb
+{
+    internal class ServiceContainer
+    {
+        private static IServiceCollection _services;
+        private static IServiceProvider _serviceProvider;
+
+        internal static void Initialize(Action<IServiceCollection> service)
+        {
+            _services = new ServiceCollection();
+            service?.Invoke(_services);
+            _serviceProvider = _services.BuildServiceProvider();
+        }
+
+        internal static T GetService<T>()
+        {
+            return _serviceProvider == null ? default : _serviceProvider.GetService<T>();
+        }
+    }
+
+}