Merge pull request #66 from EasyAbp/fix-shared-redis

Made `SharedStackExchangeRedisAccessTokenCache` work
EasyAbp · Dec 27, 2022 · 5e766dd · 5e766dd
2 parents f099e6c + e351119
commit 5e766dd
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 56 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>2.0.0-rc.21</Version>
+        <Version>2.0.0-rc.22</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>

diff --git a/...dCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj b/...dCache.StackExchangeRedis/EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis</RootNamespace>
     <Description>ABP vNext微信模块，基于StackExchangeRedis提供多服务间共享access_token等缓存数据的功能扩展。</Description>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...StackExchangeRedis/Infrastructure/AccessToken/SharedStackExchangeRedisAccessTokenCache.cs b/...StackExchangeRedis/Infrastructure/AccessToken/SharedStackExchangeRedisAccessTokenCache.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Threading.Tasks;
+using EasyAbp.Abp.WeChat.Common.Infrastructure.AccessToken;
+using EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.Settings;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.StackExchangeRedis;
+using Volo.Abp.Caching.StackExchangeRedis;
+using Volo.Abp.Settings;
+
+namespace EasyAbp.Abp.WeChat.Common.SharedCache.StackExchangeRedis.Infrastructure.AccessToken;
+
+public class SharedStackExchangeRedisAccessTokenCache : IAccessTokenCache
+{
+    public static string CachePrefix { get; set; } = "WeChatTokens:";
+    public static string SettingName { get; set; } = SharedCacheStackExchangeRedisSettings.RedisConfiguration;
+
+    private readonly ISettingProvider _settingProvider;
+
+    public SharedStackExchangeRedisAccessTokenCache(ISettingProvider settingProvider)
+    {
+        _settingProvider = settingProvider;
+    }
+
+    public virtual async Task<string> GetOrNullAsync(string key)
+    {
+        var redisCache = await CreateAbpRedisCacheAsync();
+
+        return await redisCache.GetStringAsync(await GetKeyAsync(key));
+    }
+
+    public virtual async Task SetAsync(string key, string value)
+    {
+        var redisCache = await CreateAbpRedisCacheAsync();
+
+        await redisCache.SetStringAsync(await GetKeyAsync(key), value, new DistributedCacheEntryOptions
+        {
+            AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(115)
+        });
+    }
+
+    protected virtual Task<string> GetKeyAsync(string key)
+    {
+        return Task.FromResult($"{CachePrefix}{key}");
+    }
+
+    protected virtual async Task<AbpRedisCache> CreateAbpRedisCacheAsync()
+    {
+        return new AbpRedisCache(new RedisCacheOptions
+        {
+            Configuration = await _settingProvider.GetOrNullAsync(SettingName)
+        });
+    }
+}
diff --git a/...ckExchangeRedis/Infrastructure/AccessToken/SharedStackExchangeRedisAccessTokenProvider.cs b/...ckExchangeRedis/Infrastructure/AccessToken/SharedStackExchangeRedisAccessTokenProvider.cs
diff --git a/...structure/AccessToken/AccessTokenCache.cs → ...re/AccessToken/DefaultAccessTokenCache.cs b/...structure/AccessToken/AccessTokenCache.cs → ...re/AccessToken/DefaultAccessTokenCache.cs
@@ -6,11 +6,11 @@
 
 namespace EasyAbp.Abp.WeChat.Common.Infrastructure.AccessToken;
 
-public class AccessTokenCache : IAccessTokenCache, ITransientDependency
+public class DefaultAccessTokenCache : IAccessTokenCache, ITransientDependency
 {
     protected IDistributedCache<string> DistributedCache { get; }
 
-    public AccessTokenCache(IDistributedCache<string> distributedCache)
+    public DefaultAccessTokenCache(IDistributedCache<string> distributedCache)
     {
         DistributedCache = distributedCache;
     }