From bd8e13f25d488618c6a436cb0df1a6b292035d47 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Mon, 15 Sep 2025 01:44:18 +0800 Subject: [PATCH] :recycle: Replace use aspire redis --- DysonNetwork.Control/AppHost.cs | 2 +- DysonNetwork.Control/DysonNetwork.Control.csproj | 2 +- DysonNetwork.Develop/Startup/ServiceCollectionExtensions.cs | 5 ----- DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs | 5 ----- DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs | 5 ----- DysonNetwork.Ring/Startup/ServiceCollectionExtensions.cs | 5 ----- DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs | 5 ----- DysonNetwork.sln.DotSettings.user | 1 + 8 files changed, 3 insertions(+), 27 deletions(-) diff --git a/DysonNetwork.Control/AppHost.cs b/DysonNetwork.Control/AppHost.cs index ecc737f6..7a390e72 100644 --- a/DysonNetwork.Control/AppHost.cs +++ b/DysonNetwork.Control/AppHost.cs @@ -5,7 +5,7 @@ var builder = DistributedApplication.CreateBuilder(args); // Database was configured separately in each service. // var database = builder.AddPostgres("database"); -var cache = builder.AddConnectionString("cache"); +var cache = builder.AddRedis("cache"); var queue = builder.AddNats("queue").WithJetStream(); var ringService = builder.AddProject("ring") diff --git a/DysonNetwork.Control/DysonNetwork.Control.csproj b/DysonNetwork.Control/DysonNetwork.Control.csproj index 20416d3b..822c7e52 100644 --- a/DysonNetwork.Control/DysonNetwork.Control.csproj +++ b/DysonNetwork.Control/DysonNetwork.Control.csproj @@ -14,7 +14,7 @@ - + diff --git a/DysonNetwork.Develop/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Develop/Startup/ServiceCollectionExtensions.cs index 216ac2e1..0ce57159 100644 --- a/DysonNetwork.Develop/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Develop/Startup/ServiceCollectionExtensions.cs @@ -20,11 +20,6 @@ public static class ServiceCollectionExtensions services.AddDbContext(); services.AddSingleton(SystemClock.Instance); services.AddHttpContextAccessor(); - services.AddSingleton(_ => - { - var connection = configuration.GetConnectionString("FastRetrieve")!; - return ConnectionMultiplexer.Connect(connection); - }); services.AddSingleton(); services.AddHttpClient(); diff --git a/DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs index 05f220e5..66e73697 100644 --- a/DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs @@ -17,11 +17,6 @@ public static class ServiceCollectionExtensions public static IServiceCollection AddAppServices(this IServiceCollection services, IConfiguration configuration) { services.AddDbContext(); // Assuming you'll have an AppDatabase - services.AddSingleton(_ => - { - var connection = configuration.GetConnectionString("FastRetrieve")!; - return ConnectionMultiplexer.Connect(connection); - }); services.AddSingleton(SystemClock.Instance); services.AddHttpContextAccessor(); services.AddSingleton(); // Uncomment if you have CacheServiceRedis diff --git a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs index 858b568e..cda0085a 100644 --- a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs @@ -34,11 +34,6 @@ public static class ServiceCollectionExtensions services.AddLocalization(options => options.ResourcesPath = "Resources"); services.AddDbContext(); - services.AddSingleton(_ => - { - var connection = configuration.GetConnectionString("FastRetrieve")!; - return ConnectionMultiplexer.Connect(connection); - }); services.AddSingleton(SystemClock.Instance); services.AddHttpContextAccessor(); services.AddSingleton(); diff --git a/DysonNetwork.Ring/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Ring/Startup/ServiceCollectionExtensions.cs index 63677b49..0480fcd2 100644 --- a/DysonNetwork.Ring/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Ring/Startup/ServiceCollectionExtensions.cs @@ -21,11 +21,6 @@ public static class ServiceCollectionExtensions public static IServiceCollection AddAppServices(this IServiceCollection services, IConfiguration configuration) { services.AddDbContext(); - services.AddSingleton(_ => - { - var connection = configuration.GetConnectionString("FastRetrieve")!; - return ConnectionMultiplexer.Connect(connection); - }); services.AddSingleton(SystemClock.Instance); services.AddHttpContextAccessor(); services.AddSingleton(); diff --git a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs index 69ad0bc3..7077a812 100644 --- a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs @@ -31,11 +31,6 @@ public static class ServiceCollectionExtensions services.AddLocalization(options => options.ResourcesPath = "Resources"); services.AddDbContext(); - services.AddSingleton(_ => - { - var connection = configuration.GetConnectionString("FastRetrieve")!; - return ConnectionMultiplexer.Connect(connection); - }); services.AddSingleton(SystemClock.Instance); services.AddHttpContextAccessor(); services.AddSingleton(); diff --git a/DysonNetwork.sln.DotSettings.user b/DysonNetwork.sln.DotSettings.user index 2998db0f..383843d0 100644 --- a/DysonNetwork.sln.DotSettings.user +++ b/DysonNetwork.sln.DotSettings.user @@ -66,6 +66,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded