Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sample/Senparc.CO2NET.Sample.Consoles/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ and limitations under the License.
* 1、Redis 的连接字符串信息会从 Config.SenparcSetting.Cache_Redis_Configuration 自动获取并注册,如不需要修改,下方方法可以忽略
/* 2、如需手动修改,可以通过下方 SetConfigurationOption 方法手动设置 Redis 链接信息(仅修改配置,不立即启用)
*/
Senparc.CO2NET.Cache.Redis.Register.SetConfigurationOption(redisConfigurationStr);
Console.WriteLine("完成 Redis 设置");
Senparc.CO2NET.Cache.CsRedis.Register.SetConfigurationOption(redisConfigurationStr);
Console.WriteLine("完成 CsRedis 设置");


//以下会立即将全局缓存设置为 Redis
Senparc.CO2NET.Cache.Redis.Register.UseKeyValueRedisNow();//键值对缓存策略(推荐)
Console.WriteLine("启用 Redis UseKeyValue 策略");
Senparc.CO2NET.Cache.CsRedis.Register.UseKeyValueRedisNow();//键值对缓存策略(推荐)
Console.WriteLine("启用 CsRedis UseKeyValue 策略");

//Senparc.CO2NET.Cache.Redis.Register.UseHashRedisNow();//HashSet储存格式的缓存策略

Expand Down
7 changes: 2 additions & 5 deletions src/Senparc.CO2NET.Cache.CsRedis.Tests/InitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ public void AutoRegisterConfigurationTest()
.UseSenparcGlobal();
Assert.AreEqual(null, RedisManager.ConfigurationOption);// Not registered yet

registerService.RegisterCacheRedis(
redisServer,
redisConfiguration => RedisObjectCacheStrategy.Instance// Will automatically register on the first call
);
Assert.AreEqual(redisServer, RedisManager.ConfigurationOption);
Register.SetConfigurationOption(redisServer);
\ Assert.AreEqual(redisServer, RedisManager.ConfigurationOption);

var currentCache = CacheStrategyFactory.GetObjectCacheStrategyInstance();
Assert.IsInstanceOfType(currentCache, typeof(RedisObjectCacheStrategy));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ protected BaseRedisObjectCacheStrategy()

static bool CanUseRedis()
{
return string.IsNullOrEmpty(RedisManager.ConfigurationOption) &&
!string.IsNullOrEmpty(Config.SenparcSetting.Cache_Redis_Configuration) &&
return !string.IsNullOrEmpty(RedisManager.ConfigurationOption) ||
(!string.IsNullOrEmpty(Config.SenparcSetting.Cache_Redis_Configuration) &&
Config.SenparcSetting.Cache_Redis_Configuration != "Redis配置" &&
Config.SenparcSetting.Cache_Redis_Configuration != "#{Cache_Redis_Configuration}#";
Config.SenparcSetting.Cache_Redis_Configuration != "#{Cache_Redis_Configuration}#");
}

static BaseRedisObjectCacheStrategy()
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.CO2NET.Cache.CsRedis/Register.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static class Register
/// <param name="redisConfigurationString">Redis connection string</param>
/// <param name="redisObjectCacheStrategyInstance">Cache strategy delegate, the first parameter is redisConfigurationString</param>
/// <returns></returns>
[Obsolete("The registration process has been automated. Please use the Register.SetConfigurationOption() method to modify the connection string.")]
[Obsolete("The registration process has been automated. Please use the Register.SetConfigurationOption() method to modify the connection string.", true)]
public static IRegisterService RegisterCacheRedis(this IRegisterService registerService,
string redisConfigurationString,
Func<string, IBaseObjectCacheStrategy> redisObjectCacheStrategyInstance)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<Version>2.2.0.2</Version>
<Version>2.3.0</Version>
<AssemblyName>Senparc.CO2NET.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.CO2NET.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand All @@ -22,15 +22,16 @@
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
<PackageIcon>icon.jpg</PackageIcon>
<PackageReleaseNotes>
v0.1.0 Genesis
v0.5.2 BaseRedisObjectCacheStrategy destructor performs null value check and adds "#{Cache_Redis_Configuration}#" filter check
v1.1.4 RedisObjectCacheStrategy and RedisHashSetObjectCacheStrategy.Get() methods add pure string check
v1.2.5 Fix bug where GetAllByPrefixAsync(key) method automatically retrieves all keys
[2024-09-11] v1.2.6 Update Cache, remove InsertToCache(), add Count(prefix)
[2024-10-24] v2.0.1-beta1 fix: GetCountAsync(string prefix) #306 Thanks to @rendyu
[2024-11-28] v2.1.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
[2024-12-04] v2.2.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
</PackageReleaseNotes>
v0.1.0 Genesis
v0.5.2 BaseRedisObjectCacheStrategy destructor performs null value check and adds "#{Cache_Redis_Configuration}#" filter check
v1.1.4 RedisObjectCacheStrategy and RedisHashSetObjectCacheStrategy.Get() methods add pure string check
v1.2.5 Fix bug where GetAllByPrefixAsync(key) method automatically retrieves all keys
[2024-09-11] v1.2.6 Update Cache, remove InsertToCache(), add Count(prefix)
[2024-10-24] v2.0.1-beta1 fix: GetCountAsync(string prefix) #306 Thanks to @rendyu
[2024-11-28] v2.1.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
[2024-12-04] v2.2.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
[2025-08-18] v2.3.0 update BaseRedisObjectCacheStrategy.Client init progress
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
<Configurations>Debug;Release;Test</Configurations>
</PropertyGroup>
Expand Down