Selaa lähdekoodia

移除Redis库

懒得勤快 6 vuotta sitten
vanhempi
sitoutus
0dc7253133

+ 0 - 38
Masuit.Tools.Core/AspNetCore/ServiceCollectionExtensions.cs

@@ -1,9 +1,7 @@
 using Masuit.Tools.AspNetCore.ResumeFileResults.Executor;
 using Masuit.Tools.AspNetCore.ResumeFileResults.ResumeFileResult;
 using Masuit.Tools.Core.Net;
-using Masuit.Tools.Core.NoSQL;
 using Masuit.Tools.Files;
-using Masuit.Tools.NoSQL;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
@@ -43,42 +41,6 @@ namespace Masuit.Tools.Core.AspNetCore
             return services;
         }
 
-        /// <summary>
-        /// 注入一个本地化的RedisHelper
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddLocalRedisHelper(this IServiceCollection services)
-        {
-            return AddRedisHelper(services, "local");
-        }
-
-        /// <summary>
-        /// 注入一个默认的RedisHelper实例
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="redisHost"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddDefaultRedisHelper(this IServiceCollection services, string redisHost)
-        {
-            return AddRedisHelper(services, "default", redisHost);
-        }
-
-        /// <summary>
-        /// 注入RedisHelper
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="name"></param>
-        /// <param name="redisHost"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddRedisHelper(this IServiceCollection services, string name, string redisHost = null)
-        {
-            RedisHelperFactory.ConnectionCache[name] = redisHost;
-            services.TryAddTransient<RedisHelperFactory>();
-            services.TryAddTransient(s => RedisHelper.GetInstance(redisHost));
-            return services;
-        }
-
         /// <summary>
         /// 注入HttpContext静态对象,方便在任意地方获取HttpContext,services.AddHttpContextAccessor();
         /// </summary>

+ 1 - 5
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -27,14 +27,10 @@ github:https://github.com/ldqk/Masuit.Tools</Description>
     <CodeAnalysisRuleSet />
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="NoSQL\RedisConnectionManager.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="4.0.207" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
-    <PackageReference Include="SharpCompress" Version="0.22.0" />
+    <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.5.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
     <PackageReference Include="System.Management" Version="4.5.0" />

+ 0 - 196
Masuit.Tools.Core/Net/WebExtension.cs

@@ -1,17 +1,11 @@
 using Masuit.Tools.Core.Config;
-using Masuit.Tools.Core.NoSQL;
-using Masuit.Tools.Logging;
 using Masuit.Tools.Models;
-using Masuit.Tools.NoSQL;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading.Tasks;
 
 namespace Masuit.Tools.Core.Net
@@ -218,58 +212,6 @@ namespace Masuit.Tools.Core.Net
 
         #endregion
 
-        /// <summary>
-        /// 上传图片到百度图床
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        public static async Task<string> UploadImageAsync(Stream stream)
-        {
-            using (HttpClient httpClient = new HttpClient()
-            {
-                BaseAddress = new Uri("https://sp1.baidu.com"),
-            })
-            {
-                httpClient.DefaultRequestHeaders.UserAgent.Add(ProductInfoHeaderValue.Parse("Mozilla/5.0"));
-                using (var bc = new StreamContent(stream))
-                {
-                    bc.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
-                    {
-                        FileName = "1.jpg",
-                        Name = "image"
-                    };
-                    bc.Headers.ContentType = MediaTypeHeaderValue.Parse("image/jpeg");
-                    using (var content = new MultipartFormDataContent { bc })
-                    {
-                        return await await httpClient.PostAsync("/70cHazva2gU2pMbgoY3K/n/image?needJson=true", content).ContinueWith(async t =>
-                        {
-                            if (t.IsCanceled || t.IsFaulted)
-                            {
-                                Console.WriteLine("发送请求出错了" + t.Exception);
-                                return string.Empty;
-                            }
-                            var res = await t;
-                            if (res.IsSuccessStatusCode)
-                            {
-                                string s = await res.Content.ReadAsStringAsync();
-                                var token = JObject.Parse(s);
-                                if ((int)token["errno"] == 0)
-                                {
-                                    s = (string)token["data"]["imageUrl"];
-                                    return s;
-                                }
-                                s = (string)token["errmsg"];
-                                return s;
-                            }
-                            return string.Empty;
-                        });
-                    }
-                }
-            }
-        }
-
-        #region 写Session
-
         /// <summary>
         /// 写Session
         /// </summary>
@@ -281,43 +223,6 @@ namespace Masuit.Tools.Core.Net
             session.SetString(key, value.ToJsonString());
         }
 
-        /// <summary>
-        /// 将Session存到Redis,需要先在config中配置链接字符串,连接字符串在config配置文件中的ConnectionStrings节下配置,name固定为RedisHosts,值的格式:127.0.0.1:6379,allowadmin=true,若未正确配置,将按默认值“127.0.0.1:6379,allowadmin=true”进行操作,如:<br/>
-        /// &lt;connectionStrings&gt;<br/>
-        ///      &lt;add name = "RedisHosts" connectionString="127.0.0.1:6379,allowadmin=true"/&gt;<br/>
-        /// &lt;/connectionStrings&gt;
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="session"></param>
-        /// <param name="key">键</param>
-        /// <param name="obj">需要存的对象</param>
-        /// <param name="expire">过期时间,默认20分钟</param>
-        /// <returns></returns>
-        public static void SetByRedis<T>(this ISession session, string key, T obj, int expire = 20)
-        {
-            if (HttpContext2.Current is null)
-            {
-                throw new Exception("请确保此方法调用是在同步线程中执行!");
-            }
-            session?.SetString(key, obj.ToJsonString());
-
-            try
-            {
-                using (RedisHelper redisHelper = RedisHelper.GetInstance(RedisHelperFactory.ConnectionCache.Values.FirstOrDefault() ?? throw new ArgumentException("在使用该方法之前,请先在Startup.cs中配置services.AddxxxRedisHelper"), 1))
-                {
-                    redisHelper.SetHash("Session:" + HttpContext2.Current.Connection.Id, key, obj, TimeSpan.FromMinutes(expire)); //存储数据到缓存服务器,这里将字符串"my value"缓存,key 是"test"
-                }
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        #endregion
-
-        #region 获取Session
-
         /// <summary>
         /// 获取Session
         /// </summary>
@@ -334,106 +239,5 @@ namespace Masuit.Tools.Core.Net
             }
             return JsonConvert.DeserializeObject<T>(value);
         }
-
-        /// <summary>
-        /// 从Redis取Session
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="_"></param>
-        /// <param name="key">键</param>
-        /// <param name="expire">过期时间,默认20分钟</param>
-        /// <returns></returns> 
-        public static T GetByRedis<T>(this ISession _, string key, int expire = 20) where T : class
-        {
-            if (HttpContext2.Current is null)
-            {
-                throw new Exception("请确保此方法调用是在同步线程中执行!");
-            }
-            T obj = default(T);
-            if (_ != null)
-            {
-                obj = _.Get<T>(key);
-            }
-
-            if (obj == default(T))
-            {
-                try
-                {
-                    var sessionKey = "Session:" + HttpContext2.Current.Connection.Id;
-                    using (RedisHelper redisHelper = RedisHelper.GetInstance(RedisHelperFactory.ConnectionCache.Values.FirstOrDefault() ?? throw new ArgumentException("在使用该方法之前,请先在Startup.cs中配置services.AddxxxRedisHelper"), 1))
-                    {
-                        if (redisHelper.KeyExists(sessionKey) && redisHelper.HashExists(sessionKey, key))
-                        {
-                            redisHelper.Expire(sessionKey, TimeSpan.FromMinutes(expire));
-                            return redisHelper.GetHash<T>(sessionKey, key);
-                        }
-
-                        return default(T);
-                    }
-                }
-                catch
-                {
-                    return default(T);
-                }
-            }
-
-            return obj;
-        }
-
-        /// <summary>
-        /// 从Redis移除对应键的Session
-        /// </summary>
-        /// <param name="session"></param>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public static void RemoveByRedis(this ISession session, string key)
-        {
-            if (HttpContext2.Current is null)
-            {
-                throw new Exception("请确保此方法调用是在同步线程中执行!");
-            }
-
-            session?.Remove(key);
-
-            try
-            {
-                var sessionKey = "Session:" + HttpContext2.Current.Connection.Id;
-                using (RedisHelper redisHelper = RedisHelper.GetInstance(RedisHelperFactory.ConnectionCache.Values.FirstOrDefault() ?? throw new ArgumentException("在使用该方法之前,请先在Startup.cs中配置services.AddxxxRedisHelper"), 1))
-                {
-                    if (redisHelper.KeyExists(sessionKey) && redisHelper.HashExists(sessionKey, key))
-                    {
-                        redisHelper.DeleteHash(sessionKey, key);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                LogManager.Error(e);
-            }
-        }
-
-        /// <summary>
-        /// Session个数
-        /// </summary>
-        /// <param name="session"></param>
-        /// <returns></returns>
-        public static int SessionCount(this ISession session)
-        {
-            try
-            {
-                using (RedisHelper redisHelper = RedisHelper.GetInstance(RedisHelperFactory.ConnectionCache.Values.FirstOrDefault() ?? throw new ArgumentException("在使用该方法之前,请先在Startup.cs中配置services.AddxxxRedisHelper"), 1))
-                {
-                    return redisHelper.GetServer().Keys(1, "Session:*").Count();
-                }
-            }
-            catch (Exception e)
-            {
-                LogManager.Error(e);
-                return 0;
-            }
-        }
-
-        #endregion
-
     }
 }

+ 0 - 124
Masuit.Tools.Core/NoSQL/RedisConnectionManager.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using StackExchange.Redis;
-
-namespace Masuit.Tools.Core.NoSQL
-{
-    /// <summary>
-    /// ConnectionMultiplexer对象管理帮助类
-    /// </summary>
-    public static class RedisConnectionManager
-    {
-        /// <summary>
-        /// Redis服务器连接字符串,默认为:127.0.0.1:6379,allowadmin=true<br/>
-        /// </summary>
-        public static string RedisConnectionString
-        {
-            get => "127.0.0.1:6379,allowadmin=true";
-            set { }
-        }
-        private static readonly ConcurrentDictionary<string, ConnectionMultiplexer> ConnectionCache = new ConcurrentDictionary<string, ConnectionMultiplexer>();
-
-        /// <summary>
-        /// 对象池获取线程内唯一对象
-        /// </summary>
-        public static ConnectionMultiplexer Instance
-        {
-            get
-            {
-                var multiplexer = ConnectionCache.GetOrAdd(RedisConnectionString, GetManager(RedisConnectionString));
-                return multiplexer;
-            }
-        }
-
-        /// <summary>
-        /// 缓存获取
-        /// </summary>
-        /// <param name="connectionString">连接字符串</param>
-        /// <returns>连接对象</returns>
-        public static ConnectionMultiplexer GetConnectionMultiplexer(string connectionString)
-        {
-            var multiplexer = ConnectionCache.GetOrAdd(connectionString, GetManager(RedisConnectionString));
-            return multiplexer;
-        }
-
-        private static ConnectionMultiplexer GetManager(string connectionString = null)
-        {
-            connectionString = connectionString ?? RedisConnectionString;
-            var connect = ConnectionMultiplexer.Connect(ConfigurationOptions.Parse(connectionString, true));
-            //注册如下事件
-            connect.ConnectionFailed += MuxerConnectionFailed;
-            connect.ConnectionRestored += MuxerConnectionRestored;
-            connect.ErrorMessage += MuxerErrorMessage;
-            connect.ConfigurationChanged += MuxerConfigurationChanged;
-            connect.HashSlotMoved += MuxerHashSlotMoved;
-            connect.InternalError += MuxerInternalError;
-
-            return connect;
-        }
-
-        #region 事件
-
-        /// <summary>
-        /// 配置更改时
-        /// </summary>
-        /// <param name="sender">触发者</param>
-        /// <param name="e">事件参数</param>
-        private static void MuxerConfigurationChanged(object sender, EndPointEventArgs e)
-        {
-            Console.WriteLine("Configuration changed: " + e.EndPoint);
-        }
-
-        /// <summary>
-        /// 发生错误时
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MuxerErrorMessage(object sender, RedisErrorEventArgs e)
-        {
-            Console.WriteLine("ErrorMessage: " + e.Message);
-        }
-
-        /// <summary>
-        /// 重新建立连接之前的错误
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MuxerConnectionRestored(object sender, ConnectionFailedEventArgs e)
-        {
-            Console.WriteLine("ConnectionRestored: " + e.EndPoint);
-        }
-
-        /// <summary>
-        /// 连接失败 , 如果重新连接成功你将不会收到这个通知
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MuxerConnectionFailed(object sender, ConnectionFailedEventArgs e)
-        {
-            Console.WriteLine("重新连接:Endpoint failed: " + e.EndPoint + ", " + e.FailureType + (e.Exception == null ? "" : (", " + e.Exception.Message)));
-        }
-
-        /// <summary>
-        /// 更改集群
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MuxerHashSlotMoved(object sender, HashSlotMovedEventArgs e)
-        {
-            Console.WriteLine("HashSlotMoved:NewEndPoint" + e.NewEndPoint + ", OldEndPoint" + e.OldEndPoint);
-        }
-
-        /// <summary>
-        /// redis类库错误
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void MuxerInternalError(object sender, InternalErrorEventArgs e)
-        {
-            Console.WriteLine("InternalError:Message" + e.Exception.Message);
-        }
-
-        #endregion 事件
-    }
-}

+ 0 - 1269
Masuit.Tools.Core/NoSQL/RedisHelper.cs

@@ -1,1269 +0,0 @@
-using Masuit.Tools.Core.Config;
-using Newtonsoft.Json;
-using StackExchange.Redis;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Masuit.Tools.NoSQL
-{
-    /// <summary>
-    /// Redis操作
-    /// </summary>
-    public class RedisHelper : IDisposable
-    {
-        private int DbNum { get; }
-        private readonly ConnectionMultiplexer _conn;
-
-        /// <summary>
-        /// Redis服务器默认连接字符串,默认为:127.0.0.1:6379,allowadmin=true<br/>
-        /// </summary>
-        internal static string RedisConnectionString { get; set; } = CoreConfig.Configuration["Redis"] ?? "127.0.0.1:6379,allowadmin=true,connectTimeout=20000,connectRetry=1,responseTimeout=20000,syncTimeout=10000";
-
-        /// <summary>
-        /// 自定义键
-        /// </summary>
-        public string CustomKey;
-
-        /// <summary>
-        /// 连接失败 , 如果重新连接成功你将不会收到这个通知
-        /// </summary>
-        public event EventHandler<ConnectionFailedEventArgs> ConnectionFailed;
-
-        /// <summary>
-        /// 重新建立连接之前的错误
-        /// </summary>
-        public event EventHandler<ConnectionFailedEventArgs> ConnectionRestored;
-
-        /// <summary>
-        /// 发生错误时
-        /// </summary>
-        public event EventHandler<RedisErrorEventArgs> ErrorMessage;
-
-        /// <summary>
-        /// 配置更改时
-        /// </summary>
-        public event EventHandler<EndPointEventArgs> ConfigurationChanged;
-
-        /// <summary>
-        /// 更改集群时
-        /// </summary>
-        public event EventHandler<HashSlotMovedEventArgs> HashSlotMoved;
-
-        /// <summary>
-        /// redis类库错误时
-        /// </summary>
-        public event EventHandler<InternalErrorEventArgs> InternalError;
-
-        /// <summary>
-        /// 静态连接池
-        /// </summary>
-        private static ConcurrentDictionary<string, ConnectionMultiplexer> ConnectionCache { get; set; } = new ConcurrentDictionary<string, ConnectionMultiplexer>();
-
-        #region 构造函数
-
-        /// <summary>
-        /// 构造函数,使用该构造函数需要先在config中配置链接字符串,连接字符串在config配置文件中的ConnectionStrings节下配置,name固定为RedisHosts,值的格式:127.0.0.1:6379,allowadmin=true,若未正确配置,将按默认值“127.0.0.1:6379,allowadmin=true,abortConnect=false”进行操作,如:<br/>
-        /// &lt;connectionStrings&gt;<br/>
-        ///      &lt;add name = "RedisHosts" connectionString="127.0.0.1:6379,allowadmin=true,abortConnect=false"/&gt;<br/>
-        /// &lt;/connectionStrings&gt;
-        /// </summary>
-        /// <param name="dbNum">数据库编号</param>
-        public RedisHelper(int dbNum = 0) : this(null, dbNum)
-        {
-        }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="readWriteHosts">Redis服务器连接字符串,格式:127.0.0.1:6379,allowadmin=true,abortConnect=false</param>
-        /// <param name="dbNum">数据库的编号</param>
-        public RedisHelper(string readWriteHosts, int dbNum = 0)
-        {
-            DbNum = dbNum;
-            _conn = string.IsNullOrWhiteSpace(readWriteHosts) ? ConnectionMultiplexer.Connect(ConfigurationOptions.Parse(RedisConnectionString)) : ConnectionMultiplexer.Connect(ConfigurationOptions.Parse(readWriteHosts));
-            //_conn.ConfigurationChanged += MuxerConfigurationChanged;
-            _conn.ConfigurationChanged += ConfigurationChanged;
-            //_conn.ConnectionFailed += MuxerConnectionFailed;
-            _conn.ConnectionFailed += ConnectionFailed;
-            //_conn.ConnectionRestored += MuxerConnectionRestored;
-            _conn.ConnectionRestored += ConnectionRestored;
-            //_conn.ErrorMessage += MuxerErrorMessage;
-            _conn.ErrorMessage += ErrorMessage;
-            //_conn.HashSlotMoved += MuxerHashSlotMoved;
-            _conn.HashSlotMoved += HashSlotMoved;
-            //_conn.InternalError += MuxerInternalError;
-            _conn.InternalError += InternalError;
-        }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="readWriteHosts">Redis服务器连接字符串,格式:127.0.0.1:6379,allowadmin=true,abortConnect=false</param>
-        /// <param name="dbNum">数据库的编号</param>
-        /// <param name="_"></param>
-        private RedisHelper(string readWriteHosts, int dbNum, int _)
-        {
-            DbNum = dbNum;
-            readWriteHosts = string.IsNullOrWhiteSpace(readWriteHosts) ? RedisConnectionString : readWriteHosts;
-            _conn = ConnectionCache.GetOrAdd(readWriteHosts, ConnectionMultiplexer.Connect(ConfigurationOptions.Parse(readWriteHosts)));
-            //_conn.ConfigurationChanged += MuxerConfigurationChanged;
-            _conn.ConfigurationChanged += ConfigurationChanged;
-            //_conn.ConnectionFailed += MuxerConnectionFailed;
-            _conn.ConnectionFailed += ConnectionFailed;
-            //_conn.ConnectionRestored += MuxerConnectionRestored;
-            _conn.ConnectionRestored += ConnectionRestored;
-            //_conn.ErrorMessage += MuxerErrorMessage;
-            _conn.ErrorMessage += ErrorMessage;
-            //_conn.HashSlotMoved += MuxerHashSlotMoved;
-            _conn.HashSlotMoved += HashSlotMoved;
-            //_conn.InternalError += MuxerInternalError;
-            _conn.InternalError += InternalError;
-        }
-
-        /// <summary>
-        /// 获取新实例
-        /// </summary>
-        /// <param name="db">数据库的编号</param>
-        /// <returns></returns>
-        public static RedisHelper GetInstance(int db = 0)
-        {
-            return new RedisHelper(db);
-        }
-
-        /// <summary>
-        /// 获取单例
-        /// </summary>
-        /// <param name="db">数据库的编号</param>
-        /// <returns></returns>
-        public static RedisHelper GetSingleInstance(int db = 0)
-        {
-            return new RedisHelper(null, db, 0);
-        }
-
-        /// <summary>
-        /// 从对象池获取默认实例
-        /// </summary>
-        /// <param name="conn">Redis服务器连接字符串,格式:127.0.0.1:6379,allowadmin=true,abortConnect=false</param>
-        /// <param name="db">数据库的编号</param>
-        /// <returns></returns>
-        public static RedisHelper GetInstance(string conn, int db = 0)
-        {
-            return new RedisHelper(conn, db);
-        }
-
-        /// <summary>
-        /// 获取单例
-        /// </summary>
-        /// <param name="conn">Redis服务器连接字符串,格式:127.0.0.1:6379,allowadmin=true,abortConnect=false</param>
-        /// <param name="db">数据库的编号</param>
-        /// <returns></returns>
-        public static RedisHelper GetSingleInstance(string conn, int db = 0)
-        {
-            return new RedisHelper(conn, db, 0);
-        }
-
-        #endregion 构造函数
-
-        #region String
-
-        #region 同步方法
-
-        /// <summary>
-        /// 保存单个key value
-        /// </summary>
-        /// <param name="key">Redis Key</param>
-        /// <param name="value">保存的值</param>
-        /// <param name="expiry">过期时间</param>
-        /// <returns>是否保存成功</returns>
-        public bool SetString(string key, string value, TimeSpan? expiry = default(TimeSpan?))
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.StringSet(key, value, expiry));
-        }
-
-        /// <summary>
-        /// 保存多个key value
-        /// </summary>
-        /// <param name="keyValues">键值对</param>
-        /// <returns>是否保存成功</returns>
-        public bool SetString(List<KeyValuePair<RedisKey, RedisValue>> keyValues)
-        {
-            List<KeyValuePair<RedisKey, RedisValue>> newkeyValues = keyValues.Select(p => new KeyValuePair<RedisKey, RedisValue>(AddSysCustomKey(p.Key), p.Value)).ToList();
-            return Do(db => db.StringSet(newkeyValues.ToArray()));
-        }
-
-        /// <summary>
-        /// 保存一个对象
-        /// </summary>
-        /// <typeparam name="T">对象类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="obj">值</param>
-        /// <param name="expiry">过期时间</param>
-        /// <returns>是否保存成功</returns>
-        public bool SetString<T>(string key, T obj, TimeSpan? expiry = default(TimeSpan?))
-        {
-            key = AddSysCustomKey(key);
-            string json = ConvertJson(obj);
-            return Do(db => db.StringSet(key, json, expiry));
-        }
-
-        /// <summary>
-        /// 获取单个key的值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>值</returns>
-        public string GetString(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(db => db.StringGet(key));
-            }
-            return string.Empty;
-        }
-
-        /// <summary>
-        /// 获取多个Key
-        /// </summary>
-        /// <param name="listKey">键集合</param>
-        /// <returns>值集合</returns>
-        public RedisValue[] GetString(List<string> listKey)
-        {
-            List<string> newKeys = listKey.Select(AddSysCustomKey).ToList();
-            return Do(db => db.StringGet(ConvertRedisKeys(newKeys)));
-        }
-
-        /// <summary>
-        /// 获取一个key的对象
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>实例对象</returns>
-        public T GetString<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(db => ConvertObj<T>(db.StringGet(key)));
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 为数字增长val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>增长后的值</returns>
-        public double StringIncrement(string key, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.StringIncrement(key, val));
-        }
-
-        /// <summary>
-        /// 为数字减少val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>减少后的值</returns>
-        public double StringDecrement(string key, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.StringDecrement(key, val));
-        }
-
-        #endregion 同步方法
-
-        #region 异步方法
-
-        /// <summary>
-        /// 保存单个key value
-        /// </summary>
-        /// <param name="key">Redis Key</param>
-        /// <param name="value">保存的值</param>
-        /// <param name="expiry">过期时间</param>
-        /// <returns>是否保存成功</returns>
-        public async Task<bool> SetStringAsync(string key, string value, TimeSpan? expiry = default(TimeSpan?))
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.StringSetAsync(key, value, expiry));
-        }
-
-        /// <summary>
-        /// 保存多个key value
-        /// </summary>
-        /// <param name="keyValues">键值对</param>
-        /// <returns>是否保存成功</returns>
-        public async Task<bool> SetStringAsync(List<KeyValuePair<RedisKey, RedisValue>> keyValues)
-        {
-            List<KeyValuePair<RedisKey, RedisValue>> newkeyValues = keyValues.Select(p => new KeyValuePair<RedisKey, RedisValue>(AddSysCustomKey(p.Key), p.Value)).ToList();
-            return await Do(async db => await db.StringSetAsync(newkeyValues.ToArray()));
-        }
-
-        /// <summary>
-        /// 保存一个对象
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="obj">需要被缓存的对象</param>
-        /// <param name="expiry">过期时间</param>
-        /// <returns>是否保存成功</returns>
-        public async Task<bool> SetStringAsync<T>(string key, T obj, TimeSpan? expiry = default(TimeSpan?))
-        {
-            key = AddSysCustomKey(key);
-            string json = ConvertJson(obj);
-            return await Do(async db => await db.StringSetAsync(key, json, expiry));
-        }
-
-        /// <summary>
-        /// 获取单个key的值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>值</returns>
-        public async Task<string> GetStringAsync(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return await Do(async db => await db.StringGetAsync(key));
-            }
-            return string.Empty;
-        }
-
-        /// <summary>
-        /// 获取多个Key
-        /// </summary>
-        /// <param name="listKey">键集合</param>
-        /// <returns>值集合</returns>
-        public async Task<RedisValue[]> GetStringAsync(List<string> listKey)
-        {
-            List<string> newKeys = listKey.Select(AddSysCustomKey).ToList();
-            return await Do(async db => await db.StringGetAsync(ConvertRedisKeys(newKeys)));
-        }
-
-        /// <summary>
-        /// 获取一个key的对象
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>实例对象</returns>
-        public async Task<T> GetStringAsync<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                string result = await Do(async db => await db.StringGetAsync(key));
-                return ConvertObj<T>(result);
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 为数字增长val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>增长后的值</returns>
-        public async Task<double> IncrementStringAsync(string key, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.StringIncrementAsync(key, val));
-        }
-
-        /// <summary>
-        /// 为数字减少val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>减少后的值</returns>
-        public async Task<double> DecrementStringAsync(string key, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.StringDecrementAsync(key, val));
-        }
-
-        #endregion 异步方法
-
-        #endregion String
-
-        #region Hash
-
-        #region 同步方法
-
-        /// <summary>
-        /// 判断某个数据是否已经被缓存
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>是否缓存成功</returns>
-        public bool HashExists(string key, string dataKey)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.HashExists(key, dataKey));
-        }
-
-        /// <summary>
-        /// 存储数据到hash表
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="t">对象实例</param>
-        /// <returns>是否存储成功</returns>
-        public bool SetHash<T>(string key, string dataKey, T t)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db =>
-            {
-                string json = ConvertJson(t);
-                return db.HashSet(key, dataKey, json);
-            });
-        }
-
-        /// <summary>
-        /// 存储数据到hash表
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="t">对象实例</param>
-        /// <param name="expire">过期时间</param>
-        /// <returns>是否存储成功</returns>
-        public bool SetHash<T>(string key, string dataKey, T t, TimeSpan expire)
-        {
-            bool b = SetHash(key, dataKey, t);
-            Expire(key, expire);
-            return b;
-        }
-
-        /// <summary>
-        /// 移除hash中的某值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>是否移除成功</returns>
-        public bool DeleteHash(string key, string dataKey)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.HashDelete(key, dataKey));
-        }
-
-        /// <summary>
-        /// 移除hash中的多个值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKeys">对象的字段集合</param>
-        /// <returns>数量</returns>
-        public long DeleteHash(string key, List<RedisValue> dataKeys)
-        {
-            key = AddSysCustomKey(key);
-            //List<RedisValue> dataKeys1 = new List<RedisValue>() {"1","2"};
-            return Do(db => db.HashDelete(key, dataKeys.ToArray()));
-        }
-
-        /// <summary>
-        /// 从hash表获取数据
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>对象实例</returns>
-        public T GetHash<T>(string key, string dataKey)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(db =>
-                {
-                    string value = db.HashGet(key, dataKey);
-                    return ConvertObj<T>(value);
-                });
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 为数字增长val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>增长后的值</returns>
-        public double IncrementHash(string key, string dataKey, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.HashIncrement(key, dataKey, val));
-        }
-
-        /// <summary>
-        /// 为数字减少val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>减少后的值</returns>
-        public double DecrementHash(string key, string dataKey, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.HashDecrement(key, dataKey, val));
-        }
-
-        /// <summary>
-        /// 获取hashkey所有Redis key
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>数据集合</returns>
-        public List<T> HashKeys<T>(string key)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db =>
-            {
-                RedisValue[] values = db.HashKeys(key);
-                return ConvetList<T>(values);
-            });
-        }
-
-        #endregion 同步方法
-
-        #region 异步方法
-
-        /// <summary>
-        /// 判断某个数据是否已经被缓存
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>是否缓存成功</returns>
-        public async Task<bool> ExistsHashAsync(string key, string dataKey)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.HashExistsAsync(key, dataKey));
-        }
-
-        /// <summary>
-        /// 存储数据到hash表
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="t">对象实例</param>
-        /// <returns>是否存储成功</returns>
-        public async Task<bool> SetHashAsync<T>(string key, string dataKey, T t)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db =>
-            {
-                string json = ConvertJson(t);
-                return await db.HashSetAsync(key, dataKey, json);
-            });
-        }
-
-        /// <summary>
-        /// 存储数据到hash表
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="t">对象实例</param>
-        /// <param name="expire">过期时间</param>
-        /// <returns>是否存储成功</returns>
-        public async Task<bool> SetHashAsync<T>(string key, string dataKey, T t, TimeSpan expire)
-        {
-            var b = await SetHashAsync(key, dataKey, t);
-            Expire(key, expire);
-            return b;
-        }
-
-        /// <summary>
-        /// 移除hash中的某值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>是否移除成功</returns>
-        public async Task<bool> DeleteHashAsync(string key, string dataKey)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.HashDeleteAsync(key, dataKey));
-        }
-
-        /// <summary>
-        /// 移除hash中的多个值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKeys">对象的字段集合</param>
-        /// <returns>数量</returns>
-        public async Task<long> DeleteHashAsync(string key, List<RedisValue> dataKeys)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.HashDeleteAsync(key, dataKeys.ToArray()));
-        }
-
-        /// <summary>
-        /// 从hash表获取数据
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <returns>对象实例</returns>
-        public async Task<T> GetHashAsync<T>(string key, string dataKey)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                string value = await Do(async db => await db.HashGetAsync(key, dataKey));
-                return ConvertObj<T>(value);
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 为数字增长val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>增长后的值</returns>
-        public async Task<double> IncrementHashAsync(string key, string dataKey, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.HashIncrementAsync(key, dataKey, val));
-        }
-
-        /// <summary>
-        /// 为数字减少val
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="dataKey">对象的字段</param>
-        /// <param name="val">可以为负</param>
-        /// <returns>减少后的值</returns>
-        public async Task<double> DecrementHashAsync(string key, string dataKey, double val = 1)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.HashDecrementAsync(key, dataKey, val));
-        }
-
-        /// <summary>
-        /// 获取hashkey所有Redis key
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>数据集合</returns>
-        public async Task<List<T>> HashKeysAsync<T>(string key)
-        {
-            key = AddSysCustomKey(key);
-            RedisValue[] values = await Do(async db => await db.HashKeysAsync(key));
-            return ConvetList<T>(values);
-        }
-
-        #endregion 异步方法
-
-        #endregion Hash
-
-        #region List
-
-        #region 同步方法
-
-        /// <summary>
-        /// 移除指定ListId的内部List的值
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public void RemoveList<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            Do(db => db.ListRemove(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 获取指定key的List
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>数据集</returns>
-        public List<T> ListRange<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(redis =>
-                {
-                    var values = redis.ListRange(key);
-                    return ConvetList<T>(values);
-                });
-            }
-            return new List<T>();
-        }
-
-        /// <summary>
-        /// 入队
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public void ListRightPush<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            Do(db => db.ListRightPush(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 出队
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>值</returns>
-        public T ListRightPop<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(db =>
-                {
-                    var value = db.ListRightPop(key);
-                    return ConvertObj<T>(value);
-                });
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 入栈
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public void ListLeftPush<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            Do(db => db.ListLeftPush(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 出栈
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>对象实例</returns>
-        public T ListLeftPop<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(db =>
-                {
-                    var value = db.ListLeftPop(key);
-                    return ConvertObj<T>(value);
-                });
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 获取集合中的数量
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数量</returns>
-        public long ListLength(string key)
-        {
-            key = AddSysCustomKey(key);
-            return Do(redis => redis.ListLength(key));
-        }
-
-        #endregion 同步方法
-
-        #region 异步方法
-
-        /// <summary>
-        /// 移除指定ListId的内部List的值
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public async Task<long> RemoveListAsync<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.ListRemoveAsync(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 获取指定key的List
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>数据集合</returns>
-        public async Task<List<T>> ListRangeAsync<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                var values = await Do(async redis => await redis.ListRangeAsync(key));
-                return ConvetList<T>(values);
-            }
-            return new List<T>();
-        }
-
-        /// <summary>
-        /// 入队
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public async Task<long> ListRightPushAsync<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.ListRightPushAsync(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 出队
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>对象实例</returns>
-        public async Task<T> ListRightPopAsync<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                var value = await Do(async db => await db.ListRightPopAsync(key));
-                return ConvertObj<T>(value);
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 入栈
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public async Task<long> ListLeftPushAsync<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async db => await db.ListLeftPushAsync(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 出栈
-        /// </summary>
-        /// <typeparam name="T">数据类型</typeparam>
-        /// <param name="key">键</param>
-        /// <returns>实例对象</returns>
-        public async Task<T> ListLeftPopAsync<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                var value = await Do(async db => await db.ListLeftPopAsync(key));
-                return ConvertObj<T>(value);
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// 获取集合中的数量
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数量</returns>
-        public async Task<long> ListLengthAsync(string key)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async redis => await redis.ListLengthAsync(key));
-        }
-
-        #endregion 异步方法
-
-        #endregion List
-
-        #region SortedSet 有序集合
-
-        #region 同步方法
-
-        /// <summary>
-        /// 添加
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        /// <param name="score">排序号</param>
-        public bool AddSortedSet<T>(string key, T value, double score)
-        {
-            key = AddSysCustomKey(key);
-            return Do(redis => redis.SortedSetAdd(key, ConvertJson<T>(value), score));
-        }
-
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public bool RemoveSortedSet<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            return Do(redis => redis.SortedSetRemove(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 获取全部
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数据集合</returns>
-        public List<T> SetRangeSortedByRank<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                return Do(redis =>
-                {
-                    var values = redis.SortedSetRangeByRank(key);
-                    return ConvetList<T>(values);
-                });
-            }
-            return new List<T>();
-        }
-
-        /// <summary>
-        /// 获取集合中的数量
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数量</returns>
-        public long SetSortedLength(string key)
-        {
-            key = AddSysCustomKey(key);
-            return Do(redis => redis.SortedSetLength(key));
-        }
-
-        #endregion 同步方法
-
-        #region 异步方法
-
-        /// <summary>
-        /// 添加
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        /// <param name="score">排序号</param>
-        public async Task<bool> SortedSetAddAsync<T>(string key, T value, double score)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async redis => await redis.SortedSetAddAsync(key, ConvertJson<T>(value), score));
-        }
-
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="value">值</param>
-        public async Task<bool> SortedSetRemoveAsync<T>(string key, T value)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async redis => await redis.SortedSetRemoveAsync(key, ConvertJson(value)));
-        }
-
-        /// <summary>
-        /// 获取全部
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数据集合</returns>
-        public async Task<List<T>> SortedSetRangeByRankAsync<T>(string key)
-        {
-            if (KeyExists(key))
-            {
-                key = AddSysCustomKey(key);
-                var values = await Do(async redis => await redis.SortedSetRangeByRankAsync(key));
-                return ConvetList<T>(values);
-            }
-            return new List<T>();
-        }
-
-        /// <summary>
-        /// 获取集合中的数量
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>数量</returns>
-        public async Task<long> SortedSetLengthAsync(string key)
-        {
-            key = AddSysCustomKey(key);
-            return await Do(async redis => await redis.SortedSetLengthAsync(key));
-        }
-
-        #endregion 异步方法
-
-        #endregion SortedSet 有序集合
-
-        #region key
-
-        /// <summary>
-        /// 删除单个key
-        /// </summary>
-        /// <param name="key">redis key</param>
-        /// <returns>是否删除成功</returns>
-        public bool DeleteKey(string key)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.KeyDelete(key));
-        }
-
-        /// <summary>
-        /// 删除多个key
-        /// </summary>
-        /// <param name="keys">rediskey</param>
-        /// <returns>成功删除的个数</returns>
-        public long DeleteKey(List<string> keys)
-        {
-            List<string> newKeys = keys.Select(AddSysCustomKey).ToList();
-            return Do(db => db.KeyDelete(ConvertRedisKeys(newKeys)));
-        }
-
-        /// <summary>
-        /// 判断key是否存储
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <returns>是否存储成功</returns>
-        public bool KeyExists(string key)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.KeyExists(key));
-        }
-
-        /// <summary>
-        /// 重新命名key
-        /// </summary>
-        /// <param name="key">旧的键</param>
-        /// <param name="newKey">新的键</param>
-        /// <returns>处理结果</returns>
-        public bool RenameKey(string key, string newKey)
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.KeyRename(key, newKey));
-        }
-
-        /// <summary>
-        /// 设置Key的过期时间
-        /// </summary>
-        /// <param name="key">键</param>
-        /// <param name="expiry">过期时间</param>
-        /// <returns>处理结果</returns>
-        public bool Expire(string key, TimeSpan? expiry = default(TimeSpan?))
-        {
-            key = AddSysCustomKey(key);
-            return Do(db => db.KeyExpire(key, expiry));
-        }
-
-        #endregion key
-
-        #region 发布订阅
-
-        /// <summary>
-        /// Redis发布订阅  订阅
-        /// </summary>
-        /// <param name="subChannel">订阅频道</param>
-        /// <param name="handler">处理过程</param>
-        public void Subscribe(string subChannel, Action<RedisChannel, RedisValue> handler = null)
-        {
-            ISubscriber sub = _conn.GetSubscriber();
-            sub.Subscribe(subChannel, (channel, message) =>
-            {
-                if (handler == null)
-                {
-                    Console.WriteLine(subChannel + " 订阅收到消息:" + message);
-                }
-                else
-                {
-                    handler(channel, message);
-                }
-            });
-        }
-
-        /// <summary>
-        /// Redis发布订阅  发布
-        /// </summary>
-        /// <typeparam name="T">消息对象</typeparam>
-        /// <param name="channel">发布频道</param>
-        /// <param name="msg">消息</param>
-        /// <returns>消息的数量</returns>
-        public long Publish<T>(string channel, T msg)
-        {
-            ISubscriber sub = _conn.GetSubscriber();
-            return sub.Publish(channel, ConvertJson(msg));
-        }
-
-        /// <summary>
-        /// Redis发布订阅  取消订阅
-        /// </summary>
-        /// <param name="channel">频道</param>
-        public void Unsubscribe(string channel)
-        {
-            ISubscriber sub = _conn.GetSubscriber();
-            sub.Unsubscribe(channel);
-        }
-
-        /// <summary>
-        /// Redis发布订阅  取消全部订阅
-        /// </summary>
-        public void UnsubscribeAll()
-        {
-            ISubscriber sub = _conn.GetSubscriber();
-            sub.UnsubscribeAll();
-        }
-
-        #endregion 发布订阅
-
-        #region 其他
-
-        /// <summary>
-        /// 创建一个事务
-        /// </summary>
-        /// <returns>事务对象</returns>
-        public ITransaction CreateTransaction()
-        {
-            return GetDatabase().CreateTransaction();
-        }
-
-        /// <summary>
-        /// 获得一个数据库实例
-        /// </summary>
-        /// <returns>数据库实例</returns>
-        public IDatabase GetDatabase()
-        {
-            return _conn.GetDatabase(DbNum);
-        }
-
-        /// <summary>
-        /// 获得一个服务器实例
-        /// </summary>
-        /// <param name="hostAndPort">服务器地址</param>
-        /// <returns>服务器实例</returns>
-        public IServer GetServer(string hostAndPort = null)
-        {
-            hostAndPort = string.IsNullOrEmpty(hostAndPort) ? _conn.Configuration.Split(',')[0] : hostAndPort;
-            return _conn.GetServer(hostAndPort);
-        }
-
-        /// <summary>
-        /// 设置前缀
-        /// </summary>
-        /// <param name="customKey">前缀</param>
-        public void SetSysCustomKey(string customKey)
-        {
-            CustomKey = customKey;
-        }
-
-        #endregion 其他
-
-        #region 辅助方法
-
-        private string AddSysCustomKey(string oldKey)
-        {
-            var prefixKey = CustomKey ?? String.Empty;
-            return prefixKey + oldKey;
-        }
-
-        private T Do<T>(Func<IDatabase, T> func)
-        {
-            var database = _conn.GetDatabase(DbNum);
-            return func(database);
-        }
-
-        private string ConvertJson<T>(T value)
-        {
-            return JsonConvert.SerializeObject(value);
-        }
-
-        private T ConvertObj<T>(RedisValue value)
-        {
-            return JsonConvert.DeserializeObject<T>(value);
-        }
-
-        private List<T> ConvetList<T>(RedisValue[] values)
-        {
-            List<T> result = new List<T>();
-            foreach (var item in values)
-            {
-                var model = ConvertObj<T>(item);
-                result.Add(model);
-            }
-            return result;
-        }
-
-        private RedisKey[] ConvertRedisKeys(List<string> redisKeys)
-        {
-            return redisKeys.Select(redisKey => (RedisKey)redisKey).ToArray();
-        }
-
-        #endregion 辅助方法
-
-        #region 事件
-
-        ///// <summary>
-        ///// 配置更改时
-        ///// </summary>
-        ///// <param name="sender">触发者</param>
-        ///// <param name="e">事件参数</param>
-        //private static void MuxerConfigurationChanged(object sender, EndPointEventArgs e)
-        //{
-        //    Console.WriteLine("Configuration changed: " + e.EndPoint);
-        //}
-
-        ///// <summary>
-        ///// 发生错误时
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private static void MuxerErrorMessage(object sender, RedisErrorEventArgs e)
-        //{
-        //    Console.WriteLine("ErrorMessage: " + e.Message);
-        //}
-
-        ///// <summary>
-        ///// 重新建立连接之前的错误
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private static void MuxerConnectionRestored(object sender, ConnectionFailedEventArgs e)
-        //{
-        //    Console.WriteLine("ConnectionRestored: " + e.EndPoint);
-        //}
-
-        ///// <summary>
-        ///// 连接失败 , 如果重新连接成功你将不会收到这个通知
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private static void MuxerConnectionFailed(object sender, ConnectionFailedEventArgs e)
-        //{
-        //    Console.WriteLine("重新连接:Endpoint failed: " + e.EndPoint + ", " + e.FailureType + (e.Exception == null ? "" : (", " + e.Exception.Message)));
-        //}
-
-        ///// <summary>
-        ///// 更改集群
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private static void MuxerHashSlotMoved(object sender, HashSlotMovedEventArgs e)
-        //{
-        //    Console.WriteLine("HashSlotMoved:NewEndPoint" + e.NewEndPoint + ", OldEndPoint" + e.OldEndPoint);
-        //}
-
-        ///// <summary>
-        ///// redis类库错误
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private static void MuxerInternalError(object sender, InternalErrorEventArgs e)
-        //{
-        //    Console.WriteLine("InternalError:Message" + e.Exception.Message);
-        //}
-
-        #endregion 事件
-
-        /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
-        public void Dispose()
-        {
-            _conn.Dispose();
-        }
-    }
-}

+ 0 - 44
Masuit.Tools.Core/NoSQL/RedisHelperFactory.cs

@@ -1,44 +0,0 @@
-using Masuit.Tools.NoSQL;
-using System.Collections.Generic;
-
-namespace Masuit.Tools.Core.NoSQL
-{
-    /// <summary>
-    /// RedisHelper工厂类
-    /// </summary>
-    public class RedisHelperFactory
-    {
-        internal static Dictionary<string, string> ConnectionCache { get; set; } = new Dictionary<string, string>();
-
-        /// <summary>
-        /// 创建一个Redis实例
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="db"></param>
-        /// <returns></returns>
-        public RedisHelper Create(string name, int db = 0)
-        {
-            return RedisHelper.GetInstance(ConnectionCache[name], db);
-        }
-
-        /// <summary>
-        /// 创建一个默认实例
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns></returns>
-        public RedisHelper CreateDefault(int db = 0)
-        {
-            return RedisHelper.GetInstance(ConnectionCache["default"], db);
-        }
-
-        /// <summary>
-        /// 创建一个本地连接实例
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns></returns>
-        public RedisHelper CreateLocal(int db = 0)
-        {
-            return RedisHelper.GetInstance(ConnectionCache["local"], db);
-        }
-    }
-}