From db6e314acaf2e7e6a724ac302ab1922c99078383 Mon Sep 17 00:00:00 2001 From: Dai Mr <1822802785@qq.com> Date: Thu, 17 Apr 2025 20:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiShe.CollectBus.sln | 82 +++++++++--------- .../CassandraConfig.cs | 0 .../CassandraProvider.cs | 0 .../CassandraQueryOptimizer.cs | 0 .../CassandraRepository.cs | 1 - .../CollectBusCassandraModule.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../Extensions/SessionExtension.cs | 0 .../ICassandraProvider.cs | 0 .../ICassandraRepository.cs | 0 .../JiShe.CollectBus.Cassandra.csproj | 4 +- .../Mappers/CollectBusMapping.cs | 0 .../CollectBusFreeRedisModule.cs | 4 +- .../FreeRedisProvider.cs | 13 +-- .../IFreeRedisProvider.cs | 3 +- .../JiShe.CollectBus.FreeRedis.csproj | 2 +- .../Options/FreeRedisOptions.cs | 8 +- .../CollectBusFreeSqlModule.cs | 0 .../JiShe.CollectBus.FreeSql/DbEnum.cs | 0 .../FreeSqlProvider.cs | 0 .../IFreeSqlProvider.cs | 0 .../JiShe.CollectBus.FreeSql.csproj | 0 .../Attribute/ATTRIBUTEColumnAttribute.cs | 10 +++ .../Attribute/FIELDColumnAttribute.cs | 10 +++ .../Attribute/SingleMeasuringAttribute.cs | 10 +-- .../Attribute/TAGColumnAttribute.cs | 10 +++ .../CollectBusIoTDBModule.cs | 15 ++-- .../Context/IoTDBRuntimeContext.cs | 10 +-- .../Interface/IIoTDBProvider.cs | 4 +- .../Interface/IIoTDBSessionFactory.cs | 8 +- .../Interface/IIoTDBSessionPool.cs | 7 +- .../JiShe.CollectBus.IoTDB.csproj | 2 +- .../Options/IoTDBOptions.cs | 8 +- .../Options/QueryCondition.cs | 8 +- .../Options/QueryOptions.cs | 8 +- .../Provider/DeviceMetadata.cs | 7 +- .../Provider/DevicePathBuilder.cs | 8 +- .../Provider/IoTDBProvider.cs | 20 ++--- .../Provider/IoTDBSessionFactory.cs | 12 +-- .../Provider/IoTEntity.cs | 4 +- .../Provider/SessionPoolAdapter.cs | 14 ++- .../Provider/TableSessionPoolAdapter.cs | 14 ++- .../AdminClient/AdminClientService.cs | 0 .../AdminClient/IAdminClientService.cs | 0 .../Attributes/KafkaSubscribeAttribute.cs | 0 .../Attributes/TopicAttribute.cs | 0 .../CollectBusKafkaModule.cs | 0 .../Consumer/ConsumerService.cs | 0 .../Consumer/IConsumerService.cs | 0 .../JiShe.CollectBus.Kafka}/HeadersFilter.cs | 0 .../IKafkaSubscribe.cs | 0 .../JiShe.CollectBus.Kafka}/ISubscribeAck.cs | 0 .../JiShe.CollectBus.Kafka.csproj | 2 +- .../JiShe.CollectBus.Kafka}/JsonSerializer.cs | 0 .../KafkaOptionConfig.cs | 0 .../KafkaSubcribesExtensions.cs | 0 .../Producer/IProducerService.cs | 0 .../Producer/ProducerService.cs | 0 .../SubscribeResult.cs | 0 .../JiShe.CollectBus.MongoDB}/FodyWeavers.xml | 0 .../JiShe.CollectBus.MongoDB.abppkg | 0 .../JiShe.CollectBus.MongoDB.csproj | 2 +- .../MongoDB/CollectBusDbSchemaMigrator.cs | 0 .../MongoDB/CollectBusMongoDbContext.cs | 0 .../CollectBusMongoDbContextExtensions.cs | 0 .../MongoDB/CollectBusMongoDbModule.cs | 0 .../MongoDB/ICollectBusMongoDbContext.cs | 0 .../IMeterReadingRecordRepository.cs | 0 .../MeterReadingRecordRepository.cs | 0 .../ShardingStrategy/DayShardingStrategy.cs | 0 .../ShardingStrategy/IShardingStrategy.cs | 0 .../Abstracts/BaseProtocolPlugin.cs | 0 .../StandardFixedHeaderDataHandlingAdapter.cs | 0 .../AnalysisData/Appendix.cs | 0 .../Attributes/ProtocolNameAttribute.cs | 0 .../Interfaces/IProtocolPlugin.cs | 0 ...JiShe.CollectBus.Protocol.Contracts.csproj | 16 ++-- .../Models/CustomFixedHeaderRequestInfo.cs | 0 .../Models/TB3761.cs | 0 .../QGDW3761Config.cs | 0 .../JiShe.CollectBus.Protocol.Test.csproj | 6 +- .../JiSheCollectBusProtocolModule.cs | 0 .../TestProtocolPlugin.cs | 0 .../JiShe.CollectBus.Protocol.csproj | 8 +- .../JiSheCollectBusProtocolModule.cs | 0 .../StandardProtocolPlugin.cs | 0 .../BaseResultDto.cs | 0 .../CollectBusApplicationContractsModule.cs | 0 .../CollectBusRemoteServiceConsts.cs | 0 .../DataMigration/IDataMigrationService.cs | 0 .../Options/DataMigrationOptions.cs | 0 .../Dto/AddConrOnlineRecordInput.cs | 0 .../EnergySystem/Dto/AddFocusLogInput.cs | 0 .../Dto/AddSignalStrengthInput.cs | 0 .../Dto/AdjustMeterTimingInput.cs | 0 .../Dto/AmmeterArchivesDownInput.cs | 0 .../Dto/AmmeterArchivesDownOutput.cs | 0 .../Dto/AmmeterArchivesMatchInput.cs | 0 .../Dto/AutoReportCollectionItemsSetInput.cs | 0 .../EnergySystem/Dto/AutoReportSetInput.cs | 0 .../EnergySystem/Dto/BaseInput.cs | 0 .../EnergySystem/Dto/BatchReadVersionInput.cs | 0 .../Dto/BatchReadVersionOutput.cs | 0 .../EnergySystem/Dto/CallTimeTestingInput.cs | 0 .../Dto/CommunicationParametersSetInput.cs | 0 .../EnergySystem/Dto/EquitDubgInput.cs | 0 .../Dto/QueryAutoReportOpenStatusInput.cs | 0 .../EnergySystem/Dto/QueryRecordLogInput.cs | 0 .../EnergySystem/Dto/QueryRecordLogOutput.cs | 0 .../EnergySystem/Dto/ReadMeterNumInput.cs | 0 .../EnergySystem/Dto/ReadMeterNumOutput.cs | 0 .../EnergySystem/Dto/ReadTimeInput.cs | 0 .../EnergySystem/Dto/ReadTimeOutput.cs | 0 .../EnergySystem/Dto/ReadingInput.cs | 0 .../EnergySystem/Dto/ReadingOutput.cs | 0 .../EnergySystem/Dto/TerminalRestartInput.cs | 0 .../EnergySystem/Dto/TimeAdjustInput.cs | 0 .../EnergySystem/Dto/TimeSetInput.cs | 0 .../EnergySystem/Dto/TimeSetOutput.cs | 0 .../EnergySystem/Dto/ValveControlInput.cs | 0 .../EnergySystem/Dto/ValveControlOutput.cs | 0 .../EnergySystem/ICacheAppService.cs | 0 .../EnergySystem/IEnergySystemAppService.cs | 0 .../FodyWeavers.xml | 0 .../ICollectWorker.cs | 0 ...up.CollectBus.Application.Contracts.csproj | 0 ...he.CollectBus.Application.Contracts.abppkg | 0 ...he.CollectBus.Application.Contracts.csproj | 6 +- .../CollectBusPermissionDefinitionProvider.cs | 0 .../Permissions/CollectBusPermissions.cs | 0 .../RedisDataCache/IRedisDataCacheService.cs | 0 .../Samples/ISampleAppService.cs | 0 .../Samples/SampleDto.cs | 0 .../IScheduledMeterReadingService.cs | 0 .../Subscribers/ISubscriberAppService.cs | 0 .../IWorkerSubscriberAppService.cs | 0 .../CollectBusAppService.cs | 2 +- .../CollectBusApplicationAutoMapperProfile.cs | 0 .../CollectBusApplicationModule.cs | 4 +- .../Consumers/IssuedConsumer.cs | 0 .../Consumers/IssuedFaultConsumer.cs | 0 .../Consumers/ReceivedConsumer.cs | 0 .../Consumers/ReceivedFaultConsumer.cs | 0 .../Consumers/ReceivedHeartbeatConsumer.cs | 0 .../Consumers/ReceivedLoginConsumer.cs | 0 .../ScheduledMeterReadingConsumer.cs | 0 .../DataMigration/DataMigrationService.cs | 0 .../EnergySystem/CacheAppService.cs | 0 .../EnergySystem/EnergySystemAppService.cs | 0 .../Exceptions/CloseException.cs | 0 .../FodyWeavers.xml | 0 .../Handlers/SampleHandler.cs | 0 ...She - Backup.CollectBus.Application.csproj | 0 .../JiShe.CollectBus.Application.abppkg | 0 .../JiShe.CollectBus.Application.csproj | 10 +-- .../Plugins/CloseMonitor.cs | 0 .../Plugins/ServerMonitor.cs | 0 .../Plugins/TcpMonitor.cs | 0 .../Plugins/UdpMonitor.cs | 0 .../RedisDataCache/RedisDataCacheService.cs | 2 +- .../Samples/SampleAppService.cs | 5 +- .../Samples/TestAppService.cs | 2 - .../BasicScheduledMeterReadingService.cs | 2 +- ...nergySystemScheduledMeterReadingService.cs | 2 +- .../Subscribers/SubscriberAppService.cs | 2 +- .../Subscribers/WorkerSubscriberAppService.cs | 0 .../Workers/CreateToBeIssueTaskWorker.cs | 0 .../Workers/EpiCollectWorker.cs | 0 .../Workers/SubscriberFifteenMinuteWorker.cs | 0 .../Workers/SubscriberFiveMinuteWorker.cs | 0 .../Workers/SubscriberOneMinuteWorker.cs | 0 .../cmd3761Matching.txt | 0 .../cmd3761TdcMatching.txt | 0 .../CollectBusDbMigratorModule.cs | 0 .../DbMigratorHostedService.cs | 0 .../JiShe.CollectBus.DbMigrator/Dockerfile | 0 .../FodyWeavers.xml | 0 .../JiShe.CollectBus.DbMigrator.abppkg | 0 .../JiShe.CollectBus.DbMigrator.csproj | 2 +- .../JiShe.CollectBus.DbMigrator/Program.cs | 0 .../appsettings.json | 0 .../appsettings.secrets.json | 0 .../Ammeters/AmmeterInfo.cs | 0 .../Ammeters/AmmeterInfoTemp.cs | 0 .../Ammeters/ElectricityMeter.cs | 5 +- .../Analyze3761Data.cs | 0 .../CollectBusConsts.cs | 0 .../CollectBusDbProperties.cs | 0 .../CollectBusDomainModule.cs | 0 .../Data/CollectBusDbMigrationService.cs | 0 .../Data/ICollectBusDbSchemaMigrator.cs | 0 .../Data/NullCollectBusDbSchemaMigrator.cs | 0 .../EnergySystems/Entities/TB_AmmeterInfo.cs | 0 .../TableViews/V_FocusAmmeter.cs | 0 .../JiShe.CollectBus.Domain/FodyWeavers.xml | 0 .../GatherItem/GatherItemInfo.cs | 0 .../AFNEntity/SingleMeasuringAFNDataEntity.cs | 5 +- .../IotSystems/Devices/Device.cs | 0 .../MessageIssueds/MessageIssued.cs | 0 ...ScheduledMeterReadingIssuedEventMessage.cs | 0 .../IotSystems/MessageReceiveds/IReceived.cs | 0 .../MessageReceiveds/MessageReceived.cs | 0 .../MeterReadingRecords.cs | 0 .../MeterReadingTelemetryPacketInfo.cs | 0 .../PrepayModel/Vi_BaseAmmeterInfo.cs | 0 .../IotSystems/Protocols/ProtocolInfo.cs | 0 .../IotSystems/Records/ConrOnlineRecord.cs | 0 .../IotSystems/Records/CsqRecord.cs | 0 .../IotSystems/Records/FocusRecord.cs | 0 .../IotSystems/Watermeter/WatermeterInfo.cs | 0 .../JiShe - Backup.CollectBus.Domain.csproj | 0 .../JiShe.CollectBus.Domain.abppkg | 0 .../JiShe.CollectBus.Domain.csproj | 8 +- .../Properties/AssemblyInfo.cs | 0 .../CollectBusSettingDefinitionProvider.cs | 0 .../Settings/CollectBusSettings.cs | 0 .../CollectBusDbContext.cs | 0 .../CollectBusDbContextFactory.cs | 0 ...CollectBusEfCoreEntityExtensionMappings.cs | 0 .../CollectBusEntityFrameworkCoreModule.cs | 0 ...FrameworkCoreCollectBusDbSchemaMigrator.cs | 0 .../FodyWeavers.xml | 0 ...iShe.CollectBus.EntityFrameworkCore.abppkg | 0 ...iShe.CollectBus.EntityFrameworkCore.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../AttributeInfo/NumericalOrderAttribute.cs | 0 .../Attributes/CassandraTableAttribute.cs | 0 .../Attributes/IgnoreJobAttribute.cs | 0 .../Attributes/TopicNameAttribute.cs | 0 .../BuildSendDatas/Build188SendData.cs | 0 .../BuildSendDatas/Build3761SendData.cs | 0 .../BuildSendDatas/Build645SendData.cs | 0 .../BuildSendDatas/TasksToBeIssueModel.cs | 0 .../BuildSendDatas/TelemetryPacketBuilder.cs | 0 .../BuildSendDatas/TelemetryPacketRequest.cs | 0 .../Consts/CommonConst.cs | 0 .../Consts/ProtocolConst.cs | 0 .../Consts/RedisConst.cs | 0 .../Consts/RegexConst.cs | 0 .../Consts/SystemTypeConst.cs | 0 .../DeviceGroupBalanceControl.cs | 0 .../JiShe.CollectBus.Common/Enums/188Enums.cs | 0 .../JiShe.CollectBus.Common/Enums/376Enums.cs | 0 .../JiShe.CollectBus.Common/Enums/645Enums.cs | 0 .../Enums/ComandCodeEnum.cs | 0 .../Enums/CommandChunkEnum.cs | 0 .../Enums/F25DataItemEnum.cs | 0 .../Enums/MaskTypeEnum.cs | 0 .../Enums/MeterLinkProtocolEnum.cs | 0 .../Enums/MeterTypeEnum.cs | 0 .../Enums/RecordsDataMigrationStatusEnum.cs | 0 .../JiShe.CollectBus.Common/Enums/SortEnum.cs | 0 .../Enums/TransparentForwardingFlagEnum.cs | 0 .../Extensions/CollectionExtensions.cs | 0 .../Extensions/ComparableExtensions.cs | 0 .../Extensions/DataTableExtensions.cs | 0 .../Extensions/DateTimeExtensions.cs | 0 .../Extensions/DayOfWeekExtensions.cs | 0 .../Extensions/DecimalOrIntExtensions.cs | 0 .../Extensions/DictionaryExtensions.cs | 0 .../Extensions/EnumExtensions.cs | 0 .../Extensions/EnumerableExtensions.cs | 0 .../Extensions/EventHandlerExtensions.cs | 0 .../Extensions/ExceptionExtensions.cs | 0 .../Extensions/HexStringExtensions.cs | 0 .../Extensions/HttpResponseExtensions.cs | 0 .../Extensions/IntExtensions.cs | 0 .../Extensions/ListExtensions.cs | 0 .../Extensions/LockExtensions.cs | 0 .../Extensions/ObjectExtensions.cs | 0 .../Extensions/ProtocolConstExtensions.cs | 0 .../Extensions/StreamExtensions.cs | 0 .../Extensions/StringExtensions.cs | 0 .../Extensions/XmlExtensions.cs | 0 .../Helpers/BusJsonSerializer.cs | 0 .../Helpers/CommonHelper.cs | 0 .../Helpers/SelectResult.cs | 0 .../Helpers/TypeHelper.cs | 0 .../JiShe.CollectBus.Common.csproj | 0 .../JiShe.CollectBus.Common/Jobs/IBaseJob.cs | 0 .../Models/BusCacheGlobalPagedResult.cs | 0 .../Models/BusPagedResult.cs | 0 .../Models/CommandReuslt.cs | 0 .../CurrentPositiveActiveEnergyAnalyze.cs | 0 .../Models/DeviceCacheBasicModel.cs | 0 .../Models/F25ReadingAnalyze.cs | 0 .../Models/IssuedEventMessage.cs | 0 .../Models/ReqParameter.cs | 0 .../Models/SetAmmeterJFPGEntity.cs | 0 .../Models/TerminalVersionInfoAnalyze.cs | 0 .../CollectBusDomainSharedConsts.cs | 0 .../CollectBusDomainSharedModule.cs | 0 .../CollectBusErrorCodes.cs | 0 .../CollectBusGlobalFeatureConfigurator.cs | 0 .../CollectBusModuleExtensionConfigurator.cs | 0 .../Enums/DeviceStatus.cs | 0 .../FodyWeavers.xml | 0 .../Interceptors/ProtocolInspectAttribute.cs | 0 .../ProtocolInspectInterceptor.cs | 0 .../ProtocolInspectInterceptorRegistrar.cs | 0 .../Interfaces/IProtocolInfo.cs | 0 .../JiShe.CollectBus.Domain.Shared.abppkg | 0 .../JiShe.CollectBus.Domain.Shared.csproj | 0 .../Jobs/EPICollectArgs.cs | 0 .../Localization/CollectBus/ar.json | 0 .../Localization/CollectBus/cs.json | 0 .../Localization/CollectBus/de.json | 0 .../Localization/CollectBus/en-GB.json | 0 .../Localization/CollectBus/en.json | 0 .../Localization/CollectBus/es.json | 0 .../Localization/CollectBus/fi.json | 0 .../Localization/CollectBus/fr.json | 0 .../Localization/CollectBus/hi.json | 0 .../Localization/CollectBus/hr.json | 0 .../Localization/CollectBus/hu.json | 0 .../Localization/CollectBus/is.json | 0 .../Localization/CollectBus/it.json | 0 .../Localization/CollectBus/nl.json | 0 .../Localization/CollectBus/pl-PL.json | 0 .../Localization/CollectBus/pt-BR.json | 0 .../Localization/CollectBus/ro-RO.json | 0 .../Localization/CollectBus/ru.json | 0 .../Localization/CollectBus/sk.json | 0 .../Localization/CollectBus/sl.json | 0 .../Localization/CollectBus/tr.json | 0 .../Localization/CollectBus/vi.json | 0 .../Localization/CollectBus/zh-Hans.json | 0 .../Localization/CollectBus/zh-Hant.json | 0 .../Localization/CollectBusResource.cs | 0 .../Loggers/LoggerExtensions.cs | 0 .../Attribute/ATTRIBUTEColumnAttribute.cs | 16 ---- .../Attribute/FIELDColumnAttribute.cs | 16 ---- .../Attribute/TAGColumnAttribute.cs | 16 ---- .../CollectBusApplicationTestBase.cs | 12 --- .../CollectBusApplicationTestModule.cs | 12 --- .../FodyWeavers.xml | 3 - .../JiShe.CollectBus.Application.Tests.abppkg | 3 - .../JiShe.CollectBus.Application.Tests.csproj | 17 ---- .../Samples/SampleAppService_Tests.cs | 31 ------- .../CollectBusDomainTestBase.cs | 12 --- .../CollectBusDomainTestModule.cs | 12 --- .../FodyWeavers.xml | 3 - .../JiShe.CollectBus.Domain.Tests.abppkg | 3 - .../JiShe.CollectBus.Domain.Tests.csproj | 21 ----- .../Samples/SampleManager_Tests.cs | 22 ----- .../EfCoreSampleAppService_Tests.cs | 9 -- .../CollectBusEntityFrameworkCoreTestBase.cs | 9 -- ...CollectBusEntityFrameworkCoreTestModule.cs | 45 ---------- .../Domains/EfCoreSampleDomain_Tests.cs | 9 -- .../Samples/SampleRepository_Tests.cs | 11 --- .../FodyWeavers.xml | 3 - ...ollectBus.EntityFrameworkCore.Tests.abppkg | 3 - ...ollectBus.EntityFrameworkCore.Tests.csproj | 19 ---- .../FodyWeavers.xml | 3 - .../JiShe.CollectBus.MongoDB.Tests.abppkg | 3 - .../JiShe.CollectBus.MongoDB.Tests.csproj | 21 ----- .../MongoDBSampleAppService_Tests.cs | 11 --- .../MongoDB/CollectBusMongoDbTestBase.cs | 9 -- .../MongoDB/CollectBusMongoDbTestModule.cs | 21 ----- .../Domains/MongoDBSampleDomain_Tests.cs | 10 --- .../MongoDB/MongoDbFixture.cs | 34 -------- .../MongoDB/MongoTestCollection.cs | 9 -- .../MongoDB/Samples/SampleRepository_Tests.cs | 13 --- .../CollectBusDataSeedContributor.cs | 32 ------- .../CollectBusTestBase.cs | 59 ------------- .../CollectBusTestBaseModule.cs | 42 --------- .../JiShe.CollectBus.TestBase/FodyWeavers.xml | 3 - .../JiShe.CollectBus.TestBase.abppkg | 3 - .../JiShe.CollectBus.TestBase.csproj | 28 ------ .../Samples/SampleRepository_Tests.cs | 26 ------ .../Security/FakeCurrentPrincipalAccessor.cs | 27 ------ .../CollectBusHostConst.cs | 0 .../CollectBusHostModule.Configure.cs | 0 .../CollectBusHostModule.cs | 0 .../Controllers/HomeController.cs | 0 .../CustomApplicationBuilderExtensions.cs | 0 .../ServiceCollectionExtensions.cs | 0 .../Hangfire/JobRetryLastFilter.cs | 0 .../HealthChecks/HealthCheckResponse.cs | 0 .../JiShe.CollectBus.Host.csproj | 6 +- .../Pages/Monitor.cshtml | 0 .../Pages/Monitor.cshtml.cs | 0 .../JiShe.CollectBus.Protocol.Test.dll | Bin 0 -> 12288 bytes .../Plugins/JiShe.CollectBus.Protocol.dll | Bin 0 -> 14336 bytes .../JiShe.CollectBus.Host/Plugins/ignore.txt | 0 {src => web}/JiShe.CollectBus.Host/Program.cs | 0 .../Properties/launchSettings.json | 0 {src => web}/JiShe.CollectBus.Host/Startup.cs | 0 .../Swaggers/EnumSchemaFilter.cs | 0 .../Swaggers/HiddenAbpDefaultApiFilter.cs | 0 .../Swaggers/SwaggerConfig.cs | 0 .../appsettings.Development.json | 0 .../JiShe.CollectBus.Host/appsettings.json | 0 .../wwwroot/images/cap.png | Bin .../wwwroot/images/hangfire.png | Bin .../wwwroot/images/miniprofiler.png | Bin .../wwwroot/images/more.png | Bin .../wwwroot/images/swagger.png | Bin .../libs/bootstrap/css/bootstrap.min.css | 0 .../CollectBusController.cs | 0 .../CollectBusHttpApiModule.cs | 0 .../JiShe.CollectBus.HttpApi}/FodyWeavers.xml | 0 .../JiShe.CollectBus.HttpApi.abppkg | 0 .../JiShe.CollectBus.HttpApi.csproj | 4 +- .../Samples/SampleController.cs | 0 405 files changed, 183 insertions(+), 885 deletions(-) rename {src => modules}/JiShe.CollectBus.Cassandra/CassandraConfig.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/CassandraProvider.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/CassandraQueryOptimizer.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/CassandraRepository.cs (98%) rename {src => modules}/JiShe.CollectBus.Cassandra/CollectBusCassandraModule.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/Extensions/ServiceCollectionExtensions.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/Extensions/SessionExtension.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/ICassandraProvider.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/ICassandraRepository.cs (100%) rename {src => modules}/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj (75%) rename {src => modules}/JiShe.CollectBus.Cassandra/Mappers/CollectBusMapping.cs (100%) rename {src/JiShe.CollectBus.FreeRedisProvider => modules/JiShe.CollectBus.FreeRedis}/CollectBusFreeRedisModule.cs (83%) rename {src/JiShe.CollectBus.FreeRedisProvider => modules/JiShe.CollectBus.FreeRedis}/FreeRedisProvider.cs (98%) rename {src/JiShe.CollectBus.FreeRedisProvider => modules/JiShe.CollectBus.FreeRedis}/IFreeRedisProvider.cs (73%) rename src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj => modules/JiShe.CollectBus.FreeRedis/JiShe.CollectBus.FreeRedis.csproj (78%) rename {src/JiShe.CollectBus.FreeRedisProvider => modules/JiShe.CollectBus.FreeRedis}/Options/FreeRedisOptions.cs (75%) rename {src => modules}/JiShe.CollectBus.FreeSql/CollectBusFreeSqlModule.cs (100%) rename {src => modules}/JiShe.CollectBus.FreeSql/DbEnum.cs (100%) rename {src => modules}/JiShe.CollectBus.FreeSql/FreeSqlProvider.cs (100%) rename {src => modules}/JiShe.CollectBus.FreeSql/IFreeSqlProvider.cs (100%) rename {src => modules}/JiShe.CollectBus.FreeSql/JiShe.CollectBus.FreeSql.csproj (100%) create mode 100644 modules/JiShe.CollectBus.IoTDB/Attribute/ATTRIBUTEColumnAttribute.cs create mode 100644 modules/JiShe.CollectBus.IoTDB/Attribute/FIELDColumnAttribute.cs rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Attribute/SingleMeasuringAttribute.cs (66%) create mode 100644 modules/JiShe.CollectBus.IoTDB/Attribute/TAGColumnAttribute.cs rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/CollectBusIoTDBModule.cs (70%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Context/IoTDBRuntimeContext.cs (78%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Interface/IIoTDBProvider.cs (92%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Interface/IIoTDBSessionFactory.cs (53%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Interface/IIoTDBSessionPool.cs (80%) rename src/JiShe.CollectBus.IoTDBProvider/JiShe.CollectBus.IoTDBProvider.csproj => modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj (81%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Options/IoTDBOptions.cs (89%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Options/QueryCondition.cs (72%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Options/QueryOptions.cs (79%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/DeviceMetadata.cs (84%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/DevicePathBuilder.cs (85%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/IoTDBProvider.cs (98%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/IoTDBSessionFactory.cs (83%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/IoTEntity.cs (91%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/SessionPoolAdapter.cs (88%) rename {src/JiShe.CollectBus.IoTDBProvider => modules/JiShe.CollectBus.IoTDB}/Provider/TableSessionPoolAdapter.cs (88%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/AdminClient/AdminClientService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/AdminClient/IAdminClientService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Attributes/KafkaSubscribeAttribute.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Attributes/TopicAttribute.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/CollectBusKafkaModule.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Consumer/ConsumerService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Consumer/IConsumerService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/HeadersFilter.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/IKafkaSubscribe.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/ISubscribeAck.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/JiShe.CollectBus.Kafka.csproj (82%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/JsonSerializer.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/KafkaOptionConfig.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/KafkaSubcribesExtensions.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Producer/IProducerService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/Producer/ProducerService.cs (100%) rename {src/JiShe.CollectBus.KafkaProducer => modules/JiShe.CollectBus.Kafka}/SubscribeResult.cs (100%) rename {src/JiShe.CollectBus.Application.Contracts => modules/JiShe.CollectBus.MongoDB}/FodyWeavers.xml (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.abppkg (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj (85%) rename {src => modules}/JiShe.CollectBus.MongoDB/MongoDB/CollectBusDbSchemaMigrator.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContextExtensions.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbModule.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/MongoDB/ICollectBusMongoDbContext.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/IMeterReadingRecordRepository.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/MeterReadingRecordRepository.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/ShardingStrategy/DayShardingStrategy.cs (100%) rename {src => modules}/JiShe.CollectBus.MongoDB/ShardingStrategy/IShardingStrategy.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Adapters/StandardFixedHeaderDataHandlingAdapter.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/AnalysisData/Appendix.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Attributes/ProtocolNameAttribute.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj (57%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Models/CustomFixedHeaderRequestInfo.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/Models/TB3761.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Contracts/QGDW3761Config.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj (75%) rename {src => protocols}/JiShe.CollectBus.Protocol.Test/JiSheCollectBusProtocolModule.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj (64%) rename {src => protocols}/JiShe.CollectBus.Protocol/JiSheCollectBusProtocolModule.cs (100%) rename {src => protocols}/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/CollectBusApplicationContractsModule.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/CollectBusRemoteServiceConsts.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/DataMigration/IDataMigrationService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/DataMigration/Options/DataMigrationOptions.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddFocusLogInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddSignalStrengthInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlOutput.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/ICacheAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs (100%) rename {src/JiShe.CollectBus.Application => services/JiShe.CollectBus.Application.Contracts}/FodyWeavers.xml (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/ICollectWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/JiShe - Backup.CollectBus.Application.Contracts.csproj (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.abppkg (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj (73%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissionDefinitionProvider.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissions.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/RedisDataCache/IRedisDataCacheService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Samples/ISampleAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Subscribers/ISubscriberAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application/CollectBusAppService.cs (99%) rename {src => services}/JiShe.CollectBus.Application/CollectBusApplicationAutoMapperProfile.cs (100%) rename {src => services}/JiShe.CollectBus.Application/CollectBusApplicationModule.cs (97%) rename {src => services}/JiShe.CollectBus.Application/Consumers/IssuedConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/IssuedFaultConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/ReceivedConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/ReceivedFaultConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/ReceivedHeartbeatConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/ReceivedLoginConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs (100%) rename {src => services}/JiShe.CollectBus.Application/DataMigration/DataMigrationService.cs (100%) rename {src => services}/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Exceptions/CloseException.cs (100%) rename {src/JiShe.CollectBus.Domain.Shared => services/JiShe.CollectBus.Application}/FodyWeavers.xml (100%) rename {src => services}/JiShe.CollectBus.Application/Handlers/SampleHandler.cs (100%) rename {src => services}/JiShe.CollectBus.Application/JiShe - Backup.CollectBus.Application.csproj (100%) rename {src => services}/JiShe.CollectBus.Application/JiShe.CollectBus.Application.abppkg (100%) rename {src => services}/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj (69%) rename {src => services}/JiShe.CollectBus.Application/Plugins/CloseMonitor.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Plugins/ServerMonitor.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Plugins/UdpMonitor.cs (100%) rename {src => services}/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs (99%) rename {src => services}/JiShe.CollectBus.Application/Samples/SampleAppService.cs (98%) rename {src => services}/JiShe.CollectBus.Application/Samples/TestAppService.cs (98%) rename {src => services}/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs (99%) rename {src => services}/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs (99%) rename {src => services}/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs (99%) rename {src => services}/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Workers/CreateToBeIssueTaskWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Workers/SubscriberFifteenMinuteWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Workers/SubscriberFiveMinuteWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application/Workers/SubscriberOneMinuteWorker.cs (100%) rename {src => services}/JiShe.CollectBus.Application/cmd3761Matching.txt (100%) rename {src => services}/JiShe.CollectBus.Application/cmd3761TdcMatching.txt (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/CollectBusDbMigratorModule.cs (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/Dockerfile (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/FodyWeavers.xml (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.abppkg (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj (93%) rename {src => services}/JiShe.CollectBus.DbMigrator/Program.cs (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/appsettings.json (100%) rename {src => services}/JiShe.CollectBus.DbMigrator/appsettings.secrets.json (100%) rename {src => services}/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Ammeters/AmmeterInfoTemp.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs (89%) rename {src => services}/JiShe.CollectBus.Domain/Analyze3761Data.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/CollectBusConsts.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/CollectBusDbProperties.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/CollectBusDomainModule.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Data/CollectBusDbMigrationService.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Data/ICollectBusDbSchemaMigrator.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Data/NullCollectBusDbSchemaMigrator.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/EnergySystems/Entities/TB_AmmeterInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/EnergySystems/TableViews/V_FocusAmmeter.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/FodyWeavers.xml (100%) rename {src => services}/JiShe.CollectBus.Domain/GatherItem/GatherItemInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs (83%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Devices/Device.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/MessageIssued.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/IReceived.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/MessageReceived.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingRecords.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/PrepayModel/Vi_BaseAmmeterInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Protocols/ProtocolInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Records/ConrOnlineRecord.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Records/CsqRecord.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Records/FocusRecord.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/JiShe - Backup.CollectBus.Domain.csproj (100%) rename {src => services}/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.abppkg (100%) rename {src => services}/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj (72%) rename {src => services}/JiShe.CollectBus.Domain/Properties/AssemblyInfo.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Settings/CollectBusSettingDefinitionProvider.cs (100%) rename {src => services}/JiShe.CollectBus.Domain/Settings/CollectBusSettings.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContext.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContextFactory.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEfCoreEntityExtensionMappings.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEntityFrameworkCoreModule.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreCollectBusDbSchemaMigrator.cs (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/FodyWeavers.xml (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.abppkg (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.csproj (100%) rename {src => services}/JiShe.CollectBus.EntityFrameworkCore/Properties/AssemblyInfo.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/AttributeInfo/NumericalOrderAttribute.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Attributes/CassandraTableAttribute.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Attributes/IgnoreJobAttribute.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Attributes/TopicNameAttribute.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/Build188SendData.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/TasksToBeIssueModel.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketRequest.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Consts/CommonConst.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Consts/ProtocolConst.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Consts/RedisConst.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Consts/RegexConst.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Consts/SystemTypeConst.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/188Enums.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/376Enums.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/645Enums.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/CommandChunkEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/F25DataItemEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/MaskTypeEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/MeterLinkProtocolEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/RecordsDataMigrationStatusEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/SortEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Enums/TransparentForwardingFlagEnum.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/CollectionExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/ComparableExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/DataTableExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/DateTimeExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/DayOfWeekExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/DecimalOrIntExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/DictionaryExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/EnumExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/EnumerableExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/EventHandlerExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/ExceptionExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/HexStringExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/HttpResponseExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/IntExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/ListExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/LockExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/ObjectExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/ProtocolConstExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/StreamExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/StringExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Extensions/XmlExtensions.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Helpers/CommonHelper.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Helpers/SelectResult.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Helpers/TypeHelper.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj (100%) rename {src => shared}/JiShe.CollectBus.Common/Jobs/IBaseJob.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/BusCacheGlobalPagedResult.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/BusPagedResult.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/CommandReuslt.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/CurrentPositiveActiveEnergyAnalyze.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/F25ReadingAnalyze.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/IssuedEventMessage.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/ReqParameter.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs (100%) rename {src => shared}/JiShe.CollectBus.Common/Models/TerminalVersionInfoAnalyze.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedConsts.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedModule.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/CollectBusErrorCodes.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/CollectBusGlobalFeatureConfigurator.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/CollectBusModuleExtensionConfigurator.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Enums/DeviceStatus.cs (100%) rename {src/JiShe.CollectBus.HttpApi => shared/JiShe.CollectBus.Domain.Shared}/FodyWeavers.xml (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectAttribute.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptor.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptorRegistrar.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Interfaces/IProtocolInfo.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.abppkg (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Jobs/EPICollectArgs.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ar.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/cs.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/de.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en-GB.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/es.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fi.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fr.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hi.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hr.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hu.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/is.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/it.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/nl.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pl-PL.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pt-BR.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ro-RO.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ru.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sk.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sl.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/tr.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/vi.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hans.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hant.json (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Localization/CollectBusResource.cs (100%) rename {src => shared}/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs (100%) delete mode 100644 src/JiShe.CollectBus.IoTDBProvider/Attribute/ATTRIBUTEColumnAttribute.cs delete mode 100644 src/JiShe.CollectBus.IoTDBProvider/Attribute/FIELDColumnAttribute.cs delete mode 100644 src/JiShe.CollectBus.IoTDBProvider/Attribute/TAGColumnAttribute.cs delete mode 100644 test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestBase.cs delete mode 100644 test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestModule.cs delete mode 100644 test/JiShe.CollectBus.Application.Tests/FodyWeavers.xml delete mode 100644 test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.abppkg delete mode 100644 test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.csproj delete mode 100644 test/JiShe.CollectBus.Application.Tests/Samples/SampleAppService_Tests.cs delete mode 100644 test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestBase.cs delete mode 100644 test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestModule.cs delete mode 100644 test/JiShe.CollectBus.Domain.Tests/FodyWeavers.xml delete mode 100644 test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.abppkg delete mode 100644 test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.csproj delete mode 100644 test/JiShe.CollectBus.Domain.Tests/Samples/SampleManager_Tests.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Applications/EfCoreSampleAppService_Tests.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestBase.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestModule.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Domains/EfCoreSampleDomain_Tests.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/FodyWeavers.xml delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.abppkg delete mode 100644 test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.csproj delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/FodyWeavers.xml delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.abppkg delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.csproj delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Applications/MongoDBSampleAppService_Tests.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestBase.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestModule.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Domains/MongoDBSampleDomain_Tests.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoDbFixture.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoTestCollection.cs delete mode 100644 test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs delete mode 100644 test/JiShe.CollectBus.TestBase/CollectBusDataSeedContributor.cs delete mode 100644 test/JiShe.CollectBus.TestBase/CollectBusTestBase.cs delete mode 100644 test/JiShe.CollectBus.TestBase/CollectBusTestBaseModule.cs delete mode 100644 test/JiShe.CollectBus.TestBase/FodyWeavers.xml delete mode 100644 test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.abppkg delete mode 100644 test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.csproj delete mode 100644 test/JiShe.CollectBus.TestBase/Samples/SampleRepository_Tests.cs delete mode 100644 test/JiShe.CollectBus.TestBase/Security/FakeCurrentPrincipalAccessor.cs rename {src => web}/JiShe.CollectBus.Host/CollectBusHostConst.cs (100%) rename {src => web}/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs (100%) rename {src => web}/JiShe.CollectBus.Host/CollectBusHostModule.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Controllers/HomeController.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Extensions/CustomApplicationBuilderExtensions.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Extensions/ServiceCollections/ServiceCollectionExtensions.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Hangfire/JobRetryLastFilter.cs (100%) rename {src => web}/JiShe.CollectBus.Host/HealthChecks/HealthCheckResponse.cs (100%) rename {src => web}/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj (90%) rename {src => web}/JiShe.CollectBus.Host/Pages/Monitor.cshtml (100%) rename {src => web}/JiShe.CollectBus.Host/Pages/Monitor.cshtml.cs (100%) create mode 100644 web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.Test.dll create mode 100644 web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.dll rename {src => web}/JiShe.CollectBus.Host/Plugins/ignore.txt (100%) rename {src => web}/JiShe.CollectBus.Host/Program.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Properties/launchSettings.json (100%) rename {src => web}/JiShe.CollectBus.Host/Startup.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Swaggers/EnumSchemaFilter.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Swaggers/HiddenAbpDefaultApiFilter.cs (100%) rename {src => web}/JiShe.CollectBus.Host/Swaggers/SwaggerConfig.cs (100%) rename {src => web}/JiShe.CollectBus.Host/appsettings.Development.json (100%) rename {src => web}/JiShe.CollectBus.Host/appsettings.json (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/images/cap.png (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/images/hangfire.png (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/images/miniprofiler.png (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/images/more.png (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/images/swagger.png (100%) rename {src => web}/JiShe.CollectBus.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css (100%) rename {src => web}/JiShe.CollectBus.HttpApi/CollectBusController.cs (100%) rename {src => web}/JiShe.CollectBus.HttpApi/CollectBusHttpApiModule.cs (100%) rename {src/JiShe.CollectBus.MongoDB => web/JiShe.CollectBus.HttpApi}/FodyWeavers.xml (100%) rename {src => web}/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.abppkg (100%) rename {src => web}/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj (68%) rename {src => web}/JiShe.CollectBus.HttpApi/Samples/SampleController.cs (100%) diff --git a/JiShe.CollectBus.sln b/JiShe.CollectBus.sln index 0d0c5e4..d4e6591 100644 --- a/JiShe.CollectBus.sln +++ b/JiShe.CollectBus.sln @@ -3,43 +3,49 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain.Shared", "src\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain.Shared", "shared\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain", "src\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj", "{F2840BC7-0188-4606-9126-DADD0F5ABF7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain", "services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj", "{F2840BC7-0188-4606-9126-DADD0F5ABF7A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application.Contracts", "src\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj", "{BD65D04F-08D5-40C1-8C24-77CA0BACB877}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application.Contracts", "services\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj", "{BD65D04F-08D5-40C1-8C24-77CA0BACB877}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application", "src\JiShe.CollectBus.Application\JiShe.CollectBus.Application.csproj", "{78040F9E-3501-4A40-82DF-00A597710F35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application", "services\JiShe.CollectBus.Application\JiShe.CollectBus.Application.csproj", "{78040F9E-3501-4A40-82DF-00A597710F35}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{649A3FFA-182F-4E56-9717-E6A9A2BEC545}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.MongoDB", "modules\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj", "{F1C58097-4C08-4D88-8976-6B3389391481}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.MongoDB", "src\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj", "{F1C58097-4C08-4D88-8976-6B3389391481}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.HttpApi", "web\JiShe.CollectBus.HttpApi\JiShe.CollectBus.HttpApi.csproj", "{077AA5F8-8B61-420C-A6B5-0150A66FDB34}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.HttpApi", "src\JiShe.CollectBus.HttpApi\JiShe.CollectBus.HttpApi.csproj", "{077AA5F8-8B61-420C-A6B5-0150A66FDB34}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Host", "web\JiShe.CollectBus.Host\JiShe.CollectBus.Host.csproj", "{35829A15-4127-4F69-8BDE-9405DEAACA9A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Host", "src\JiShe.CollectBus.Host\JiShe.CollectBus.Host.csproj", "{35829A15-4127-4F69-8BDE-9405DEAACA9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Common", "shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj", "{AD2F1928-4411-4511-B564-5FB996EC08B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Common", "src\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj", "{AD2F1928-4411-4511-B564-5FB996EC08B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol", "protocols\JiShe.CollectBus.Protocol\JiShe.CollectBus.Protocol.csproj", "{C62EFF95-5C32-435F-BD78-6977E828F894}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol", "src\JiShe.CollectBus.Protocol\JiShe.CollectBus.Protocol.csproj", "{C62EFF95-5C32-435F-BD78-6977E828F894}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Contracts", "protocols\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj", "{38C1808B-009A-418B-B17B-AB3626341B5D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Contracts", "src\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj", "{38C1808B-009A-418B-B17B-AB3626341B5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.DbMigrator", "services\JiShe.CollectBus.DbMigrator\JiShe.CollectBus.DbMigrator.csproj", "{8BA01C3D-297D-42DF-BD63-EF07202A0A67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.DbMigrator", "src\JiShe.CollectBus.DbMigrator\JiShe.CollectBus.DbMigrator.csproj", "{8BA01C3D-297D-42DF-BD63-EF07202A0A67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeSql", "modules\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj", "{FE0457D9-4038-4A17-8808-DCAD06CFC0A0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeSql", "src\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj", "{FE0457D9-4038-4A17-8808-DCAD06CFC0A0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeRedis", "modules\JiShe.CollectBus.FreeRedis\JiShe.CollectBus.FreeRedis.csproj", "{C06C4082-638F-2996-5FED-7784475766C1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.FreeRedisProvider", "src\JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj", "{C06C4082-638F-2996-5FED-7784475766C1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Kafka", "modules\JiShe.CollectBus.Kafka\JiShe.CollectBus.Kafka.csproj", "{F0288175-F0EC-48BD-945F-CF1512850943}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka", "src\JiShe.CollectBus.KafkaProducer\JiShe.CollectBus.Kafka.csproj", "{F0288175-F0EC-48BD-945F-CF1512850943}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.IoTDB", "modules\JiShe.CollectBus.IoTDB\JiShe.CollectBus.IoTDB.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.IoTDBProvider", "src\JiShe.CollectBus.IoTDBProvider\JiShe.CollectBus.IoTDBProvider.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Test", "protocols\JiShe.CollectBus.Protocol.Test\JiShe.CollectBus.Protocol.Test.csproj", "{A377955E-7EA1-6F29-8CF7-774569E93925}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.Test", "src\JiShe.CollectBus.Protocol.Test\JiShe.CollectBus.Protocol.Test.csproj", "{A377955E-7EA1-6F29-8CF7-774569E93925}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Cassandra", "modules\JiShe.CollectBus.Cassandra\JiShe.CollectBus.Cassandra.csproj", "{443B4549-0AC0-4493-8F3E-49C83225DD76}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Cassandra", "src\JiShe.CollectBus.Cassandra\JiShe.CollectBus.Cassandra.csproj", "{443B4549-0AC0-4493-8F3E-49C83225DD76}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Web", "1.Web", "{A02F7D8A-04DC-44D6-94D4-3F65712D6B94}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka.Test", "src\JiShe.CollectBus.Kafka.Test\JiShe.CollectBus.Kafka.Test.csproj", "{FA762E8F-659A-DECF-83D6-5F364144450E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Modules", "4.Modules", "{2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Protocols", "3.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Services", "2.Services", "{BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Shared", "5.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -115,32 +121,28 @@ Global {443B4549-0AC0-4493-8F3E-49C83225DD76}.Debug|Any CPU.Build.0 = Debug|Any CPU {443B4549-0AC0-4493-8F3E-49C83225DD76}.Release|Any CPU.ActiveCfg = Release|Any CPU {443B4549-0AC0-4493-8F3E-49C83225DD76}.Release|Any CPU.Build.0 = Release|Any CPU - {FA762E8F-659A-DECF-83D6-5F364144450E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA762E8F-659A-DECF-83D6-5F364144450E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA762E8F-659A-DECF-83D6-5F364144450E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA762E8F-659A-DECF-83D6-5F364144450E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D64C1577-4929-4B60-939E-96DE1534891A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {78040F9E-3501-4A40-82DF-00A597710F35} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {F1C58097-4C08-4D88-8976-6B3389391481} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {35829A15-4127-4F69-8BDE-9405DEAACA9A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {AD2F1928-4411-4511-B564-5FB996EC08B9} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {C62EFF95-5C32-435F-BD78-6977E828F894} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {38C1808B-009A-418B-B17B-AB3626341B5D} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {C06C4082-638F-2996-5FED-7784475766C1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {F0288175-F0EC-48BD-945F-CF1512850943} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {A377955E-7EA1-6F29-8CF7-774569E93925} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} - {443B4549-0AC0-4493-8F3E-49C83225DD76} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {D64C1577-4929-4B60-939E-96DE1534891A} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B} + {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23} + {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23} + {78040F9E-3501-4A40-82DF-00A597710F35} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23} + {F1C58097-4C08-4D88-8976-6B3389391481} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} + {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {A02F7D8A-04DC-44D6-94D4-3F65712D6B94} + {35829A15-4127-4F69-8BDE-9405DEAACA9A} = {A02F7D8A-04DC-44D6-94D4-3F65712D6B94} + {AD2F1928-4411-4511-B564-5FB996EC08B9} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B} + {C62EFF95-5C32-435F-BD78-6977E828F894} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC} + {38C1808B-009A-418B-B17B-AB3626341B5D} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC} + {8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23} + {FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} + {C06C4082-638F-2996-5FED-7784475766C1} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} + {F0288175-F0EC-48BD-945F-CF1512850943} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} + {A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} + {A377955E-7EA1-6F29-8CF7-774569E93925} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC} + {443B4549-0AC0-4493-8F3E-49C83225DD76} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD} diff --git a/src/JiShe.CollectBus.Cassandra/CassandraConfig.cs b/modules/JiShe.CollectBus.Cassandra/CassandraConfig.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/CassandraConfig.cs rename to modules/JiShe.CollectBus.Cassandra/CassandraConfig.cs diff --git a/src/JiShe.CollectBus.Cassandra/CassandraProvider.cs b/modules/JiShe.CollectBus.Cassandra/CassandraProvider.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/CassandraProvider.cs rename to modules/JiShe.CollectBus.Cassandra/CassandraProvider.cs diff --git a/src/JiShe.CollectBus.Cassandra/CassandraQueryOptimizer.cs b/modules/JiShe.CollectBus.Cassandra/CassandraQueryOptimizer.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/CassandraQueryOptimizer.cs rename to modules/JiShe.CollectBus.Cassandra/CassandraQueryOptimizer.cs diff --git a/src/JiShe.CollectBus.Cassandra/CassandraRepository.cs b/modules/JiShe.CollectBus.Cassandra/CassandraRepository.cs similarity index 98% rename from src/JiShe.CollectBus.Cassandra/CassandraRepository.cs rename to modules/JiShe.CollectBus.Cassandra/CassandraRepository.cs index 66ac6d7..25a51e3 100644 --- a/src/JiShe.CollectBus.Cassandra/CassandraRepository.cs +++ b/modules/JiShe.CollectBus.Cassandra/CassandraRepository.cs @@ -3,7 +3,6 @@ using Cassandra.Data.Linq; using Cassandra.Mapping; using JiShe.CollectBus.Cassandra.Extensions; using JiShe.CollectBus.Common.Attributes; -using JiShe.CollectBus.IoTDBProvider; using Microsoft.AspNetCore.Http; using System.Reflection; using Thrift.Protocol.Entities; diff --git a/src/JiShe.CollectBus.Cassandra/CollectBusCassandraModule.cs b/modules/JiShe.CollectBus.Cassandra/CollectBusCassandraModule.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/CollectBusCassandraModule.cs rename to modules/JiShe.CollectBus.Cassandra/CollectBusCassandraModule.cs diff --git a/src/JiShe.CollectBus.Cassandra/Extensions/ServiceCollectionExtensions.cs b/modules/JiShe.CollectBus.Cassandra/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/Extensions/ServiceCollectionExtensions.cs rename to modules/JiShe.CollectBus.Cassandra/Extensions/ServiceCollectionExtensions.cs diff --git a/src/JiShe.CollectBus.Cassandra/Extensions/SessionExtension.cs b/modules/JiShe.CollectBus.Cassandra/Extensions/SessionExtension.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/Extensions/SessionExtension.cs rename to modules/JiShe.CollectBus.Cassandra/Extensions/SessionExtension.cs diff --git a/src/JiShe.CollectBus.Cassandra/ICassandraProvider.cs b/modules/JiShe.CollectBus.Cassandra/ICassandraProvider.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/ICassandraProvider.cs rename to modules/JiShe.CollectBus.Cassandra/ICassandraProvider.cs diff --git a/src/JiShe.CollectBus.Cassandra/ICassandraRepository.cs b/modules/JiShe.CollectBus.Cassandra/ICassandraRepository.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/ICassandraRepository.cs rename to modules/JiShe.CollectBus.Cassandra/ICassandraRepository.cs diff --git a/src/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj b/modules/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj similarity index 75% rename from src/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj rename to modules/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj index db7ccf3..edc303c 100644 --- a/src/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj +++ b/modules/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/JiShe.CollectBus.Cassandra/Mappers/CollectBusMapping.cs b/modules/JiShe.CollectBus.Cassandra/Mappers/CollectBusMapping.cs similarity index 100% rename from src/JiShe.CollectBus.Cassandra/Mappers/CollectBusMapping.cs rename to modules/JiShe.CollectBus.Cassandra/Mappers/CollectBusMapping.cs diff --git a/src/JiShe.CollectBus.FreeRedisProvider/CollectBusFreeRedisModule.cs b/modules/JiShe.CollectBus.FreeRedis/CollectBusFreeRedisModule.cs similarity index 83% rename from src/JiShe.CollectBus.FreeRedisProvider/CollectBusFreeRedisModule.cs rename to modules/JiShe.CollectBus.FreeRedis/CollectBusFreeRedisModule.cs index 6485e92..fb86fdd 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/CollectBusFreeRedisModule.cs +++ b/modules/JiShe.CollectBus.FreeRedis/CollectBusFreeRedisModule.cs @@ -1,9 +1,9 @@ -using JiShe.CollectBus.FreeRedisProvider.Options; +using JiShe.CollectBus.FreeRedis.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; -namespace JiShe.CollectBus.FreeRedisProvider +namespace JiShe.CollectBus.FreeRedis { public class CollectBusFreeRedisModule : AbpModule { diff --git a/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs b/modules/JiShe.CollectBus.FreeRedis/FreeRedisProvider.cs similarity index 98% rename from src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs rename to modules/JiShe.CollectBus.FreeRedis/FreeRedisProvider.cs index d3a9bff..4c81d02 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs +++ b/modules/JiShe.CollectBus.FreeRedis/FreeRedisProvider.cs @@ -1,16 +1,11 @@ -using FreeRedis; +using System.Diagnostics; +using FreeRedis; using JiShe.CollectBus.Common.Helpers; -using JiShe.CollectBus.Common.Models; -using JiShe.CollectBus.Common.Extensions; -using JiShe.CollectBus.FreeRedisProvider.Options; +using JiShe.CollectBus.FreeRedis.Options; using Microsoft.Extensions.Options; -using System.Diagnostics; -using System.Text.Json; using Volo.Abp.DependencyInjection; -using static System.Runtime.InteropServices.JavaScript.JSType; -using System.Collections.Concurrent; -namespace JiShe.CollectBus.FreeRedisProvider +namespace JiShe.CollectBus.FreeRedis { public class FreeRedisProvider : IFreeRedisProvider, ISingletonDependency diff --git a/src/JiShe.CollectBus.FreeRedisProvider/IFreeRedisProvider.cs b/modules/JiShe.CollectBus.FreeRedis/IFreeRedisProvider.cs similarity index 73% rename from src/JiShe.CollectBus.FreeRedisProvider/IFreeRedisProvider.cs rename to modules/JiShe.CollectBus.FreeRedis/IFreeRedisProvider.cs index 8fc6861..e9e8a40 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/IFreeRedisProvider.cs +++ b/modules/JiShe.CollectBus.FreeRedis/IFreeRedisProvider.cs @@ -1,7 +1,6 @@ using FreeRedis; -using JiShe.CollectBus.Common.Models; -namespace JiShe.CollectBus.FreeRedisProvider +namespace JiShe.CollectBus.FreeRedis { public interface IFreeRedisProvider { diff --git a/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj b/modules/JiShe.CollectBus.FreeRedis/JiShe.CollectBus.FreeRedis.csproj similarity index 78% rename from src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj rename to modules/JiShe.CollectBus.FreeRedis/JiShe.CollectBus.FreeRedis.csproj index 7db0478..92b3223 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj +++ b/modules/JiShe.CollectBus.FreeRedis/JiShe.CollectBus.FreeRedis.csproj @@ -10,6 +10,6 @@ - + diff --git a/src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs b/modules/JiShe.CollectBus.FreeRedis/Options/FreeRedisOptions.cs similarity index 75% rename from src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs rename to modules/JiShe.CollectBus.FreeRedis/Options/FreeRedisOptions.cs index 2ed7e49..331da88 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/Options/FreeRedisOptions.cs +++ b/modules/JiShe.CollectBus.FreeRedis/Options/FreeRedisOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.FreeRedisProvider.Options +namespace JiShe.CollectBus.FreeRedis.Options { public class FreeRedisOptions { diff --git a/src/JiShe.CollectBus.FreeSql/CollectBusFreeSqlModule.cs b/modules/JiShe.CollectBus.FreeSql/CollectBusFreeSqlModule.cs similarity index 100% rename from src/JiShe.CollectBus.FreeSql/CollectBusFreeSqlModule.cs rename to modules/JiShe.CollectBus.FreeSql/CollectBusFreeSqlModule.cs diff --git a/src/JiShe.CollectBus.FreeSql/DbEnum.cs b/modules/JiShe.CollectBus.FreeSql/DbEnum.cs similarity index 100% rename from src/JiShe.CollectBus.FreeSql/DbEnum.cs rename to modules/JiShe.CollectBus.FreeSql/DbEnum.cs diff --git a/src/JiShe.CollectBus.FreeSql/FreeSqlProvider.cs b/modules/JiShe.CollectBus.FreeSql/FreeSqlProvider.cs similarity index 100% rename from src/JiShe.CollectBus.FreeSql/FreeSqlProvider.cs rename to modules/JiShe.CollectBus.FreeSql/FreeSqlProvider.cs diff --git a/src/JiShe.CollectBus.FreeSql/IFreeSqlProvider.cs b/modules/JiShe.CollectBus.FreeSql/IFreeSqlProvider.cs similarity index 100% rename from src/JiShe.CollectBus.FreeSql/IFreeSqlProvider.cs rename to modules/JiShe.CollectBus.FreeSql/IFreeSqlProvider.cs diff --git a/src/JiShe.CollectBus.FreeSql/JiShe.CollectBus.FreeSql.csproj b/modules/JiShe.CollectBus.FreeSql/JiShe.CollectBus.FreeSql.csproj similarity index 100% rename from src/JiShe.CollectBus.FreeSql/JiShe.CollectBus.FreeSql.csproj rename to modules/JiShe.CollectBus.FreeSql/JiShe.CollectBus.FreeSql.csproj diff --git a/modules/JiShe.CollectBus.IoTDB/Attribute/ATTRIBUTEColumnAttribute.cs b/modules/JiShe.CollectBus.IoTDB/Attribute/ATTRIBUTEColumnAttribute.cs new file mode 100644 index 0000000..d188c36 --- /dev/null +++ b/modules/JiShe.CollectBus.IoTDB/Attribute/ATTRIBUTEColumnAttribute.cs @@ -0,0 +1,10 @@ +namespace JiShe.CollectBus.IoTDB.Attribute +{ + /// + /// Column分类标记特性（ATTRIBUTE字段）,也就是属性字段 + /// + [AttributeUsage(AttributeTargets.Property)] + public class ATTRIBUTEColumnAttribute : System.Attribute + { + } +} diff --git a/modules/JiShe.CollectBus.IoTDB/Attribute/FIELDColumnAttribute.cs b/modules/JiShe.CollectBus.IoTDB/Attribute/FIELDColumnAttribute.cs new file mode 100644 index 0000000..7cabdf4 --- /dev/null +++ b/modules/JiShe.CollectBus.IoTDB/Attribute/FIELDColumnAttribute.cs @@ -0,0 +1,10 @@ +namespace JiShe.CollectBus.IoTDB.Attribute +{ + /// + /// Column分类标记特性（FIELD字段），数据列字段 + /// + [AttributeUsage(AttributeTargets.Property)] + public class FIELDColumnAttribute : System.Attribute + { + } +} diff --git a/src/JiShe.CollectBus.IoTDBProvider/Attribute/SingleMeasuringAttribute.cs b/modules/JiShe.CollectBus.IoTDB/Attribute/SingleMeasuringAttribute.cs similarity index 66% rename from src/JiShe.CollectBus.IoTDBProvider/Attribute/SingleMeasuringAttribute.cs rename to modules/JiShe.CollectBus.IoTDB/Attribute/SingleMeasuringAttribute.cs index ba5af69..cebb85a 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Attribute/SingleMeasuringAttribute.cs +++ b/modules/JiShe.CollectBus.IoTDB/Attribute/SingleMeasuringAttribute.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Attribute { /// /// 用于标识当前实体为单侧点模式，单侧点模式只有一个Filed标识字段,类型是Tuple,Item1=>测点名称，Item2=>测点值,泛型 /// [AttributeUsage(AttributeTargets.Property)] - public class SingleMeasuringAttribute : Attribute + public class SingleMeasuringAttribute : System.Attribute { public string FieldName { get; set;} diff --git a/modules/JiShe.CollectBus.IoTDB/Attribute/TAGColumnAttribute.cs b/modules/JiShe.CollectBus.IoTDB/Attribute/TAGColumnAttribute.cs new file mode 100644 index 0000000..6f40a47 --- /dev/null +++ b/modules/JiShe.CollectBus.IoTDB/Attribute/TAGColumnAttribute.cs @@ -0,0 +1,10 @@ +namespace JiShe.CollectBus.IoTDB.Attribute +{ + /// + /// Column分类标记特性（TAG字段），标签字段 + /// + [AttributeUsage(AttributeTargets.Property)] + public class TAGColumnAttribute : System.Attribute + { + } +} diff --git a/src/JiShe.CollectBus.IoTDBProvider/CollectBusIoTDBModule.cs b/modules/JiShe.CollectBus.IoTDB/CollectBusIoTDBModule.cs similarity index 70% rename from src/JiShe.CollectBus.IoTDBProvider/CollectBusIoTDBModule.cs rename to modules/JiShe.CollectBus.IoTDB/CollectBusIoTDBModule.cs index 62c63c4..93bbbfe 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/CollectBusIoTDBModule.cs +++ b/modules/JiShe.CollectBus.IoTDB/CollectBusIoTDBModule.cs @@ -1,17 +1,12 @@ -using JiShe.CollectBus.IoTDBProvider.Context; -using JiShe.CollectBus.IoTDBProvider.Interface; -using JiShe.CollectBus.IoTDBProvider.Provider; +using JiShe.CollectBus.IoTDB.Context; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; +using JiShe.CollectBus.IoTDB.Provider; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Volo.Abp.Modularity; -using static Thrift.Server.TThreadPoolAsyncServer; -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB { public class CollectBusIoTDBModule : AbpModule { diff --git a/src/JiShe.CollectBus.IoTDBProvider/Context/IoTDBRuntimeContext.cs b/modules/JiShe.CollectBus.IoTDB/Context/IoTDBRuntimeContext.cs similarity index 78% rename from src/JiShe.CollectBus.IoTDBProvider/Context/IoTDBRuntimeContext.cs rename to modules/JiShe.CollectBus.IoTDB/Context/IoTDBRuntimeContext.cs index 41f48cb..cd99b00 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Context/IoTDBRuntimeContext.cs +++ b/modules/JiShe.CollectBus.IoTDB/Context/IoTDBRuntimeContext.cs @@ -1,11 +1,7 @@ -using Microsoft.Extensions.Options; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JiShe.CollectBus.IoTDB.Options; +using Microsoft.Extensions.Options; -namespace JiShe.CollectBus.IoTDBProvider.Context +namespace JiShe.CollectBus.IoTDB.Context { /// /// IoTDB SessionPool 运行时上下文 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBProvider.cs similarity index 92% rename from src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs rename to modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBProvider.cs index 8fe46a9..bb47841 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs +++ b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBProvider.cs @@ -1,6 +1,8 @@ using JiShe.CollectBus.Common.Models; +using JiShe.CollectBus.IoTDB.Options; +using JiShe.CollectBus.IoTDB.Provider; -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Interface { /// /// IoTDB数据源,数据库能同时存多个时序模型，但数据是完全隔离的，不能跨时序模型查询，通过连接字符串配置 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionFactory.cs b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionFactory.cs similarity index 53% rename from src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionFactory.cs rename to modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionFactory.cs index c7d9b10..03cd4a6 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionFactory.cs +++ b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionFactory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider.Interface +namespace JiShe.CollectBus.IoTDB.Interface { /// /// Session 工厂接口 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionPool.cs b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionPool.cs similarity index 80% rename from src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionPool.cs rename to modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionPool.cs index be2c2b7..026a83a 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBSessionPool.cs +++ b/modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionPool.cs @@ -1,11 +1,6 @@ using Apache.IoTDB.DataStructure; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace JiShe.CollectBus.IoTDBProvider.Interface +namespace JiShe.CollectBus.IoTDB.Interface { /// /// Session 连接池 diff --git a/src/JiShe.CollectBus.IoTDBProvider/JiShe.CollectBus.IoTDBProvider.csproj b/modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj similarity index 81% rename from src/JiShe.CollectBus.IoTDBProvider/JiShe.CollectBus.IoTDBProvider.csproj rename to modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj index 9153601..dc8f2fb 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/JiShe.CollectBus.IoTDBProvider.csproj +++ b/modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj @@ -11,6 +11,6 @@ - + diff --git a/src/JiShe.CollectBus.IoTDBProvider/Options/IoTDBOptions.cs b/modules/JiShe.CollectBus.IoTDB/Options/IoTDBOptions.cs similarity index 89% rename from src/JiShe.CollectBus.IoTDBProvider/Options/IoTDBOptions.cs rename to modules/JiShe.CollectBus.IoTDB/Options/IoTDBOptions.cs index 62cbd92..c9c0610 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Options/IoTDBOptions.cs +++ b/modules/JiShe.CollectBus.IoTDB/Options/IoTDBOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Options { /// /// IOTDB配置 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Options/QueryCondition.cs b/modules/JiShe.CollectBus.IoTDB/Options/QueryCondition.cs similarity index 72% rename from src/JiShe.CollectBus.IoTDBProvider/Options/QueryCondition.cs rename to modules/JiShe.CollectBus.IoTDB/Options/QueryCondition.cs index b1aa53b..cf6d3a9 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Options/QueryCondition.cs +++ b/modules/JiShe.CollectBus.IoTDB/Options/QueryCondition.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Options { /// /// 查询条件 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Options/QueryOptions.cs b/modules/JiShe.CollectBus.IoTDB/Options/QueryOptions.cs similarity index 79% rename from src/JiShe.CollectBus.IoTDBProvider/Options/QueryOptions.cs rename to modules/JiShe.CollectBus.IoTDB/Options/QueryOptions.cs index 3600f12..90e44b2 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Options/QueryOptions.cs +++ b/modules/JiShe.CollectBus.IoTDB/Options/QueryOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Options { /// /// 查询条件 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/DeviceMetadata.cs b/modules/JiShe.CollectBus.IoTDB/Provider/DeviceMetadata.cs similarity index 84% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/DeviceMetadata.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/DeviceMetadata.cs index 6bdbd56..447f6ce 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/DeviceMetadata.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/DeviceMetadata.cs @@ -1,11 +1,6 @@ using Apache.IoTDB; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Provider { /// /// 设备元数据 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/DevicePathBuilder.cs b/modules/JiShe.CollectBus.IoTDB/Provider/DevicePathBuilder.cs similarity index 85% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/DevicePathBuilder.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/DevicePathBuilder.cs index e170577..46ce091 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/DevicePathBuilder.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/DevicePathBuilder.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Provider { /// /// 设备路径构建器 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs similarity index 98% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs index 3dd1341..9e18ac8 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs @@ -1,16 +1,16 @@ -using Apache.IoTDB; -using Apache.IoTDB.DataStructure; -using JiShe.CollectBus.Common.Extensions; -using JiShe.CollectBus.Common.Models; -using JiShe.CollectBus.IoTDBProvider.Context; -using JiShe.CollectBus.IoTDBProvider.Interface; -using Microsoft.Extensions.Logging; -using System.Collections.Concurrent; +using System.Collections.Concurrent; using System.Reflection; using System.Text; +using Apache.IoTDB; +using Apache.IoTDB.DataStructure; +using JiShe.CollectBus.Common.Models; +using JiShe.CollectBus.IoTDB.Attribute; +using JiShe.CollectBus.IoTDB.Context; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; +using Microsoft.Extensions.Logging; - -namespace JiShe.CollectBus.IoTDBProvider +namespace JiShe.CollectBus.IoTDB.Provider { /// /// IoTDB数据源 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBSessionFactory.cs b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBSessionFactory.cs similarity index 83% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBSessionFactory.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/IoTDBSessionFactory.cs index cbc3869..572e93d 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBSessionFactory.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBSessionFactory.cs @@ -1,13 +1,9 @@ -using JiShe.CollectBus.IoTDBProvider.Interface; +using System.Collections.Concurrent; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; using Microsoft.Extensions.Options; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace JiShe.CollectBus.IoTDBProvider.Provider +namespace JiShe.CollectBus.IoTDB.Provider { /// diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTEntity.cs b/modules/JiShe.CollectBus.IoTDB/Provider/IoTEntity.cs similarity index 91% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/IoTEntity.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/IoTEntity.cs index d9bf4fa..39a584d 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTEntity.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/IoTEntity.cs @@ -1,4 +1,6 @@ -namespace JiShe.CollectBus.IoTDBProvider +using JiShe.CollectBus.IoTDB.Attribute; + +namespace JiShe.CollectBus.IoTDB.Provider { /// /// IoT实体基类 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/SessionPoolAdapter.cs b/modules/JiShe.CollectBus.IoTDB/Provider/SessionPoolAdapter.cs similarity index 88% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/SessionPoolAdapter.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/SessionPoolAdapter.cs index e836672..44692bd 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/SessionPoolAdapter.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/SessionPoolAdapter.cs @@ -1,14 +1,10 @@ -using Apache.IoTDB.DataStructure; -using Apache.IoTDB; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using JiShe.CollectBus.IoTDBProvider.Interface; +using Apache.IoTDB; +using Apache.IoTDB.DataStructure; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; using Microsoft.Extensions.Logging; -namespace JiShe.CollectBus.IoTDBProvider.Provider +namespace JiShe.CollectBus.IoTDB.Provider { /// /// 树模型连接池 diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/TableSessionPoolAdapter.cs b/modules/JiShe.CollectBus.IoTDB/Provider/TableSessionPoolAdapter.cs similarity index 88% rename from src/JiShe.CollectBus.IoTDBProvider/Provider/TableSessionPoolAdapter.cs rename to modules/JiShe.CollectBus.IoTDB/Provider/TableSessionPoolAdapter.cs index 22de1b0..1efd04f 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/TableSessionPoolAdapter.cs +++ b/modules/JiShe.CollectBus.IoTDB/Provider/TableSessionPoolAdapter.cs @@ -1,14 +1,10 @@ -using Apache.IoTDB.DataStructure; -using Apache.IoTDB; -using JiShe.CollectBus.IoTDBProvider.Interface; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Apache.IoTDB; +using Apache.IoTDB.DataStructure; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; using Microsoft.Extensions.Logging; -namespace JiShe.CollectBus.IoTDBProvider.Provider +namespace JiShe.CollectBus.IoTDB.Provider { /// /// 表模型Session连接池 diff --git a/src/JiShe.CollectBus.KafkaProducer/AdminClient/AdminClientService.cs b/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/AdminClient/AdminClientService.cs rename to modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/AdminClient/IAdminClientService.cs b/modules/JiShe.CollectBus.Kafka/AdminClient/IAdminClientService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/AdminClient/IAdminClientService.cs rename to modules/JiShe.CollectBus.Kafka/AdminClient/IAdminClientService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Attributes/KafkaSubscribeAttribute.cs b/modules/JiShe.CollectBus.Kafka/Attributes/KafkaSubscribeAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Attributes/KafkaSubscribeAttribute.cs rename to modules/JiShe.CollectBus.Kafka/Attributes/KafkaSubscribeAttribute.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Attributes/TopicAttribute.cs b/modules/JiShe.CollectBus.Kafka/Attributes/TopicAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Attributes/TopicAttribute.cs rename to modules/JiShe.CollectBus.Kafka/Attributes/TopicAttribute.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/CollectBusKafkaModule.cs b/modules/JiShe.CollectBus.Kafka/CollectBusKafkaModule.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/CollectBusKafkaModule.cs rename to modules/JiShe.CollectBus.Kafka/CollectBusKafkaModule.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Consumer/ConsumerService.cs b/modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Consumer/ConsumerService.cs rename to modules/JiShe.CollectBus.Kafka/Consumer/ConsumerService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Consumer/IConsumerService.cs b/modules/JiShe.CollectBus.Kafka/Consumer/IConsumerService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Consumer/IConsumerService.cs rename to modules/JiShe.CollectBus.Kafka/Consumer/IConsumerService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/HeadersFilter.cs b/modules/JiShe.CollectBus.Kafka/HeadersFilter.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/HeadersFilter.cs rename to modules/JiShe.CollectBus.Kafka/HeadersFilter.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/IKafkaSubscribe.cs b/modules/JiShe.CollectBus.Kafka/IKafkaSubscribe.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/IKafkaSubscribe.cs rename to modules/JiShe.CollectBus.Kafka/IKafkaSubscribe.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/ISubscribeAck.cs b/modules/JiShe.CollectBus.Kafka/ISubscribeAck.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/ISubscribeAck.cs rename to modules/JiShe.CollectBus.Kafka/ISubscribeAck.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj b/modules/JiShe.CollectBus.Kafka/JiShe.CollectBus.Kafka.csproj similarity index 82% rename from src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj rename to modules/JiShe.CollectBus.Kafka/JiShe.CollectBus.Kafka.csproj index 9518b0b..ce31120 100644 --- a/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj +++ b/modules/JiShe.CollectBus.Kafka/JiShe.CollectBus.Kafka.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/JiShe.CollectBus.KafkaProducer/JsonSerializer.cs b/modules/JiShe.CollectBus.Kafka/JsonSerializer.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/JsonSerializer.cs rename to modules/JiShe.CollectBus.Kafka/JsonSerializer.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/KafkaOptionConfig.cs b/modules/JiShe.CollectBus.Kafka/KafkaOptionConfig.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/KafkaOptionConfig.cs rename to modules/JiShe.CollectBus.Kafka/KafkaOptionConfig.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/KafkaSubcribesExtensions.cs b/modules/JiShe.CollectBus.Kafka/KafkaSubcribesExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/KafkaSubcribesExtensions.cs rename to modules/JiShe.CollectBus.Kafka/KafkaSubcribesExtensions.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Producer/IProducerService.cs b/modules/JiShe.CollectBus.Kafka/Producer/IProducerService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Producer/IProducerService.cs rename to modules/JiShe.CollectBus.Kafka/Producer/IProducerService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/Producer/ProducerService.cs b/modules/JiShe.CollectBus.Kafka/Producer/ProducerService.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/Producer/ProducerService.cs rename to modules/JiShe.CollectBus.Kafka/Producer/ProducerService.cs diff --git a/src/JiShe.CollectBus.KafkaProducer/SubscribeResult.cs b/modules/JiShe.CollectBus.Kafka/SubscribeResult.cs similarity index 100% rename from src/JiShe.CollectBus.KafkaProducer/SubscribeResult.cs rename to modules/JiShe.CollectBus.Kafka/SubscribeResult.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/FodyWeavers.xml b/modules/JiShe.CollectBus.MongoDB/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/FodyWeavers.xml rename to modules/JiShe.CollectBus.MongoDB/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.abppkg b/modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.abppkg similarity index 100% rename from src/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.abppkg rename to modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.abppkg diff --git a/src/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj b/modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj similarity index 85% rename from src/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj rename to modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj index fcb97fa..2987d33 100644 --- a/src/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj +++ b/modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusDbSchemaMigrator.cs b/modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusDbSchemaMigrator.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusDbSchemaMigrator.cs rename to modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusDbSchemaMigrator.cs diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs b/modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs rename to modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContextExtensions.cs b/modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContextExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContextExtensions.cs rename to modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContextExtensions.cs diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbModule.cs b/modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbModule.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbModule.cs rename to modules/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbModule.cs diff --git a/src/JiShe.CollectBus.MongoDB/MongoDB/ICollectBusMongoDbContext.cs b/modules/JiShe.CollectBus.MongoDB/MongoDB/ICollectBusMongoDbContext.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/MongoDB/ICollectBusMongoDbContext.cs rename to modules/JiShe.CollectBus.MongoDB/MongoDB/ICollectBusMongoDbContext.cs diff --git a/src/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/IMeterReadingRecordRepository.cs b/modules/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/IMeterReadingRecordRepository.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/IMeterReadingRecordRepository.cs rename to modules/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/IMeterReadingRecordRepository.cs diff --git a/src/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/MeterReadingRecordRepository.cs b/modules/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/MeterReadingRecordRepository.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/MeterReadingRecordRepository.cs rename to modules/JiShe.CollectBus.MongoDB/Repository/MeterReadingRecord/MeterReadingRecordRepository.cs diff --git a/src/JiShe.CollectBus.MongoDB/ShardingStrategy/DayShardingStrategy.cs b/modules/JiShe.CollectBus.MongoDB/ShardingStrategy/DayShardingStrategy.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/ShardingStrategy/DayShardingStrategy.cs rename to modules/JiShe.CollectBus.MongoDB/ShardingStrategy/DayShardingStrategy.cs diff --git a/src/JiShe.CollectBus.MongoDB/ShardingStrategy/IShardingStrategy.cs b/modules/JiShe.CollectBus.MongoDB/ShardingStrategy/IShardingStrategy.cs similarity index 100% rename from src/JiShe.CollectBus.MongoDB/ShardingStrategy/IShardingStrategy.cs rename to modules/JiShe.CollectBus.MongoDB/ShardingStrategy/IShardingStrategy.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Adapters/StandardFixedHeaderDataHandlingAdapter.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Adapters/StandardFixedHeaderDataHandlingAdapter.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Adapters/StandardFixedHeaderDataHandlingAdapter.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Adapters/StandardFixedHeaderDataHandlingAdapter.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/AnalysisData/Appendix.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/AnalysisData/Appendix.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/AnalysisData/Appendix.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/AnalysisData/Appendix.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Attributes/ProtocolNameAttribute.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Attributes/ProtocolNameAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Attributes/ProtocolNameAttribute.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Attributes/ProtocolNameAttribute.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj b/protocols/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj similarity index 57% rename from src/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj rename to protocols/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj index fc0f12e..cb60dbd 100644 --- a/src/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj +++ b/protocols/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + @@ -15,13 +21,9 @@ - - - - - - - + + + diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Models/CustomFixedHeaderRequestInfo.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Models/CustomFixedHeaderRequestInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Models/CustomFixedHeaderRequestInfo.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Models/CustomFixedHeaderRequestInfo.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Models/TB3761.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Models/TB3761.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/Models/TB3761.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/Models/TB3761.cs diff --git a/src/JiShe.CollectBus.Protocol.Contracts/QGDW3761Config.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/QGDW3761Config.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Contracts/QGDW3761Config.cs rename to protocols/JiShe.CollectBus.Protocol.Contracts/QGDW3761Config.cs diff --git a/src/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj b/protocols/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj similarity index 75% rename from src/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj rename to protocols/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj index d7b4af6..899ebad 100644 --- a/src/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj +++ b/protocols/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj @@ -16,13 +16,13 @@ - - + + - + diff --git a/src/JiShe.CollectBus.Protocol.Test/JiSheCollectBusProtocolModule.cs b/protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusProtocolModule.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Test/JiSheCollectBusProtocolModule.cs rename to protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusProtocolModule.cs diff --git a/src/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs rename to protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs diff --git a/src/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj b/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj similarity index 64% rename from src/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj rename to protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj index 0ee8a46..1497183 100644 --- a/src/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj +++ b/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj @@ -16,13 +16,13 @@ - - - + + + - + diff --git a/src/JiShe.CollectBus.Protocol/JiSheCollectBusProtocolModule.cs b/protocols/JiShe.CollectBus.Protocol/JiSheCollectBusProtocolModule.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol/JiSheCollectBusProtocolModule.cs rename to protocols/JiShe.CollectBus.Protocol/JiSheCollectBusProtocolModule.cs diff --git a/src/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs similarity index 100% rename from src/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs rename to protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs b/services/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs rename to services/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/CollectBusApplicationContractsModule.cs b/services/JiShe.CollectBus.Application.Contracts/CollectBusApplicationContractsModule.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/CollectBusApplicationContractsModule.cs rename to services/JiShe.CollectBus.Application.Contracts/CollectBusApplicationContractsModule.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/CollectBusRemoteServiceConsts.cs b/services/JiShe.CollectBus.Application.Contracts/CollectBusRemoteServiceConsts.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/CollectBusRemoteServiceConsts.cs rename to services/JiShe.CollectBus.Application.Contracts/CollectBusRemoteServiceConsts.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/DataMigration/IDataMigrationService.cs b/services/JiShe.CollectBus.Application.Contracts/DataMigration/IDataMigrationService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/DataMigration/IDataMigrationService.cs rename to services/JiShe.CollectBus.Application.Contracts/DataMigration/IDataMigrationService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/DataMigration/Options/DataMigrationOptions.cs b/services/JiShe.CollectBus.Application.Contracts/DataMigration/Options/DataMigrationOptions.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/DataMigration/Options/DataMigrationOptions.cs rename to services/JiShe.CollectBus.Application.Contracts/DataMigration/Options/DataMigrationOptions.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddFocusLogInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddFocusLogInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddFocusLogInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddFocusLogInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddSignalStrengthInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddSignalStrengthInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddSignalStrengthInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddSignalStrengthInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlOutput.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlOutput.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlOutput.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlOutput.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/ICacheAppService.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/ICacheAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/ICacheAppService.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/ICacheAppService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs b/services/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs rename to services/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs diff --git a/src/JiShe.CollectBus.Application/FodyWeavers.xml b/services/JiShe.CollectBus.Application.Contracts/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.Application/FodyWeavers.xml rename to services/JiShe.CollectBus.Application.Contracts/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.Application.Contracts/ICollectWorker.cs b/services/JiShe.CollectBus.Application.Contracts/ICollectWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/ICollectWorker.cs rename to services/JiShe.CollectBus.Application.Contracts/ICollectWorker.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/JiShe - Backup.CollectBus.Application.Contracts.csproj b/services/JiShe.CollectBus.Application.Contracts/JiShe - Backup.CollectBus.Application.Contracts.csproj similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/JiShe - Backup.CollectBus.Application.Contracts.csproj rename to services/JiShe.CollectBus.Application.Contracts/JiShe - Backup.CollectBus.Application.Contracts.csproj diff --git a/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.abppkg b/services/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.abppkg similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.abppkg rename to services/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.abppkg diff --git a/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj b/services/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj similarity index 73% rename from src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj rename to services/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj index 6e4fed5..fedbafd 100644 --- a/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj +++ b/services/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj @@ -23,10 +23,10 @@ - - + + - + diff --git a/src/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissionDefinitionProvider.cs b/services/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissionDefinitionProvider.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissionDefinitionProvider.cs rename to services/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissionDefinitionProvider.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissions.cs b/services/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissions.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissions.cs rename to services/JiShe.CollectBus.Application.Contracts/Permissions/CollectBusPermissions.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/RedisDataCache/IRedisDataCacheService.cs b/services/JiShe.CollectBus.Application.Contracts/RedisDataCache/IRedisDataCacheService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/RedisDataCache/IRedisDataCacheService.cs rename to services/JiShe.CollectBus.Application.Contracts/RedisDataCache/IRedisDataCacheService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/Samples/ISampleAppService.cs b/services/JiShe.CollectBus.Application.Contracts/Samples/ISampleAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Samples/ISampleAppService.cs rename to services/JiShe.CollectBus.Application.Contracts/Samples/ISampleAppService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs b/services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs rename to services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs rename to services/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/Subscribers/ISubscriberAppService.cs b/services/JiShe.CollectBus.Application.Contracts/Subscribers/ISubscriberAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Subscribers/ISubscriberAppService.cs rename to services/JiShe.CollectBus.Application.Contracts/Subscribers/ISubscriberAppService.cs diff --git a/src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs b/services/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs rename to services/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs diff --git a/src/JiShe.CollectBus.Application/CollectBusAppService.cs b/services/JiShe.CollectBus.Application/CollectBusAppService.cs similarity index 99% rename from src/JiShe.CollectBus.Application/CollectBusAppService.cs rename to services/JiShe.CollectBus.Application/CollectBusAppService.cs index ad5b585..e155c65 100644 --- a/src/JiShe.CollectBus.Application/CollectBusAppService.cs +++ b/services/JiShe.CollectBus.Application/CollectBusAppService.cs @@ -2,7 +2,6 @@ using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; -using JiShe.CollectBus.FreeRedisProvider; using JiShe.CollectBus.FreeSql; using JiShe.CollectBus.Localization; using Microsoft.AspNetCore.Mvc; @@ -10,6 +9,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using JiShe.CollectBus.FreeRedis; using Volo.Abp.Application.Services; namespace JiShe.CollectBus; diff --git a/src/JiShe.CollectBus.Application/CollectBusApplicationAutoMapperProfile.cs b/services/JiShe.CollectBus.Application/CollectBusApplicationAutoMapperProfile.cs similarity index 100% rename from src/JiShe.CollectBus.Application/CollectBusApplicationAutoMapperProfile.cs rename to services/JiShe.CollectBus.Application/CollectBusApplicationAutoMapperProfile.cs diff --git a/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs similarity index 97% rename from src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs rename to services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs index 19aa539..e5077cc 100644 --- a/src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs +++ b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs @@ -1,8 +1,6 @@ using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Extensions; -using JiShe.CollectBus.FreeRedisProvider; using JiShe.CollectBus.FreeSql; -using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.Kafka; using JiShe.CollectBus.Kafka.AdminClient; using JiShe.CollectBus.Protocol.Contracts; @@ -14,6 +12,8 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using JiShe.CollectBus.Cassandra; +using JiShe.CollectBus.FreeRedis; +using JiShe.CollectBus.IoTDB; using Volo.Abp; using Volo.Abp.Application; using Volo.Abp.Autofac; diff --git a/src/JiShe.CollectBus.Application/Consumers/IssuedConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/IssuedConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/IssuedConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/IssuedConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/IssuedFaultConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/IssuedFaultConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/IssuedFaultConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/IssuedFaultConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/ReceivedConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/ReceivedConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/ReceivedConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/ReceivedConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/ReceivedFaultConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/ReceivedFaultConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/ReceivedFaultConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/ReceivedFaultConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/ReceivedHeartbeatConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/ReceivedHeartbeatConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/ReceivedHeartbeatConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/ReceivedHeartbeatConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/ReceivedLoginConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/ReceivedLoginConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/ReceivedLoginConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/ReceivedLoginConsumer.cs diff --git a/src/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs b/services/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs rename to services/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs diff --git a/src/JiShe.CollectBus.Application/DataMigration/DataMigrationService.cs b/services/JiShe.CollectBus.Application/DataMigration/DataMigrationService.cs similarity index 100% rename from src/JiShe.CollectBus.Application/DataMigration/DataMigrationService.cs rename to services/JiShe.CollectBus.Application/DataMigration/DataMigrationService.cs diff --git a/src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs b/services/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs rename to services/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs diff --git a/src/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs b/services/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs rename to services/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs diff --git a/src/JiShe.CollectBus.Application/Exceptions/CloseException.cs b/services/JiShe.CollectBus.Application/Exceptions/CloseException.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Exceptions/CloseException.cs rename to services/JiShe.CollectBus.Application/Exceptions/CloseException.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/FodyWeavers.xml b/services/JiShe.CollectBus.Application/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/FodyWeavers.xml rename to services/JiShe.CollectBus.Application/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.Application/Handlers/SampleHandler.cs b/services/JiShe.CollectBus.Application/Handlers/SampleHandler.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Handlers/SampleHandler.cs rename to services/JiShe.CollectBus.Application/Handlers/SampleHandler.cs diff --git a/src/JiShe.CollectBus.Application/JiShe - Backup.CollectBus.Application.csproj b/services/JiShe.CollectBus.Application/JiShe - Backup.CollectBus.Application.csproj similarity index 100% rename from src/JiShe.CollectBus.Application/JiShe - Backup.CollectBus.Application.csproj rename to services/JiShe.CollectBus.Application/JiShe - Backup.CollectBus.Application.csproj diff --git a/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.abppkg b/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.abppkg similarity index 100% rename from src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.abppkg rename to services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.abppkg diff --git a/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj b/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj similarity index 69% rename from src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj rename to services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj index 3fa551c..b473dea 100644 --- a/src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj +++ b/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj @@ -25,14 +25,14 @@ + - - - - - + + + + diff --git a/src/JiShe.CollectBus.Application/Plugins/CloseMonitor.cs b/services/JiShe.CollectBus.Application/Plugins/CloseMonitor.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Plugins/CloseMonitor.cs rename to services/JiShe.CollectBus.Application/Plugins/CloseMonitor.cs diff --git a/src/JiShe.CollectBus.Application/Plugins/ServerMonitor.cs b/services/JiShe.CollectBus.Application/Plugins/ServerMonitor.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Plugins/ServerMonitor.cs rename to services/JiShe.CollectBus.Application/Plugins/ServerMonitor.cs diff --git a/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs b/services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs rename to services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs diff --git a/src/JiShe.CollectBus.Application/Plugins/UdpMonitor.cs b/services/JiShe.CollectBus.Application/Plugins/UdpMonitor.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Plugins/UdpMonitor.cs rename to services/JiShe.CollectBus.Application/Plugins/UdpMonitor.cs diff --git a/src/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs b/services/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs similarity index 99% rename from src/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs rename to services/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs index 43dae23..1a056a7 100644 --- a/src/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs +++ b/services/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs @@ -4,7 +4,6 @@ using JiShe.CollectBus.Application.Contracts; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Models; -using JiShe.CollectBus.FreeRedisProvider; using Microsoft.Extensions.Logging; using System; using System.Collections.Concurrent; @@ -12,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using JiShe.CollectBus.FreeRedis; using Volo.Abp.DependencyInjection; using static FreeSql.Internal.GlobalFilter; using static System.Runtime.InteropServices.JavaScript.JSType; diff --git a/src/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs similarity index 98% rename from src/JiShe.CollectBus.Application/Samples/SampleAppService.cs rename to services/JiShe.CollectBus.Application/Samples/SampleAppService.cs index 169b3f8..f0aa541 100644 --- a/src/JiShe.CollectBus.Application/Samples/SampleAppService.cs +++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs @@ -6,12 +6,10 @@ using Apache.IoTDB; using Confluent.Kafka; using JiShe.CollectBus.Ammeters; using JiShe.CollectBus.FreeSql; -using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.PrepayModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using JiShe.CollectBus.IoTDBProvider.Context; using Microsoft.Extensions.Logging; using JiShe.CollectBus.IotSystems.AFNEntity; using JiShe.CollectBus.Protocol.Contracts.Interfaces; @@ -26,6 +24,9 @@ using JiShe.CollectBus.Kafka; using JiShe.CollectBus.Application.Contracts; using JiShe.CollectBus.Common.Models; using System.Diagnostics; +using JiShe.CollectBus.IoTDB.Context; +using JiShe.CollectBus.IoTDB.Interface; +using JiShe.CollectBus.IoTDB.Options; namespace JiShe.CollectBus.Samples; diff --git a/src/JiShe.CollectBus.Application/Samples/TestAppService.cs b/services/JiShe.CollectBus.Application/Samples/TestAppService.cs similarity index 98% rename from src/JiShe.CollectBus.Application/Samples/TestAppService.cs rename to services/JiShe.CollectBus.Application/Samples/TestAppService.cs index 53f4b9e..2de458f 100644 --- a/src/JiShe.CollectBus.Application/Samples/TestAppService.cs +++ b/services/JiShe.CollectBus.Application/Samples/TestAppService.cs @@ -6,12 +6,10 @@ using Apache.IoTDB; using Confluent.Kafka; using JiShe.CollectBus.Ammeters; using JiShe.CollectBus.FreeSql; -using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.PrepayModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using JiShe.CollectBus.IoTDBProvider.Context; using Microsoft.Extensions.Logging; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.AFNEntity; diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs similarity index 99% rename from src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs rename to services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs index 97bcc50..42f0f1c 100644 --- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs +++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs @@ -9,7 +9,6 @@ using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.GatherItem; -using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.MessageIssueds; using JiShe.CollectBus.IotSystems.MeterReadingRecords; using JiShe.CollectBus.IotSystems.Watermeter; @@ -27,6 +26,7 @@ using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; +using JiShe.CollectBus.IoTDB.Interface; using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.ScheduledMeterReading diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs similarity index 99% rename from src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs rename to services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs index cfb0193..733f14a 100644 --- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs +++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs @@ -10,7 +10,7 @@ using JiShe.CollectBus.Common.DeviceBalanceControl; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.FreeSql; using JiShe.CollectBus.GatherItem; -using JiShe.CollectBus.IoTDBProvider; +using JiShe.CollectBus.IoTDB.Interface; using JiShe.CollectBus.IotSystems.Devices; using JiShe.CollectBus.IotSystems.MessageIssueds; using JiShe.CollectBus.IotSystems.MeterReadingRecords; diff --git a/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs similarity index 99% rename from src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs rename to services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs index ce41db1..eb3abd9 100644 --- a/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs +++ b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs @@ -3,7 +3,6 @@ using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Models; -using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.Devices; using JiShe.CollectBus.IotSystems.MessageReceiveds; using JiShe.CollectBus.IotSystems.MeterReadingRecords; @@ -18,6 +17,7 @@ using Microsoft.Extensions.Logging; using System; using System.Linq; using System.Threading.Tasks; +using JiShe.CollectBus.IoTDB.Interface; using TouchSocket.Sockets; using Volo.Abp.Domain.Repositories; diff --git a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs b/services/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs rename to services/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs diff --git a/src/JiShe.CollectBus.Application/Workers/CreateToBeIssueTaskWorker.cs b/services/JiShe.CollectBus.Application/Workers/CreateToBeIssueTaskWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Workers/CreateToBeIssueTaskWorker.cs rename to services/JiShe.CollectBus.Application/Workers/CreateToBeIssueTaskWorker.cs diff --git a/src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs b/services/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs rename to services/JiShe.CollectBus.Application/Workers/EpiCollectWorker.cs diff --git a/src/JiShe.CollectBus.Application/Workers/SubscriberFifteenMinuteWorker.cs b/services/JiShe.CollectBus.Application/Workers/SubscriberFifteenMinuteWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Workers/SubscriberFifteenMinuteWorker.cs rename to services/JiShe.CollectBus.Application/Workers/SubscriberFifteenMinuteWorker.cs diff --git a/src/JiShe.CollectBus.Application/Workers/SubscriberFiveMinuteWorker.cs b/services/JiShe.CollectBus.Application/Workers/SubscriberFiveMinuteWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Workers/SubscriberFiveMinuteWorker.cs rename to services/JiShe.CollectBus.Application/Workers/SubscriberFiveMinuteWorker.cs diff --git a/src/JiShe.CollectBus.Application/Workers/SubscriberOneMinuteWorker.cs b/services/JiShe.CollectBus.Application/Workers/SubscriberOneMinuteWorker.cs similarity index 100% rename from src/JiShe.CollectBus.Application/Workers/SubscriberOneMinuteWorker.cs rename to services/JiShe.CollectBus.Application/Workers/SubscriberOneMinuteWorker.cs diff --git a/src/JiShe.CollectBus.Application/cmd3761Matching.txt b/services/JiShe.CollectBus.Application/cmd3761Matching.txt similarity index 100% rename from src/JiShe.CollectBus.Application/cmd3761Matching.txt rename to services/JiShe.CollectBus.Application/cmd3761Matching.txt diff --git a/src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt b/services/JiShe.CollectBus.Application/cmd3761TdcMatching.txt similarity index 100% rename from src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt rename to services/JiShe.CollectBus.Application/cmd3761TdcMatching.txt diff --git a/src/JiShe.CollectBus.DbMigrator/CollectBusDbMigratorModule.cs b/services/JiShe.CollectBus.DbMigrator/CollectBusDbMigratorModule.cs similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/CollectBusDbMigratorModule.cs rename to services/JiShe.CollectBus.DbMigrator/CollectBusDbMigratorModule.cs diff --git a/src/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs b/services/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs rename to services/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs diff --git a/src/JiShe.CollectBus.DbMigrator/Dockerfile b/services/JiShe.CollectBus.DbMigrator/Dockerfile similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/Dockerfile rename to services/JiShe.CollectBus.DbMigrator/Dockerfile diff --git a/src/JiShe.CollectBus.DbMigrator/FodyWeavers.xml b/services/JiShe.CollectBus.DbMigrator/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/FodyWeavers.xml rename to services/JiShe.CollectBus.DbMigrator/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.abppkg b/services/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.abppkg similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.abppkg rename to services/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.abppkg diff --git a/src/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj b/services/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj similarity index 93% rename from src/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj rename to services/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj index e163f7e..f875a56 100644 --- a/src/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj +++ b/services/JiShe.CollectBus.DbMigrator/JiShe.CollectBus.DbMigrator.csproj @@ -18,8 +18,8 @@ + - diff --git a/src/JiShe.CollectBus.DbMigrator/Program.cs b/services/JiShe.CollectBus.DbMigrator/Program.cs similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/Program.cs rename to services/JiShe.CollectBus.DbMigrator/Program.cs diff --git a/src/JiShe.CollectBus.DbMigrator/appsettings.json b/services/JiShe.CollectBus.DbMigrator/appsettings.json similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/appsettings.json rename to services/JiShe.CollectBus.DbMigrator/appsettings.json diff --git a/src/JiShe.CollectBus.DbMigrator/appsettings.secrets.json b/services/JiShe.CollectBus.DbMigrator/appsettings.secrets.json similarity index 100% rename from src/JiShe.CollectBus.DbMigrator/appsettings.secrets.json rename to services/JiShe.CollectBus.DbMigrator/appsettings.secrets.json diff --git a/src/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs b/services/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs rename to services/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs diff --git a/src/JiShe.CollectBus.Domain/Ammeters/AmmeterInfoTemp.cs b/services/JiShe.CollectBus.Domain/Ammeters/AmmeterInfoTemp.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Ammeters/AmmeterInfoTemp.cs rename to services/JiShe.CollectBus.Domain/Ammeters/AmmeterInfoTemp.cs diff --git a/src/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs b/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs similarity index 89% rename from src/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs rename to services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs index 987013c..2d9cc67 100644 --- a/src/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs +++ b/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs @@ -1,9 +1,10 @@ -using JiShe.CollectBus.IoTDBProvider; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using JiShe.CollectBus.IoTDB.Attribute; +using JiShe.CollectBus.IoTDB.Provider; namespace JiShe.CollectBus.Ammeters { diff --git a/src/JiShe.CollectBus.Domain/Analyze3761Data.cs b/services/JiShe.CollectBus.Domain/Analyze3761Data.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Analyze3761Data.cs rename to services/JiShe.CollectBus.Domain/Analyze3761Data.cs diff --git a/src/JiShe.CollectBus.Domain/CollectBusConsts.cs b/services/JiShe.CollectBus.Domain/CollectBusConsts.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/CollectBusConsts.cs rename to services/JiShe.CollectBus.Domain/CollectBusConsts.cs diff --git a/src/JiShe.CollectBus.Domain/CollectBusDbProperties.cs b/services/JiShe.CollectBus.Domain/CollectBusDbProperties.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/CollectBusDbProperties.cs rename to services/JiShe.CollectBus.Domain/CollectBusDbProperties.cs diff --git a/src/JiShe.CollectBus.Domain/CollectBusDomainModule.cs b/services/JiShe.CollectBus.Domain/CollectBusDomainModule.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/CollectBusDomainModule.cs rename to services/JiShe.CollectBus.Domain/CollectBusDomainModule.cs diff --git a/src/JiShe.CollectBus.Domain/Data/CollectBusDbMigrationService.cs b/services/JiShe.CollectBus.Domain/Data/CollectBusDbMigrationService.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Data/CollectBusDbMigrationService.cs rename to services/JiShe.CollectBus.Domain/Data/CollectBusDbMigrationService.cs diff --git a/src/JiShe.CollectBus.Domain/Data/ICollectBusDbSchemaMigrator.cs b/services/JiShe.CollectBus.Domain/Data/ICollectBusDbSchemaMigrator.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Data/ICollectBusDbSchemaMigrator.cs rename to services/JiShe.CollectBus.Domain/Data/ICollectBusDbSchemaMigrator.cs diff --git a/src/JiShe.CollectBus.Domain/Data/NullCollectBusDbSchemaMigrator.cs b/services/JiShe.CollectBus.Domain/Data/NullCollectBusDbSchemaMigrator.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Data/NullCollectBusDbSchemaMigrator.cs rename to services/JiShe.CollectBus.Domain/Data/NullCollectBusDbSchemaMigrator.cs diff --git a/src/JiShe.CollectBus.Domain/EnergySystems/Entities/TB_AmmeterInfo.cs b/services/JiShe.CollectBus.Domain/EnergySystems/Entities/TB_AmmeterInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/EnergySystems/Entities/TB_AmmeterInfo.cs rename to services/JiShe.CollectBus.Domain/EnergySystems/Entities/TB_AmmeterInfo.cs diff --git a/src/JiShe.CollectBus.Domain/EnergySystems/TableViews/V_FocusAmmeter.cs b/services/JiShe.CollectBus.Domain/EnergySystems/TableViews/V_FocusAmmeter.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/EnergySystems/TableViews/V_FocusAmmeter.cs rename to services/JiShe.CollectBus.Domain/EnergySystems/TableViews/V_FocusAmmeter.cs diff --git a/src/JiShe.CollectBus.Domain/FodyWeavers.xml b/services/JiShe.CollectBus.Domain/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.Domain/FodyWeavers.xml rename to services/JiShe.CollectBus.Domain/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.Domain/GatherItem/GatherItemInfo.cs b/services/JiShe.CollectBus.Domain/GatherItem/GatherItemInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/GatherItem/GatherItemInfo.cs rename to services/JiShe.CollectBus.Domain/GatherItem/GatherItemInfo.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs b/services/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs similarity index 83% rename from src/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs rename to services/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs index 751e9e3..0440c1d 100644 --- a/src/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs +++ b/services/JiShe.CollectBus.Domain/IotSystems/AFNEntity/SingleMeasuringAFNDataEntity.cs @@ -1,9 +1,10 @@ -using JiShe.CollectBus.IoTDBProvider; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using JiShe.CollectBus.IoTDB.Attribute; +using JiShe.CollectBus.IoTDB.Provider; namespace JiShe.CollectBus.IotSystems.AFNEntity { diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Devices/Device.cs b/services/JiShe.CollectBus.Domain/IotSystems/Devices/Device.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Devices/Device.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Devices/Device.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/MessageIssued.cs b/services/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/MessageIssued.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/MessageIssued.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/MessageIssued.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs b/services/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/IReceived.cs b/services/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/IReceived.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/IReceived.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/IReceived.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/MessageReceived.cs b/services/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/MessageReceived.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/MessageReceived.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MessageReceiveds/MessageReceived.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingRecords.cs b/services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingRecords.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingRecords.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingRecords.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs b/services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs rename to services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/PrepayModel/Vi_BaseAmmeterInfo.cs b/services/JiShe.CollectBus.Domain/IotSystems/PrepayModel/Vi_BaseAmmeterInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/PrepayModel/Vi_BaseAmmeterInfo.cs rename to services/JiShe.CollectBus.Domain/IotSystems/PrepayModel/Vi_BaseAmmeterInfo.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Protocols/ProtocolInfo.cs b/services/JiShe.CollectBus.Domain/IotSystems/Protocols/ProtocolInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Protocols/ProtocolInfo.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Protocols/ProtocolInfo.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Records/ConrOnlineRecord.cs b/services/JiShe.CollectBus.Domain/IotSystems/Records/ConrOnlineRecord.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Records/ConrOnlineRecord.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Records/ConrOnlineRecord.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Records/CsqRecord.cs b/services/JiShe.CollectBus.Domain/IotSystems/Records/CsqRecord.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Records/CsqRecord.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Records/CsqRecord.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Records/FocusRecord.cs b/services/JiShe.CollectBus.Domain/IotSystems/Records/FocusRecord.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Records/FocusRecord.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Records/FocusRecord.cs diff --git a/src/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs b/services/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs rename to services/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs diff --git a/src/JiShe.CollectBus.Domain/JiShe - Backup.CollectBus.Domain.csproj b/services/JiShe.CollectBus.Domain/JiShe - Backup.CollectBus.Domain.csproj similarity index 100% rename from src/JiShe.CollectBus.Domain/JiShe - Backup.CollectBus.Domain.csproj rename to services/JiShe.CollectBus.Domain/JiShe - Backup.CollectBus.Domain.csproj diff --git a/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.abppkg b/services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.abppkg similarity index 100% rename from src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.abppkg rename to services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.abppkg diff --git a/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj b/services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj similarity index 72% rename from src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj rename to services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj index 16eef7f..a4dbc5d 100644 --- a/src/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj +++ b/services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/src/JiShe.CollectBus.Domain/Properties/AssemblyInfo.cs b/services/JiShe.CollectBus.Domain/Properties/AssemblyInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Properties/AssemblyInfo.cs rename to services/JiShe.CollectBus.Domain/Properties/AssemblyInfo.cs diff --git a/src/JiShe.CollectBus.Domain/Settings/CollectBusSettingDefinitionProvider.cs b/services/JiShe.CollectBus.Domain/Settings/CollectBusSettingDefinitionProvider.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Settings/CollectBusSettingDefinitionProvider.cs rename to services/JiShe.CollectBus.Domain/Settings/CollectBusSettingDefinitionProvider.cs diff --git a/src/JiShe.CollectBus.Domain/Settings/CollectBusSettings.cs b/services/JiShe.CollectBus.Domain/Settings/CollectBusSettings.cs similarity index 100% rename from src/JiShe.CollectBus.Domain/Settings/CollectBusSettings.cs rename to services/JiShe.CollectBus.Domain/Settings/CollectBusSettings.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContext.cs b/services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContext.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContext.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContext.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContextFactory.cs b/services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContextFactory.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContextFactory.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusDbContextFactory.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEfCoreEntityExtensionMappings.cs b/services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEfCoreEntityExtensionMappings.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEfCoreEntityExtensionMappings.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEfCoreEntityExtensionMappings.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEntityFrameworkCoreModule.cs b/services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEntityFrameworkCoreModule.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEntityFrameworkCoreModule.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/CollectBusEntityFrameworkCoreModule.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreCollectBusDbSchemaMigrator.cs b/services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreCollectBusDbSchemaMigrator.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreCollectBusDbSchemaMigrator.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreCollectBusDbSchemaMigrator.cs diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/FodyWeavers.xml b/services/JiShe.CollectBus.EntityFrameworkCore/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/FodyWeavers.xml rename to services/JiShe.CollectBus.EntityFrameworkCore/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.abppkg b/services/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.abppkg similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.abppkg rename to services/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.abppkg diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.csproj b/services/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.csproj similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.csproj rename to services/JiShe.CollectBus.EntityFrameworkCore/JiShe.CollectBus.EntityFrameworkCore.csproj diff --git a/src/JiShe.CollectBus.EntityFrameworkCore/Properties/AssemblyInfo.cs b/services/JiShe.CollectBus.EntityFrameworkCore/Properties/AssemblyInfo.cs similarity index 100% rename from src/JiShe.CollectBus.EntityFrameworkCore/Properties/AssemblyInfo.cs rename to services/JiShe.CollectBus.EntityFrameworkCore/Properties/AssemblyInfo.cs diff --git a/src/JiShe.CollectBus.Common/AttributeInfo/NumericalOrderAttribute.cs b/shared/JiShe.CollectBus.Common/AttributeInfo/NumericalOrderAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Common/AttributeInfo/NumericalOrderAttribute.cs rename to shared/JiShe.CollectBus.Common/AttributeInfo/NumericalOrderAttribute.cs diff --git a/src/JiShe.CollectBus.Common/Attributes/CassandraTableAttribute.cs b/shared/JiShe.CollectBus.Common/Attributes/CassandraTableAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Attributes/CassandraTableAttribute.cs rename to shared/JiShe.CollectBus.Common/Attributes/CassandraTableAttribute.cs diff --git a/src/JiShe.CollectBus.Common/Attributes/IgnoreJobAttribute.cs b/shared/JiShe.CollectBus.Common/Attributes/IgnoreJobAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Attributes/IgnoreJobAttribute.cs rename to shared/JiShe.CollectBus.Common/Attributes/IgnoreJobAttribute.cs diff --git a/src/JiShe.CollectBus.Common/Attributes/TopicNameAttribute.cs b/shared/JiShe.CollectBus.Common/Attributes/TopicNameAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Attributes/TopicNameAttribute.cs rename to shared/JiShe.CollectBus.Common/Attributes/TopicNameAttribute.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/Build188SendData.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/Build188SendData.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/Build188SendData.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/Build188SendData.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/TasksToBeIssueModel.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/TasksToBeIssueModel.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/TasksToBeIssueModel.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/TasksToBeIssueModel.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketRequest.cs b/shared/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketRequest.cs similarity index 100% rename from src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketRequest.cs rename to shared/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketRequest.cs diff --git a/src/JiShe.CollectBus.Common/Consts/CommonConst.cs b/shared/JiShe.CollectBus.Common/Consts/CommonConst.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Consts/CommonConst.cs rename to shared/JiShe.CollectBus.Common/Consts/CommonConst.cs diff --git a/src/JiShe.CollectBus.Common/Consts/ProtocolConst.cs b/shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Consts/ProtocolConst.cs rename to shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs diff --git a/src/JiShe.CollectBus.Common/Consts/RedisConst.cs b/shared/JiShe.CollectBus.Common/Consts/RedisConst.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Consts/RedisConst.cs rename to shared/JiShe.CollectBus.Common/Consts/RedisConst.cs diff --git a/src/JiShe.CollectBus.Common/Consts/RegexConst.cs b/shared/JiShe.CollectBus.Common/Consts/RegexConst.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Consts/RegexConst.cs rename to shared/JiShe.CollectBus.Common/Consts/RegexConst.cs diff --git a/src/JiShe.CollectBus.Common/Consts/SystemTypeConst.cs b/shared/JiShe.CollectBus.Common/Consts/SystemTypeConst.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Consts/SystemTypeConst.cs rename to shared/JiShe.CollectBus.Common/Consts/SystemTypeConst.cs diff --git a/src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs b/shared/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs similarity index 100% rename from src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs rename to shared/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs diff --git a/src/JiShe.CollectBus.Common/Enums/188Enums.cs b/shared/JiShe.CollectBus.Common/Enums/188Enums.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/188Enums.cs rename to shared/JiShe.CollectBus.Common/Enums/188Enums.cs diff --git a/src/JiShe.CollectBus.Common/Enums/376Enums.cs b/shared/JiShe.CollectBus.Common/Enums/376Enums.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/376Enums.cs rename to shared/JiShe.CollectBus.Common/Enums/376Enums.cs diff --git a/src/JiShe.CollectBus.Common/Enums/645Enums.cs b/shared/JiShe.CollectBus.Common/Enums/645Enums.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/645Enums.cs rename to shared/JiShe.CollectBus.Common/Enums/645Enums.cs diff --git a/src/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs b/shared/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/CommandChunkEnum.cs b/shared/JiShe.CollectBus.Common/Enums/CommandChunkEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/CommandChunkEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/CommandChunkEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/F25DataItemEnum.cs b/shared/JiShe.CollectBus.Common/Enums/F25DataItemEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/F25DataItemEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/F25DataItemEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/MaskTypeEnum.cs b/shared/JiShe.CollectBus.Common/Enums/MaskTypeEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/MaskTypeEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/MaskTypeEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/MeterLinkProtocolEnum.cs b/shared/JiShe.CollectBus.Common/Enums/MeterLinkProtocolEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/MeterLinkProtocolEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/MeterLinkProtocolEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs b/shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/RecordsDataMigrationStatusEnum.cs b/shared/JiShe.CollectBus.Common/Enums/RecordsDataMigrationStatusEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/RecordsDataMigrationStatusEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/RecordsDataMigrationStatusEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/SortEnum.cs b/shared/JiShe.CollectBus.Common/Enums/SortEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/SortEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/SortEnum.cs diff --git a/src/JiShe.CollectBus.Common/Enums/TransparentForwardingFlagEnum.cs b/shared/JiShe.CollectBus.Common/Enums/TransparentForwardingFlagEnum.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Enums/TransparentForwardingFlagEnum.cs rename to shared/JiShe.CollectBus.Common/Enums/TransparentForwardingFlagEnum.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/CollectionExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/CollectionExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/CollectionExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/CollectionExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/ComparableExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/ComparableExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/ComparableExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/ComparableExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/DataTableExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/DataTableExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/DataTableExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/DataTableExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/DateTimeExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/DateTimeExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/DateTimeExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/DateTimeExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/DayOfWeekExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/DayOfWeekExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/DayOfWeekExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/DayOfWeekExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/DecimalOrIntExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/DecimalOrIntExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/DecimalOrIntExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/DecimalOrIntExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/DictionaryExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/DictionaryExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/DictionaryExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/DictionaryExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/EnumExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/EnumExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/EnumExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/EnumExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/EnumerableExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/EnumerableExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/EnumerableExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/EnumerableExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/EventHandlerExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/EventHandlerExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/EventHandlerExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/EventHandlerExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/ExceptionExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/ExceptionExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/ExceptionExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/ExceptionExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/HexStringExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/HexStringExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/HexStringExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/HexStringExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/HttpResponseExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/HttpResponseExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/HttpResponseExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/HttpResponseExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/IntExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/IntExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/IntExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/IntExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/ListExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/ListExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/ListExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/ListExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/LockExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/LockExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/LockExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/LockExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/ObjectExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/ObjectExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/ObjectExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/ObjectExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/ProtocolConstExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/ProtocolConstExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/ProtocolConstExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/ProtocolConstExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/StreamExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/StreamExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/StreamExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/StreamExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/StringExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/StringExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Extensions/XmlExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/XmlExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Extensions/XmlExtensions.cs rename to shared/JiShe.CollectBus.Common/Extensions/XmlExtensions.cs diff --git a/src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs b/shared/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs rename to shared/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs diff --git a/src/JiShe.CollectBus.Common/Helpers/CommonHelper.cs b/shared/JiShe.CollectBus.Common/Helpers/CommonHelper.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Helpers/CommonHelper.cs rename to shared/JiShe.CollectBus.Common/Helpers/CommonHelper.cs diff --git a/src/JiShe.CollectBus.Common/Helpers/SelectResult.cs b/shared/JiShe.CollectBus.Common/Helpers/SelectResult.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Helpers/SelectResult.cs rename to shared/JiShe.CollectBus.Common/Helpers/SelectResult.cs diff --git a/src/JiShe.CollectBus.Common/Helpers/TypeHelper.cs b/shared/JiShe.CollectBus.Common/Helpers/TypeHelper.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Helpers/TypeHelper.cs rename to shared/JiShe.CollectBus.Common/Helpers/TypeHelper.cs diff --git a/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj b/shared/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj similarity index 100% rename from src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj rename to shared/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj diff --git a/src/JiShe.CollectBus.Common/Jobs/IBaseJob.cs b/shared/JiShe.CollectBus.Common/Jobs/IBaseJob.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Jobs/IBaseJob.cs rename to shared/JiShe.CollectBus.Common/Jobs/IBaseJob.cs diff --git a/src/JiShe.CollectBus.Common/Models/BusCacheGlobalPagedResult.cs b/shared/JiShe.CollectBus.Common/Models/BusCacheGlobalPagedResult.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/BusCacheGlobalPagedResult.cs rename to shared/JiShe.CollectBus.Common/Models/BusCacheGlobalPagedResult.cs diff --git a/src/JiShe.CollectBus.Common/Models/BusPagedResult.cs b/shared/JiShe.CollectBus.Common/Models/BusPagedResult.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/BusPagedResult.cs rename to shared/JiShe.CollectBus.Common/Models/BusPagedResult.cs diff --git a/src/JiShe.CollectBus.Common/Models/CommandReuslt.cs b/shared/JiShe.CollectBus.Common/Models/CommandReuslt.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/CommandReuslt.cs rename to shared/JiShe.CollectBus.Common/Models/CommandReuslt.cs diff --git a/src/JiShe.CollectBus.Common/Models/CurrentPositiveActiveEnergyAnalyze.cs b/shared/JiShe.CollectBus.Common/Models/CurrentPositiveActiveEnergyAnalyze.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/CurrentPositiveActiveEnergyAnalyze.cs rename to shared/JiShe.CollectBus.Common/Models/CurrentPositiveActiveEnergyAnalyze.cs diff --git a/src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs b/shared/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs rename to shared/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs diff --git a/src/JiShe.CollectBus.Common/Models/F25ReadingAnalyze.cs b/shared/JiShe.CollectBus.Common/Models/F25ReadingAnalyze.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/F25ReadingAnalyze.cs rename to shared/JiShe.CollectBus.Common/Models/F25ReadingAnalyze.cs diff --git a/src/JiShe.CollectBus.Common/Models/IssuedEventMessage.cs b/shared/JiShe.CollectBus.Common/Models/IssuedEventMessage.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/IssuedEventMessage.cs rename to shared/JiShe.CollectBus.Common/Models/IssuedEventMessage.cs diff --git a/src/JiShe.CollectBus.Common/Models/ReqParameter.cs b/shared/JiShe.CollectBus.Common/Models/ReqParameter.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/ReqParameter.cs rename to shared/JiShe.CollectBus.Common/Models/ReqParameter.cs diff --git a/src/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs b/shared/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs rename to shared/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs diff --git a/src/JiShe.CollectBus.Common/Models/TerminalVersionInfoAnalyze.cs b/shared/JiShe.CollectBus.Common/Models/TerminalVersionInfoAnalyze.cs similarity index 100% rename from src/JiShe.CollectBus.Common/Models/TerminalVersionInfoAnalyze.cs rename to shared/JiShe.CollectBus.Common/Models/TerminalVersionInfoAnalyze.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedConsts.cs b/shared/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedConsts.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedConsts.cs rename to shared/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedConsts.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedModule.cs b/shared/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedModule.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedModule.cs rename to shared/JiShe.CollectBus.Domain.Shared/CollectBusDomainSharedModule.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/CollectBusErrorCodes.cs b/shared/JiShe.CollectBus.Domain.Shared/CollectBusErrorCodes.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/CollectBusErrorCodes.cs rename to shared/JiShe.CollectBus.Domain.Shared/CollectBusErrorCodes.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/CollectBusGlobalFeatureConfigurator.cs b/shared/JiShe.CollectBus.Domain.Shared/CollectBusGlobalFeatureConfigurator.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/CollectBusGlobalFeatureConfigurator.cs rename to shared/JiShe.CollectBus.Domain.Shared/CollectBusGlobalFeatureConfigurator.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/CollectBusModuleExtensionConfigurator.cs b/shared/JiShe.CollectBus.Domain.Shared/CollectBusModuleExtensionConfigurator.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/CollectBusModuleExtensionConfigurator.cs rename to shared/JiShe.CollectBus.Domain.Shared/CollectBusModuleExtensionConfigurator.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Enums/DeviceStatus.cs b/shared/JiShe.CollectBus.Domain.Shared/Enums/DeviceStatus.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Enums/DeviceStatus.cs rename to shared/JiShe.CollectBus.Domain.Shared/Enums/DeviceStatus.cs diff --git a/src/JiShe.CollectBus.HttpApi/FodyWeavers.xml b/shared/JiShe.CollectBus.Domain.Shared/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.HttpApi/FodyWeavers.xml rename to shared/JiShe.CollectBus.Domain.Shared/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectAttribute.cs b/shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectAttribute.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectAttribute.cs rename to shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectAttribute.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptor.cs b/shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptor.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptor.cs rename to shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptor.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptorRegistrar.cs b/shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptorRegistrar.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptorRegistrar.cs rename to shared/JiShe.CollectBus.Domain.Shared/Interceptors/ProtocolInspectInterceptorRegistrar.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Interfaces/IProtocolInfo.cs b/shared/JiShe.CollectBus.Domain.Shared/Interfaces/IProtocolInfo.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Interfaces/IProtocolInfo.cs rename to shared/JiShe.CollectBus.Domain.Shared/Interfaces/IProtocolInfo.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.abppkg b/shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.abppkg similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.abppkg rename to shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.abppkg diff --git a/src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj b/shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj rename to shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj diff --git a/src/JiShe.CollectBus.Domain.Shared/Jobs/EPICollectArgs.cs b/shared/JiShe.CollectBus.Domain.Shared/Jobs/EPICollectArgs.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Jobs/EPICollectArgs.cs rename to shared/JiShe.CollectBus.Domain.Shared/Jobs/EPICollectArgs.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ar.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ar.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ar.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ar.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/cs.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/cs.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/cs.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/cs.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/de.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/de.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/de.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/de.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en-GB.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en-GB.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en-GB.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en-GB.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/en.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/es.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/es.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/es.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/es.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fi.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fi.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fi.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fi.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fr.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fr.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fr.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/fr.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hi.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hi.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hi.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hi.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hr.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hr.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hr.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hr.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hu.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hu.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hu.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/hu.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/is.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/is.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/is.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/is.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/it.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/it.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/it.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/it.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/nl.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/nl.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/nl.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/nl.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pl-PL.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pl-PL.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pl-PL.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pl-PL.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pt-BR.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pt-BR.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pt-BR.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/pt-BR.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ro-RO.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ro-RO.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ro-RO.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ro-RO.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ru.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ru.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ru.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/ru.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sk.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sk.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sk.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sk.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sl.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sl.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sl.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/sl.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/tr.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/tr.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/tr.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/tr.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/vi.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/vi.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/vi.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/vi.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hans.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hans.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hans.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hans.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hant.json b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hant.json similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hant.json rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBus/zh-Hant.json diff --git a/src/JiShe.CollectBus.Domain.Shared/Localization/CollectBusResource.cs b/shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBusResource.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Localization/CollectBusResource.cs rename to shared/JiShe.CollectBus.Domain.Shared/Localization/CollectBusResource.cs diff --git a/src/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs b/shared/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs rename to shared/JiShe.CollectBus.Domain.Shared/Loggers/LoggerExtensions.cs diff --git a/src/JiShe.CollectBus.IoTDBProvider/Attribute/ATTRIBUTEColumnAttribute.cs b/src/JiShe.CollectBus.IoTDBProvider/Attribute/ATTRIBUTEColumnAttribute.cs deleted file mode 100644 index 1780bf9..0000000 --- a/src/JiShe.CollectBus.IoTDBProvider/Attribute/ATTRIBUTEColumnAttribute.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider -{ - /// - /// Column分类标记特性（ATTRIBUTE字段）,也就是属性字段 - /// - [AttributeUsage(AttributeTargets.Property)] - public class ATTRIBUTEColumnAttribute : Attribute - { - } -} diff --git a/src/JiShe.CollectBus.IoTDBProvider/Attribute/FIELDColumnAttribute.cs b/src/JiShe.CollectBus.IoTDBProvider/Attribute/FIELDColumnAttribute.cs deleted file mode 100644 index 2f8470b..0000000 --- a/src/JiShe.CollectBus.IoTDBProvider/Attribute/FIELDColumnAttribute.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider -{ - /// - /// Column分类标记特性（FIELD字段），数据列字段 - /// - [AttributeUsage(AttributeTargets.Property)] - public class FIELDColumnAttribute : Attribute - { - } -} diff --git a/src/JiShe.CollectBus.IoTDBProvider/Attribute/TAGColumnAttribute.cs b/src/JiShe.CollectBus.IoTDBProvider/Attribute/TAGColumnAttribute.cs deleted file mode 100644 index b6149fe..0000000 --- a/src/JiShe.CollectBus.IoTDBProvider/Attribute/TAGColumnAttribute.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JiShe.CollectBus.IoTDBProvider -{ - /// - /// Column分类标记特性（TAG字段），标签字段 - /// - [AttributeUsage(AttributeTargets.Property)] - public class TAGColumnAttribute : Attribute - { - } -} diff --git a/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestBase.cs b/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestBase.cs deleted file mode 100644 index f680698..0000000 --- a/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestBase.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; - -namespace JiShe.CollectBus; - -/* Inherit from this class for your application layer tests. - * See SampleAppService_Tests for example. - */ -public abstract class CollectBusApplicationTestBase : CollectBusTestBase - where TStartupModule : IAbpModule -{ - -} diff --git a/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestModule.cs b/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestModule.cs deleted file mode 100644 index bc81f70..0000000 --- a/test/JiShe.CollectBus.Application.Tests/CollectBusApplicationTestModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; - -namespace JiShe.CollectBus; - -[DependsOn( - typeof(CollectBusApplicationModule), - typeof(CollectBusDomainTestModule) - )] -public class CollectBusApplicationTestModule : AbpModule -{ - -} diff --git a/test/JiShe.CollectBus.Application.Tests/FodyWeavers.xml b/test/JiShe.CollectBus.Application.Tests/FodyWeavers.xml deleted file mode 100644 index 1715698..0000000 --- a/test/JiShe.CollectBus.Application.Tests/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.abppkg b/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.abppkg deleted file mode 100644 index a686451..0000000 --- a/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.abppkg +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.test" -} \ No newline at end of file diff --git a/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.csproj b/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.csproj deleted file mode 100644 index 04959f7..0000000 --- a/test/JiShe.CollectBus.Application.Tests/JiShe.CollectBus.Application.Tests.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - net8.0 - enable - JiShe.CollectBus - - - - - - - - - diff --git a/test/JiShe.CollectBus.Application.Tests/Samples/SampleAppService_Tests.cs b/test/JiShe.CollectBus.Application.Tests/Samples/SampleAppService_Tests.cs deleted file mode 100644 index 9b81ebf..0000000 --- a/test/JiShe.CollectBus.Application.Tests/Samples/SampleAppService_Tests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Volo.Abp.Modularity; -using Xunit; - -namespace JiShe.CollectBus.Samples; - -public abstract class SampleAppService_Tests : CollectBusApplicationTestBase - where TStartupModule : IAbpModule -{ - private readonly ISampleAppService _sampleAppService; - - protected SampleAppService_Tests() - { - _sampleAppService = GetRequiredService(); - } - - [Fact] - public async Task GetAsync() - { - var result = await _sampleAppService.GetAsync(); - result.Value.ShouldBe(42); - } - - [Fact] - public async Task GetAuthorizedAsync() - { - var result = await _sampleAppService.GetAuthorizedAsync(); - result.Value.ShouldBe(42); - } -} diff --git a/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestBase.cs b/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestBase.cs deleted file mode 100644 index 71a0f76..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestBase.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; - -namespace JiShe.CollectBus; - -/* Inherit from this class for your domain layer tests. - * See SampleManager_Tests for example. - */ -public abstract class CollectBusDomainTestBase : CollectBusTestBase - where TStartupModule : IAbpModule -{ - -} diff --git a/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestModule.cs b/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestModule.cs deleted file mode 100644 index ff4d85b..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/CollectBusDomainTestModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; - -namespace JiShe.CollectBus; - -[DependsOn( - typeof(CollectBusDomainModule), - typeof(CollectBusTestBaseModule) -)] -public class CollectBusDomainTestModule : AbpModule -{ - -} diff --git a/test/JiShe.CollectBus.Domain.Tests/FodyWeavers.xml b/test/JiShe.CollectBus.Domain.Tests/FodyWeavers.xml deleted file mode 100644 index 1715698..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.abppkg b/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.abppkg deleted file mode 100644 index a686451..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.abppkg +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.test" -} \ No newline at end of file diff --git a/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.csproj b/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.csproj deleted file mode 100644 index e9b2d08..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/JiShe.CollectBus.Domain.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net8.0 - enable - JiShe.CollectBus - - - - - - - - - - - - - diff --git a/test/JiShe.CollectBus.Domain.Tests/Samples/SampleManager_Tests.cs b/test/JiShe.CollectBus.Domain.Tests/Samples/SampleManager_Tests.cs deleted file mode 100644 index 431484b..0000000 --- a/test/JiShe.CollectBus.Domain.Tests/Samples/SampleManager_Tests.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Modularity; -using Xunit; - -namespace JiShe.CollectBus.Samples; - -public abstract class SampleManager_Tests : CollectBusDomainTestBase - where TStartupModule : IAbpModule -{ - //private readonly SampleManager _sampleManager; - - public SampleManager_Tests() - { - //_sampleManager = GetRequiredService(); - } - - [Fact] - public Task Method1Async() - { - return Task.CompletedTask; - } -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Applications/EfCoreSampleAppService_Tests.cs b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Applications/EfCoreSampleAppService_Tests.cs deleted file mode 100644 index d63e41d..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Applications/EfCoreSampleAppService_Tests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using JiShe.CollectBus.Samples; -using Xunit; - -namespace JiShe.CollectBus.EntityFrameworkCore.Applications; - -public class EfCoreSampleAppService_Tests : SampleAppService_Tests -{ - -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestBase.cs b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestBase.cs deleted file mode 100644 index dbb442b..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace JiShe.CollectBus.EntityFrameworkCore; - -/* This class can be used as a base class for EF Core integration tests, - * while SampleRepository_Tests uses a different approach. - */ -public abstract class CollectBusEntityFrameworkCoreTestBase : CollectBusTestBase -{ - -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestModule.cs b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestModule.cs deleted file mode 100644 index ec59a28..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/CollectBusEntityFrameworkCoreTestModule.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore.Sqlite; -using Volo.Abp.Modularity; -using Volo.Abp.Uow; - -namespace JiShe.CollectBus.EntityFrameworkCore; - -[DependsOn( - typeof(CollectBusApplicationTestModule), - typeof(CollectBusEntityFrameworkCoreModule), - typeof(AbpEntityFrameworkCoreSqliteModule) -)] -public class CollectBusEntityFrameworkCoreTestModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAlwaysDisableUnitOfWorkTransaction(); - - var sqliteConnection = CreateDatabaseAndGetConnection(); - - Configure(options => - { - options.Configure(abpDbContextConfigurationContext => - { - abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection); - }); - }); - } - - private static SqliteConnection CreateDatabaseAndGetConnection() - { - var connection = new SqliteConnection("Data Source=:memory:"); - connection.Open(); - - new CollectBusDbContext( - new DbContextOptionsBuilder().UseSqlite(connection).Options - ).GetService().CreateTables(); - - return connection; - } -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Domains/EfCoreSampleDomain_Tests.cs b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Domains/EfCoreSampleDomain_Tests.cs deleted file mode 100644 index 2a115f5..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Domains/EfCoreSampleDomain_Tests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using JiShe.CollectBus.Samples; -using Xunit; - -namespace JiShe.CollectBus.EntityFrameworkCore.Domains; - -public class EfCoreSampleDomain_Tests : SampleManager_Tests -{ - -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 01dd9e2..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,11 +0,0 @@ -using JiShe.CollectBus.Samples; - -namespace JiShe.CollectBus.EntityFrameworkCore.Samples; - -public class SampleRepository_Tests : SampleRepository_Tests -{ - /* Don't write custom repository tests here, instead write to - * the base class. - * One exception can be some specific tests related to EF core. - */ -} diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/FodyWeavers.xml b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/FodyWeavers.xml deleted file mode 100644 index 1715698..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.abppkg b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.abppkg deleted file mode 100644 index a686451..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.abppkg +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.test" -} \ No newline at end of file diff --git a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.csproj b/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.csproj deleted file mode 100644 index 63c7e8e..0000000 --- a/test/JiShe.CollectBus.EntityFrameworkCore.Tests/JiShe.CollectBus.EntityFrameworkCore.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - net8.0 - enable - JiShe.CollectBus - - - - - - - - - - - diff --git a/test/JiShe.CollectBus.MongoDB.Tests/FodyWeavers.xml b/test/JiShe.CollectBus.MongoDB.Tests/FodyWeavers.xml deleted file mode 100644 index 1715698..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.abppkg b/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.abppkg deleted file mode 100644 index a686451..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.abppkg +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.test" -} \ No newline at end of file diff --git a/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.csproj b/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.csproj deleted file mode 100644 index c17ce34..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/JiShe.CollectBus.MongoDB.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net8.0 - enable - JiShe.CollectBus - - - - - - - - - - - - - diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Applications/MongoDBSampleAppService_Tests.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Applications/MongoDBSampleAppService_Tests.cs deleted file mode 100644 index f6dd5c7..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Applications/MongoDBSampleAppService_Tests.cs +++ /dev/null @@ -1,11 +0,0 @@ -using JiShe.CollectBus.MongoDB; -using JiShe.CollectBus.Samples; -using Xunit; - -namespace JiShe.CollectBus.MongoDb.Applications; - -[Collection(MongoTestCollection.Name)] -public class MongoDBSampleAppService_Tests : SampleAppService_Tests -{ - -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestBase.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestBase.cs deleted file mode 100644 index 242879a..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace JiShe.CollectBus.MongoDB; - -/* This class can be used as a base class for MongoDB integration tests, - * while SampleRepository_Tests uses a different approach. - */ -public abstract class CollectBusMongoDbTestBase : CollectBusTestBase -{ - -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestModule.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestModule.cs deleted file mode 100644 index 02028e7..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/CollectBusMongoDbTestModule.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Volo.Abp.Data; -using Volo.Abp.Modularity; -using Volo.Abp.Uow; - -namespace JiShe.CollectBus.MongoDB; - -[DependsOn( - typeof(CollectBusApplicationTestModule), - typeof(CollectBusMongoDbModule) -)] -public class CollectBusMongoDbTestModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString(); - }); - } -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Domains/MongoDBSampleDomain_Tests.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Domains/MongoDBSampleDomain_Tests.cs deleted file mode 100644 index 466ae53..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Domains/MongoDBSampleDomain_Tests.cs +++ /dev/null @@ -1,10 +0,0 @@ -using JiShe.CollectBus.Samples; -using Xunit; - -namespace JiShe.CollectBus.MongoDB.Domains; - -[Collection(MongoTestCollection.Name)] -public class MongoDBSampleDomain_Tests : SampleManager_Tests -{ - -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoDbFixture.cs deleted file mode 100644 index 540bd3c..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using EphemeralMongo; - -namespace JiShe.CollectBus.MongoDB; - -public class MongoDbFixture : IDisposable -{ - public readonly static IMongoRunner MongoDbRunner; - - static MongoDbFixture() - { - MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions - { - UseSingleNodeReplicaSet = true - }); - } - - public static string GetRandomConnectionString() - { - return GetConnectionString("Db_" + Guid.NewGuid().ToString("N")); - } - - public static string GetConnectionString(string databaseName) - { - var stringArray = MongoDbRunner.ConnectionString.Split('?'); - var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1]; - return connectionString; - } - - public void Dispose() - { - MongoDbRunner?.Dispose(); - } -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoTestCollection.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoTestCollection.cs deleted file mode 100644 index 08fc3b9..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/MongoTestCollection.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Xunit; - -namespace JiShe.CollectBus.MongoDB; - -[CollectionDefinition(Name)] -public class MongoTestCollection : ICollectionFixture -{ - public const string Name = "MongoDB Collection"; -} diff --git a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs b/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 2fc8587..0000000 --- a/test/JiShe.CollectBus.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,13 +0,0 @@ -using JiShe.CollectBus.Samples; -using Xunit; - -namespace JiShe.CollectBus.MongoDB.Samples; - -[Collection(MongoTestCollection.Name)] -public class SampleRepository_Tests : SampleRepository_Tests -{ - /* Don't write custom repository tests here, instead write to - * the base class. - * One exception can be some specific tests related to MongoDB. - */ -} diff --git a/test/JiShe.CollectBus.TestBase/CollectBusDataSeedContributor.cs b/test/JiShe.CollectBus.TestBase/CollectBusDataSeedContributor.cs deleted file mode 100644 index a72a0d1..0000000 --- a/test/JiShe.CollectBus.TestBase/CollectBusDataSeedContributor.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Data; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Guids; -using Volo.Abp.MultiTenancy; - -namespace JiShe.CollectBus; - -public class CollectBusDataSeedContributor : IDataSeedContributor, ITransientDependency -{ - private readonly IGuidGenerator _guidGenerator; - private readonly ICurrentTenant _currentTenant; - - public CollectBusDataSeedContributor( - IGuidGenerator guidGenerator, ICurrentTenant currentTenant) - { - _guidGenerator = guidGenerator; - _currentTenant = currentTenant; - } - - public Task SeedAsync(DataSeedContext context) - { - /* Instead of returning the Task.CompletedTask, you can insert your test data - * at this point! - */ - - using (_currentTenant.Change(context?.TenantId)) - { - return Task.CompletedTask; - } - } -} diff --git a/test/JiShe.CollectBus.TestBase/CollectBusTestBase.cs b/test/JiShe.CollectBus.TestBase/CollectBusTestBase.cs deleted file mode 100644 index 7db1dce..0000000 --- a/test/JiShe.CollectBus.TestBase/CollectBusTestBase.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.Modularity; -using Volo.Abp.Uow; -using Volo.Abp.Testing; - -namespace JiShe.CollectBus; - -/* All test classes are derived from this class, directly or indirectly. */ -public abstract class CollectBusTestBase : AbpIntegratedTest - where TStartupModule : IAbpModule -{ - protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) - { - options.UseAutofac(); - } - - protected virtual Task WithUnitOfWorkAsync(Func func) - { - return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); - } - - protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) - { - using (var scope = ServiceProvider.CreateScope()) - { - var uowManager = scope.ServiceProvider.GetRequiredService(); - - using (var uow = uowManager.Begin(options)) - { - await action(); - - await uow.CompleteAsync(); - } - } - } - - protected virtual Task WithUnitOfWorkAsync(Func> func) - { - return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); - } - - protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) - { - using (var scope = ServiceProvider.CreateScope()) - { - var uowManager = scope.ServiceProvider.GetRequiredService(); - - using (var uow = uowManager.Begin(options)) - { - var result = await func(); - await uow.CompleteAsync(); - return result; - } - } - } -} diff --git a/test/JiShe.CollectBus.TestBase/CollectBusTestBaseModule.cs b/test/JiShe.CollectBus.TestBase/CollectBusTestBaseModule.cs deleted file mode 100644 index 89b154e..0000000 --- a/test/JiShe.CollectBus.TestBase/CollectBusTestBaseModule.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.Authorization; -using Volo.Abp.Autofac; -using Volo.Abp.Data; -using Volo.Abp.Guids; -using Volo.Abp.Modularity; -using Volo.Abp.Threading; - -namespace JiShe.CollectBus; - -[DependsOn( - typeof(AbpAutofacModule), - typeof(AbpTestBaseModule), - typeof(AbpAuthorizationModule), - typeof(AbpGuidsModule) -)] -public class CollectBusTestBaseModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAlwaysAllowAuthorization(); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - SeedTestData(context); - } - - private static void SeedTestData(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(async () => - { - using (var scope = context.ServiceProvider.CreateScope()) - { - await scope.ServiceProvider - .GetRequiredService() - .SeedAsync(); - } - }); - } -} diff --git a/test/JiShe.CollectBus.TestBase/FodyWeavers.xml b/test/JiShe.CollectBus.TestBase/FodyWeavers.xml deleted file mode 100644 index 1715698..0000000 --- a/test/JiShe.CollectBus.TestBase/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.abppkg b/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.abppkg deleted file mode 100644 index a686451..0000000 --- a/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.abppkg +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.test" -} \ No newline at end of file diff --git a/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.csproj b/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.csproj deleted file mode 100644 index cda873b..0000000 --- a/test/JiShe.CollectBus.TestBase/JiShe.CollectBus.TestBase.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - net8.0 - enable - JiShe.CollectBus - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - diff --git a/test/JiShe.CollectBus.TestBase/Samples/SampleRepository_Tests.cs b/test/JiShe.CollectBus.TestBase/Samples/SampleRepository_Tests.cs deleted file mode 100644 index 06874fd..0000000 --- a/test/JiShe.CollectBus.TestBase/Samples/SampleRepository_Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Modularity; -using Xunit; - -namespace JiShe.CollectBus.Samples; - -/* Write your custom repository tests like that, in this project, as abstract classes. - * Then inherit these abstract classes from EF Core & MongoDB test projects. - * In this way, both database providers are tests with the same set tests. - */ -public abstract class SampleRepository_Tests : CollectBusTestBase - where TStartupModule : IAbpModule -{ - //private readonly ISampleRepository _sampleRepository; - - protected SampleRepository_Tests() - { - //_sampleRepository = GetRequiredService(); - } - - [Fact] - public Task Method1Async() - { - return Task.CompletedTask; - } -} diff --git a/test/JiShe.CollectBus.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/test/JiShe.CollectBus.TestBase/Security/FakeCurrentPrincipalAccessor.cs deleted file mode 100644 index a976624..0000000 --- a/test/JiShe.CollectBus.TestBase/Security/FakeCurrentPrincipalAccessor.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using System.Security.Claims; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Security.Claims; - -namespace JiShe.CollectBus.Security; - -[Dependency(ReplaceServices = true)] -public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor -{ - protected override ClaimsPrincipal GetClaimsPrincipal() - { - return GetPrincipal(); - } - - private ClaimsPrincipal GetPrincipal() - { - return new ClaimsPrincipal(new ClaimsIdentity(new List - { - new Claim(AbpClaimTypes.UserId, "2e701e62-0953-4dd3-910b-dc6cc93ccb0d"), - new Claim(AbpClaimTypes.UserName, "admin"), - new Claim(AbpClaimTypes.Email, "admin@abp.io") - } - ) - ); - } -} diff --git a/src/JiShe.CollectBus.Host/CollectBusHostConst.cs b/web/JiShe.CollectBus.Host/CollectBusHostConst.cs similarity index 100% rename from src/JiShe.CollectBus.Host/CollectBusHostConst.cs rename to web/JiShe.CollectBus.Host/CollectBusHostConst.cs diff --git a/src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs b/web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs similarity index 100% rename from src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs rename to web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs diff --git a/src/JiShe.CollectBus.Host/CollectBusHostModule.cs b/web/JiShe.CollectBus.Host/CollectBusHostModule.cs similarity index 100% rename from src/JiShe.CollectBus.Host/CollectBusHostModule.cs rename to web/JiShe.CollectBus.Host/CollectBusHostModule.cs diff --git a/src/JiShe.CollectBus.Host/Controllers/HomeController.cs b/web/JiShe.CollectBus.Host/Controllers/HomeController.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Controllers/HomeController.cs rename to web/JiShe.CollectBus.Host/Controllers/HomeController.cs diff --git a/src/JiShe.CollectBus.Host/Extensions/CustomApplicationBuilderExtensions.cs b/web/JiShe.CollectBus.Host/Extensions/CustomApplicationBuilderExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Extensions/CustomApplicationBuilderExtensions.cs rename to web/JiShe.CollectBus.Host/Extensions/CustomApplicationBuilderExtensions.cs diff --git a/src/JiShe.CollectBus.Host/Extensions/ServiceCollections/ServiceCollectionExtensions.cs b/web/JiShe.CollectBus.Host/Extensions/ServiceCollections/ServiceCollectionExtensions.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Extensions/ServiceCollections/ServiceCollectionExtensions.cs rename to web/JiShe.CollectBus.Host/Extensions/ServiceCollections/ServiceCollectionExtensions.cs diff --git a/src/JiShe.CollectBus.Host/Hangfire/JobRetryLastFilter.cs b/web/JiShe.CollectBus.Host/Hangfire/JobRetryLastFilter.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Hangfire/JobRetryLastFilter.cs rename to web/JiShe.CollectBus.Host/Hangfire/JobRetryLastFilter.cs diff --git a/src/JiShe.CollectBus.Host/HealthChecks/HealthCheckResponse.cs b/web/JiShe.CollectBus.Host/HealthChecks/HealthCheckResponse.cs similarity index 100% rename from src/JiShe.CollectBus.Host/HealthChecks/HealthCheckResponse.cs rename to web/JiShe.CollectBus.Host/HealthChecks/HealthCheckResponse.cs diff --git a/src/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj similarity index 90% rename from src/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj rename to web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj index 7d9bc47..76dfe60 100644 --- a/src/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj +++ b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj @@ -52,10 +52,10 @@ - - + + + - diff --git a/src/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml similarity index 100% rename from src/JiShe.CollectBus.Host/Pages/Monitor.cshtml rename to web/JiShe.CollectBus.Host/Pages/Monitor.cshtml diff --git a/src/JiShe.CollectBus.Host/Pages/Monitor.cshtml.cs b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Pages/Monitor.cshtml.cs rename to web/JiShe.CollectBus.Host/Pages/Monitor.cshtml.cs diff --git a/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.Test.dll b/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.Test.dll new file mode 100644 index 0000000000000000000000000000000000000000..ccc12db0bf1d2359a55c6e66fa1cbf9d068118a8 GIT binary patch literal 12288 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 literal 0 HcmV?d00001 diff --git a/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.dll b/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.dll new file mode 100644 index 0000000000000000000000000000000000000000..ecd494bfd0ab1e0eb8f61ef75d993874669daf6d GIT binary patch literal 14336 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 VtBk-p>;DXuU-ehn`@i~5|1a?Q%0~bI literal 0 HcmV?d00001 diff --git a/src/JiShe.CollectBus.Host/Plugins/ignore.txt b/web/JiShe.CollectBus.Host/Plugins/ignore.txt similarity index 100% rename from src/JiShe.CollectBus.Host/Plugins/ignore.txt rename to web/JiShe.CollectBus.Host/Plugins/ignore.txt diff --git a/src/JiShe.CollectBus.Host/Program.cs b/web/JiShe.CollectBus.Host/Program.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Program.cs rename to web/JiShe.CollectBus.Host/Program.cs diff --git a/src/JiShe.CollectBus.Host/Properties/launchSettings.json b/web/JiShe.CollectBus.Host/Properties/launchSettings.json similarity index 100% rename from src/JiShe.CollectBus.Host/Properties/launchSettings.json rename to web/JiShe.CollectBus.Host/Properties/launchSettings.json diff --git a/src/JiShe.CollectBus.Host/Startup.cs b/web/JiShe.CollectBus.Host/Startup.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Startup.cs rename to web/JiShe.CollectBus.Host/Startup.cs diff --git a/src/JiShe.CollectBus.Host/Swaggers/EnumSchemaFilter.cs b/web/JiShe.CollectBus.Host/Swaggers/EnumSchemaFilter.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Swaggers/EnumSchemaFilter.cs rename to web/JiShe.CollectBus.Host/Swaggers/EnumSchemaFilter.cs diff --git a/src/JiShe.CollectBus.Host/Swaggers/HiddenAbpDefaultApiFilter.cs b/web/JiShe.CollectBus.Host/Swaggers/HiddenAbpDefaultApiFilter.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Swaggers/HiddenAbpDefaultApiFilter.cs rename to web/JiShe.CollectBus.Host/Swaggers/HiddenAbpDefaultApiFilter.cs diff --git a/src/JiShe.CollectBus.Host/Swaggers/SwaggerConfig.cs b/web/JiShe.CollectBus.Host/Swaggers/SwaggerConfig.cs similarity index 100% rename from src/JiShe.CollectBus.Host/Swaggers/SwaggerConfig.cs rename to web/JiShe.CollectBus.Host/Swaggers/SwaggerConfig.cs diff --git a/src/JiShe.CollectBus.Host/appsettings.Development.json b/web/JiShe.CollectBus.Host/appsettings.Development.json similarity index 100% rename from src/JiShe.CollectBus.Host/appsettings.Development.json rename to web/JiShe.CollectBus.Host/appsettings.Development.json diff --git a/src/JiShe.CollectBus.Host/appsettings.json b/web/JiShe.CollectBus.Host/appsettings.json similarity index 100% rename from src/JiShe.CollectBus.Host/appsettings.json rename to web/JiShe.CollectBus.Host/appsettings.json diff --git a/src/JiShe.CollectBus.Host/wwwroot/images/cap.png b/web/JiShe.CollectBus.Host/wwwroot/images/cap.png similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/images/cap.png rename to web/JiShe.CollectBus.Host/wwwroot/images/cap.png diff --git a/src/JiShe.CollectBus.Host/wwwroot/images/hangfire.png b/web/JiShe.CollectBus.Host/wwwroot/images/hangfire.png similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/images/hangfire.png rename to web/JiShe.CollectBus.Host/wwwroot/images/hangfire.png diff --git a/src/JiShe.CollectBus.Host/wwwroot/images/miniprofiler.png b/web/JiShe.CollectBus.Host/wwwroot/images/miniprofiler.png similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/images/miniprofiler.png rename to web/JiShe.CollectBus.Host/wwwroot/images/miniprofiler.png diff --git a/src/JiShe.CollectBus.Host/wwwroot/images/more.png b/web/JiShe.CollectBus.Host/wwwroot/images/more.png similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/images/more.png rename to web/JiShe.CollectBus.Host/wwwroot/images/more.png diff --git a/src/JiShe.CollectBus.Host/wwwroot/images/swagger.png b/web/JiShe.CollectBus.Host/wwwroot/images/swagger.png similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/images/swagger.png rename to web/JiShe.CollectBus.Host/wwwroot/images/swagger.png diff --git a/src/JiShe.CollectBus.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css b/web/JiShe.CollectBus.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css similarity index 100% rename from src/JiShe.CollectBus.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css rename to web/JiShe.CollectBus.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css diff --git a/src/JiShe.CollectBus.HttpApi/CollectBusController.cs b/web/JiShe.CollectBus.HttpApi/CollectBusController.cs similarity index 100% rename from src/JiShe.CollectBus.HttpApi/CollectBusController.cs rename to web/JiShe.CollectBus.HttpApi/CollectBusController.cs diff --git a/src/JiShe.CollectBus.HttpApi/CollectBusHttpApiModule.cs b/web/JiShe.CollectBus.HttpApi/CollectBusHttpApiModule.cs similarity index 100% rename from src/JiShe.CollectBus.HttpApi/CollectBusHttpApiModule.cs rename to web/JiShe.CollectBus.HttpApi/CollectBusHttpApiModule.cs diff --git a/src/JiShe.CollectBus.MongoDB/FodyWeavers.xml b/web/JiShe.CollectBus.HttpApi/FodyWeavers.xml similarity index 100% rename from src/JiShe.CollectBus.MongoDB/FodyWeavers.xml rename to web/JiShe.CollectBus.HttpApi/FodyWeavers.xml diff --git a/src/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.abppkg b/web/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.abppkg similarity index 100% rename from src/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.abppkg rename to web/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.abppkg diff --git a/src/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj b/web/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj similarity index 68% rename from src/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj rename to web/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj index d5ecd25..3ea1d32 100644 --- a/src/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj +++ b/web/JiShe.CollectBus.HttpApi/JiShe.CollectBus.HttpApi.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/JiShe.CollectBus.HttpApi/Samples/SampleController.cs b/web/JiShe.CollectBus.HttpApi/Samples/SampleController.cs similarity index 100% rename from src/JiShe.CollectBus.HttpApi/Samples/SampleController.cs rename to web/JiShe.CollectBus.HttpApi/Samples/SampleController.cs