diff --git a/Yi.Abp.Net8/Yi.Abp.sln b/Yi.Abp.Net8/Yi.Abp.sln
index 03343e50..68fdb662 100644
--- a/Yi.Abp.Net8/Yi.Abp.sln
+++ b/Yi.Abp.Net8/Yi.Abp.sln
@@ -115,6 +115,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain.Shared", "module\code-gen\Yi.Framework.Codegen.Domain.Shared\Yi.Framework.CodeGen.Domain.Shared.csproj", "{EEFF0F05-2709-4151-A8CE-667935CEAE0B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Caching.FreeRedis", "framework\Yi.Framework.Caching.FreeRedis\Yi.Framework.Caching.FreeRedis.csproj", "{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -289,6 +291,10 @@ Global
{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -341,6 +347,7 @@ Global
{882BC563-2F75-4B95-AC96-F4BF23F5E69D} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
{85CB8517-2B80-42D8-B954-081079AC9BA0} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
{EEFF0F05-2709-4151-A8CE-667935CEAE0B} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
+ {862BB0EF-3D4E-44FF-AB15-0EB74CE553D3} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {23D6FBC9-C970-4641-BC1E-2AEA59F51C18}
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/FreeSqlOptions.cs b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/FreeSqlOptions.cs
new file mode 100644
index 00000000..f87d54ec
--- /dev/null
+++ b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/FreeSqlOptions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FreeRedis;
+
+namespace Yi.Framework.Caching.FreeRedis
+{
+ ///
+ /// 便于转到定义
+ ///
+ public class FreeSqlOptions: ConnectionStringBuilder
+ {
+
+ }
+}
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj
new file mode 100644
index 00000000..fe61ba31
--- /dev/null
+++ b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj
@@ -0,0 +1,16 @@
+
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/YiFrameworkCachingFreeRedisModule.cs b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/YiFrameworkCachingFreeRedisModule.cs
new file mode 100644
index 00000000..85b65e44
--- /dev/null
+++ b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/YiFrameworkCachingFreeRedisModule.cs
@@ -0,0 +1,32 @@
+using FreeRedis;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Volo.Abp.Caching;
+
+namespace Yi.Framework.Caching.FreeRedis
+{
+ ///
+ /// 此模块得益于FreeRedis作者支持IDistributedCache,使用湿滑
+ ///
+ [DependsOn(typeof(AbpCachingModule))]
+ public class YiFrameworkCachingFreeRedisModule : AbpModule
+ {
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+
+ var configuration = context.Services.GetConfiguration();
+
+ var redisEnabled = configuration["Redis:IsEnabled"];
+ if (redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled))
+ {
+ var redisConfiguration = configuration["Redis:Configuration"];
+ RedisClient redisClient = new RedisClient(redisConfiguration);
+
+ context.Services.AddSingleton(redisClient);
+ context.Services.Replace(ServiceDescriptor.Singleton(new
+ DistributedCache(redisClient)));
+ }
+ }
+ }
+}
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
index b841aa14..05bb666b 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
@@ -23,7 +23,7 @@
"EnabledSqlLog": true,
"EnabledDbSeed": true,
//SAAS多租户
- "EnabledSaasMultiTenancy":false
+ "EnabledSaasMultiTenancy": false
//读写分离地址
//"ReadUrl": [
// "DataSource=[xxxx]", //Sqlite
@@ -32,6 +32,12 @@
//]
},
+ //redis使用freeesql参数在“FreeSqlOptions的ConnectionStringBuilder中”
+ "Redis": {
+ "IsEnabled": false,
+ "Configuration": "127.0.0.1:6379,password=123,defaultDatabase=13"
+ },
+
//鉴权
"JwtOptions": {
"Issuer": "https://ccnetcore.com",
@@ -47,6 +53,7 @@
"ExpiresMinuteTime": 172800
},
+
//第三方登录
"OAuth": {
//QQ