Skip to content

Commit 62b8da4

Browse files
zhenlei520doddguzhenlei520zhenlei520朱嵘
authored
refactor: change MASA.Contrib to Masa.Contrib (#11)
* tag: 0.3.0-preview.1 (#10) * chore: update readme * Merge branch 'docs/contrib' of... * fix: Fix the problem of failing to get context after enabling soft delete * Configuration and UnitTest * chore: support net6.0 * Doc/contrib * Feature/optimize * chore: add package CI * chore: update library package * chore: add Codecov * chore: update codecov * chore: update codecov * docs: add codecov badge * chore: codecov ignore tests * chore: update codecov * chore: update codecov * Update packge.yml * Feature/ci * 🆕 feat(minimal-apis): Improve MapGet, MapPost, MapPut and MapDelete with BaseUri prop * 🐛 fix: Combine baseUri and customUri * Update .gitlab-ci.yml * 更新.gitlab-ci.yml文件 * Delete .gitlab-ci.yml * chore: change fileName * chore: update dapr library package * chore: change readme * chore: Added a solution to the failure to obtain the Event relationship chain * Fix/event * add ghpackageconfig * Update package_push_github.yml * Update package_push_nuget.org.yml * Update nuget.config * Update nuget.config * Update package_push_nuget.org.yml * Update package_push_github.yml * Update nuget.config * chore: Modify the introduction of Uow usage documentation (#3) * chore: Modify the introduction of Uow usage documentation * chore: Remove invalid comments * Update package_push_github.yml * Update nuget.config * feat:event bus * chore: Support local message retry * chore: add retry record * chore: Change the current time to Utc time * chore: Optimize background tasks * chore: Increase local message retry * chore: Add local queue to support short retry * chore: add retry retry Policy Documentation * chore: Upgrade the base library * chore: 1. Adjust EventBus to automatically execute savechange 2. UoW supports Dispose 3. Simplify the writing of Event, Command, Query, IntegrationEvent, etc. * chore: Open transactions are controlled by Repository * chore: adjust UnitOfWork and localmessage * chore: add EventBus doc * chore: Add local message table log * chore: Adjust retry configuration * chore: code review modification * chore: Get current time support modification * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient Change the file name ConfigurationAPIManage -> ConfigurationApiManage EntityState overload * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient Change the file name ConfigurationAPIManage -> ConfigurationApiManage EntityState overload * chore: Update MASA.BuildingBlocks.DDD.Domain package version * chore: add JsonIgnore and adjust unittest * chore: code review modification * chore: Adjust the writing method of CheckAndOpenTransaction to simplify nested if * chore: Change the parameter description, change Task.Delay to Thread.Sleep * fix: Fixed an error in the PublishQueueAsync method in the IDomainEventBus * fix: Fixed an error in the PublishQueueAsync method in the IDomainEventBus class * chore: remove using by class * Squashed 'src/MASA.BuildingBlocks/' content from commit b6a2d36 git-subtree-dir: src/MASA.BuildingBlocks git-subtree-split: b6a2d366dae89cef24d452ae2ad4d4debe252ae6 * update src * add buildingblock * update action * Delete package_push_github.yml * Update package_push_nuget.org.yml * refactor: project references building blocks * chore: Support local message retry * chore: add retry record * chore: Change the current time to Utc time * chore: Optimize background tasks * chore: Increase local message retry * chore: Add local queue to support short retry * chore: add retry retry Policy Documentation * chore: Upgrade the base library * chore: 1. Adjust EventBus to automatically execute savechange 2. UoW supports Dispose 3. Simplify the writing of Event, Command, Query, IntegrationEvent, etc. * chore: Open transactions are controlled by Repository * chore: adjust UnitOfWork and localmessage * chore: add EventBus doc * chore: Add local message table log * chore: Adjust retry configuration * chore: code review modification * chore: Get current time support modification * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient Change the file name ConfigurationAPIManage -> ConfigurationApiManage EntityState overload * chore: Change the file name ConfigurationAPIClient -> ConfigurationApiClient Change the file name ConfigurationAPIManage -> ConfigurationApiManage EntityState overload * chore: Update MASA.BuildingBlocks.DDD.Domain package version * chore: add JsonIgnore and adjust unittest * chore: code review modification * chore: Adjust the writing method of CheckAndOpenTransaction to simplify nested if * chore: Change the parameter description, change Task.Delay to Thread.Sleep * Update package_push_github.yml * chore: update library package and filter the local failure message just executed * chore: update library package * Update package_push_github.yml * Update package_push_github.yml * chore: ILogger changed to optional * chore: add Logging by integrationEventBus * chore: Handle background local message tasks * refactor: Handling null exceptions, warnings, and Logger changed to not requiredHandling null exceptions, warnings, and Logger changed to not required * chore: update library package * chore: adjust DelayAsync * chore: Replacement interval in seconds * chore: delete summodule * chore: add MASA.BuildingBlocks submodules * chore: Change parameter remarks * chore: Adjust package references * chore: remove MASA.BuildingBlock package * Update package_push_nuget.org.yml Co-authored-by: zhenlei520 <wangzhenlei@masastack.com> Co-authored-by: zhenlei520 <wangzhenlei@gmail.com> Co-authored-by: 朱嵘 <zhurong@masastack.com> Co-authored-by: capdiem <capdiem@live.com> Co-authored-by: 曹尤先 <caoyouxian@masastack.com> Co-authored-by: zhenlei520 <wangzhenlei520@gmail.com> Co-authored-by: 王达 <wangda@lonsid.cn> Co-authored-by: PollosD <55781685+PollosD@users.noreply.github.com> * Update package_push_nuget.org.yml * Update package_push_nuget.org.yml * chore: delete submodule * chore: add submodule * refactor: change MASA.Contrib to Masa.Contrib * refactor: change MASA.Contrib to Masa.Contrib * chore: update readme * chore: change readme * chore: change readme Co-authored-by: 鬼谷子 <358683537@qq.com> Co-authored-by: zhenlei520 <wangzhenlei@masastack.com> Co-authored-by: zhenlei520 <wangzhenlei@gmail.com> Co-authored-by: 朱嵘 <zhurong@masastack.com> Co-authored-by: capdiem <capdiem@live.com> Co-authored-by: 曹尤先 <caoyouxian@masastack.com> Co-authored-by: 王达 <wangda@lonsid.cn> Co-authored-by: PollosD <55781685+PollosD@users.noreply.github.com>
1 parent fef75ed commit 62b8da4

File tree

341 files changed

+827
-827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

341 files changed

+827
-827
lines changed

MASA.Contrib.sln Masa.Contrib.sln

+53-53
Large diffs are not rendered by default.

README.md

+35-35
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,53 @@ MASA.Contrib
1414
│ ├── nuget.config
1515
├── src
1616
│ ├── BasicAbility
17-
│ │ ├── MASA.Contrib.BasicAbility.Dcc ConfigurationAPI
17+
│ │ ├── Masa.Contrib.BasicAbility.Dcc ConfigurationAPI
1818
│ ├── Configuration
19-
│ │ ├── MASA.Contrib.Configuration
19+
│ │ ├── Masa.Contrib.Configuration
2020
│ ├── Data
21-
│ │ ├── MASA.Contrib.Data.UoW.EF Unit of work
22-
│ │ └── MASA.Contrib.Data.Contracts.EF Protocol EF version
23-
│ ├── DDD
24-
│ │ ├── MASA.Contrib.DDD.Domain In-process and cross-process support
25-
│ │ └── MASA.Contrib.DDD.Domain.Repository.EF
21+
│ │ ├── Masa.Contrib.Data.UoW.EF Unit of work
22+
│ │ └── Masa.Contrib.Data.Contracts.EF Protocol EF version
23+
│ ├── Ddd
24+
│ │ ├── Masa.Contrib.Ddd.Domain In-process and cross-process support
25+
│ │ └── Masa.Contrib.Ddd.Domain.Repository.EF
2626
│ ├── Dispatcher
27-
│ │ ├── MASA.Contrib.Dispatcher.Events In-process event
28-
│ │ ├── MASA.Contrib.Dispatcher.IntegrationEvents.Dapr
29-
│ │ └── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF Cross-process event
27+
│ │ ├── Masa.Contrib.Dispatcher.Events In-process event
28+
│ │ ├── Masa.Contrib.Dispatcher.IntegrationEvents.Dapr
29+
│ │ └── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF Cross-process event
3030
│ ├── ReadWriteSpliting
31-
│ │ └── CQRS
32-
│ │ │ └── MASA.Contrib.ReadWriteSpliting.CQRS CQRS
31+
│ │ └── Cqrs
32+
│ │ │ └── Masa.Contrib.ReadWriteSpliting.Cqrs Cqrs
3333
│ ├── Service
34-
│ │ └── MASA.Contrib.Service.MinimalAPIs Best practices for [MinimalAPI]
34+
│ │ └── Masa.Contrib.Service.MinimalAPIs Best practices for [MinimalAPI]
3535
├── test
36-
│ ├── MASA.Contrib.Dispatcher.Events
37-
│ │ ├── MASA.Contrib.Dispatcher.Events.BenchmarkDotnetTest
38-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
39-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
40-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
41-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
42-
│ │ ├── MASA.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
43-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
44-
│ │ ├── MASA.Contrib.Dispatcher.Events.Tests
45-
│ ├── MASA.Contrib.Data.UoW.EF.Tests
46-
│ ├── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
47-
│ ├── MASA.Contrib.DDD.Domain.Tests
48-
│ ├── MASA.Contrib.DDD.Domain.Repository.EF.Tests
36+
│ ├── Masa.Contrib.Dispatcher.Events
37+
│ │ ├── Masa.Contrib.Dispatcher.Events.BenchmarkDotnetTest
38+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
39+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
40+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
41+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
42+
│ │ ├── Masa.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
43+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
44+
│ │ ├── Masa.Contrib.Dispatcher.Events.Tests
45+
│ ├── Masa.Contrib.Data.UoW.EF.Tests
46+
│ ├── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
47+
│ ├── Masa.Contrib.Ddd.Domain.Tests
48+
│ ├── Masa.Contrib.Ddd.Domain.Repository.EF.Tests
4949
```
5050

5151
## Feature
5252

5353
### 1. MinimalAPI
5454

55-
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)
55+
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)
5656
5757
> Advantage:
5858
>
5959
> 1. Classify APIs and add them to different Services to make the Service structure clearer and get rid of running account programming
6060

6161
### 2. EventBus
6262

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

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

8080
### 3. CQRS
8181

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

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

8888
> AdvantageUse the same transaction to commit the user-defined context and the log to ensure atomicity and consistency
8989

9090
### 5. DomainEventBus
9191

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

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

106106
### 7. Contracts.EF
107107

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

110110
> Advantage
111111
>
112112
> 1. Filter deleted information when querying
113113
> 2. Soft delete
114114

115115
```C#
116-
Install-Package MASA.Contrib.Data.Contracts.EF
116+
Install-Package Masa.Contrib.Data.Contracts.EF
117117
```
118118

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

134-
### 8. MASA.Contrib.Configuration
134+
### 8. Masa.Contrib.Configuration
135135

136-
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)
136+
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)
137137

138138
## Unit testing rules
139139

README.zh-CN.md

+36-36
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# MASA.Contrib
66

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

99
## 结构
1010

@@ -14,53 +14,53 @@ MASA.Contrib
1414
│ ├── nuget.config
1515
├── src
1616
│ ├── BasicAbility
17-
│ │ ├── MASA.Contrib.BasicAbility.Dcc ConfigurationAPI
17+
│ │ ├── Masa.Contrib.BasicAbility.Dcc ConfigurationAPI
1818
│ ├── Configuration
19-
│ │ ├── MASA.Contrib.Configuration
19+
│ │ ├── Masa.Contrib.Configuration
2020
│ ├── Data
21-
│ │ ├── MASA.Contrib.Data.UoW.EF 工作单元
22-
│ │ └── MASA.Contrib.Data.Contracts.EF 规约EF
23-
│ ├── DDD
24-
│ │ ├── MASA.Contrib.DDD.Domain 进程内、跨进程都支持
25-
│ │ └── MASA.Contrib.DDD.Domain.Repository.EF
21+
│ │ ├── Masa.Contrib.Data.UoW.EF 工作单元
22+
│ │ └── Masa.Contrib.Data.Contracts.EF 规约EF
23+
│ ├── Ddd
24+
│ │ ├── Masa.Contrib.Ddd.Domain 进程内、跨进程都支持
25+
│ │ └── Masa.Contrib.Ddd.Domain.Repository.EF
2626
│ ├── Dispatcher
27-
│ │ ├── MASA.Contrib.Dispatcher.Events 进程内事件
28-
│ │ ├── MASA.Contrib.Dispatcher.IntegrationEvents.Dapr
29-
│ │ └── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF 跨进程事件
27+
│ │ ├── Masa.Contrib.Dispatcher.Events 进程内事件
28+
│ │ ├── Masa.Contrib.Dispatcher.IntegrationEvents.Dapr
29+
│ │ └── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF 跨进程事件
3030
│ ├── ReadWriteSpliting
31-
│ │ └── CQRS
32-
│ │ │ └── MASA.Contrib.ReadWriteSpliting.CQRS CQRS
31+
│ │ └── Cqrs
32+
│ │ │ └── Masa.Contrib.ReadWriteSpliting.Cqrs Cqrs
3333
│ ├── Service
34-
│ │ └── MASA.Contrib.Service.MinimalAPIs MinimalAPI最佳实践
34+
│ │ └── Masa.Contrib.Service.MinimalAPIs MinimalAPI最佳实践
3535
├── test
36-
│ ├── MASA.Contrib.Dispatcher.Events
37-
│ │ ├── MASA.Contrib.Dispatcher.Events.BenchmarkDotnetTest
38-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
39-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
40-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
41-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
42-
│ │ ├── MASA.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
43-
│ │ ├── MASA.Contrib.Dispatcher.Events.CheckMethodsType.Tests
44-
│ │ ├── MASA.Contrib.Dispatcher.Events.Tests
45-
│ ├── MASA.Contrib.Data.UoW.EF.Tests
46-
│ ├── MASA.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
47-
│ ├── MASA.Contrib.DDD.Domain.Tests
48-
│ ├── MASA.Contrib.DDD.Domain.Repository.EF.Tests
36+
│ ├── Masa.Contrib.Dispatcher.Events
37+
│ │ ├── Masa.Contrib.Dispatcher.Events.BenchmarkDotnetTest
38+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameter.Tests
39+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterNotNull.Tests
40+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsParameterType.Tests
41+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
42+
│ │ ├── Masa.Contrib.Dispatcher.Events.OnlyCancelHandler.Tests
43+
│ │ ├── Masa.Contrib.Dispatcher.Events.CheckMethodsType.Tests
44+
│ │ ├── Masa.Contrib.Dispatcher.Events.Tests
45+
│ ├── Masa.Contrib.Data.UoW.EF.Tests
46+
│ ├── Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests
47+
│ ├── Masa.Contrib.Ddd.Domain.Tests
48+
│ ├── Masa.Contrib.Ddd.Domain.Repository.EF.Tests
4949
```
5050

5151
## 特性
5252

5353
### 1. MinimalAPI
5454

55-
什么是[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)
55+
什么是[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)
5656

5757
> 优势:
5858
>
5959
> 1. 对API进行分类添加到不同的Service,使得Service结构更清晰,摆脱流水账式编程
6060
6161
### 2. EventBus
6262

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

6565
> 优势:
6666
>
@@ -79,17 +79,17 @@ MASA.Contrib
7979
8080
### 3. CQRS
8181

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

8484
### 4. IntegrationEventBus
8585

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

8888
> 优势:将用户自定义上下文与日志使用同一事务提交,确保原子性、一致性
8989
9090
### 5. DomainEventBus
9191

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

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

106106
### 7. Contracts.EF
107107

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

110110
> 优势:
111111
>
112112
> 1. 查询的时候过滤已删除的信息
113113
> 2. 软删除
114114
115115
```C#
116-
Install-Package MASA.Contrib.Data.Contracts.EF
116+
Install-Package Masa.Contrib.Data.Contracts.EF
117117
```
118118

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

135-
重定义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)
135+
重定义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)
136136

137137
## 单元测试规则
138138

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/_Imports.cs

-24
This file was deleted.

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/ConfigurationApiClient.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/ConfigurationApiClient.cs

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

33
public class ConfigurationApiClient : ConfigurationAPIBase, IConfigurationApiClient
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/ConfigurationApiManage.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/ConfigurationApiManage.cs

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

33
public class ConfigurationApiManage : ConfigurationAPIBase, IConfigurationApiManage
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/ConfigFormats.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/ConfigFormats.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal;
22

33
internal enum ConfigFormats
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/ConfigurationAPIBase.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/ConfigurationAPIBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal;
22

33
public class ConfigurationAPIBase
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/Constants.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Constants.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal;
22

33
internal class Constants
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/DccConfigurationRepository.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/DccConfigurationRepository.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal;
22

33
internal class DccConfigurationRepository : AbstractConfigurationRepository
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/DccFactory.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/DccFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal;
22

33
internal class DccFactory
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/Model/Property.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Model/Property.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Model;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Model;
22

33
internal class Property
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/Model/PublishRelease.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Model/PublishRelease.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Model;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Model;
22

33
internal class PublishRelease
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/Parser/JsonConfigurationParser.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Parser/JsonConfigurationParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Parser;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Parser;
22

33
/// <summary>
44
/// https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/Internal/Parser/PropertyConfigurationParser.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Parser/PropertyConfigurationParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MASA.Contrib.BasicAbility.Dcc.Internal.Parser;
1+
namespace Masa.Contrib.BasicAbility.Dcc.Internal.Parser;
22

33
internal class PropertyConfigurationParser
44
{

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/MASA.Contrib.BasicAbility.Dcc.csproj src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="MASA.Utils.Caching.DistributedMemory" Version="0.3.0-preview.1" />
11-
<PackageReference Include="MASA.Utils.Caching.Redis" Version="0.3.0-preview.1" />
12-
<PackageReference Include="MASA.Utils.Caller.Core" Version="0.3.0-preview.1" />
13-
<PackageReference Include="MASA.Utils.Caller.HttpClient" Version="0.3.0-preview.1" />
10+
<PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="0.3.0" />
11+
<PackageReference Include="Masa.Utils.Caching.Redis" Version="0.3.0" />
12+
<PackageReference Include="Masa.Utils.Caller.Core" Version="0.3.0" />
13+
<PackageReference Include="Masa.Utils.Caller.HttpClient" Version="0.3.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Configuration\MASA.BuildingBlocks.Configuration\MASA.BuildingBlocks.Configuration.csproj" />
20+
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Configuration\Masa.BuildingBlocks.Configuration\Masa.BuildingBlocks.Configuration.csproj" />
2121
</ItemGroup>
2222

2323
</Project>

src/BasicAbility/MASA.Contrib.BasicAbility.Dcc/MasaConfigurationExtensions.cs src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/MasaConfigurationExtensions.cs

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

33
public static class MasaConfigurationExtensions
44
{

0 commit comments

Comments
 (0)