From bf296c88ea474220e491a4347ad18f9026ae9591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=A0=96=E5=AE=B6?= <61043157@qq.com>
Date: Wed, 15 Feb 2023 22:13:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?SqlSugar=E5=A2=9E=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Extensions/DbExtension.cs   | 14 ++++--
 ZR.Admin.WebApi/Extensions/SqlSugarCache.cs | 52 +++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 ZR.Admin.WebApi/Extensions/SqlSugarCache.cs

diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 2540410..4025055 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -43,14 +43,22 @@ namespace ZR.Admin.WebApi.Extensions
                    //...增加其他数据库
                 };
             SugarIocServices.AddSqlSugar(iocList);
+            ICacheService cache = new SqlSugarCache();
             SugarIocServices.ConfigurationSugar(db =>
             {
                 //db0数据过滤
                 FilterData(0);
-
+                db.CurrentConnectionConfig.MoreSettings = new ConnMoreSettings()
+                {
+                    IsAutoRemoveDataCache = true
+                };
+                db.CurrentConnectionConfig.ConfigureExternalServices = new ConfigureExternalServices()
+                {
+                    DataInfoCacheService = cache
+                };
                 iocList.ForEach(iocConfig =>
                 {
-                   SetSugarAop(db, iocConfig);
+                    SetSugarAop(db, iocConfig);
                 });
             });
         }
@@ -58,7 +66,7 @@ namespace ZR.Admin.WebApi.Extensions
         private static void SetSugarAop(SqlSugarClient db, IocConfig iocConfig)
         {
             var config = db.GetConnection(iocConfig.ConfigId).CurrentConnectionConfig;
-            
+
             string configId = config.ConfigId;
             db.GetConnectionScope(configId).Aop.OnLogExecuting = (sql, pars) =>
             {
diff --git a/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs b/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
new file mode 100644
index 0000000..8b9595b
--- /dev/null
+++ b/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
@@ -0,0 +1,52 @@
+using ZR.Common.Cache;
+
+namespace ZR.Admin.WebApi.Extensions
+{
+    public class SqlSugarCache : SqlSugar.ICacheService
+    {
+        public void Add<V>(string key, V value)
+        {
+            RedisServer.Cache.Set(key, value, 3600 + RedisHelper.RandomExpired(5, 30));
+        }
+
+        public void Add<V>(string key, V value, int cacheDurationInSeconds)
+        {
+            RedisServer.Cache.Set(key, value, cacheDurationInSeconds);
+        }
+
+        public bool ContainsKey<V>(string key)
+        {
+            return RedisServer.Cache.Exists(key);
+        }
+
+        public V Get<V>(string key)
+        {
+            return RedisServer.Cache.Get<V>(key);
+        }
+
+        public IEnumerable<string> GetAllKey<V>()
+        {
+            return RedisServer.Cache.Keys("*");
+        }
+
+        public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = int.MaxValue)
+        {
+            if (RedisServer.Cache.Exists(cacheKey))
+            {
+                return Get<V>(cacheKey);
+            }
+            else
+            {
+                var restul = create();
+
+                Add(cacheKey, restul);
+                return restul;
+            }
+        }
+
+        public void Remove<V>(string key)
+        {
+            RedisServer.Cache.Del(key);
+        }
+    }
+}
\ No newline at end of file

From 90ae95536fc51110717c13b435ed2da09f4392a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 3 Mar 2023 21:18:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=86db=E7=BC=93=E5=AD=98=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=B8=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Extensions/SqlSugarCache.cs | 15 ++++++++++-----
 ZR.Common/Cache/CacheHelper.cs              | 12 ++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs b/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
index 8b9595b..8354e63 100644
--- a/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
+++ b/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
@@ -1,4 +1,5 @@
-using ZR.Common.Cache;
+using ZR.Common;
+using ZR.Common.Cache;
 
 namespace ZR.Admin.WebApi.Extensions
 {
@@ -6,22 +7,26 @@ namespace ZR.Admin.WebApi.Extensions
     {
         public void Add<V>(string key, V value)
         {
-            RedisServer.Cache.Set(key, value, 3600 + RedisHelper.RandomExpired(5, 30));
+            //RedisServer.Cache.Set(key, value, 3600 + RedisHelper.RandomExpired(5, 30));
+            CacheHelper.SetCache(key, value);
         }
 
         public void Add<V>(string key, V value, int cacheDurationInSeconds)
         {
-            RedisServer.Cache.Set(key, value, cacheDurationInSeconds);
+            //RedisServer.Cache.Set(key, value, cacheDurationInSeconds);
+            CacheHelper.SetCaches(key, value, cacheDurationInSeconds);
         }
 
         public bool ContainsKey<V>(string key)
         {
-            return RedisServer.Cache.Exists(key);
+            //return RedisServer.Cache.Exists(key);
+            return CacheHelper.Exists(key);
         }
 
         public V Get<V>(string key)
         {
-            return RedisServer.Cache.Get<V>(key);
+            //return RedisServer.Cache.Get<V>(key);
+            return (V)CacheHelper.Get(key);
         }
 
         public IEnumerable<string> GetAllKey<V>()
diff --git a/ZR.Common/Cache/CacheHelper.cs b/ZR.Common/Cache/CacheHelper.cs
index 0fc6625..3d82255 100644
--- a/ZR.Common/Cache/CacheHelper.cs
+++ b/ZR.Common/Cache/CacheHelper.cs
@@ -106,6 +106,18 @@ namespace ZR.Common
         {
             Cache.Remove(key);
         }
+
+        /// <summary>
+        /// 验证缓存项是否存在
+        /// </summary>
+        /// <param name="key">缓存Key</param>
+        /// <returns></returns>
+        public static bool Exists(string key)
+        {
+            if (key == null)
+                throw new ArgumentNullException(nameof(key));
+            return Cache.TryGetValue(key, out _);
+        }
     }
 }