From 0b0eaa6ad0b2d96d0253e78f952a1bf874b1107b Mon Sep 17 00:00:00 2001 From: cli <377476583@qq.com> Date: Thu, 13 Mar 2025 10:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiShe.CollectBus.sln | 12 ++++++------ .../JiShe.CollectBus.Application.csproj | 2 +- .../FreeRedisProviderModule.cs | 3 ++- .../FreeRedisProviderService.cs | 7 ++++--- .../IFreeRedisProviderService.cs | 0 .../JiShe.CollectBus.FreeRedisProvider.csproj | 0 .../Options/FreeRedisOptions.cs | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) rename {JiShe.CollectBus.FreeRedisProvider => src/JiShe.CollectBus.FreeRedisProvider}/FreeRedisProviderModule.cs (85%) rename {JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider => src/JiShe.CollectBus.FreeRedisProvider}/FreeRedisProviderService.cs (84%) rename {JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider => src/JiShe.CollectBus.FreeRedisProvider}/IFreeRedisProviderService.cs (100%) rename {JiShe.CollectBus.FreeRedisProvider => src/JiShe.CollectBus.FreeRedisProvider}/JiShe.CollectBus.FreeRedisProvider.csproj (100%) rename {JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider => src/JiShe.CollectBus.FreeRedisProvider}/Options/FreeRedisOptions.cs (89%) diff --git a/JiShe.CollectBus.sln b/JiShe.CollectBus.sln index 822d02b..674eca4 100644 --- a/JiShe.CollectBus.sln +++ b/JiShe.CollectBus.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.DbMigrator EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeSql", "src\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj", "{FE0457D9-4038-4A17-8808-DCAD06CFC0A0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.FreeRedisProvider", "JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj", "{920445D9-18D2-4886-9053-6A4CC3B4F3E2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.FreeRedisProvider", "src\JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj", "{C06C4082-638F-2996-5FED-7784475766C1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -85,10 +85,10 @@ Global {FE0457D9-4038-4A17-8808-DCAD06CFC0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE0457D9-4038-4A17-8808-DCAD06CFC0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE0457D9-4038-4A17-8808-DCAD06CFC0A0}.Release|Any CPU.Build.0 = Release|Any CPU - {920445D9-18D2-4886-9053-6A4CC3B4F3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {920445D9-18D2-4886-9053-6A4CC3B4F3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {920445D9-18D2-4886-9053-6A4CC3B4F3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {920445D9-18D2-4886-9053-6A4CC3B4F3E2}.Release|Any CPU.Build.0 = Release|Any CPU + {C06C4082-638F-2996-5FED-7784475766C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C06C4082-638F-2996-5FED-7784475766C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -106,7 +106,7 @@ Global {38C1808B-009A-418B-B17B-AB3626341B5D} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} {8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} {FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {920445D9-18D2-4886-9053-6A4CC3B4F3E2} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {C06C4082-638F-2996-5FED-7784475766C1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD} diff --git a/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj b/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj index 7160628..0102b4f 100644 --- a/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj +++ b/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj @@ -23,11 +23,11 @@ - + diff --git a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs similarity index 85% rename from JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs rename to src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs index 2bf7349..881cab9 100644 --- a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs +++ b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Configuration; +using JiShe.CollectBus.FreeRedisProvider.Options; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; diff --git a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/FreeRedisProviderService.cs b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderService.cs similarity index 84% rename from JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/FreeRedisProviderService.cs rename to src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderService.cs index 79e2037..c4bf3ff 100644 --- a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/FreeRedisProviderService.cs +++ b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProviderService.cs @@ -1,5 +1,6 @@ using FreeRedis; using JetBrains.Annotations; +using JiShe.CollectBus.FreeRedisProvider.Options; using Microsoft.Extensions.Options; using System; using System.Collections.Generic; @@ -14,14 +15,14 @@ namespace JiShe.CollectBus.FreeRedisProvider; public class FreeRedisProviderService : IFreeRedisProviderService, ISingletonDependency { - private FreeRedisOptions freeRedisOptions; + private FreeRedisOptions _freeRedisOptions; /// /// FreeRedis /// public FreeRedisProviderService(IOptions options) { - freeRedisOptions = options.Value; + _freeRedisOptions = options.Value; } [NotNull] @@ -39,7 +40,7 @@ public class FreeRedisProviderService : IFreeRedisProviderService, ISingletonDep /// public IRedisClient GetClient() { - string connectionString = $"{freeRedisOptions.Configuration},defaultdatabase={freeRedisOptions.DefaultDB}"; + string connectionString = $"{_freeRedisOptions.Configuration},defaultdatabase={_freeRedisOptions.DefaultDB}"; var redisClinet = new RedisClient(connectionString); redisClinet.Serialize = obj => JsonSerializer.Serialize(obj); redisClinet.Deserialize = (json, type) => JsonSerializer.Deserialize(json, type); diff --git a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/IFreeRedisProviderService.cs b/src/JiShe.CollectBus.FreeRedisProvider/IFreeRedisProviderService.cs similarity index 100% rename from JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/IFreeRedisProviderService.cs rename to src/JiShe.CollectBus.FreeRedisProvider/IFreeRedisProviderService.cs diff --git a/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj b/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj similarity index 100% rename from JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj rename to src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj diff --git a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/Options/FreeRedisOptions.cs b/src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs similarity index 89% rename from JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/Options/FreeRedisOptions.cs rename to src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs index 9eb7bb9..bddfa28 100644 --- a/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider/Options/FreeRedisOptions.cs +++ b/src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JiShe.CollectBus.FreeRedisProvider; +namespace JiShe.CollectBus.FreeRedisProvider.Options; public class FreeRedisOptions {