From b96aab631f69397946e97f20ee49fbf11be7e40f Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Thu, 2 Jun 2022 10:17:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20AppService=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BD=BF=E7=94=A8=20DBManagerService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/AppService.cs                    | 23 +++++++++++--------
 .../Services/DBManagerService.cs              |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs
index 47b938e1..9c513cd0 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs
@@ -12,29 +12,34 @@ class AppService : IApp
 {
     private const string AppServiceGetAppsByRoleIdCacheKey = "AppService-GetAppsByRoleId";
 
-    private IDatabase Database { get; }
+    private IDBManager DBManager { get; }
 
-    public AppService(IDatabase db)
+    public AppService(IDBManager db)
     {
-        Database = db;
+        DBManager = db;
     }
 
-    public List<string> GetAppsByRoleId(string? roleId) => CacheManager.GetOrAdd($"{AppServiceGetAppsByRoleIdCacheKey}-{roleId}", entry => Database.Fetch<string>("select AppID from RoleApp where RoleID = @0", roleId));
+    public List<string> GetAppsByRoleId(string? roleId) => CacheManager.GetOrAdd($"{AppServiceGetAppsByRoleIdCacheKey}-{roleId}", entry =>
+    {
+        using var db = DBManager.Create();
+        return db.Fetch<string>("select AppID from RoleApp where RoleID = @0", roleId);
+    });
 
     public bool SaveAppsByRoleId(string? roleId, IEnumerable<string> appIds)
     {
         var ret = false;
+        using var db = DBManager.Create();
         try
         {
-            Database.BeginTransaction();
-            Database.Execute("delete from RoleApp where RoleID = @0", roleId);
-            Database.InsertBatch("RoleApp", appIds.Select(g => new { AppID = g, RoleID = roleId }));
-            Database.CompleteTransaction();
+            db.BeginTransaction();
+            db.Execute("delete from RoleApp where RoleID = @0", roleId);
+            db.InsertBatch("RoleApp", appIds.Select(g => new { AppID = g, RoleID = roleId }));
+            db.CompleteTransaction();
             ret = true;
         }
         catch (Exception)
         {
-            Database.AbortTransaction();
+            db.AbortTransaction();
             throw;
         }
         if (ret)
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DBManagerService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DBManagerService.cs
index 5cc5f760..f14ad0e9 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DBManagerService.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DBManagerService.cs
@@ -36,7 +36,7 @@ internal class DBManagerService : IDBManager
     /// <param name="connectionName">连接字符串键值</param>
     /// <param name="keepAlive"></param>
     /// <returns></returns>
-    public IDatabase Create(string? connectionName = "client", bool keepAlive = false)
+    public IDatabase Create(string? connectionName = "ba", bool keepAlive = false)
     {
         var conn = Configuration.GetConnectionString(connectionName) ?? throw new ArgumentNullException(nameof(connectionName));