【优化】移除EasyCaching.Core,EasyCaching.CSRedis,EasyCaching.InMemory等组件，直接使用原生CSRedis组件，替换SqlSugar二级缓存组件。

CoreCms.Net.Caching/CoreCms.Net.Caching.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyCaching.Core" Version="1.9.0" />
+    <PackageReference Include="CSRedisCore" Version="3.8.670" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.96" />

CoreCms.Net.Caching/Manual/RedisCacheManager.cs

@@ -14,65 +14,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using CoreCms.Net.Caching.Manual;
-using CoreCms.Net.Configuration;
-using CoreCms.Net.Utility.Extensions;
-using StackExchange.Redis;
 
 namespace CoreCms.Net.Caching.Redis
 {
     public class RedisCacheManager : IManualCacheManager
     {
-        private readonly string _redisConnenctionString;
-
-        public volatile ConnectionMultiplexer RedisConnection;
-
-        private readonly object _redisConnectionLock = new object();
-
-        public RedisCacheManager()
-        {
-            string redisConfiguration = AppSettingsConstVars.RedisConfigConnectionString;//获取连接字符串
-
-            if (string.IsNullOrWhiteSpace(redisConfiguration))
-            {
-                throw new ArgumentException("redis config is empty", nameof(redisConfiguration));
-            }
-            _redisConnenctionString = redisConfiguration;
-
-            RedisConnection = GetRedisConnection();
-        }
-
-        /// <summary>
-        /// 核心代码，获取连接实例
-        /// 通过双if 夹lock的方式，实现单例模式
-        /// </summary>
-        /// <returns></returns>
-        private ConnectionMultiplexer GetRedisConnection()
-        {
-            //如果已经连接实例，直接返回
-            if (RedisConnection != null && RedisConnection.IsConnected)
-            {
-                return RedisConnection;
-            }
-            //加锁，防止异步编程中，出现单例无效的问题
-            lock (_redisConnectionLock)
-            {
-                if (RedisConnection != null)
-                {
-                    //释放redis连接
-                    RedisConnection.Dispose();
-                }
-                try
-                {
-                    RedisConnection = ConnectionMultiplexer.Connect(_redisConnenctionString);
-                }
-                catch (Exception)
-                {
-                    throw new Exception("Redis服务未启用，请开启该服务，并且请注意端口号，Redis默认使用6379端口号。");
-                }
-            }
-            return RedisConnection;
-        }
-
 
         /// <summary>
         /// 判断key是否存在
@@ -81,12 +27,10 @@ namespace CoreCms.Net.Caching.Redis
         /// <returns></returns>
         public bool Exists(string key)
         {
-            return RedisConnection.GetDatabase().KeyExists(key);
+            return RedisHelper.Exists(key);
         }
 
 
-
-
         /// <summary>
         /// 添加缓存
         /// </summary>
@@ -98,15 +42,7 @@ namespace CoreCms.Net.Caching.Redis
         {
             if (value != null)
             {
-                //序列化，将object值生成RedisValue
-                if (expiresIn > 0)
-                {
-                    return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value), TimeSpan.FromMinutes(expiresIn));
-                }
-                else
-                {
-                    return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value));
-                }
+                return expiresIn > 0 ? RedisHelper.Set(key, value, TimeSpan.FromMinutes(expiresIn)) : RedisHelper.Set(key, value);
             }
             return false;
         }
@@ -118,7 +54,7 @@ namespace CoreCms.Net.Caching.Redis
         /// <returns></returns>
         public void Remove(string key)
         {
-            RedisConnection.GetDatabase().KeyDelete(key);
+            RedisHelper.DelAsync(key);
         }
 
         /// <summary>
@@ -127,11 +63,9 @@ namespace CoreCms.Net.Caching.Redis
         /// <returns></returns>
         public void RemoveAll(IEnumerable<string> keys)
         {
-            foreach (var key in keys)
-            {
-                RedisConnection.GetDatabase().KeyDelete(key);
-            }
-
+            var enumerable = keys as string[] ?? keys.ToArray();
+            string[] keyStrings = enumerable.ToArray();
+            RedisHelper.DelAsync(keyStrings);
         }
 
         /// <summary>
@@ -141,19 +75,12 @@ namespace CoreCms.Net.Caching.Redis
         /// <returns></returns>
         public T Get<T>(string key)
         {
-            var value = RedisConnection.GetDatabase().StringGet(key);
-            if (value.HasValue)
-            {
-                //需要用的反序列化，将Redis存储的Byte[]，进行反序列化
-                return SerializeExtensions.Deserialize<T>(value);
-            }
-
-            return default;
+            return RedisHelper.Get<T>(key);
         }
 
         public object Get(string key)
         {
-            return RedisConnection.GetDatabase().StringGet(key);
+            return RedisHelper.Get<object>(key);
         }
 
         public IDictionary<string, object> GetAll(IEnumerable<string> keys)
@@ -162,48 +89,27 @@ namespace CoreCms.Net.Caching.Redis
                 throw new ArgumentNullException(nameof(keys));
             var dict = new Dictionary<string, object>();
 
-            keys.ToList().ForEach(item => dict.Add(item, RedisConnection.GetDatabase().StringGet(item)));
+            keys.ToList().ForEach(item => dict.Add(item, RedisHelper.Get(item)));
             return dict;
 
         }
 
         public void RemoveCacheAll()
         {
-            foreach (var endPoint in GetRedisConnection().GetEndPoints())
-            {
-                var server = GetRedisConnection().GetServer(endPoint);
-                foreach (var key in server.Keys())
-                {
-                    RedisConnection.GetDatabase().KeyDelete(key);
-                }
-            }
+            //查找所有分区节点中符合给定模式(pattern)的 key
+            var cacheKeys = RedisHelper.Keys("*");
+            RedisHelper.Del(cacheKeys);
         }
 
         public void RemoveCacheRegex(string pattern)
         {
-            var script = "return redis.call('keys',@pattern)";
-            var prepared = LuaScript.Prepare(script);
-            var redisResult = RedisConnection.GetDatabase().ScriptEvaluate(prepared, new { pattern });
-            if (!redisResult.IsNull)
-            {
-                RedisConnection.GetDatabase().KeyDelete((RedisKey[])redisResult); //删除一组key
-            }
+            var cacheKeys = RedisHelper.Keys(pattern);
+            RedisHelper.Del(cacheKeys);
         }
 
         public IList<string> SearchCacheRegex(string pattern)
         {
-            var list = new List<String>();
-            var script = "return redis.call('keys',@pattern)";
-            var prepared = LuaScript.Prepare(script);
-            var redisResult = RedisConnection.GetDatabase().ScriptEvaluate(prepared, new { pattern });
-            if (!redisResult.IsNull)
-            {
-                foreach (var key in (RedisKey[])redisResult)
-                {
-                    list.Add(key);
-                }
-            }
-            return list;
+            return RedisHelper.Keys(pattern);
         }
     }
 }

CoreCms.Net.Caching/SqlSugar/SqlSugarCache.cs

@@ -1,58 +0,0 @@
-using CoreCms.Net.Utility;
-using EasyCaching.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-
-namespace CoreCms.Net.Caching.SqlSugar
-{
-    /// <summary>
-    /// 仅供ORM缓存使用
-    /// </summary>
-    public class SqlSugarCache : ICacheService
-    {
-        private static readonly IEasyCachingProvider cache = Storage.GetService<IEasyCachingProvider>();
-
-        public void Add<V>(string key, V value)
-        {
-            cache.Set(key, value, TimeSpan.FromSeconds(int.MaxValue));
-        }
-
-        public void Add<V>(string key, V value, int cacheDurationInSeconds)
-        {
-            cache.Set(key, value, TimeSpan.FromSeconds(cacheDurationInSeconds));
-        }
-
-        public bool ContainsKey<V>(string key)
-        {
-            return cache.Exists(key);
-        }
-
-        public V Get<V>(string key)
-        {
-            return cache.Get<V>(key).Value;
-        }
-
-        public IEnumerable<string> GetAllKey<V>()
-        {
-            return cache.GetByPrefix<object>("SqlSugarDataCache.").Keys;
-        }
-
-        public void Remove<V>(string key)
-        {
-            cache.Remove(key);
-        }
-
-        public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = 2147483647)
-        {
-            if (cache.Exists(cacheKey))
-            {
-                return cache.Get<V>(cacheKey).Value;
-            }
-
-            V v = create();
-            cache.Set(cacheKey, v, TimeSpan.FromSeconds(cacheDurationInSeconds));
-            return v;
-        }
-    }
-}

CoreCms.Net.Caching/SqlSugar/SqlSugarMemoryCache.cs

@@ -0,0 +1,282 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+using SqlSugar;
+
+namespace CoreCms.Net.Caching.SqlSugar
+{
+    public class SqlSugarMemoryCache : ICacheService
+    {
+        MemoryCacheHelper cache = new MemoryCacheHelper();
+        public void Add<V>(string key, V value)
+        {
+            cache.Set(key, value);
+        }
+
+        public void Add<V>(string key, V value, int cacheDurationInSeconds)
+        {
+            cache.Set(key, value, cacheDurationInSeconds);
+        }
+
+        public bool ContainsKey<V>(string key)
+        {
+            return cache.Exists(key);
+        }
+
+        public V Get<V>(string key)
+        {
+            return cache.Get<V>(key);
+        }
+
+        public IEnumerable<string> GetAllKey<V>()
+        {
+            return cache.GetCacheKeys();
+        }
+
+        public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = int.MaxValue)
+        {
+            if (cache.Exists(cacheKey))
+            {
+                return cache.Get<V>(cacheKey);
+            }
+            else
+            {
+                var result = create();
+                cache.Set(cacheKey, result, cacheDurationInSeconds);
+                return result;
+            }
+        }
+
+        public void Remove<V>(string key)
+        {
+            cache.Remove(key);
+        }
+    }
+    public class MemoryCacheHelper
+    {
+        private static readonly Microsoft.Extensions.Caching.Memory.MemoryCache Cache = new Microsoft.Extensions.Caching.Memory.MemoryCache(new MemoryCacheOptions());
+
+        /// <summary>
+        /// 验证缓存项是否存在
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <returns></returns>
+        public bool Exists(string key)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+            return Cache.TryGetValue(key, out _);
+        }
+
+        /// <summary>
+        /// 添加缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <param name="value">缓存Value</param>
+        /// <param name="expiresSliding">滑动过期时长（如果在过期时间内有操作，则以当前时间点延长过期时间）</param>
+        /// <param name="expiressAbsoulte">绝对过期时长</param>
+        /// <returns></returns>
+        public bool Set(string key, object value, TimeSpan expiresSliding, TimeSpan expiressAbsoulte)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+            if (value == null)
+                throw new ArgumentNullException(nameof(value));
+
+            Cache.Set(key, value,
+                new MemoryCacheEntryOptions().SetSlidingExpiration(expiresSliding)
+                    .SetAbsoluteExpiration(expiressAbsoulte));
+            return Exists(key);
+        }
+
+        /// <summary>
+        /// 添加缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <param name="value">缓存Value</param>
+        /// <param name="expiresIn">缓存时长</param>
+        /// <param name="isSliding">是否滑动过期（如果在过期时间内有操作，则以当前时间点延长过期时间）</param>
+        /// <returns></returns>
+        public bool Set(string key, object value, TimeSpan expiresIn, bool isSliding = false)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+            if (value == null)
+                throw new ArgumentNullException(nameof(value));
+
+            Cache.Set(key, value,
+                isSliding
+                    ? new MemoryCacheEntryOptions().SetSlidingExpiration(expiresIn)
+                    : new MemoryCacheEntryOptions().SetAbsoluteExpiration(expiresIn));
+
+            return Exists(key);
+        }
+
+        /// <summary>
+        /// 添加缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <param name="value">缓存Value</param>
+        /// <returns></returns>
+        public void Set(string key, object value)
+        {
+            Set(key, value, TimeSpan.FromDays(1));
+        }
+
+        /// <summary>
+        /// 添加缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <param name="value">缓存Value</param>
+        /// <param name="ts"></param>
+        /// <returns></returns>
+        public void Set(string key, object value, TimeSpan ts)
+        {
+            Set(key, value, ts, false);
+        }
+
+        /// <summary>
+        /// 添加缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <param name="value">缓存Value</param>
+        /// <param name="ts"></param>
+        /// <returns></returns>
+        public void Set(string key, object value, int seconds)
+        {
+            var ts = TimeSpan.FromSeconds(seconds);
+            Set(key, value, ts, false);
+        }
+
+        /// <summary>
+        /// 删除缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <returns></returns>
+        public void Remove(string key)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+            Cache.Remove(key);
+        }
+
+        /// <summary>
+        /// 批量删除缓存
+        /// </summary>
+        /// <returns></returns>
+        public void RemoveAll(IEnumerable<string> keys)
+        {
+            if (keys == null)
+                throw new ArgumentNullException(nameof(keys));
+
+            keys.ToList().ForEach(item => Cache.Remove(item));
+        }
+
+
+        #region 获取缓存
+
+        /// <summary>
+        /// 获取缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <returns></returns>
+        public T Get<T>(string key)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+
+            return Cache.Get<T>(key);
+        }
+
+        /// <summary>
+        /// 获取缓存
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <returns></returns>
+        public object Get(string key)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+
+            return Cache.Get(key);
+        }
+
+        /// <summary>
+        /// 获取缓存集合
+        /// </summary>
+        /// <param name="keys">缓存Key集合</param>
+        /// <returns></returns>
+        public IDictionary<string, object> GetAll(IEnumerable<string> keys)
+        {
+            if (keys == null)
+                throw new ArgumentNullException(nameof(keys));
+
+            var dict = new Dictionary<string, object>();
+            keys.ToList().ForEach(item => dict.Add(item, Cache.Get(item)));
+            return dict;
+        }
+        #endregion
+
+        /// <summary>
+        /// 删除所有缓存
+        /// </summary>
+        public void RemoveCacheAll()
+        {
+            var l = GetCacheKeys();
+            foreach (var s in l)
+            {
+                Remove(s);
+            }
+        }
+
+        /// <summary>
+        /// 删除匹配到的缓存
+        /// </summary>
+        /// <param name="pattern"></param>
+        /// <returns></returns>
+        public void RemoveCacheRegex(string pattern)
+        {
+            IList<string> l = SearchCacheRegex(pattern);
+            foreach (var s in l)
+            {
+                Remove(s);
+            }
+        }
+
+        /// <summary>
+        /// 搜索 匹配到的缓存
+        /// </summary>
+        /// <param name="pattern"></param>
+        /// <returns></returns>
+        public IList<string> SearchCacheRegex(string pattern)
+        {
+            var cacheKeys = GetCacheKeys();
+            var l = cacheKeys.Where(k => Regex.IsMatch(k, pattern)).ToList();
+            return l.AsReadOnly();
+        }
+
+        /// <summary>
+        /// 获取所有缓存键
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetCacheKeys()
+        {
+            const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
+            var entries = Cache.GetType().GetField("_entries", flags).GetValue(Cache);
+            var cacheItems = entries as IDictionary;
+            var keys = new List<string>();
+            if (cacheItems == null) return keys;
+            foreach (DictionaryEntry cacheItem in cacheItems)
+            {
+                keys.Add(cacheItem.Key.ToString());
+            }
+            return keys;
+        }
+    }
+}

CoreCms.Net.Caching/SqlSugar/SqlSugarRedisCache.cs

@@ -0,0 +1,59 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+
+namespace CoreCms.Net.Caching.SqlSugar
+{
+    public class SqlSugarRedisCache : ICacheService
+    {
+
+        public SqlSugarRedisCache()
+        {
+        }
+
+        public void Add<TV>(string key, TV value)
+        {
+            RedisHelper.Set(key, value);
+        }
+
+        public void Add<TV>(string key, TV value, int cacheDurationInSeconds)
+        {
+            RedisHelper.Set(key, value, cacheDurationInSeconds);
+        }
+
+        public bool ContainsKey<TV>(string key)
+        {
+            return RedisHelper.Exists(key);
+        }
+
+        public TV Get<TV>(string key)
+        {
+            return RedisHelper.Get<TV>(key);
+        }
+
+        public IEnumerable<string> GetAllKey<TV>()
+        {
+            return RedisHelper.Keys("SqlSugarDataCache.*");
+        }
+
+        public TV GetOrCreate<TV>(string cacheKey, Func<TV> create, int cacheDurationInSeconds = int.MaxValue)
+        {
+            if (this.ContainsKey<TV>(cacheKey))
+            {
+                return this.Get<TV>(cacheKey);
+            }
+            else
+            {
+                var result = create();
+                this.Add(cacheKey, result, cacheDurationInSeconds);
+                return result;
+            }
+        }
+
+        public void Remove<TV>(string key)
+        {
+            RedisHelper.DelAsync(key);
+        }
+    }
+
+}