From ef8ee7acb660defe115315041480a82a82f14209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Fri, 1 Mar 2024 15:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dvs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SJZY.Track.Api.sln | 2 +- src/SJZY.Track.Api/SJZY.Track.Api.csproj | 16 ++++++++-------- src/SJZY.Track.Api/SjzyTrackApiModule.cs | 4 ++-- .../Services/ITrackPushRecordRepository.cs | 8 -------- .../Services/TrackPushRecordRepository.cs | 10 ---------- .../ITrackPushRecordDetailsRepository.cs | 8 -------- .../Services/TrackPushRecordDetailsRepository.cs | 10 ---------- .../DataBaseContext.cs | 2 +- .../GlobalUsing.cs | 0 .../Queries/BasicQuery.cs | 2 +- .../Queries/TrackQueries.cs | 2 +- .../Repositories/BasicRepository.cs | 4 ++-- .../Repositories/DemoRepository.cs | 2 +- .../Repositories/OrderRepository.cs | 2 +- .../Repositories/TrackContentRepository.cs | 2 +- .../Repositories/TrackDetailsRepository.cs | 2 +- .../Repositories/TrackFlagRepository.cs | 2 +- .../Repositories/TrackPullConfigRepository.cs | 2 +- .../Repositories/TrackPushConfigRepository.cs | 2 +- .../Repositories/TrackStatusRepository.cs | 2 +- .../Repositories/TrackTemplateRepository.cs | 2 +- .../SJZY.Track.Repository.csproj} | 13 ++++++------- .../SjzyTrackRepositoryModule.cs} | 8 ++++---- .../Entitys/TrackPushRecordEntity.cs | 2 +- .../Services/ITrackPushRecordRepository.cs | 8 ++++++++ .../Services/TrackPushRecordRepository.cs | 10 ++++++++++ .../Entitys/TrackPushRecordDetailsEntity.cs | 2 +- .../ITrackPushRecordDetailsRepository.cs | 8 ++++++++ .../Services/TrackPushRecordDetailsRepository.cs | 10 ++++++++++ test/SJZY.Track.Test/TestModule.cs | 4 ++-- 30 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 src/SJZY.Track.Infrastructure/TrackPushRecord/Services/ITrackPushRecordRepository.cs delete mode 100644 src/SJZY.Track.Infrastructure/TrackPushRecord/Services/TrackPushRecordRepository.cs delete mode 100644 src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs delete mode 100644 src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/DataBaseContext.cs (98%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/GlobalUsing.cs (100%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Queries/BasicQuery.cs (95%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Queries/TrackQueries.cs (98%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/BasicRepository.cs (95%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/DemoRepository.cs (99%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/OrderRepository.cs (99%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackContentRepository.cs (98%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackDetailsRepository.cs (98%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackFlagRepository.cs (97%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackPullConfigRepository.cs (99%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackPushConfigRepository.cs (99%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackStatusRepository.cs (98%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/Repositories/TrackTemplateRepository.cs (99%) rename src/{SJZY.Track.Infrastructure/SJZY.Track.Infrastructure.csproj => SJZY.Track.Repository/SJZY.Track.Repository.csproj} (78%) rename src/{SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs => SJZY.Track.Repository/SjzyTrackRepositoryModule.cs} (91%) rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/TrackPushRecord/Entitys/TrackPushRecordEntity.cs (96%) create mode 100644 src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs rename src/{SJZY.Track.Infrastructure => SJZY.Track.Repository}/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs (94%) create mode 100644 src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs create mode 100644 src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs diff --git a/SJZY.Track.Api.sln b/SJZY.Track.Api.sln index 3de8a025..0c457eb0 100644 --- a/SJZY.Track.Api.sln +++ b/SJZY.Track.Api.sln @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAC93270-5A2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E2537C3-6EF3-4085-9BD2-CF923E53F82A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Infrastructure", "src\SJZY.Track.Infrastructure\SJZY.Track.Infrastructure.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Repository", "src\SJZY.Track.Repository\SJZY.Track.Repository.csproj", "{D9CF5706-1972-414F-821E-AA32C13B8570}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SJZY.Track.Application.Contract", "src\SJZY.Track.Application.Contract\SJZY.Track.Application.Contract.csproj", "{390A44FB-0DB5-4B66-86AB-7712DC3030F5}" EndProject diff --git a/src/SJZY.Track.Api/SJZY.Track.Api.csproj b/src/SJZY.Track.Api/SJZY.Track.Api.csproj index a2a8fad3..be47c0cf 100644 --- a/src/SJZY.Track.Api/SJZY.Track.Api.csproj +++ b/src/SJZY.Track.Api/SJZY.Track.Api.csproj @@ -1,6 +1,6 @@  - + net7.0 @@ -10,16 +10,16 @@ - - - - - + + + + + - - + + diff --git a/src/SJZY.Track.Api/SjzyTrackApiModule.cs b/src/SJZY.Track.Api/SjzyTrackApiModule.cs index 102be9d7..13d9633a 100644 --- a/src/SJZY.Track.Api/SjzyTrackApiModule.cs +++ b/src/SJZY.Track.Api/SjzyTrackApiModule.cs @@ -9,7 +9,7 @@ using SJZY.Expand.ABP.Core.Prometheus; using SJZY.Expand.ABP.Core.Redis; using SJZY.Expand.ABP.Core.Swagger; using SJZY.Track.Application; -using SJZY.Track.Infrastructure; +using SJZY.Track.Repository; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Serilog; @@ -28,7 +28,7 @@ namespace SJZY.Track.Api typeof(AbpAspNetCoreMvcModule), typeof(AbpAspNetCoreSerilogModule), typeof(SjzyTrackApplicationModule), - typeof(SjzyTrackInfrastructureModule) + typeof(SjzyTrackRepositoryModule) )] public class SjzyTrackApiModule : AbpModule { diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/ITrackPushRecordRepository.cs b/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/ITrackPushRecordRepository.cs deleted file mode 100644 index 7b2e515e..00000000 --- a/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/ITrackPushRecordRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using SJZY.Track.Infrastructure.TrackPushRecord.Entitys; - -namespace SJZY.Track.Infrastructure.TrackPushRecord.Services -{ - public interface ITrackPushRecordRepository : ISimpleClient - { - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/TrackPushRecordRepository.cs b/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/TrackPushRecordRepository.cs deleted file mode 100644 index 22529060..00000000 --- a/src/SJZY.Track.Infrastructure/TrackPushRecord/Services/TrackPushRecordRepository.cs +++ /dev/null @@ -1,10 +0,0 @@ -using SJZY.Track.Infrastructure.Repositories; -using SJZY.Track.Infrastructure.TrackPushRecord.Entitys; - -namespace SJZY.Track.Infrastructure.TrackPushRecord.Services -{ - public class TrackPushRecordRepository : BasicRepository, ITrackPushRecordRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs deleted file mode 100644 index 6f29bbc3..00000000 --- a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys; - -namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Services -{ - public interface ITrackPushRecordDetailsRepository : ISimpleClient - { - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs deleted file mode 100644 index 157dc8bd..00000000 --- a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs +++ /dev/null @@ -1,10 +0,0 @@ -using SJZY.Track.Infrastructure.Repositories; -using SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys; - -namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Services -{ - public class TrackPushRecordDetailsRepository : BasicRepository, ITrackPushRecordDetailsRepository, IScopedDependency - { - - } -} diff --git a/src/SJZY.Track.Infrastructure/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs similarity index 98% rename from src/SJZY.Track.Infrastructure/DataBaseContext.cs rename to src/SJZY.Track.Repository/DataBaseContext.cs index 9fbb7d44..88539836 100644 --- a/src/SJZY.Track.Infrastructure/DataBaseContext.cs +++ b/src/SJZY.Track.Repository/DataBaseContext.cs @@ -2,7 +2,7 @@ #pragma warning disable 1591 -namespace SJZY.Track.Infrastructure; +namespace SJZY.Track.Repository; /// /// Sqlsugar 上下文对象 diff --git a/src/SJZY.Track.Infrastructure/GlobalUsing.cs b/src/SJZY.Track.Repository/GlobalUsing.cs similarity index 100% rename from src/SJZY.Track.Infrastructure/GlobalUsing.cs rename to src/SJZY.Track.Repository/GlobalUsing.cs diff --git a/src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs b/src/SJZY.Track.Repository/Queries/BasicQuery.cs similarity index 95% rename from src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs rename to src/SJZY.Track.Repository/Queries/BasicQuery.cs index fbb511c7..60a234ef 100644 --- a/src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs +++ b/src/SJZY.Track.Repository/Queries/BasicQuery.cs @@ -2,7 +2,7 @@ using SJZY.Track.Domain.Queries; using SJZY.Track.Domain.SeedWork; -namespace SJZY.Track.Infrastructure.Queries; +namespace SJZY.Track.Repository.Queries; #pragma warning disable CS8613 public class BasicQuery : SimpleClient, IBasicQuery where T : class, IEntity, new() diff --git a/src/SJZY.Track.Infrastructure/Queries/TrackQueries.cs b/src/SJZY.Track.Repository/Queries/TrackQueries.cs similarity index 98% rename from src/SJZY.Track.Infrastructure/Queries/TrackQueries.cs rename to src/SJZY.Track.Repository/Queries/TrackQueries.cs index 413c38fe..da7c4dab 100644 --- a/src/SJZY.Track.Infrastructure/Queries/TrackQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackQueries.cs @@ -7,7 +7,7 @@ using SJZY.Track.Domain.Dtos.TrackDetails; using SJZY.Track.Domain.Dtos.TrackTemplate; using SJZY.Track.Domain.Queries; -namespace SJZY.Track.Infrastructure.Queries; +namespace SJZY.Track.Repository.Queries; public class TrackQueries : ISugarRepository, ITrackQueries, ITransientDependency diff --git a/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs similarity index 95% rename from src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs rename to src/SJZY.Track.Repository/Repositories/BasicRepository.cs index 7480b9f3..965bd5d7 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/BasicRepository.cs @@ -1,10 +1,10 @@ using System.Linq.Expressions; using SJZY.Track.Domain; using SJZY.Track.Domain.SeedWork; -using SJZY.Track.Infrastructure.Queries; +using SJZY.Track.Repository.Queries; using Volo.Abp; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; /// /// 仓储基类实现 diff --git a/src/SJZY.Track.Infrastructure/Repositories/DemoRepository.cs b/src/SJZY.Track.Repository/Repositories/DemoRepository.cs similarity index 99% rename from src/SJZY.Track.Infrastructure/Repositories/DemoRepository.cs rename to src/SJZY.Track.Repository/Repositories/DemoRepository.cs index 9acceca7..8334ea44 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/DemoRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/DemoRepository.cs @@ -2,7 +2,7 @@ using SJZY.Track.Domain.Aggregates.DemoAggregate; using SJZY.Track.Domain.Dtos.Demo; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class DemoRepository : BasicRepository, IDemoRepository, IScopedDependency { diff --git a/src/SJZY.Track.Infrastructure/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs similarity index 99% rename from src/SJZY.Track.Infrastructure/Repositories/OrderRepository.cs rename to src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 7fb36b99..8e9106da 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -5,7 +5,7 @@ using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.VEntities; using SJZY.Track.Repository.VData.Entitys; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class OrderRepository : BasicRepository, IOrderRepository, ITransientDependency { diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs similarity index 98% rename from src/SJZY.Track.Infrastructure/Repositories/TrackContentRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index eac2265f..bbde4d6f 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -4,7 +4,7 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Dtos.TrackContents; using SJZY.Track.Domain.VEntities; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackContentRepository : BasicRepository, ITrackContentRepository, IScopedDependency { diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs similarity index 98% rename from src/SJZY.Track.Infrastructure/Repositories/TrackDetailsRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs index c23a28fd..b5632055 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackDetailsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs @@ -3,7 +3,7 @@ using SJZY.Expand.ElasticSearch.Services; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Dtos.TrackDetails; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; internal class TrackDetailsRepository : ElasticSearchContextAbstract, ITrackDetailsRepository, ITransientDependency diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs similarity index 97% rename from src/SJZY.Track.Infrastructure/Repositories/TrackFlagRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs index 12c29447..2a2a4ba6 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackFlagRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs @@ -2,7 +2,7 @@ using SJZY.Track.Domain.Dtos.TrackFlags; using SJZY.Track.Domain.VEntities; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackFlagRepository : BasicRepository, ITrackFlagRepository, IScopedDependency { diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs similarity index 99% rename from src/SJZY.Track.Infrastructure/Repositories/TrackPullConfigRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs index 796e6778..076671d5 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackPullConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs @@ -6,7 +6,7 @@ using SJZY.Track.Domain.Dtos.Common; using SJZY.Track.Domain.Dtos.TrackPull; using SJZY.Track.Domain.VEntities; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackPullConfigRepository : BasicRepository, ITrackPullConfigRepository, IScopedDependency diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs similarity index 99% rename from src/SJZY.Track.Infrastructure/Repositories/TrackPushConfigRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs index d1ce352b..999a2732 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackPushConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs @@ -7,7 +7,7 @@ using SJZY.Track.Domain.Dtos.TrackPush; using SJZY.Track.Domain.VEntities; using SJZY.Track.Repository.VData.Entitys; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackPushConfigRepository : BasicRepository, ITrackPushConfigRepository, IScopedDependency diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackStatusRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs similarity index 98% rename from src/SJZY.Track.Infrastructure/Repositories/TrackStatusRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs index 6ac36ade..703eb8c4 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackStatusRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs @@ -2,7 +2,7 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Dtos.TrackStatus; using SJZY.Track.Domain.VEntities; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackStatusRepository : BasicRepository, ITrackStatusRepository, IScopedDependency { diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs similarity index 99% rename from src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs rename to src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs index d4ae27a6..04cd6e0e 100644 --- a/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -8,7 +8,7 @@ using SJZY.Track.Domain.Dtos.TrackTemplate; using SJZY.Track.Domain.Enums; using SJZY.Track.Domain.VEntities; -namespace SJZY.Track.Infrastructure.Repositories; +namespace SJZY.Track.Repository.Repositories; public class TrackTemplateRepository : BasicRepository, ITrackTemplateRepository, IScopedDependency { diff --git a/src/SJZY.Track.Infrastructure/SJZY.Track.Infrastructure.csproj b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj similarity index 78% rename from src/SJZY.Track.Infrastructure/SJZY.Track.Infrastructure.csproj rename to src/SJZY.Track.Repository/SJZY.Track.Repository.csproj index 938fe9a1..b2285e0b 100644 --- a/src/SJZY.Track.Infrastructure/SJZY.Track.Infrastructure.csproj +++ b/src/SJZY.Track.Repository/SJZY.Track.Repository.csproj @@ -1,21 +1,20 @@  - + net7.0 True preview - SJZY.Track.Repository - - - - + + + + - + diff --git a/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs similarity index 91% rename from src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs rename to src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs index 048d60fb..546d80d9 100644 --- a/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs +++ b/src/SJZY.Track.Repository/SjzyTrackRepositoryModule.cs @@ -4,19 +4,19 @@ using SJZY.Expand.ABP.Core.SqlSugar.Options; using SJZY.Expand.ElasticSearch; using SJZY.Track.Domain; using SJZY.Track.Domain.Queries; -using SJZY.Track.Infrastructure.Queries; -using SJZY.Track.Infrastructure.Repositories; +using SJZY.Track.Repository.Queries; +using SJZY.Track.Repository.Repositories; using Volo.Abp.Autofac; using Volo.Abp.Modularity; -namespace SJZY.Track.Infrastructure; +namespace SJZY.Track.Repository; /// /// 仓储模块 /// [DependsOn(typeof(AbpAutofacModule))] [DependsOn(typeof(SjzyTrackDomainModule))] -public class SjzyTrackInfrastructureModule : AbpModule +public class SjzyTrackRepositoryModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecord/Entitys/TrackPushRecordEntity.cs b/src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs similarity index 96% rename from src/SJZY.Track.Infrastructure/TrackPushRecord/Entitys/TrackPushRecordEntity.cs rename to src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs index 345e7335..b3c2ff5b 100644 --- a/src/SJZY.Track.Infrastructure/TrackPushRecord/Entitys/TrackPushRecordEntity.cs +++ b/src/SJZY.Track.Repository/TrackPushRecord/Entitys/TrackPushRecordEntity.cs @@ -1,6 +1,6 @@ using SJZY.Track.Domain.SeedWork; -namespace SJZY.Track.Infrastructure.TrackPushRecord.Entitys +namespace SJZY.Track.Repository.TrackPushRecord.Entitys { /// /// 轨迹推送记录 diff --git a/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs b/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs new file mode 100644 index 00000000..686a3402 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecord/Services/ITrackPushRecordRepository.cs @@ -0,0 +1,8 @@ +using SJZY.Track.Repository.TrackPushRecord.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecord.Services +{ + public interface ITrackPushRecordRepository : ISimpleClient + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs b/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs new file mode 100644 index 00000000..e8e16ab9 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecord/Services/TrackPushRecordRepository.cs @@ -0,0 +1,10 @@ +using SJZY.Track.Repository.Repositories; +using SJZY.Track.Repository.TrackPushRecord.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecord.Services +{ + public class TrackPushRecordRepository : BasicRepository, ITrackPushRecordRepository, IScopedDependency + { + + } +} diff --git a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs similarity index 94% rename from src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs rename to src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs index 796e3e47..64208102 100644 --- a/src/SJZY.Track.Infrastructure/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Entitys/TrackPushRecordDetailsEntity.cs @@ -1,6 +1,6 @@ using SJZY.Track.Domain.SeedWork; -namespace SJZY.Track.Infrastructure.TrackPushRecordDetails.Entitys +namespace SJZY.Track.Repository.TrackPushRecordDetails.Entitys { /// /// 轨迹推送明细表 diff --git a/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs new file mode 100644 index 00000000..f84fafa7 --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/ITrackPushRecordDetailsRepository.cs @@ -0,0 +1,8 @@ +using SJZY.Track.Repository.TrackPushRecordDetails.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecordDetails.Services +{ + public interface ITrackPushRecordDetailsRepository : ISimpleClient + { + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs new file mode 100644 index 00000000..3a8c025b --- /dev/null +++ b/src/SJZY.Track.Repository/TrackPushRecordDetails/Services/TrackPushRecordDetailsRepository.cs @@ -0,0 +1,10 @@ +using SJZY.Track.Repository.Repositories; +using SJZY.Track.Repository.TrackPushRecordDetails.Entitys; + +namespace SJZY.Track.Repository.TrackPushRecordDetails.Services +{ + public class TrackPushRecordDetailsRepository : BasicRepository, ITrackPushRecordDetailsRepository, IScopedDependency + { + + } +} diff --git a/test/SJZY.Track.Test/TestModule.cs b/test/SJZY.Track.Test/TestModule.cs index 6bace7fa..aa5f8d90 100644 --- a/test/SJZY.Track.Test/TestModule.cs +++ b/test/SJZY.Track.Test/TestModule.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using SJZY.Track.Api; using SJZY.Track.Application; -using SJZY.Track.Infrastructure; +using SJZY.Track.Repository; using Volo.Abp; using Volo.Abp.AspNetCore.TestBase; using Volo.Abp.Authorization; @@ -20,7 +20,7 @@ namespace SJZY.Track.Test; typeof(AbpAspNetCoreTestBaseModule), typeof(AbpAutofacModule), typeof(AbpAuthorizationModule), - typeof(SjzyTrackInfrastructureModule), + typeof(SjzyTrackRepositoryModule), typeof(SjzyTrackApplicationModule), typeof(SjzyTrackApiModule), typeof(AbpHttpClientModule) //添加abp的http代理模块