增加redis;

待处理流程中可以查看驳回的流程
This commit is contained in:
yubaolee
2021-03-09 23:35:14 +08:00
parent 679dc613c1
commit 80c38c26d7
8 changed files with 148 additions and 3 deletions

View File

@@ -36,6 +36,11 @@
//identity授权的地址
public string IdentityServerUrl { get; set; }
/// <summary>
/// Redis服务器配置
/// </summary>
public string RedisConf { get; set; }
//是否是Identity授权方式
public bool IsIdentityAuth => !string.IsNullOrEmpty(IdentityServerUrl);
}

View File

@@ -0,0 +1,59 @@
using System;
using Enyim.Caching;
using Enyim.Caching.Memcached;
using Microsoft.Extensions.Options;
using StackExchange.Redis;
namespace Infrastructure.Cache
{
/// <summary>
/// 缓存redis实现
/// </summary>
public sealed class RedisCacheContext : ICacheContext
{
private ConnectionMultiplexer _conn { get; set; }
private IDatabase iDatabase { get; set; }
private AppSetting _appSettings;
public RedisCacheContext(IOptions<AppSetting> options)
{
_conn = ConnectionMultiplexer.Connect(options.Value.RedisConf);
iDatabase = _conn.GetDatabase();
}
public override T Get<T>(string key)
{
RedisValue value = iDatabase.StringGet(key);
if (!value.HasValue)
{
return default(T);
}
if (typeof(T) == typeof(string))
{
return (T) Convert.ChangeType(value, typeof(T));
}
else
{
return JsonHelper.Instance.Deserialize<T>(value);
}
}
public override bool Set<T>(string key, T t, DateTime expire)
{
if (typeof(T) == typeof(string))
{
return iDatabase.StringSet(key, t.ToString(), expire-DateTime.Now);
}
else
{
return iDatabase.StringSet(key, JsonHelper.Instance.Serialize(t), expire - DateTime.Now);
}
}
public override bool Remove(string key)
{
return iDatabase.KeyDelete(key);
}
}
}

View File

@@ -19,6 +19,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
</ItemGroup>
<ItemGroup>

View File

@@ -481,7 +481,7 @@ namespace OpenAuth.App
if (request.type == "wait") //待办事项
{
Expression<Func<FlowInstance, bool>> waitExp = u => (u.MakerList == "1" || u.MakerList.Contains(user.User.Id)) && u.IsFinish == 0;
Expression<Func<FlowInstance, bool>> waitExp = u => (u.MakerList == "1" || u.MakerList.Contains(user.User.Id)) && (u.IsFinish == 0|| u.IsFinish==4);
// 加入搜索自定义标题
if (!string.IsNullOrEmpty(request.key))

View File

@@ -35,6 +35,7 @@ namespace OpenAuth.App.Test
.Build();
Console.WriteLine($"单元测试数据库信息:{config.GetSection("AppSetting")["DbType"]}/{config.GetSection("ConnectionStrings")["OpenAuthDBContext"]}");
serviceCollection.Configure<AppSetting>(config.GetSection("AppSetting"));
//添加log4net
serviceCollection.AddLogging(builder =>
{

View File

@@ -0,0 +1,77 @@
using System;
using System.Linq;
using Infrastructure;
using Infrastructure.Cache;
using Microsoft.AspNetCore.Http;
using NUnit.Framework;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using OpenAuth.App.Request;
using OpenAuth.App.SSO;
using OpenAuth.Repository.Domain;
namespace OpenAuth.App.Test
{
public class TestCache :TestBase
{
public override ServiceCollection GetService()
{
var services = new ServiceCollection();
var delservices = services.Where(u => u.ServiceType == typeof(ICacheContext)).ToList();
for (int i = 0; i < delservices.Count(); i++)
{
services.Remove(delservices[i]);
}
services.AddScoped(typeof(ICacheContext), typeof(RedisCacheContext));
return services;
}
/// <summary>
/// 测试字符串
/// </summary>
[Test]
public void SetString()
{
var app = _autofacServiceProvider.GetService<ICacheContext>();
app.Set("yubaolee", "ok", DateTime.Now.AddDays(1));
var result = app.Get<string>("yubaolee");
Console.WriteLine($"redis结果:{result}");
}
/// <summary>
/// 测试对象
/// </summary>
[Test]
public void SetObj()
{
var app = _autofacServiceProvider.GetService<ICacheContext>();
app.Set("user:info", new User
{
Name = "测试",
Account ="Test",
BizCode = "0.1.1"
}, DateTime.Now.AddDays(1));
var result = app.Get<User>("user:info");
Console.WriteLine($"redis结果:{JsonHelper.Instance.Serialize(result)}");
}
/// <summary>
/// 测试获取不存在的key
/// </summary>
[Test]
public void GetNoExistKey()
{
var app = _autofacServiceProvider.GetService<ICacheContext>();
var result = app.Get<User>("noexistkey");
Console.WriteLine($"redis结果:{JsonHelper.Instance.Serialize(result)}");
}
}
}

View File

@@ -15,6 +15,7 @@
"IdentityServerUrl": "", //IdentityServer服务器地址。如果为空则不启用OAuth认证
//"IdentityServerUrl": "http://demo.openauth.me:12796", //IdentityServer服务器地址。如果为空则不启用OAuth认证
"DbType": "MySql", //数据库类型SqlServer、MySql
"UploadPath": "" //附件上传的路径,如果为空则保存在站点根目录
"UploadPath": "", //附件上传的路径,如果为空则保存在站点根目录
"RedisConf": "your_redis_server:6379,password=your_redis_password" //redis配置信息
}
}

View File

@@ -14,6 +14,7 @@
"IdentityServerUrl": "", //IdentityServer服务器地址。如果为空则不启用OAuth认证
// "IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空则不启用OAuth认证
"DbType": "SqlServer", //数据库类型SqlServer、MySql
"UploadPath": "" //附件上传的路径,如果为空则保存在站点根目录
"UploadPath": "", //附件上传的路径,如果为空则保存在站点根目录
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123"
}
}