Skip to content

Commit b2e83c6

Browse files
zhenlei520doddgu
andauthored
refactor: Refactor repo structure (#171)
* chore: Readjust the directory structure * style: BasicAbility rename to StackSdks * chore: using global version * refactor: Removed using Utils from nuget package * chore: init * ci: remove buildingBlocks dependencies * ci: Adjust gitignore * chore: Add Scenes * chore: remove src by utils * refactor: Refactor repo structure * refactor: Refactor repo structure * refactor: Refactor repo structure * refactor: Refactor repo structure * rename: Oidc rename to OpenIdConnect * rename: Identity.IdentityModel rename to Authentication.Identity * rename: EF rename to EntityFrameworkCore * rename: Benchmark rename to Tests.Benchmark * chore: global using sort * refactor: remove invalid references * chore: Ignore deprecation warnings * chore: use global using * refactor: Remove the restriction that the Query response value cannot be empty * refactor: Refactor repo structure * chore: Modify unit test name * rename: Benchmark rename to Perf * chore: Adjust the directory structure * refactor: Refactor repo structure * Update pr_run_test_ci.yml * Update pr_run_test_ci.yml Co-authored-by: 鬼谷子 <358683537@qq.com>
1 parent 5eb043e commit b2e83c6

File tree

2,062 files changed

+41032
-13220
lines changed

Some content is hidden

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

2,062 files changed

+41032
-13220
lines changed

.github/workflows/pr_run_test_ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
with:
2222
dotnet-version: '6.0.x'
2323
include-prerelease: true
24-
- name: dependencies
25-
run: git clone -b main https://github.com/masastack/MASA.BuildingBlocks.git ./src/BuildingBlocks/MASA.BuildingBlocks
2624

2725
- name: Configure sysctl limits
2826
run: |

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ x86/
1717
bld/
1818
[Bb]in/
1919
[Oo]bj/
20-
[Ll]og/
2120
# Visual Studio 2015 cache/options directory
2221
.vs/
2322
# Uncomment if you have tasks that create the project's static files in wwwroot

Directory.Build.props

+10-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@
66
<MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
77
<CoverletPackageVersion>3.0.2</CoverletPackageVersion>
88
<MoqPackageVersion>4.16.1</MoqPackageVersion>
9-
<MasaUtilsPackageVersion>0.5.0</MasaUtilsPackageVersion>
109
<MapsterPackageVersion>7.3.0</MapsterPackageVersion>
1110
<DaprPackageVersion>1.5.0</DaprPackageVersion>
1211
<GoogleProtobufPackageVersion>3.19.1</GoogleProtobufPackageVersion>
1312
<MedallionDistributedLockPackageVersion>1.0.4</MedallionDistributedLockPackageVersion>
14-
15-
<OpenTelemetryVersion>1.3.0</OpenTelemetryVersion>
16-
<OpenTelemetryContribVersion>1.0.0-beta2</OpenTelemetryContribVersion>
17-
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.3</OpenTelemetryInstrumentationVersion>
18-
13+
<FluentValidationPackageVersion>11.1.0</FluentValidationPackageVersion>
14+
<FluentValidationAspNetCorePackageVersion>11.1.2</FluentValidationAspNetCorePackageVersion>
15+
<StackExchangeRedisPackageVersion>2.2.4</StackExchangeRedisPackageVersion>
16+
<NESTPackageVersion>7.17.4</NESTPackageVersion>
17+
<IdentityPackageVersion>6.15.0</IdentityPackageVersion>
18+
19+
<OpenTelemetryVersion>1.3.0</OpenTelemetryVersion>
20+
<OpenTelemetryContribVersion>1.0.0-beta2</OpenTelemetryContribVersion>
21+
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.3</OpenTelemetryInstrumentationVersion>
22+
1923
<PackageId>$(AssemblyName)</PackageId>
2024
<PackageIcon>packageIcon.png</PackageIcon>
2125
<Authors>masastack</Authors>

Masa.Contrib.sln

-1,599
This file was deleted.

Masa.Framework.sln

+2,154
Large diffs are not rendered by default.

README.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ The purpose of MASA.Contrib is based on [MASA.BuildingBlocks](https://github.com
2323
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.md)
2424
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md)
2525
* Data:
26-
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EntityFrameworkCore/README.md)
27-
* [SqlServer](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/README.md)
28-
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/README.md): Recommend
29-
* [MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/README.md)
30-
* [Sqlite](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/README.md)
31-
* [Cosmos](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/README.md)
32-
* [InMemory](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/README.md)
33-
* [Oracle](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Oracle/README.md)
34-
* [PostgreSql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/README.md)
35-
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EF/): data protocol
26+
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.md)
27+
* [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.md)
28+
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EFCore.Pomelo.MySql/README.md): Recommend
29+
* [MySql](./src/Data/Masa.Contrib.Data.EFCore.MySql/README.md)
30+
* [Sqlite](./src/Data/Masa.Contrib.Data.EFCore.Sqlite/README.md)
31+
* [Cosmos](./src/Data/Masa.Contrib.Data.EFCore.Cosmos/README.md)
32+
* [InMemory](./src/Data/Masa.Contrib.Data.EFCore.InMemory/README.md)
33+
* [Oracle](./src/Data/Masa.Contrib.Data.EFCore.Oracle/README.md)
34+
* [PostgreSql](./src/Data/Masa.Contrib.Data.EFCore.PostgreSql/README.md)
35+
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EFCore/): data protocol
3636
* UoW: unit of work
37-
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EF/README.md)
37+
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EFCore/README.md)
3838
* IdGenerator: Unique ID generator
3939
* [NormalGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.NormalGuid/README.md): Normal Guid
4040
* [SequentialGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.SequentialGuid/README.md): Sequential Guid
@@ -43,24 +43,24 @@ The purpose of MASA.Contrib is based on [MASA.BuildingBlocks](https://github.com
4343
* Mapping: object mapping
4444
* [Mapster](./src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/README.md)
4545
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.md)
46-
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/README.md): Provide warehousing services
46+
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EFCore/README.md): Provide warehousing services
4747
* Dispatcher
4848
* [EventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.md): In-process events
4949
* [IntegrationEventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.md): Cross-process events
50-
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/README.md): Provides message management services for cross-process events
50+
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore/README.md): Provides message management services for cross-process events
5151
* Isolation: Support physical isolation, logical isolation
52-
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EF/README.md)
52+
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EFCore/README.md)
5353
* [MultiEnvironment](./src/Isolation/Masa.Contrib.Isolation.MultiEnvironment/README.md): MultiEnvironment
5454
* [MultiTenant](./src/Isolation/Masa.Contrib.Isolation.MultiTenant/README.md): Multi-tenancy
55-
* [MinimalAPI](./src/Service/Masa.Contrib.Service.MinimalAPIs/README.md): Support API classification aggregation similar to Controller
55+
* [MinimalAPI](./src/Service/Masa.Contrib.Service.Mini~~~~malAPIs/README.md): Support API classification aggregation similar to Controller
5656
* Storage: cloud storage
5757
* [Aliyun Storage](./src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/README.md)
5858
* Operational capacity
59-
* [Auth](./src/BasicAbility/Masa.Contrib.BasicAbility.Auth/README.md): Authentication and Authorization
60-
* [Dcc](./src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.md): Distributed Configuration Center
61-
* [PM](./src/BasicAbility/Masa.Contrib.BasicAbility.Pm/README.md): Project Management
62-
* [Scheduler](./src/BasicAbility/Masa.Contrib.BasicAbility.Scheduler/README.md): Distributed Scheduler
63-
* [TSC](./src/BasicAbility/Masa.Contrib.BasicAbility.Tsc/README.md): Troubleshooting Console
59+
* [Auth](./src/StackSdks/Masa.Contrib.StackSdks.Auth/README.md): Authentication and Authorization
60+
* [Dcc](./src/StackSdks/Masa.Contrib.StackSdks.Dcc/README.md): Distributed Configuration Center
61+
* [PM](./src/StackSdks/Masa.Contrib.StackSdks.Pm/README.md): Project Management
62+
* [Scheduler](./src/StackSdks/Masa.Contrib.StackSdks.Scheduler/README.md): Distributed Scheduler
63+
* [TSC](./src/StackSdks/Masa.Contrib.StackSdks.Tsc/README.md): Troubleshooting Console
6464

6565

6666

README.zh-CN.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui
2323
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.zh-CN.md)
2424
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md)
2525
* Data:
26-
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EntityFrameworkCore/README.zh-CN.md)
27-
* [SqlServer](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/README.zh-CN.md)
28-
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/README.zh-CN.md): 推荐
29-
* [MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/README.zh-CN.md)
30-
* [Sqlite](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/README.zh-CN.md)
31-
* [Cosmos](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/README.zh-CN.md)
32-
* [InMemory](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/README.zh-CN.md)
33-
* [Oracle](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Oracle/README.zh-CN.md)
34-
* [PostgreSql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/README.zh-CN.md)
35-
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EF/): 数据规约
26+
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.zh-CN.md)
27+
* [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.zh-CN.md)
28+
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EFCore.Pomelo.MySql/README.zh-CN.md): 推荐
29+
* [MySql](./src/Data/Masa.Contrib.Data.EFCore.MySql/README.zh-CN.md)
30+
* [Sqlite](./src/Data/Masa.Contrib.Data.EFCore.Sqlite/README.zh-CN.md)
31+
* [Cosmos](./src/Data/Masa.Contrib.Data.EFCore.Cosmos/README.zh-CN.md)
32+
* [InMemory](./src/Data/Masa.Contrib.Data.EFCore.InMemory/README.zh-CN.md)
33+
* [Oracle](./src/Data/Masa.Contrib.Data.EFCore.Oracle/README.zh-CN.md)
34+
* [PostgreSql](./src/Data/Masa.Contrib.Data.EFCore.PostgreSql/README.zh-CN.md)
35+
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EFCore/): 数据规约
3636
* UoW: 工作单元
37-
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EF/README.zh-CN.md)
37+
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EFCore/README.zh-CN.md)
3838
* IdGenerator: 唯一ID生成器
3939
* [NormalGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.NormalGuid/README.zh-CN.md): 普通的Guid
4040
* [SequentialGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.SequentialGuid/README.zh-CN.md): 有序的Guid
@@ -43,24 +43,24 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui
4343
* Mapping: 对象映射
4444
* [Mapster](./src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/README.zh-CN.md)
4545
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.zh-CN.md)
46-
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/README.zh-CN.md): 提供仓储服务
46+
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EFCore/README.zh-CN.md): 提供仓储服务
4747
* Dispatcher
4848
* [EventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.zh-CN.md): 进程内事件
4949
* [IntegrationEventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.zh-CN.md): 跨进程事件
50-
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/README.zh-CN.md): 为跨进程事件提供消息管理服务
50+
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore/README.zh-CN.md): 为跨进程事件提供消息管理服务
5151
* Isolation: 支持物理隔离、逻辑隔离
52-
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EF/README.zh-CN.md)
52+
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EFCore/README.zh-CN.md)
5353
* [MultiEnvironment](./src/Isolation/Masa.Contrib.Isolation.MultiEnvironment/README.zh-CN.md): 多环境
5454
* [MultiTenant](./src/Isolation/Masa.Contrib.Isolation.MultiTenant/README.zh-CN.md): 多租户
5555
* [MinimalAPI](./src/Service/Masa.Contrib.Service.MinimalAPIs/README.zh-CN.md): 支持类似Controller的API分类聚合
5656
* Storage: 云存储
5757
* [阿里云存储](./src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/README.zh-CN.md)
5858
* 业务能力
59-
* [Auth](./src/BasicAbility/Masa.Contrib.BasicAbility.Auth/README.zh-CN.md): 权限认证
60-
* [Dcc](./src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.zh-CN.md): 分布式配置中心
61-
* [PM](./src/BasicAbility/Masa.Contrib.BasicAbility.Pm/README.zh-CN.md): 项目管理
62-
* [Scheduler](./src/BasicAbility/Masa.Contrib.BasicAbility.Scheduler/README.zh-CN.md): 分布式调度中心
63-
* [TSC](./src/BasicAbility/Masa.Contrib.BasicAbility.Tsc/README.zh-CN.md): 故障排除平台
59+
* [Auth](./src/StackSdks/Masa.Contrib.StackSdks.Auth/README.zh-CN.md): 权限认证
60+
* [Dcc](./src/StackSdks/Masa.Contrib.StackSdks.Dcc/README.zh-CN.md): 分布式配置中心
61+
* [PM](./src/StackSdks/Masa.Contrib.StackSdks.Pm/README.zh-CN.md): 项目管理
62+
* [Scheduler](./src/StackSdks/Masa.Contrib.StackSdks.Scheduler/README.zh-CN.md): 分布式调度中心
63+
* [TSC](./src/StackSdks/Masa.Contrib.StackSdks.Tsc/README.zh-CN.md): 故障排除平台
6464

6565

6666
## 如何克隆

0 commit comments

Comments
 (0)