wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除BloomFilter

Browse Source
This commit is contained in:
YUN-PC5\user 2023-12-14 14:55:08 +08:00
parent 8568e7c406
commit 0d077bea34
4 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Infrastructure/ZR.Infrastructure.csproj
View File

@ -12,7 +12,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AspectCore.Abstractions" Version="2.4.0" /> <PackageReference Include="AspectCore.Abstractions" Version="2.4.0" />
<PackageReference Include="BloomFilter.CSRedis.NetCore" Version="2.1.1" />
<PackageReference Include="Caching.CSRedis" Version="3.8.670" /> <PackageReference Include="Caching.CSRedis" Version="3.8.670" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />

13
ZR.Admin.WebApi/Program.cs
View File

@ -3,7 +3,6 @@ using Infrastructure.Converter;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using NLog.Web; using NLog.Web;
using System.Text.Json; using System.Text.Json;
using BloomFilter.CSRedis.Configurations;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Caching.Redis; using Microsoft.Extensions.Caching.Redis;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -69,18 +68,6 @@ if (openRedis == "1")
{ {
RedisServer.Initalize(); RedisServer.Initalize();
builder.Services.AddSingleton<IDistributedCache>(new CSRedisCache(RedisHelper.Instance)); builder.Services.AddSingleton<IDistributedCache>(new CSRedisCache(RedisHelper.Instance));
builder.Services.AddBloomFilter(setupAction =>
{
setupAction.UseCSRedis(new FilterCSRedisOptions
{
Name = "Redis1",
RedisKey = "BloomFilter",
ConnectionStrings = new List<string>
{
AppSettings.GetConfig("RedisServer:Cache")
}
});
});
} }

19
ZR.ServiceCore/SqlSugar/SqlSugarCache.cs
View File

@ -1,39 +1,24 @@
using BloomFilter; using ZR.Infrastructure.Cache;
using ZR.Infrastructure.Cache;
namespace ZR.ServiceCore.SqlSugar namespace ZR.ServiceCore.SqlSugar
{ {
public class SqlSugarCache : ICacheService public class SqlSugarCache : ICacheService
{ {
private readonly IBloomFilter _bloomFilter;
public SqlSugarCache(IBloomFilter bloomFilter)
{
_bloomFilter = bloomFilter;
}
public void Add<V>(string key, V value) public void Add<V>(string key, V value)
{ {
RedisServer.Cache.Set(key, value, 3600 + RedisHelper.RandomExpired(5, 30)); RedisServer.Cache.Set(key, value, 3600 + RedisHelper.RandomExpired(5, 30));
// CacheHelper.SetCache(key, value); // CacheHelper.SetCache(key, value);
_bloomFilter.Add(key);
} }
public void Add<V>(string key, V value, int cacheDurationInSeconds) public void Add<V>(string key, V value, int cacheDurationInSeconds)
{ {
RedisServer.Cache.Set(key, value, cacheDurationInSeconds); RedisServer.Cache.Set(key, value, cacheDurationInSeconds);
// CacheHelper.SetCaches(key, value, cacheDurationInSeconds); // CacheHelper.SetCaches(key, value, cacheDurationInSeconds);
_bloomFilter.Add(key);
} }
public bool ContainsKey<V>(string key) public bool ContainsKey<V>(string key)
{ {
if (_bloomFilter.Contains(key)) return RedisServer.Cache.Exists(key);
{
return RedisServer.Cache.Exists(key);
}
return false;
// return CacheHelper.Exists(key); // return CacheHelper.Exists(key);
} }

6
ZR.ServiceCore/SqlSugar/SqlSugarSetup.cs
View File

@ -1,5 +1,4 @@
using BloomFilter; using Infrastructure;
using Infrastructure;
using Infrastructure.Model; using Infrastructure.Model;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -36,8 +35,7 @@ namespace ZR.ServiceCore.SqlSugar
}); });
} }
SugarIocServices.AddSqlSugar(iocList); SugarIocServices.AddSqlSugar(iocList);
var provider = services.BuildServiceProvider(); ICacheService cache = new SqlSugarCache();
ICacheService cache = new SqlSugarCache(provider.GetService<IBloomFilter>());
SugarIocServices.ConfigurationSugar(db => SugarIocServices.ConfigurationSugar(db =>
{ {
var u = App.User; var u = App.User;