Browse Source

RedisHelper 更新为RedisRepository.RedisHelper。
RedisRepository.RedisHelper目前只有String的存取生效。
删除了原OASystem.Infrastructure/Tools中的RedisHelper和API启动项的配置代码

jiangjc 2 years ago
parent
commit
3d12643cdc

+ 6 - 4
OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -7,6 +7,7 @@ using StackExchange.Redis;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain;
+using OASystem.RedisRepository;
 
 namespace OASystem.API.Controllers
 {
@@ -19,15 +20,11 @@ namespace OASystem.API.Controllers
         private readonly IMapper _mapper;
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
-        //private IDatabase _redis;
-        //private RedisHelper _redisHelper;
         public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper)
         {
             _config = config;
             _loginRep = loginRep;
             _mapper = mapper;
-            //_redis = client.GetDatabase(RedisEnum.Common);
-            //_redisHelper = client("132.232.92.186", "7369", "123456");
         }
 
         /// <summary>
@@ -82,6 +79,11 @@ namespace OASystem.API.Controllers
                 signingCredentials: creds);
             view.Token = new JwtSecurityTokenHandler().WriteToken(token);
 
+            //Redis  String使用示例
+            //TimeSpan ts = new TimeSpan(0, 30, 0);
+            //await RedisRepository.RedisFactory.CreateRedisRepository().StringSetAsync<string>("key01", "value01", ts);//string 存
+            //string redisString = await RedisRepository.RedisFactory.CreateRedisRepository().StringGetAsync<string>("key01");//string 取
+
             return Ok(JsonView(view));
         }
 

+ 2 - 0
OASystem/OASystem.Api/OASystem.API.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +37,7 @@
   <ItemGroup>
     <ProjectReference Include="..\OASystem.Domain\OASystem.Domain.csproj" />
     <ProjectReference Include="..\OASystem.Infrastructure\OASystem.Infrastructure.csproj" />
+    <ProjectReference Include="..\OASystem.RedisRepository\OASystem.RedisRepository.csproj" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

+ 9 - 9
OASystem/OASystem.Api/Program.cs

@@ -16,15 +16,15 @@ builder.Services.AddControllersWithViews();
 
 #region redis
 
-//redis缓存
-var section = builder.Configuration.GetSection("Redis:Default");
-//连接字符串
-string _connectionString = section.GetSection("Connection").Value;
-//实例名称
-string _instanceName = section.GetSection("InstanceName").Value;
-//默认数据库 
-int _defaultDB = int.Parse(section.GetSection("DefaultDB").Value ?? "0");
-builder.Services.AddSingleton(new RedisHelper(_connectionString+",password=123456", _instanceName, _defaultDB));
+////redis缓存
+//var section = builder.Configuration.GetSection("Redis:Default");
+////连接字符串
+//string _connectionString = section.GetSection("Connection").Value;
+////实例名称
+//string _instanceName = section.GetSection("InstanceName").Value;
+////默认数据库 
+//int _defaultDB = int.Parse(section.GetSection("DefaultDB").Value ?? "0");
+//builder.Services.AddSingleton(new RedisHelper(_connectionString+",password=123456", _instanceName, _defaultDB));
 
 #endregion
 

+ 8 - 8
OASystem/OASystem.Api/appsettings.json

@@ -4,13 +4,13 @@
   },
   "JwtSecurityKey": "48d3f4fe770940a1068052f581536b81", //jwt密钥
   "UseSwagger": "true", //启用Swagger
-  "Redis": {
-    "Default": {
-      "Connection": "132.232.92.186:6379", //redis连接地址,端口号,密码
-      "InstanceName": "local", //实例名
-      "DefaultDB": "0" //Db8数据库
-    }
-  }
-  ,"RedisServer": "11"
+  //"Redis": {
+  //  "Default": {
+  //    "Connection": "132.232.92.186:6379", //redis连接地址,端口号,密码
+  //    "InstanceName": "local", //实例名
+  //    "DefaultDB": "0" //Db8数据库
+  //  }
+  //}
+  //,"RedisServer": "11"
 
 }

+ 2 - 2
OASystem/OASystem.RedisRepository/Config/RedisConnection.cs

@@ -27,8 +27,8 @@ namespace OASystem.RedisRepository.Config
                             Password = RedisClientConfig.RedisAuth,
                             EndPoints =
                             {
-                                {RedisClientConfig.Server, RedisClientConfig.Port},
-                                {RedisClientConfig.SlaveServer, RedisClientConfig.SlavePort}
+                                {RedisClientConfig.Server, RedisClientConfig.Port}
+                                //,{RedisClientConfig.SlaveServer, RedisClientConfig.SlavePort}
                             }
                         };
                         _connection = ConnectionMultiplexer.Connect(configurationOptions);

+ 374 - 377
OASystem/OASystem.RedisRepository/RedisAsyncHelper/IRedisHelper.cs

@@ -53,352 +53,352 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
 
         #region Redis数据类型—Hash
 
-        /// <summary>
-        /// 向Hash key中存储任意类型任意值
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <param name="value"></param>
-        /// <returns>是否成功</returns>
-        Task<bool> HashSetAsync<T>(string key, string field, T value);
-
-        /// <summary>
-        /// 批量 向Hash key中存储任意类型任意值
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="hashFields"></param>
-        /// <returns>无返回值</returns>
-        Task HashMultiSetAsync<T>(string key, Dictionary<string, T> hashFields);
-
-        /// <summary>
-        /// 对指定hash key中制定field做数量增加操作 默认自增1 
-        /// 如果此操作前key不存在 则创建。 如果此操作前该field不存在或者非数字 则先被置0,再被继续操作
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <param name="incrCount"></param>
-        /// <returns>操作后的结果</returns>
-        Task<long> HashIncrementAsync(string key, string field, long incrCount = 1);
-
-        /// <summary>
-        /// 对指定hash key中制定field做数量增加操作 默认自减1 
-        /// 如果此操作前key不存在 则创建。 如果此操作前该field不存在或者非数字 则先被置0,再被继续操作
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <param name="decrCount"></param>
-        /// <returns>操作后的结果</returns>
-        Task<long> HashDecrementAsync(string key, string field, long decrCount = 1);
-
-        /// <summary>
-        /// 从指定Hash中 删除指定field
-        /// 如果key或者field不存在,则false
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <returns>是否成功</returns>
-        Task<bool> HashDeleteFieldAsync(string key, string field);
-
-        /// <summary>
-        /// 从指定Hash key中 批量删除指定field
-        /// 如果key或者field不存在,则false
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="fields"></param>
-        /// <returns>移除数量</returns>
-        Task<long> HashMultiDeleteFieldAsync(string key, List<string> fields);
-
-        /// <summary>
-        /// 从指定Hash key中获取指定field值
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <returns></returns>
-        Task<T> HashGetAsync<T>(string key, string field);
-
-        /// <summary>
-        /// 从指定Hash key中判断field是否存在
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="field"></param>
-        /// <returns></returns>
-        Task<bool> HashFieldExistAsync(string key, string field);
-
-        /// <summary>
-        /// 获取指定Hash key中的所有field的值 
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<List<T>> HashValuesAsync<T>(string key);
-
-        /// <summary>
-        /// 获取指定Hash key中所有 field名称及其Value
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<Dictionary<string, T>> HashGetAllAsync<T>(string key);
-
-        /// <summary>
-        /// 获取指定Hash key中所有field
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<List<string>> HashFieldsAsync(string key);
+        ///// <summary>
+        ///// 向Hash key中存储任意类型任意值
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <param name="value"></param>
+        ///// <returns>是否成功</returns>
+        //Task<bool> HashSetAsync<T>(string key, string field, T value);
+
+        ///// <summary>
+        ///// 批量 向Hash key中存储任意类型任意值
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="hashFields"></param>
+        ///// <returns>无返回值</returns>
+        //Task HashMultiSetAsync<T>(string key, Dictionary<string, T> hashFields);
+
+        ///// <summary>
+        ///// 对指定hash key中制定field做数量增加操作 默认自增1 
+        ///// 如果此操作前key不存在 则创建。 如果此操作前该field不存在或者非数字 则先被置0,再被继续操作
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <param name="incrCount"></param>
+        ///// <returns>操作后的结果</returns>
+        //Task<long> HashIncrementAsync(string key, string field, long incrCount = 1);
+
+        ///// <summary>
+        ///// 对指定hash key中制定field做数量增加操作 默认自减1 
+        ///// 如果此操作前key不存在 则创建。 如果此操作前该field不存在或者非数字 则先被置0,再被继续操作
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <param name="decrCount"></param>
+        ///// <returns>操作后的结果</returns>
+        //Task<long> HashDecrementAsync(string key, string field, long decrCount = 1);
+
+        ///// <summary>
+        ///// 从指定Hash中 删除指定field
+        ///// 如果key或者field不存在,则false
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <returns>是否成功</returns>
+        //Task<bool> HashDeleteFieldAsync(string key, string field);
+
+        ///// <summary>
+        ///// 从指定Hash key中 批量删除指定field
+        ///// 如果key或者field不存在,则false
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="fields"></param>
+        ///// <returns>移除数量</returns>
+        //Task<long> HashMultiDeleteFieldAsync(string key, List<string> fields);
+
+        ///// <summary>
+        ///// 从指定Hash key中获取指定field值
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <returns></returns>
+        //Task<T> HashGetAsync<T>(string key, string field);
+
+        ///// <summary>
+        ///// 从指定Hash key中判断field是否存在
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="field"></param>
+        ///// <returns></returns>
+        //Task<bool> HashFieldExistAsync(string key, string field);
+
+        ///// <summary>
+        ///// 获取指定Hash key中的所有field的值 
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<List<T>> HashValuesAsync<T>(string key);
+
+        ///// <summary>
+        ///// 获取指定Hash key中所有 field名称及其Value
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<Dictionary<string, T>> HashGetAllAsync<T>(string key);
+
+        ///// <summary>
+        ///// 获取指定Hash key中所有field
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<List<string>> HashFieldsAsync(string key);
 
         #endregion
 
         #region Redis数据类型—List     
 
-        /// <summary>
-        /// 在指定pivot后插入value, 如果pivot不存在,则返回-1, 如果key不存在,则返回0
-        /// 如果存在多个相同指定的的pivot,则插入第一个指定pivot后面.
-        /// 即链表从左向右查找,遇到指定pivot,则确定位置
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="pivot">list中的一个值</param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<long> ListInsertAfterAsync<T>(string key, string pivot, T value);
-
-        /// <summary>
-        /// 在指定pivot前插入value, 如果pivot不存在,则返回-1, 如果key不存在,则返回0
-        /// 如果存在多个相同指定的的pivot,则插入第一个指定pivot前面.
-        /// 即链表从左向右查找,遇到指定pivot,则确定位置
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="pivot"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<long> ListInsertBeforeAsync<T>(string key, string pivot, T value);
-
-        /// <summary>
-        /// 从链表左侧弹出第一个元素(弹出能获取到该元素并且被删除)
-        /// 如果key不存在 或者链表为空 则为null
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<T> ListLeftPopAsync<T>(string key);
-
-        /// <summary>
-        /// 从链表左侧增加一个元素,key不存在则被创建
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns>返回操作后的链表长度</returns>
-        Task<long> ListLeftPushAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 从链表左侧批量增加元素,如果 a b c  则c会在链表左侧第一位  b第二位  a第三位
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="values"></param>
-        /// <returns>返回操作后的链表长度</returns>
-        Task<long> ListLeftMultiPushAsync<T>(string key, List<T> values);
-
-        /// <summary>
-        /// 获取链表长度,不存在key则为0
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<long> ListLengthAsync<T>(string key);
-
-        /// <summary>
-        /// 获取链表中所有数据,从左侧start开始到stop结束,从0—-1则认为获取全部,默认获取全部
-        /// start为负数则代表从链表右侧开始,-1为右侧第一位,-2为右侧第二位
-        /// start要小于stop,否则返回null
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="start"></param>
-        /// <param name="stop"></param>
-        /// <returns></returns>
-        Task<List<T>> ListRangeAsync<T>(string key, long start = 0L, long stop = -1L);
-
-        /// <summary>
-        /// 从链表中一处count数量的value. count大于0则从左至右,count小于0则从右至左,count=0则移除全部
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <param name="count"></param>
-        /// <returns></returns>
-        Task<long> ListRemoveAsync<T>(string key, T value, long count = 0L);
-
-        /// <summary>
-        /// 从右侧弹出第一个元素(弹出能获取到该元素并且被删除)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<T> ListRightPopAsync<T>(string key);
-
-
-        /// <summary>
-        /// 从链表右侧加入元素,如果 rpush a b c 则c为右侧第一位 b第二位 c第三位
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<long> ListRightPushAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 从右侧批量插入,和左侧相反
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="values"></param>
-        /// <returns></returns>
-        Task<long> ListRightMultiPushAsync<T>(string key, List<T> values);
-
-        /// <summary>
-        /// 在链表指定索引处,插入元素
-        /// 正数索引从0开始,代表左侧。负数从-1开始 代表从右侧。-1为右侧第一位
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="index"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task ListSetByIndexAsync<T>(string key, int index, T value);
-
-        /// <summary>
-        /// 留下start到stop之间的数据。负数代表从右侧寻找  -1为右侧第一位
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="start"></param>
-        /// <param name="stop"></param>
-        /// <returns></returns>
-        Task ListTrimAsync(string key, long start, long stop);
-
-        /// <summary>
-        /// 获取指定index的值,负数代表从右侧寻找  -1为右侧第一位
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        Task<T> ListGetByIndexAsync<T>(string key, long index);
+        ///// <summary>
+        ///// 在指定pivot后插入value, 如果pivot不存在,则返回-1, 如果key不存在,则返回0
+        ///// 如果存在多个相同指定的的pivot,则插入第一个指定pivot后面.
+        ///// 即链表从左向右查找,遇到指定pivot,则确定位置
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="pivot">list中的一个值</param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<long> ListInsertAfterAsync<T>(string key, string pivot, T value);
+
+        ///// <summary>
+        ///// 在指定pivot前插入value, 如果pivot不存在,则返回-1, 如果key不存在,则返回0
+        ///// 如果存在多个相同指定的的pivot,则插入第一个指定pivot前面.
+        ///// 即链表从左向右查找,遇到指定pivot,则确定位置
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="pivot"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<long> ListInsertBeforeAsync<T>(string key, string pivot, T value);
+
+        ///// <summary>
+        ///// 从链表左侧弹出第一个元素(弹出能获取到该元素并且被删除)
+        ///// 如果key不存在 或者链表为空 则为null
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<T> ListLeftPopAsync<T>(string key);
+
+        ///// <summary>
+        ///// 从链表左侧增加一个元素,key不存在则被创建
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns>返回操作后的链表长度</returns>
+        //Task<long> ListLeftPushAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 从链表左侧批量增加元素,如果 a b c  则c会在链表左侧第一位  b第二位  a第三位
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="values"></param>
+        ///// <returns>返回操作后的链表长度</returns>
+        //Task<long> ListLeftMultiPushAsync<T>(string key, List<T> values);
+
+        ///// <summary>
+        ///// 获取链表长度,不存在key则为0
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<long> ListLengthAsync<T>(string key);
+
+        ///// <summary>
+        ///// 获取链表中所有数据,从左侧start开始到stop结束,从0—-1则认为获取全部,默认获取全部
+        ///// start为负数则代表从链表右侧开始,-1为右侧第一位,-2为右侧第二位
+        ///// start要小于stop,否则返回null
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="start"></param>
+        ///// <param name="stop"></param>
+        ///// <returns></returns>
+        //Task<List<T>> ListRangeAsync<T>(string key, long start = 0L, long stop = -1L);
+
+        ///// <summary>
+        ///// 从链表中一处count数量的value. count大于0则从左至右,count小于0则从右至左,count=0则移除全部
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <param name="count"></param>
+        ///// <returns></returns>
+        //Task<long> ListRemoveAsync<T>(string key, T value, long count = 0L);
+
+        ///// <summary>
+        ///// 从右侧弹出第一个元素(弹出能获取到该元素并且被删除)
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<T> ListRightPopAsync<T>(string key);
+
+
+        ///// <summary>
+        ///// 从链表右侧加入元素,如果 rpush a b c 则c为右侧第一位 b第二位 c第三位
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<long> ListRightPushAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 从右侧批量插入,和左侧相反
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="values"></param>
+        ///// <returns></returns>
+        //Task<long> ListRightMultiPushAsync<T>(string key, List<T> values);
+
+        ///// <summary>
+        ///// 在链表指定索引处,插入元素
+        ///// 正数索引从0开始,代表左侧。负数从-1开始 代表从右侧。-1为右侧第一位
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="index"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task ListSetByIndexAsync<T>(string key, int index, T value);
+
+        ///// <summary>
+        ///// 留下start到stop之间的数据。负数代表从右侧寻找  -1为右侧第一位
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="start"></param>
+        ///// <param name="stop"></param>
+        ///// <returns></returns>
+        //Task ListTrimAsync(string key, long start, long stop);
+
+        ///// <summary>
+        ///// 获取指定index的值,负数代表从右侧寻找  -1为右侧第一位
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="index"></param>
+        ///// <returns></returns>
+        //Task<T> ListGetByIndexAsync<T>(string key, long index);
 
         #endregion
 
         #region Redis数据类型—Set
 
-        /// <summary>
-        /// 向指定集合中增加一个元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<bool> SetAddAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 指定集合计算操作operation枚举,指定计算结果将存的目标destKey,指定需要参与计算的多个key
-        /// </summary>
-        /// <param name="operation"></param>
-        /// <param name="destKey"></param>
-        /// <param name="combineKeys"></param>
-        /// <returns></returns>
-        Task<long> SetCombineAndStoreAsync(SetOperation operation, string destKey, List<string> combineKeys);
-
-        /// <summary>
-        /// 指定集合计算操作operation枚举,指定需要参与计算的多个key
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="operation"></param>
-        /// <param name="combineKeys"></param>
-        /// <returns></returns>
-        Task<List<T>> SetCombineAsync<T>(SetOperation operation, List<string> combineKeys);
-
-        /// <summary>
-        /// 指定值是否存在于指定集合中
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<bool> SetContainsAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 获取指定集合中元素个数
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<long> SetLengthAsync(string key);
-
-        /// <summary>
-        /// 获取指定集合中的所有元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<List<T>> SetMembersAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 从sourceKey移除指定value到目标distKey集合当中
-        /// 如果sourceKey存在指定value则返回true,否则不做任何操作返回false
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="sourcekey"></param>
-        /// <param name="distKey"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<bool> SetMoveAsync<T>(string sourcekey, string distKey, T value);
-
-        /// <summary>
-        /// 从指定集合当中随机取出一个元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<T> SetRandomMemberAsync<T>(string key);
-
-        /// <summary>
-        /// 从指定集合随机弹出(删除并获取)一个元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<T> SetPopAsync<T>(string key);
-
-        /// <summary>
-        /// 从集合中随机弹出(删除并获取)多个元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<List<T>> SetRandomMembersAsync<T>(string key);
-
-        /// <summary>
-        /// 从集合中移除指定元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        Task<bool> SetRemoveAsync<T>(string key, T value);
-
-        /// <summary>
-        /// 从集合中批量移除元素
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="key"></param>
-        /// <param name="values"></param>
-        /// <returns></returns>
-        Task<long> SetMultiRemoveAsync<T>(string key, List<T> values);
+        ///// <summary>
+        ///// 向指定集合中增加一个元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<bool> SetAddAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 指定集合计算操作operation枚举,指定计算结果将存的目标destKey,指定需要参与计算的多个key
+        ///// </summary>
+        ///// <param name="operation"></param>
+        ///// <param name="destKey"></param>
+        ///// <param name="combineKeys"></param>
+        ///// <returns></returns>
+        //Task<long> SetCombineAndStoreAsync(SetOperation operation, string destKey, List<string> combineKeys);
+
+        ///// <summary>
+        ///// 指定集合计算操作operation枚举,指定需要参与计算的多个key
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="operation"></param>
+        ///// <param name="combineKeys"></param>
+        ///// <returns></returns>
+        //Task<List<T>> SetCombineAsync<T>(SetOperation operation, List<string> combineKeys);
+
+        ///// <summary>
+        ///// 指定值是否存在于指定集合中
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<bool> SetContainsAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 获取指定集合中元素个数
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<long> SetLengthAsync(string key);
+
+        ///// <summary>
+        ///// 获取指定集合中的所有元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<List<T>> SetMembersAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 从sourceKey移除指定value到目标distKey集合当中
+        ///// 如果sourceKey存在指定value则返回true,否则不做任何操作返回false
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="sourcekey"></param>
+        ///// <param name="distKey"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<bool> SetMoveAsync<T>(string sourcekey, string distKey, T value);
+
+        ///// <summary>
+        ///// 从指定集合当中随机取出一个元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<T> SetRandomMemberAsync<T>(string key);
+
+        ///// <summary>
+        ///// 从指定集合随机弹出(删除并获取)一个元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<T> SetPopAsync<T>(string key);
+
+        ///// <summary>
+        ///// 从集合中随机弹出(删除并获取)多个元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<List<T>> SetRandomMembersAsync<T>(string key);
+
+        ///// <summary>
+        ///// 从集合中移除指定元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="value"></param>
+        ///// <returns></returns>
+        //Task<bool> SetRemoveAsync<T>(string key, T value);
+
+        ///// <summary>
+        ///// 从集合中批量移除元素
+        ///// </summary>
+        ///// <typeparam name="T"></typeparam>
+        ///// <param name="key"></param>
+        ///// <param name="values"></param>
+        ///// <returns></returns>
+        //Task<long> SetMultiRemoveAsync<T>(string key, List<T> values);
 
         #endregion
 
@@ -410,43 +410,43 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
 
         #region Redis Key操作
 
-        /// <summary>
-        /// 删除指定key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<bool> KeyDeleteAsync(string key);
-
-        /// <summary>
-        /// 设置key过期时间具体DateTime
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="expireAt"></param>
-        /// <returns></returns>
-        Task<bool> KeyExpireAtAsync(string key, DateTime expireAt);
-
-        /// <summary>
-        /// 设置key在将来的timeout后过期(TimeSpan)
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="timeout"></param>
-        /// <returns></returns>
-        Task<bool> KeyExpireInAsync(string key, TimeSpan timeout);
-
-        /// <summary>
-        /// key重命名
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="newKey"></param>
-        /// <returns></returns>
-        Task<bool> KeyRenameAsync(string key, string newKey);
-
-        /// <summary>
-        /// 判断key是否已存在
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<bool> KeyExistsAsync(string key);
+        ///// <summary>
+        ///// 删除指定key
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<bool> KeyDeleteAsync(string key);
+
+        ///// <summary>
+        ///// 设置key过期时间具体DateTime
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="expireAt"></param>
+        ///// <returns></returns>
+        //Task<bool> KeyExpireAtAsync(string key, DateTime expireAt);
+
+        ///// <summary>
+        ///// 设置key在将来的timeout后过期(TimeSpan)
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="timeout"></param>
+        ///// <returns></returns>
+        //Task<bool> KeyExpireInAsync(string key, TimeSpan timeout);
+
+        ///// <summary>
+        ///// key重命名
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <param name="newKey"></param>
+        ///// <returns></returns>
+        //Task<bool> KeyRenameAsync(string key, string newKey);
+
+        ///// <summary>
+        ///// 判断key是否已存在
+        ///// </summary>
+        ///// <param name="key"></param>
+        ///// <returns></returns>
+        //Task<bool> KeyExistsAsync(string key);
 
         #endregion
 
@@ -457,12 +457,9 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
         /// </summary>
         /// <param name="ranOperations"></param>
         /// <returns></returns>
-        Task<bool> DoInTranscationAsync(Action<ITransaction> ranOperations);
+        //Task<bool> DoInTranscationAsync(Action<ITransaction> ranOperations);
 
         #endregion
 
-
-
-        Task<RedisResult> Test();
     }
 }

+ 93 - 0
OASystem/OASystem.RedisRepository/RedisAsyncHelper/RedisHashHelperAsync.cs

@@ -0,0 +1,93 @@
+using OASystem.RedisRepository.CommonHelper;
+using StackExchange.Redis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.RedisRepository.RedisAsyncHelper
+{
+    /// <summary>
+    ///  Redis异步操作类  Hash部分类
+    /// </summary>
+    internal partial class RedisHelper //: IRedisHelper
+    {
+        #region Hash 写操作
+
+        public async Task<bool> HashSetAsync<T>(string key, string field, T value)
+        {
+            return await _client.HashSetAsync(key, field, SerializeHelper.Serialize(value));
+        }
+
+        public async Task HashMultiSetAsync<T>(string key, Dictionary<string, T> hashFields)
+        {
+            List<HashEntry> entries = new List<HashEntry>();
+            hashFields.ToList().ForEach(d => entries.Add(new HashEntry(d.Key, SerializeHelper.Serialize(d.Value))));
+            await _client.HashSetAsync(key, entries.ToArray());
+        }
+
+        public async Task<long> HashIncrementAsync(string key, string field, long incrCount = 1)
+        {
+            return await _client.HashIncrementAsync(key, field, incrCount);
+        }
+
+        public async Task<long> HashDecrementAsync(string key, string field, long decrCount = 1)
+        {
+            return await _client.HashDecrementAsync(key, field, decrCount);
+        }
+
+        public async Task<bool> HashDeleteFieldAsync(string key, string field)
+        {
+            return await _client.HashDeleteAsync(key, field);
+        }
+
+        public async Task<long> HashMultiDeleteFieldAsync(string key, List<string> fields)
+        {
+            List<RedisValue> values = new List<RedisValue>();
+            fields.ForEach(f => values.Add(f));
+            return await _client.HashDeleteAsync(key, values.ToArray());
+        }
+
+        #endregion
+
+        #region Hash 读操作
+
+        /// <summary>
+        /// Redis 指定hash类型key中field是否存在
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="field"></param>
+        /// <returns></returns>
+        public async Task<bool> HashFieldExistAsync(string key, string field)
+        {
+            return await _client.HashExistsAsync(key, field, CommandFlags.PreferSlave);
+        }
+        public async Task<List<string>> HashFieldsAsync(string key)
+        {
+            RedisValue[] values = await _client.HashKeysAsync(key, CommandFlags.PreferSlave);
+            return RedisInnerTypeHelper.RedisValuesToGenericList<string>(values);
+        }
+        public async Task<List<T>> HashValuesAsync<T>(string key)
+        {
+            var values = await _client.HashValuesAsync(key, CommandFlags.PreferSlave);
+            return RedisInnerTypeHelper.RedisValuesToGenericList<T>(values);
+        }
+
+        public async Task<T> HashGetAsync<T>(string key, string field)
+        {
+            return SerializeHelper.Deserialize<T>(await _client.HashGetAsync(key, field, CommandFlags.PreferSlave));
+        }
+
+        public async Task<Dictionary<string, T>> HashGetAllAsync<T>(string key)
+        {
+            HashEntry[] entries = await _client.HashGetAllAsync(key, CommandFlags.PreferSlave);
+            Dictionary<string, T> dic = new Dictionary<string, T>();
+            entries.ToList().ForEach(e => dic.Add(e.Name, SerializeHelper.Deserialize<T>(e.Value)));
+            return dic;
+        }
+
+        #endregion
+
+    }
+}

+ 99 - 0
OASystem/OASystem.RedisRepository/RedisAsyncHelper/RedisListHelperAsync.cs

@@ -0,0 +1,99 @@
+using OASystem.RedisRepository.CommonHelper;
+using StackExchange.Redis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.RedisRepository.RedisAsyncHelper
+{
+    /// <summary>
+    /// Redis异步操作类  List部分类
+    /// </summary>
+    internal partial class RedisHelper //: IRedisHelper
+    {
+        //    _client.ListRightPopLeftPushAsync();
+        //    _client.ListTrimAsync();
+
+        #region List 写操作
+
+        public async Task<long> ListInsertAfterAsync<T>(string key, string pivot, T value)
+        {
+            return await _client.ListInsertAfterAsync(key, pivot, SerializeHelper.Serialize(value));
+        }
+
+        public async Task<long> ListInsertBeforeAsync<T>(string key, string pivot, T value)
+        {
+            return await _client.ListInsertBeforeAsync(key, pivot, SerializeHelper.Serialize(value));
+        }
+
+        public async Task<T> ListLeftPopAsync<T>(string key)
+        {
+            return SerializeHelper.Deserialize<T>(await _client.ListLeftPopAsync(key));
+        }
+
+        public async Task<long> ListLeftPushAsync<T>(string key, T value)
+        {
+            return await _client.ListLeftPushAsync(key, SerializeHelper.Serialize(value));
+        }
+
+        public async Task<long> ListLeftMultiPushAsync<T>(string key, List<T> values)
+        {
+            return await _client.ListLeftPushAsync(key, SerializeHelper.Serialize(RedisInnerTypeHelper.GenericListToRedisValues(values)));
+        }
+
+        public async Task<long> ListRemoveAsync<T>(string key, T value, long count = 0L)
+        {
+            return await _client.ListRemoveAsync(key, SerializeHelper.Serialize(value), count);
+        }
+
+        public async Task<T> ListRightPopAsync<T>(string key)
+        {
+            return SerializeHelper.Deserialize<T>(await _client.ListRightPopAsync(key));
+        }
+
+        public async Task<long> ListRightPushAsync<T>(string key, T value)
+        {
+            return await _client.ListRightPushAsync(key, SerializeHelper.Serialize(value));
+        }
+
+        public async Task<long> ListRightMultiPushAsync<T>(string key, List<T> values)
+        {
+            return
+                await
+                    _client.ListRightPushAsync(key,
+                        SerializeHelper.Serialize(RedisInnerTypeHelper.GenericListToRedisValues(values)));
+        }
+
+        public async Task ListSetByIndexAsync<T>(string key, int index, T value)
+        {
+            await _client.ListSetByIndexAsync(key, index, SerializeHelper.Serialize(value));
+        }
+
+        public async Task ListTrimAsync(string key, long start, long stop)
+        {
+            await _client.ListTrimAsync(key, start, stop);
+        }
+        #endregion
+
+        #region List 读操作
+
+        public async Task<T> ListGetByIndexAsync<T>(string key, long index)
+        {
+            return SerializeHelper.Deserialize<T>(await _client.ListGetByIndexAsync(key, index, CommandFlags.PreferSlave));
+        }
+
+        public async Task<long> ListLengthAsync<T>(string key)
+        {
+            return await _client.ListLengthAsync(key, CommandFlags.PreferSlave);
+        }
+
+        public async Task<List<T>> ListRangeAsync<T>(string key, long start = 0L, long stop = -1L)
+        {
+            return RedisInnerTypeHelper.RedisValuesToGenericList<T>(await _client.ListRangeAsync(key, start, stop, CommandFlags.PreferSlave));
+        }
+
+        #endregion
+    }
+}

+ 1 - 1
OASystem/OASystem.RedisRepository/RedisAsyncHelper/RedisStringHelperAsync.cs

@@ -11,7 +11,7 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
 {/// <summary>
  /// Redis异步操作类  String部分类
  /// </summary>
-    internal partial class RedisHelper// : IRedisHelper
+    internal partial class RedisHelper : IRedisHelper
     {
 
         private static IDatabase _client;

+ 21 - 0
OASystem/OASystem.RedisRepository/RedisFactory.cs

@@ -0,0 +1,21 @@
+using OASystem.RedisRepository.RedisAsyncHelper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.RedisRepository
+{
+    public class RedisFactory
+    {
+        /// <summary>
+        /// 外部访问redis入口,暂时只暴露异步方法
+        /// </summary>
+        /// <returns></returns>
+        public static IRedisHelper CreateRedisRepository()
+        {
+            return new RedisHelper();
+        }
+    }
+}