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

refactor: change MASA.Contrib to Masa.Contrib #11

Merged
merged 11 commits into from
Feb 24, 2022
  •  
  •  
  •  
106 changes: 53 additions & 53 deletions MASA.Contrib.sln → Masa.Contrib.sln

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -14,53 +14,53 @@ MASA.Contrib
│ ├── nuget.config
├── src
│ ├── BasicAbility
│ │ ├── MASA.Contrib.BasicAbility.Dcc ConfigurationAPI
│ │ ├── Masa.Contrib.BasicAbility.Dcc ConfigurationAPI
│ ├── Configuration
│ │ ├── MASA.Contrib.Configuration
│ │ ├── Masa.Contrib.Configuration
│ ├── Data
│ │ ├── MASA.Contrib.Data.UoW.EF Unit of work
│ │ └── MASA.Contrib.Data.Contracts.EF Protocol EF version
│ ├── DDD
│ │ ├── MASA.Contrib.DDD.Domain In-process and cross-process support
│ │ └── MASA.Contrib.DDD.Domain.Repository.EF
│ │ ├── Masa.Contrib.Data.UoW.EF Unit of work
│ │ └── Masa.Contrib.Data.Contracts.EF Protocol EF version
│ ├── Ddd
│ │ ├── Masa.Contrib.Ddd.Domain In-process and cross-process support
│ │ └── Masa.Contrib.Ddd.Domain.Repository.EF
│ ├── Dispatcher
│ │ ├── MASA.Contrib.Dispatcher.Events In-process event
│ │ ├── MASA.Contrib.Dispatcher.IntegrationEvents.Dapr
│ │ └── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF Cross-process event
│ │ ├── Masa.Contrib.Dispatcher.Events In-process event
│ │ ├── Masa.Contrib.Dispatcher.IntegrationEvents.Dapr
│ │ └── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF Cross-process event
│ ├── ReadWriteSpliting
│ │ └── CQRS
│ │ │ └── MASA.Contrib.ReadWriteSpliting.CQRS CQRS
│ │ └── Cqrs
│ │ │ └── Masa.Contrib.ReadWriteSpliting.Cqrs Cqrs
│ ├── Service
│ │ └── MASA.Contrib.Service.MinimalAPIs Best practices for [MinimalAPI]
│ │ └── Masa.Contrib.Service.MinimalAPIs Best practices for [MinimalAPI]
├── test
│ ├── MASA.Contrib.Dispatcher.Events
│ │ ├── MASA.Contrib.Dispatcher.Events.BenchmarkDotnetTest
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.Tests
│ ├── MASA.Contrib.Data.UoW.EF.Tests
│ ├── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
│ ├── MASA.Contrib.DDD.Domain.Tests
│ ├── MASA.Contrib.DDD.Domain.Repository.EF.Tests
│ ├── Masa.Contrib.Dispatcher.Events
│ │ ├── Masa.Contrib.Dispatcher.Events.BenchmarkDotnetTest
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.Tests
│ ├── Masa.Contrib.Data.UoW.EF.Tests
│ ├── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
│ ├── Masa.Contrib.Ddd.Domain.Tests
│ ├── Masa.Contrib.Ddd.Domain.Repository.EF.Tests
```

## Feature

### 1. MinimalAPI

What is [MinimalAPI](https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-6-preview-4/#introducing-minimal-apis)?[Usage introduction](/src/Service/MASA.Contrib.Service.MinimalAPIs/README.md)
What is [MinimalAPI](https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-6-preview-4/#introducing-minimal-apis)?[Usage introduction](/src/Service/Masa.Contrib.Service.MinimalAPIs/README.md)

> Advantage:
>
> 1. Classify APIs and add them to different Services to make the Service structure clearer and get rid of running account programming

### 2. EventBus

[Usage introduction](/src/Dispatcher/MASA.Contrib.Dispatcher.Events/README.md)
[Usage introduction](/src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.md)

> Advantage:
>
@@ -79,17 +79,17 @@ What is [MinimalAPI](https://devblogs.microsoft.com/aspnet/asp-net-core-updates-

### 3. CQRS

what is[CQRS](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs)?[Usage introduction](/src/ReadWriteSpliting/CQRS/MASA.Contrib.ReadWriteSpliting.CQRS/README.md)
what is[CQRS](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs)?[Usage introduction](/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md)

### 4. IntegrationEventBus

Realize cross-process events based on Dapr。[Usage introduction](/src/Dispatcher/MASA.Contrib.Dispatcher.IntegrationEvents.Dapr/README.md)
Realize cross-process events based on Dapr。[Usage introduction](/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.md)

> Advantage:Use the same transaction to commit the user-defined context and the log to ensure atomicity and consistency

### 5. DomainEventBus

[Usage introduction](/src/DDD/MASA.Contrib.DDD.Domain/README.md)
[Usage introduction](/src/Ddd/Masa.Contrib.Ddd.Domain/README.md)

> Advantage:
>
@@ -105,15 +105,15 @@ Realize cross-process events based on Dapr。[Usage introduction](/src/Dispatche

### 7. Contracts.EF

Protocol based on EF implementation,[Usage introduction](/Data/MASA.Contrib.Data.Contracts.EF/README.md)
Protocol based on EF implementation,[Usage introduction](/Data/Masa.Contrib.Data.Contracts.EF/README.md)

> Advantage:
>
> 1. Filter deleted information when querying
> 2. Soft delete

```C#
Install-Package MASA.Contrib.Data.Contracts.EF
Install-Package Masa.Contrib.Data.Contracts.EF
```

```C#
@@ -131,9 +131,9 @@ builder.Services.AddEventBus(options => {
> Do not query the data marked as soft deleted when querying
> When combined with EventBus, the transaction is opened after the first CUD, and the transaction rollback is supported when the entire Handler is abnormal.

### 8. MASA.Contrib.Configuration
### 8. Masa.Contrib.Configuration

Redefine Configuration, support the management of Local and ConfigurationAPI nodes, combine IOptions and IOptionsMonitor to complete configuration acquisition and configuration update subscription [Local Usage introduction](src/Configuration/MASA.Contrib.Configuration/README.md) 、[Dcc Usage introduction](src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/README.md)
Redefine Configuration, support the management of Local and ConfigurationAPI nodes, combine IOptions and IOptionsMonitor to complete configuration acquisition and configuration update subscription [Local Usage introduction](src/Configuration/Masa.Contrib.Configuration/README.md) 、[Dcc Usage introduction](src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.md)

## Unit testing rules

72 changes: 36 additions & 36 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

# MASA.Contrib

MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.BuildingBlocks)提供开放, 社区驱动的可重用组件,用于构建网格应用程序。这些组件将被[MASA Stack](https://github.com/masastack)和[MASA Labs](https://github.com/masalabs)等项目使用。
MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.BuildingBlocks)提供开放, 社区驱动的可重用组件,用于构建网格应用程序。这些组件将被[MaMASAsa Stack](https://github.com/masastack)和[MASA Labs](https://github.com/masalabs)等项目使用。

## 结构

@@ -14,53 +14,53 @@ MASA.Contrib
│ ├── nuget.config
├── src
│ ├── BasicAbility
│ │ ├── MASA.Contrib.BasicAbility.Dcc ConfigurationAPI
│ │ ├── Masa.Contrib.BasicAbility.Dcc ConfigurationAPI
│ ├── Configuration
│ │ ├── MASA.Contrib.Configuration
│ │ ├── Masa.Contrib.Configuration
│ ├── Data
│ │ ├── MASA.Contrib.Data.UoW.EF 工作单元
│ │ └── MASA.Contrib.Data.Contracts.EF 规约EF版
│ ├── DDD
│ │ ├── MASA.Contrib.DDD.Domain 进程内、跨进程都支持
│ │ └── MASA.Contrib.DDD.Domain.Repository.EF
│ │ ├── Masa.Contrib.Data.UoW.EF 工作单元
│ │ └── Masa.Contrib.Data.Contracts.EF 规约EF版
│ ├── Ddd
│ │ ├── Masa.Contrib.Ddd.Domain 进程内、跨进程都支持
│ │ └── Masa.Contrib.Ddd.Domain.Repository.EF
│ ├── Dispatcher
│ │ ├── MASA.Contrib.Dispatcher.Events 进程内事件
│ │ ├── MASA.Contrib.Dispatcher.IntegrationEvents.Dapr
│ │ └── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF 跨进程事件
│ │ ├── Masa.Contrib.Dispatcher.Events 进程内事件
│ │ ├── Masa.Contrib.Dispatcher.IntegrationEvents.Dapr
│ │ └── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF 跨进程事件
│ ├── ReadWriteSpliting
│ │ └── CQRS
│ │ │ └── MASA.Contrib.ReadWriteSpliting.CQRS CQRS
│ │ └── Cqrs
│ │ │ └── Masa.Contrib.ReadWriteSpliting.Cqrs Cqrs
│ ├── Service
│ │ └── MASA.Contrib.Service.MinimalAPIs MinimalAPI最佳实践
│ │ └── Masa.Contrib.Service.MinimalAPIs MinimalAPI最佳实践
├── test
│ ├── MASA.Contrib.Dispatcher.Events
│ │ ├── MASA.Contrib.Dispatcher.Events.BenchmarkDotnetTest
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── MASA.Contrib.Dispatcher.Events.Tests
│ ├── MASA.Contrib.Data.UoW.EF.Tests
│ ├── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
│ ├── MASA.Contrib.DDD.Domain.Tests
│ ├── MASA.Contrib.DDD.Domain.Repository.EF.Tests
│ ├── Masa.Contrib.Dispatcher.Events
│ │ ├── Masa.Contrib.Dispatcher.Events.BenchmarkDotnetTest
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
│ │ ├── Masa.Contrib.Dispatcher.Events.Tests
│ ├── Masa.Contrib.Data.UoW.EF.Tests
│ ├── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
│ ├── Masa.Contrib.Ddd.Domain.Tests
│ ├── Masa.Contrib.Ddd.Domain.Repository.EF.Tests
```

## 特性

### 1. MinimalAPI

什么是[MinimalAPI](https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-6-preview-4/#introducing-minimal-apis)?[用法介绍](/src/Service/MASA.Contrib.Service.MinimalAPIs/README.zh-CN.md)
什么是[MinimalAPI](https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-6-preview-4/#introducing-minimal-apis)?[用法介绍](/src/Service/Masa.Contrib.Service.MinimalAPIs/README.zh-CN.md)

> 优势:
>
> 1. 对API进行分类添加到不同的Service,使得Service结构更清晰,摆脱流水账式编程

### 2. EventBus

[用法介绍](/src/Dispatcher/MASA.Contrib.Dispatcher.Events/README.zh-CN.md)
[用法介绍](/src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.zh-CN.md)

> 优势:
>
@@ -79,17 +79,17 @@ MASA.Contrib

### 3. CQRS

什么是[CQRS](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs)?[用法介绍](/src/ReadWriteSpliting/CQRS/MASA.Contrib.ReadWriteSpliting.CQRS/README.zh-CN.md)
什么是[CQRS](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs)?[用法介绍](/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md)

### 4. IntegrationEventBus

基于Dapr实现跨进程的事件。[用法介绍](/src/Dispatcher/MASA.Contrib.Dispatcher.IntegrationEvents.Dapr/README.zh-CN.md)
基于Dapr实现跨进程的事件。[用法介绍](/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.zh-CN.md)

> 优势:将用户自定义上下文与日志使用同一事务提交,确保原子性、一致性

### 5. DomainEventBus

[用法介绍](/src/DDD/MASA.Contrib.DDD.Domain/README.zh-CN.md)
[用法介绍](/src/Ddd/Masa.Contrib.Ddd.Domain/README.zh-CN.md)

> 优势:
>
@@ -105,15 +105,15 @@ MASA.Contrib

### 7. Contracts.EF

基于EF实现的规约,[用法介绍](src/Data/MASA.Contrib.Data.Contracts.EF/README.zh-CN.md)
基于EF实现的规约,[用法介绍](src/Data/Masa.Contrib.Data.Contracts.EF/README.zh-CN.md)

> 优势:
>
> 1. 查询的时候过滤已删除的信息
> 2. 软删除

```C#
Install-Package MASA.Contrib.Data.Contracts.EF
Install-Package Masa.Contrib.Data.Contracts.EF
```

```C#
@@ -130,9 +130,9 @@ builder.Services.AddEventBus(options => {
> 支持查询的时候不查询被标记软删除的数据
> 与EventBus结合使用时,做到了第一次CUD后开启事务,当整个Handler出现异常后支持事务回滚

### 8. MASA.Contrib.Configuration
### 8. Masa.Contrib.Configuration

重定义Configuration,支持Local、ConfigurationAPI节点的管理,结合IOptions、IOptionsMonitor完成配置的获取以及配置的更新订阅 [Local用法介绍](src/Configuration/MASA.Contrib.Configuration/README.zh-CN.md) 、[Dcc用法介绍](src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/README.zh-CN.md)
重定义Configuration,支持Local、ConfigurationAPI节点的管理,结合IOptions、IOptionsMonitor完成配置的获取以及配置的更新订阅 [Local用法介绍](src/Configuration/Masa.Contrib.Configuration/README.zh-CN.md) 、[Dcc用法介绍](src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.zh-CN.md)

## 单元测试规则

24 changes: 0 additions & 24 deletions src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/_Imports.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc;
namespace Masa.Contrib.BasicAbility.Dcc;

public class ConfigurationApiClient : ConfigurationAPIBase, IConfigurationApiClient
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc;
namespace Masa.Contrib.BasicAbility.Dcc;

public class ConfigurationApiManage : ConfigurationAPIBase, IConfigurationApiManage
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
namespace Masa.Contrib.BasicAbility.Dcc.Internal;

internal enum ConfigFormats
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
namespace Masa.Contrib.BasicAbility.Dcc.Internal;

public class ConfigurationAPIBase
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
namespace Masa.Contrib.BasicAbility.Dcc.Internal;

internal class Constants
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
namespace Masa.Contrib.BasicAbility.Dcc.Internal;

internal class DccConfigurationRepository : AbstractConfigurationRepository
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
namespace Masa.Contrib.BasicAbility.Dcc.Internal;

internal class DccFactory
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Model;
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Model;

internal class Property
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Model;
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Model;

internal class PublishRelease
{
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Parser;
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Parser;

/// <summary>
/// https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Parser;
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Parser;

internal class PropertyConfigurationParser
{
Original file line number Diff line number Diff line change
@@ -7,17 +7,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MASA.Utils.Caching.DistributedMemory" Version="0.3.0-preview.1" />
<PackageReference Include="MASA.Utils.Caching.Redis" Version="0.3.0-preview.1" />
<PackageReference Include="MASA.Utils.Caller.Core" Version="0.3.0-preview.1" />
<PackageReference Include="MASA.Utils.Caller.HttpClient" Version="0.3.0-preview.1" />
<PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="0.3.0" />
<PackageReference Include="Masa.Utils.Caching.Redis" Version="0.3.0" />
<PackageReference Include="Masa.Utils.Caller.Core" Version="0.3.0" />
<PackageReference Include="Masa.Utils.Caller.HttpClient" Version="0.3.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
</ItemGroup>

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

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MASA.Contrib.BasicAbility.Dcc;
namespace Masa.Contrib.BasicAbility.Dcc;

public static class MasaConfigurationExtensions
{
Loading