From 063390e255d531787aa13d705abbdd82e5543169 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Thu, 27 Jan 2022 01:45:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/GroupService.cs                  | 50 ++-----------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs
index d2bbe805..bd850888 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs
@@ -5,12 +5,11 @@
 using BootstrapAdmin.Caching;
 using BootstrapAdmin.DataAccess.Models;
 using BootstrapAdmin.Web.Core;
-using Microsoft.Extensions.Primitives;
 using PetaPoco;
 
 namespace BootstrapAdmin.DataAccess.PetaPoco.Services;
 
-class GroupService : IGroup, IDisposable
+class GroupService : IGroup
 {
     private const string GroupServiceGetAllCacheKey = "GroupService-GetAll";
 
@@ -18,10 +17,6 @@ class GroupService : IGroup, IDisposable
 
     private const string GroupServiceGetGroupsByRoleIdCacheKey = "GroupService-GetGroupsByRoleId";
 
-    private CancellationTokenSource? GetGroupsByUserIdCancellationTokenSource { get; set; }
-
-    private CancellationTokenSource? GetGroupsByRoleIdCancellationTokenSource { get; set; }
-
     private IDatabase Database { get; }
 
     /// <summary>
@@ -41,13 +36,7 @@ class GroupService : IGroup, IDisposable
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    public List<string> GetGroupsByUserId(string? userId) => CacheManager.GetOrAdd($"{GroupServiceGetGroupsByUserIdCacheKey}-{userId}", entry =>
-    {
-        GetGroupsByUserIdCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromMinutes(10));
-        var token = new CancellationChangeToken(GetGroupsByUserIdCancellationTokenSource.Token);
-        entry.ExpirationTokens.Add(token);
-        return Database.Fetch<string>("select GroupID from UserGroup where UserID = @0", userId);
-    });
+    public List<string> GetGroupsByUserId(string? userId) => CacheManager.GetOrAdd($"{GroupServiceGetGroupsByUserIdCacheKey}-{userId}", entry => Database.Fetch<string>("select GroupID from UserGroup where UserID = @0", userId));
 
     /// <summary>
     /// 
@@ -71,10 +60,9 @@ class GroupService : IGroup, IDisposable
             Database.AbortTransaction();
             throw;
         }
-
         if (ret)
         {
-            GetGroupsByUserIdCancellationTokenSource?.Cancel();
+            CacheManager.Clear();
         }
         return ret;
     }
@@ -84,13 +72,7 @@ class GroupService : IGroup, IDisposable
     /// </summary>
     /// <param name="roleId"></param>
     /// <returns></returns>
-    public List<string> GetGroupsByRoleId(string? roleId) => CacheManager.GetOrAdd($"{GroupServiceGetGroupsByRoleIdCacheKey}-{roleId}", entry =>
-    {
-        GetGroupsByRoleIdCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromMinutes(10));
-        var token = new CancellationChangeToken(GetGroupsByRoleIdCancellationTokenSource.Token);
-        entry.ExpirationTokens.Add(token);
-        return Database.Fetch<string>("select GroupID from RoleGroup where RoleID = @0", roleId);
-    });
+    public List<string> GetGroupsByRoleId(string? roleId) => CacheManager.GetOrAdd($"{GroupServiceGetGroupsByRoleIdCacheKey}-{roleId}", entry => Database.Fetch<string>("select GroupID from RoleGroup where RoleID = @0", roleId));
 
     /// <summary>
     /// 
@@ -117,30 +99,8 @@ class GroupService : IGroup, IDisposable
 
         if (ret)
         {
-            // reset cache
-            GetGroupsByRoleIdCancellationTokenSource?.Cancel();
+            CacheManager.Clear();
         }
         return ret;
     }
-
-    private void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            GetGroupsByRoleIdCancellationTokenSource?.Cancel();
-            GetGroupsByRoleIdCancellationTokenSource?.Dispose();
-
-            GetGroupsByUserIdCancellationTokenSource?.Cancel();
-            GetGroupsByUserIdCancellationTokenSource?.Dispose();
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
 }