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 0000000..ccc12db Binary files /dev/null and b/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.Test.dll differ 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 0000000..ecd494b Binary files /dev/null and b/web/JiShe.CollectBus.Host/Plugins/JiShe.CollectBus.Protocol.dll differ 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