Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add BasicAbility dcc client and adjust dcc configuration directory #96

Merged
merged 11 commits into from
Jun 27, 2022
Merged
Changes from 8 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
77 changes: 55 additions & 22 deletions Masa.Contrib.sln
Original file line number Diff line number Diff line change
@@ -84,16 +84,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EF",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EF.Tests", "test\Masa.Contrib.Data.UoW.EF.Tests\Masa.Contrib.Data.UoW.EF.Tests.csproj", "{1B16DD58-0847-45A7-AF93-53EBFBEDAAE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.Dcc", "src\BasicAbility\Masa.Contrib.BasicAbility.Dcc\Masa.Contrib.BasicAbility.Dcc.csproj", "{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Configuration", "src\Configuration\Masa.Contrib.Configuration\Masa.Contrib.Configuration.csproj", "{C056C688-8FFC-42BC-B4EA-EF3808A8A12C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.ReadWriteSpliting.Cqrs.Tests", "test\Masa.Contrib.ReadWriteSpliting.Cqrs.Tests\Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj", "{428CDAF3-957A-4017-82EA-70737F205546}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Configuration.Tests", "test\Masa.Contrib.Configuration.Tests\Masa.Contrib.Configuration.Tests.csproj", "{DB93B639-899D-4B2C-AF8A-47B4BC6B3776}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.Dcc.Tests", "test\Masa.Contrib.BasicAbility.Dcc.Tests\Masa.Contrib.BasicAbility.Dcc.Tests.csproj", "{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Masa.Contrib.Configuration", "Masa.Contrib.Configuration", "{9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.MinimalAPIs.Tests", "test\Masa.Contrib.Service.MinimalAPIs.Tests\Masa.Contrib.Service.MinimalAPIs.Tests.csproj", "{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD}"
@@ -290,6 +286,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.Distribut
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.DistributedLocking.Medallion.Tests", "test\Masa.Contrib.Data.DistributedLocking.Medallion.Tests\Masa.Contrib.Data.DistributedLocking.Medallion.Tests.csproj", "{FD35BEFA-512C-4483-B5C0-ADCA35680315}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Configuration.ConfigurationApi.Dcc", "src\Configuration\Masa.Contrib.Configuration.ConfigurationApi.Dcc\Masa.Contrib.Configuration.ConfigurationApi.Dcc.csproj", "{23582B50-BAEA-4A2D-82A4-345A3C30124E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Configuration.ConfigurationApi.Dcc.Tests", "test\Masa.Contrib.Configuration.ConfigurationApi.Dcc.Tests\Masa.Contrib.Configuration.ConfigurationApi.Dcc.Tests.csproj", "{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.BasicAbility.Dcc", "src\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Dcc\Masa.BuildingBlocks.BasicAbility.Dcc.csproj", "{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.BasicAbility.Dcc", "src\BasicAbility\Masa.Contrib.BasicAbility.Dcc\Masa.Contrib.BasicAbility.Dcc.csproj", "{83FA668F-C838-4883-996D-AF2ECF00FDF8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.BasicAbility.Dcc.Tests", "test\Masa.Contrib.BasicAbility.Dcc.Tests\Masa.Contrib.BasicAbility.Dcc.Tests\Masa.Contrib.BasicAbility.Dcc.Tests.csproj", "{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -458,14 +464,6 @@ Global
{1B16DD58-0847-45A7-AF93-53EBFBEDAAE7}.Release|Any CPU.Build.0 = Release|Any CPU
{1B16DD58-0847-45A7-AF93-53EBFBEDAAE7}.Release|x64.ActiveCfg = Release|Any CPU
{1B16DD58-0847-45A7-AF93-53EBFBEDAAE7}.Release|x64.Build.0 = Release|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Debug|x64.ActiveCfg = Debug|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Debug|x64.Build.0 = Debug|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Release|Any CPU.Build.0 = Release|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Release|x64.ActiveCfg = Release|Any CPU
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8}.Release|x64.Build.0 = Release|Any CPU
{C056C688-8FFC-42BC-B4EA-EF3808A8A12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C056C688-8FFC-42BC-B4EA-EF3808A8A12C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C056C688-8FFC-42BC-B4EA-EF3808A8A12C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -490,14 +488,6 @@ Global
{DB93B639-899D-4B2C-AF8A-47B4BC6B3776}.Release|Any CPU.Build.0 = Release|Any CPU
{DB93B639-899D-4B2C-AF8A-47B4BC6B3776}.Release|x64.ActiveCfg = Release|Any CPU
{DB93B639-899D-4B2C-AF8A-47B4BC6B3776}.Release|x64.Build.0 = Release|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Debug|x64.ActiveCfg = Debug|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Debug|x64.Build.0 = Debug|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Release|Any CPU.Build.0 = Release|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Release|x64.ActiveCfg = Release|Any CPU
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD}.Release|x64.Build.0 = Release|Any CPU
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1178,6 +1168,46 @@ Global
{AA7876FF-3EF9-40EC-B5FF-66AB748DB93E}.Release|Any CPU.Build.0 = Release|Any CPU
{AA7876FF-3EF9-40EC-B5FF-66AB748DB93E}.Release|x64.ActiveCfg = Release|Any CPU
{AA7876FF-3EF9-40EC-B5FF-66AB748DB93E}.Release|x64.Build.0 = Release|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Debug|x64.ActiveCfg = Debug|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Debug|x64.Build.0 = Debug|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Release|Any CPU.Build.0 = Release|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Release|x64.ActiveCfg = Release|Any CPU
{23582B50-BAEA-4A2D-82A4-345A3C30124E}.Release|x64.Build.0 = Release|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Debug|x64.ActiveCfg = Debug|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Debug|x64.Build.0 = Debug|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Release|Any CPU.Build.0 = Release|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Release|x64.ActiveCfg = Release|Any CPU
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3}.Release|x64.Build.0 = Release|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Debug|x64.Build.0 = Debug|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Release|Any CPU.Build.0 = Release|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Release|x64.ActiveCfg = Release|Any CPU
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF}.Release|x64.Build.0 = Release|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Debug|x64.ActiveCfg = Debug|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Debug|x64.Build.0 = Debug|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Release|Any CPU.Build.0 = Release|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Release|x64.ActiveCfg = Release|Any CPU
{83FA668F-C838-4883-996D-AF2ECF00FDF8}.Release|x64.Build.0 = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Debug|Any CPU.Build.0 = Debug|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Debug|x64.ActiveCfg = Debug|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Debug|x64.Build.0 = Debug|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|Any CPU.ActiveCfg = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|Any CPU.Build.0 = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|x64.ActiveCfg = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|x64.Build.0 = Release|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1235,11 +1265,9 @@ Global
{880E8263-AECC-4793-BD28-7CD03650D124} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{1265AE3C-B5FD-4339-8A7D-BC598E6E1C9F} = {E33ADF54-4D35-49B7-BDA6-412587CA39FF}
{1B16DD58-0847-45A7-AF93-53EBFBEDAAE7} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{FDF1C618-4C68-485E-A881-4FFF04EDF6E8} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
{C056C688-8FFC-42BC-B4EA-EF3808A8A12C} = {59DA3D5F-9E39-4173-8C31-126967CC189F}
{428CDAF3-957A-4017-82EA-70737F205546} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{DB93B639-899D-4B2C-AF8A-47B4BC6B3776} = {9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669}
{85BCA106-4A6F-4BEE-A748-E61A24D12DBD} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{B29ABF5D-AFA8-4480-B74E-3ACB6FAAA826} = {13EDB361-AF88-4F89-B4AB-46622BCCBC37}
@@ -1338,6 +1366,11 @@ Global
{DB2B4DA3-EEF2-49AA-93A4-B00C25210A68} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{D91C3145-C31C-4301-A493-96F94C903CF2} = {DB2B4DA3-EEF2-49AA-93A4-B00C25210A68}
{FD35BEFA-512C-4483-B5C0-ADCA35680315} = {DB2B4DA3-EEF2-49AA-93A4-B00C25210A68}
{23582B50-BAEA-4A2D-82A4-345A3C30124E} = {59DA3D5F-9E39-4173-8C31-126967CC189F}
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
{83FA668F-C838-4883-996D-AF2ECF00FDF8} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479} = {38E6C400-90C0-493E-9266-C1602E229F1B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40383055-CC50-4600-AD9A-53C14F620D03}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ The purpose of MASA.Contrib is based on [MASA.BuildingBlocks](https://github.com
* Configuration: Configuration Center
* [Configuration core, provide local configuration](./src/Configuration/Masa.Contrib.Configuration/README.md)
* ConfigurationAPI
* [Dcc](./src/Configuration/Masa.Contrib.Configuration/README.md)
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.md)
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md)
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.md)
* Dispatcher
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui
* Configuration: 配置中心
* [Configuration核心、提供本地配置](./src/Configuration/Masa.Contrib.Configuration/README.zh-CN.md)
* ConfigurationAPI
* [Dcc](./src/Configuration/Masa.Contrib.Configuration/README.zh-CN.md)
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.zh-CN.md)
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md)
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.zh-CN.md)
* Dispatcher
14 changes: 14 additions & 0 deletions src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/DccClient.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.BasicAbility.Dcc;

public class DccClient : IDccClient
{
public DccClient(IDistributedCacheClient distributedCacheClient)
{
LabelService = new LabelService(distributedCacheClient);
}

public ILabelService LabelService { get; }
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.BasicAbility.Dcc.Internal;

internal class Constants
namespace Masa.Contrib.BasicAbility.Dcc.Internal
{
internal const string DEFAULT_CLIENT_NAME = "masa.contrib.basicability.dcc";

internal const string DEFAULT_SUBSCRIBE_KEY_PREFIX = "masa.dcc:";

internal const string DEFAULT_ENVIRONMENT_NAME = "ASPNETCORE_ENVIRONMENT";

internal const string DATA_DICTIONARY_SECTION_NAME = "DataDictionary";
internal class Constants
{
internal const string DEFAULT_CLIENT_NAME = "masa.contrib.basicability.dcc";
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
@@ -7,16 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="$(MasaUtilsPackageVersion)" />
<PackageReference Include="Masa.Utils.Caching.Redis" Version="$(MasaUtilsPackageVersion)" />
<PackageReference Include="Masa.Utils.Caller.HttpClient" Version="$(MasaUtilsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftPackageVersion)" />
<PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="0.5.0-preview.3" />
<PackageReference Include="Masa.Utils.Caching.Redis" Version="0.5.0-preview.3" />
<PackageReference Include="Masa.Utils.Configuration.Json" Version="0.5.0-preview.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Configuration\Masa.BuildingBlocks.Configuration\Masa.BuildingBlocks.Configuration.csproj" />
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Dcc\Masa.BuildingBlocks.BasicAbility.Dcc.csproj" />
</ItemGroup>

</Project>
Loading