From 15007cd2fcf6e5ae679f3e5e1412619d95856b71 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Fri, 7 Jan 2022 01:14:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20PetaPoco=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/ServicesExtensions.cs               | 10 +++++-----
 .../Extensions/ServicesExtensions.cs               | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Extensions/ServicesExtensions.cs
index 1cdd85ab..944eda27 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Extensions/ServicesExtensions.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Extensions/ServicesExtensions.cs
@@ -26,14 +26,14 @@ public static class ServicesExtensions
     /// </summary>
     /// <param name="services"></param>
     /// <returns></returns>
-    public static IServiceCollection AddPetaPocoDataAccessServices(this IServiceCollection services)
+    public static IServiceCollection AddPetaPocoDataAccessServices(this IServiceCollection services, Action<IServiceProvider, IDatabaseBuildConfiguration> builder)
     {
         services.TryAddSingleton<IDatabase>(provider =>
         {
-            //TODO: 后期改造成自定适配
-            var configuration = provider.GetRequiredService<IConfiguration>();
-            var connString = configuration.GetConnectionString("bb");
-            var db = new Database<SQLiteDatabaseProvider>(connString, new BootstrapAdminConventionMapper());
+            var option = DatabaseConfiguration.Build();
+            builder(provider, option);
+            option.UsingDefaultMapper<BootstrapAdminConventionMapper>();
+            var db = new Database(option);
 
             var logger = provider.GetRequiredService<ILogger<Database>>();
             db.ExceptionThrown += (sender, e) =>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
index 971c169d..52137a7d 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
@@ -3,10 +3,8 @@ using BootstrapAdmin.Web.Services;
 using BootstrapAdmin.Web.Services.SMS;
 using BootstrapAdmin.Web.Services.SMS.Tencent;
 using BootstrapAdmin.Web.Utils;
-//using Microsoft.EntityFrameworkCore;
-using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Unicode;
+using PetaPoco;
+using PetaPoco.Providers;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -49,7 +47,13 @@ namespace Microsoft.Extensions.DependencyInjection
             //});
 
             // 增加 PetaPoco 数据服务
-            services.AddPetaPocoDataAccessServices();
+            services.AddPetaPocoDataAccessServices((provider, builder) =>
+            {
+                var configuration = provider.GetRequiredService<IConfiguration>();
+                var connString = configuration.GetConnectionString("bb");
+                builder.UsingProvider<SQLiteDatabaseProvider>()
+                       .UsingConnectionString(connString);
+            });
 
             // 增加后台任务
             services.AddTaskServices();