【新增】新增【EasyCaching.CSRedis】redis组件,替换SqlSugar二级缓存的【StackExchange.Redis】组件实现,使用异步替代同步处理二级缓存,解决【StackExchange.Redis】超过200并发后的异常情况。异步提升二级缓存获取效率。

【新增】appsetting.json配置文件增加【AppPcUrl】PC端访问地址,【AppH5Url】H5端访问地址,方便对接pc端、h5端、微信公众号端。
This commit is contained in:
大灰灰
2022-12-30 04:21:40 +08:00
parent 8b03f565f0
commit 2a0c5710b2
14 changed files with 237 additions and 356 deletions

View File

@@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyCaching.Core" Version="1.7.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.20.1" />
<PackageReference Include="StackExchange.Redis" Version="2.6.70" />

View File

@@ -0,0 +1,58 @@
using CoreCms.Net.Utility;
using EasyCaching.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace CoreCms.Net.Caching.SqlSugar
{
/// <summary>
/// 仅供ORM缓存使用
/// </summary>
public class SqlSugarCache : ICacheService
{
private static readonly IEasyCachingProvider cache = Storage.GetService<IEasyCachingProvider>();
public void Add<V>(string key, V value)
{
cache.Set(key, value, TimeSpan.FromSeconds(int.MaxValue));
}
public void Add<V>(string key, V value, int cacheDurationInSeconds)
{
cache.Set(key, value, TimeSpan.FromSeconds(cacheDurationInSeconds));
}
public bool ContainsKey<V>(string key)
{
return cache.Exists(key);
}
public V Get<V>(string key)
{
return cache.Get<V>(key).Value;
}
public IEnumerable<string> GetAllKey<V>()
{
return cache.GetByPrefix<object>("SqlSugarDataCache.").Keys;
}
public void Remove<V>(string key)
{
cache.Remove(key);
}
public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = 2147483647)
{
if (cache.Exists(cacheKey))
{
return cache.Get<V>(cacheKey).Value;
}
V v = create();
cache.Set(cacheKey, v, TimeSpan.FromSeconds(cacheDurationInSeconds));
return v;
}
}
}

View File

@@ -1,282 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Microsoft.Extensions.Caching.Memory;
using SqlSugar;
namespace CoreCms.Net.Caching.SqlSugar
{
public class SqlSugarMemoryCache : ICacheService
{
MemoryCacheHelper cache = new MemoryCacheHelper();
public void Add<V>(string key, V value)
{
cache.Set(key, value);
}
public void Add<V>(string key, V value, int cacheDurationInSeconds)
{
cache.Set(key, value, cacheDurationInSeconds);
}
public bool ContainsKey<V>(string key)
{
return cache.Exists(key);
}
public V Get<V>(string key)
{
return cache.Get<V>(key);
}
public IEnumerable<string> GetAllKey<V>()
{
return cache.GetCacheKeys();
}
public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = int.MaxValue)
{
if (cache.Exists(cacheKey))
{
return cache.Get<V>(cacheKey);
}
else
{
var result = create();
cache.Set(cacheKey, result, cacheDurationInSeconds);
return result;
}
}
public void Remove<V>(string key)
{
cache.Remove(key);
}
}
public class MemoryCacheHelper
{
private static readonly Microsoft.Extensions.Caching.Memory.MemoryCache Cache = new Microsoft.Extensions.Caching.Memory.MemoryCache(new MemoryCacheOptions());
/// <summary>
/// 验证缓存项是否存在
/// </summary>
/// <param name="key">缓存Key</param>
/// <returns></returns>
public bool Exists(string key)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
return Cache.TryGetValue(key, out _);
}
/// <summary>
/// 添加缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <param name="value">缓存Value</param>
/// <param name="expiresSliding">滑动过期时长(如果在过期时间内有操作,则以当前时间点延长过期时间)</param>
/// <param name="expiressAbsoulte">绝对过期时长</param>
/// <returns></returns>
public bool Set(string key, object value, TimeSpan expiresSliding, TimeSpan expiressAbsoulte)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
if (value == null)
throw new ArgumentNullException(nameof(value));
Cache.Set(key, value,
new MemoryCacheEntryOptions().SetSlidingExpiration(expiresSliding)
.SetAbsoluteExpiration(expiressAbsoulte));
return Exists(key);
}
/// <summary>
/// 添加缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <param name="value">缓存Value</param>
/// <param name="expiresIn">缓存时长</param>
/// <param name="isSliding">是否滑动过期(如果在过期时间内有操作,则以当前时间点延长过期时间)</param>
/// <returns></returns>
public bool Set(string key, object value, TimeSpan expiresIn, bool isSliding = false)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
if (value == null)
throw new ArgumentNullException(nameof(value));
Cache.Set(key, value,
isSliding
? new MemoryCacheEntryOptions().SetSlidingExpiration(expiresIn)
: new MemoryCacheEntryOptions().SetAbsoluteExpiration(expiresIn));
return Exists(key);
}
/// <summary>
/// 添加缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <param name="value">缓存Value</param>
/// <returns></returns>
public void Set(string key, object value)
{
Set(key, value, TimeSpan.FromDays(1));
}
/// <summary>
/// 添加缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <param name="value">缓存Value</param>
/// <param name="ts"></param>
/// <returns></returns>
public void Set(string key, object value, TimeSpan ts)
{
Set(key, value, ts, false);
}
/// <summary>
/// 添加缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <param name="value">缓存Value</param>
/// <param name="ts"></param>
/// <returns></returns>
public void Set(string key, object value, int seconds)
{
var ts = TimeSpan.FromSeconds(seconds);
Set(key, value, ts, false);
}
/// <summary>
/// 删除缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <returns></returns>
public void Remove(string key)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
Cache.Remove(key);
}
/// <summary>
/// 批量删除缓存
/// </summary>
/// <returns></returns>
public void RemoveAll(IEnumerable<string> keys)
{
if (keys == null)
throw new ArgumentNullException(nameof(keys));
keys.ToList().ForEach(item => Cache.Remove(item));
}
#region
/// <summary>
/// 获取缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <returns></returns>
public T Get<T>(string key)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
return Cache.Get<T>(key);
}
/// <summary>
/// 获取缓存
/// </summary>
/// <param name="key">缓存Key</param>
/// <returns></returns>
public object Get(string key)
{
if (key == null)
throw new ArgumentNullException(nameof(key));
return Cache.Get(key);
}
/// <summary>
/// 获取缓存集合
/// </summary>
/// <param name="keys">缓存Key集合</param>
/// <returns></returns>
public IDictionary<string, object> GetAll(IEnumerable<string> keys)
{
if (keys == null)
throw new ArgumentNullException(nameof(keys));
var dict = new Dictionary<string, object>();
keys.ToList().ForEach(item => dict.Add(item, Cache.Get(item)));
return dict;
}
#endregion
/// <summary>
/// 删除所有缓存
/// </summary>
public void RemoveCacheAll()
{
var l = GetCacheKeys();
foreach (var s in l)
{
Remove(s);
}
}
/// <summary>
/// 删除匹配到的缓存
/// </summary>
/// <param name="pattern"></param>
/// <returns></returns>
public void RemoveCacheRegex(string pattern)
{
IList<string> l = SearchCacheRegex(pattern);
foreach (var s in l)
{
Remove(s);
}
}
/// <summary>
/// 搜索 匹配到的缓存
/// </summary>
/// <param name="pattern"></param>
/// <returns></returns>
public IList<string> SearchCacheRegex(string pattern)
{
var cacheKeys = GetCacheKeys();
var l = cacheKeys.Where(k => Regex.IsMatch(k, pattern)).ToList();
return l.AsReadOnly();
}
/// <summary>
/// 获取所有缓存键
/// </summary>
/// <returns></returns>
public List<string> GetCacheKeys()
{
const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
var entries = Cache.GetType().GetField("_entries", flags).GetValue(Cache);
var cacheItems = entries as IDictionary;
var keys = new List<string>();
if (cacheItems == null) return keys;
foreach (DictionaryEntry cacheItem in cacheItems)
{
keys.Add(cacheItem.Key.ToString());
}
return keys;
}
}
}

View File

@@ -1,70 +0,0 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CoreCms.Net.Caching.Redis;
using StackExchange.Redis;
using CoreCms.Net.Configuration;
namespace CoreCms.Net.Caching.SqlSugar
{
public class SqlSugarRedisCache : ICacheService
{
//readonly RedisCacheManager _service = null;
static readonly RedisCacheManager _service = new RedisCacheManager();
public SqlSugarRedisCache()
{
//_service = new RedisCacheManager(); ;
}
public void Add<TV>(string key, TV value)
{
_service.Set(key, value);
}
public void Add<TV>(string key, TV value, int cacheDurationInSeconds)
{
_service.Set(key, value, cacheDurationInSeconds);
}
public bool ContainsKey<TV>(string key)
{
return _service.Exists(key);
}
public TV Get<TV>(string key)
{
return _service.Get<TV>(key);
}
public IEnumerable<string> GetAllKey<TV>()
{
return _service.SearchCacheRegex("SqlSugarDataCache.*");
}
public TV GetOrCreate<TV>(string cacheKey, Func<TV> create, int cacheDurationInSeconds = int.MaxValue)
{
if (this.ContainsKey<TV>(cacheKey))
{
return this.Get<TV>(cacheKey);
}
else
{
var result = create();
this.Add(cacheKey, result, cacheDurationInSeconds);
return result;
}
}
public void Remove<TV>(string key)
{
_service.Remove(key);
}
}
}

View File

@@ -49,7 +49,8 @@ namespace CoreCms.Net.Core.Config
db.CurrentConnectionConfig.ConfigureExternalServices = new ConfigureExternalServices()
{
//判断是否开启redis设置二级缓存方式
DataInfoCacheService = AppSettingsConstVars.RedisUseCache ? (ICacheService)new SqlSugarRedisCache() : new SqlSugarMemoryCache()
//DataInfoCacheService = AppSettingsConstVars.RedisUseCache ? (ICacheService)new SqlSugarRedisCache() : new SqlSugarMemoryCache()
DataInfoCacheService = new SqlSugarCache()
};
db.CurrentConnectionConfig.MoreSettings = new ConnMoreSettings()
{

View File

@@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="6.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NPOI" Version="2.5.6" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" />

View File

@@ -0,0 +1,55 @@
using Autofac;
using Microsoft.Extensions.Configuration;
namespace CoreCms.Net.Utility
{
public static class Storage
{
/// <summary>
/// 静态构造函数
/// </summary>
static Storage()
{
//var builder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
// .AddJsonFile("appsettings.json", true, true);
//Configuration = builder.Build();
//Assemblys = DependencyContext.Default.CompileLibraries
// .Where(x => x.Type == "project")
// .Select(x => AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(x.Name)))
// .ToList();
}
/// <summary>
/// 配置文件的根节点
/// </summary>
public static IConfigurationRoot Configuration { get; }
/// <summary>
/// 全局程序集
/// </summary>
//public static List<Assembly> Assemblys { get; }
/// <summary>
/// Autofac依赖注入静态服务
/// </summary>
public static ILifetimeScope Container;
/// <summary>
/// 获取服务(Single)
/// </summary>
/// <typeparam name="T">接口类型</typeparam>
/// <returns></returns>
public static T GetService<T>() where T : class
{
return Container.Resolve<T>();
}
}
}

View File

@@ -48,6 +48,9 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="EasyCaching.CSRedis" Version="1.7.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
<PackageReference Include="EasyCaching.Serialization.Json" Version="1.7.0" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.0.14" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.14" />
<PackageReference Include="IdentityModel" Version="6.0.0" />

View File

@@ -14,7 +14,7 @@
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
-->
<target name="log_database" xsi:type="Database" dbProvider="MySql.Data.MySqlClient.MySqlConnection,Mysql.Data" connectionString="Server=rm-wz92918pm46bsbc37mo.mysql.rds.aliyuncs.com;Port=3306;Database=coreshop;Uid=coreshop;Pwd=coreshop;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;">
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShopProfessional;pwd=CoreShopProfessional;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
<commandText>
INSERT INTO SysNLogRecords
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod

View File

@@ -26,6 +26,8 @@ using CoreCms.Net.Filter;
using CoreCms.Net.Mapping;
using CoreCms.Net.Middlewares;
using CoreCms.Net.Swagger;
using CoreCms.Net.Utility;
using EasyCaching.Core;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
@@ -131,7 +133,25 @@ YitIdHelper.SetIdGenerator(options);
//var newId = YitIdHelper.NextId();
#region
string cacheProviderName = "default";
builder.Services.AddEasyCaching(options =>
{
////使用文档 https://easycaching.readthedocs.io/en/latest
if (AppSettingsConstVars.RedisUseCache)
{
options.UseCSRedis(builder.Configuration);
cacheProviderName = EasyCachingConstValue.DefaultCSRedisName;
}
else
{
cacheProviderName = EasyCachingConstValue.DefaultInMemoryName;
options.UseInMemory(builder.Configuration);
}
options.WithJson(cacheProviderName);
});
#endregion
#region AutoFac注册============================================================================
@@ -179,6 +199,8 @@ app.UseRequestResponseLog();
app.UseRecordAccessLogsMildd(GlobalEnumVars.CoreShopSystemCategory.Admin.ToString());
// 记录ip请求 (注意开启权限,不然本地无法写入)
app.UseIpLogMildd();
//注册csredis中间件处理
Storage.Container = app.Services.CreateScope().ServiceProvider.GetAutofacRoot();
#endregion
app.UseSwagger().UseSwaggerUI(c =>

View File

@@ -15,6 +15,8 @@
},
"AppConfig": {
"AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
"AppVersion": "CoreShopProfessional v0.6.7"
},
@@ -23,7 +25,38 @@
"UseCache": true, //启用redis作为内存选择
"UseTimedTask": true, //启用redis作为定时任务
// 如果采用容器化部署Service 要写成redis的服务名否则写地址
"ConnectionString": "127.0.0.1:6379,password=coreshop,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
"ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
},
"easycaching": {
"csredis": {
"MaxRdSecond": 0, //预防缓存在同一时间全部失效可以为每个key的过期时间添加一个随机的秒数默认值是120秒
"EnableLogging": false, // 是否开启日志默认值是false
"LockMs": 5000, // 互斥锁的存活时间, 默认值是5000毫秒
"SleepMs": 300, // 没有获取到互斥锁时的休眠时间默认值是300毫秒
"dbconfig": {
"ConnectionStrings": [
"127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //如果没有密码请保持为空
],
//"Sentinels": [
// "192.169.1.10:26379",
// "192.169.1.11:26379",
// "192.169.1.12:26379"
//],
"ReadOnly": false
}
},
"inmemory": {
"MaxRdSecond": 0,
"EnableLogging": false,
"LockMs": 5000,
"SleepMs": 300,
"DBConfig": {
"SizeLimit": 10000,
"ExpirationScanFrequency": 60, // InMemory的过期扫描频率默认值是60秒
"EnableReadDeepClone": true,
"EnableWriteDeepClone": false
}
}
},
//jwt授权认证的一些设置
"JwtConfig": {

View File

@@ -52,6 +52,9 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="EasyCaching.CSRedis" Version="1.7.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
<PackageReference Include="EasyCaching.Serialization.Json" Version="1.7.0" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.0.14" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.14" />
<PackageReference Include="Hangfire" Version="1.7.31" />

View File

@@ -12,7 +12,9 @@ using CoreCms.Net.Mapping;
using CoreCms.Net.Middlewares;
using CoreCms.Net.Swagger;
using CoreCms.Net.Task;
using CoreCms.Net.Utility;
using CoreCms.Net.WeChat.Service.Mediator;
using EasyCaching.Core;
using Essensoft.Paylink.Alipay;
using Essensoft.Paylink.WeChatPay;
using Hangfire;
@@ -142,6 +144,25 @@ YitIdHelper.SetIdGenerator(options);
//var newId = YitIdHelper.NextId();
#region
string cacheProviderName = "default";
builder.Services.AddEasyCaching(options =>
{
////使用文档 https://easycaching.readthedocs.io/en/latest
if (AppSettingsConstVars.RedisUseCache)
{
options.UseCSRedis(builder.Configuration);
cacheProviderName = EasyCachingConstValue.DefaultCSRedisName;
}
else
{
cacheProviderName = EasyCachingConstValue.DefaultInMemoryName;
options.UseInMemory(builder.Configuration);
}
options.WithJson(cacheProviderName);
});
#endregion
#region AutoFac注册============================================================================
@@ -189,6 +210,8 @@ app.UseRequestResponseLog();
app.UseRecordAccessLogsMildd(GlobalEnumVars.CoreShopSystemCategory.Api.ToString());
// 记录ip请求 (注意开启权限,不然本地无法写入)
app.UseIpLogMildd();
//注册csredis中间件处理
Storage.Container = app.Services.CreateScope().ServiceProvider.GetAutofacRoot();
#endregion
//强制显示中文

View File

@@ -15,6 +15,8 @@
},
"AppConfig": {
"AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
"AppVersion": "CoreShopProfessional v0.6.7"
},
@@ -23,7 +25,38 @@
"UseCache": true, //启用redis作为内存选择
"UseTimedTask": true, //启用redis作为定时任务
// 如果采用容器化部署Service 要写成redis的服务名否则写地址
"ConnectionString": "127.0.0.1:6379,password=coreshop,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
"ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
},
"easycaching": {
"csredis": {
"MaxRdSecond": 0, //预防缓存在同一时间全部失效可以为每个key的过期时间添加一个随机的秒数默认值是120秒
"EnableLogging": false, // 是否开启日志默认值是false
"LockMs": 5000, // 互斥锁的存活时间, 默认值是5000毫秒
"SleepMs": 300, // 没有获取到互斥锁时的休眠时间默认值是300毫秒
"dbconfig": {
"ConnectionStrings": [
"127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //如果没有密码请保持为空
],
//"Sentinels": [
// "192.169.1.10:26379",
// "192.169.1.11:26379",
// "192.169.1.12:26379"
//],
"ReadOnly": false
}
},
"inmemory": {
"MaxRdSecond": 0,
"EnableLogging": false,
"LockMs": 5000,
"SleepMs": 300,
"DBConfig": {
"SizeLimit": 10000,
"ExpirationScanFrequency": 60, // InMemory的过期扫描频率默认值是60秒
"EnableReadDeepClone": true,
"EnableWriteDeepClone": false
}
}
},
//jwt授权认证的一些设置
"JwtConfig": {