diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs index 50db6fd..c3bdde3 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.ServerOptions; using JiShe.ServicePro.SwaggerConfigs; using System.Reflection; using Volo.Abp.BlobStoring.FileSystem; @@ -45,6 +46,11 @@ namespace JiShe.IoT ConfigurationSignalR(context); ConfigurationMultiTenancy(); ConfigureBlobStorage(); + + Configure(options => + { + configuration.GetSection(nameof(ServerApplicationOptions)).Bind(options); + }); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs b/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs index 154ea11..ae3a1fd 100644 --- a/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs +++ b/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.FileManagement; @@ -17,6 +18,7 @@ namespace JiShe.IoT typeof(FileManagementApplicationContractsModule), typeof(IoTDBManagementApplicationContractsModule), typeof(DynamicMenuManagementApplicationContractsModule), + typeof(CTWingManagementApplicationContractsModule), typeof(DeviceManagementApplicationContractsModule) )] public class IoTApplicationContractsModule : AbpModule diff --git a/src/JiShe.IoT.Application/IoTApplicationModule.cs b/src/JiShe.IoT.Application/IoTApplicationModule.cs index d86608b..8163254 100644 --- a/src/JiShe.IoT.Application/IoTApplicationModule.cs +++ b/src/JiShe.IoT.Application/IoTApplicationModule.cs @@ -1,5 +1,6 @@ using JiShe.IoT.Jobs.ToMysql; using JiShe.IoT.Jobs.ToRedis; +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.FileManagement; @@ -24,6 +25,7 @@ namespace JiShe.IoT typeof(IoTDBManagementApplicationModule), typeof(ServiceProFreeRedisProviderModule), typeof(ServiceProFreeSqlProviderModule), + typeof(CTWingManagementApplicationModule), typeof(DeviceManagementApplicationModule) )] public class IoTApplicationModule : AbpModule @@ -41,7 +43,7 @@ namespace JiShe.IoT public override void PostConfigureServices(ServiceConfigurationContext context) { // ¶¨Ê±ÈÎÎñ - ConfigureBackgroundJob(context); + //ConfigureBackgroundJob(context); } private static void ConfigureBackgroundJob(ServiceConfigurationContext context) diff --git a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs index 1a73b4d..05b67c7 100644 --- a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs +++ b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.FileManagement; @@ -17,6 +18,7 @@ namespace JiShe.IoT typeof(FileManagementDomainSharedModule), typeof(IoTDBManagementDomainSharedModule), typeof(ServiceProFreeSqlProviderModule), + typeof(CTWingManagementDomainSharedModule), typeof(ServiceProCoreModule), typeof(DeviceManagementDomainSharedModule) )] diff --git a/src/JiShe.IoT.Domain/IoTDomainModule.cs b/src/JiShe.IoT.Domain/IoTDomainModule.cs index 915ea1e..5e25a1e 100644 --- a/src/JiShe.IoT.Domain/IoTDomainModule.cs +++ b/src/JiShe.IoT.Domain/IoTDomainModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.FileManagement; @@ -16,6 +17,7 @@ namespace JiShe.IoT typeof(FileManagementDomainModule), typeof(IoTDBManagementDomainModule), typeof(DynamicMenuManagementDomainModule), + typeof(CTWingManagementDomainModule), typeof(DeviceManagementDomainModule) )] public class IoTDomainModule : AbpModule diff --git a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTEntityFrameworkCoreModule.cs b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTEntityFrameworkCoreModule.cs index bdc9dff..aa0e78a 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTEntityFrameworkCoreModule.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTEntityFrameworkCoreModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.CTWingManagement.EntityFrameworkCore; using JiShe.ServicePro.DeviceManagement.EntityFrameworkCore; using JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore; using JiShe.ServicePro.FileManagement.EntityFrameworkCore; @@ -16,6 +17,7 @@ namespace JiShe.IoT.EntityFrameworkCore typeof(TemplateManagementEntityFrameworkCoreModule), typeof(FileManagementEntityFrameworkCoreModule), typeof(DynamicMenuManagementEntityFrameworkCoreModule), + typeof(CTWingManagementEntityFrameworkCoreModule), typeof(DeviceManagementEntityFrameworkCoreModule) )] public class IoTEntityFrameworkCoreModule : AbpModule diff --git a/src/JiShe.IoT.HttpApi.Client/IoTHttpApiClientModule.cs b/src/JiShe.IoT.HttpApi.Client/IoTHttpApiClientModule.cs index 3421004..094b933 100644 --- a/src/JiShe.IoT.HttpApi.Client/IoTHttpApiClientModule.cs +++ b/src/JiShe.IoT.HttpApi.Client/IoTHttpApiClientModule.cs @@ -1,4 +1,5 @@ using JiShe.ServicePro.BasicManagement; +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DataDictionaryManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; @@ -20,6 +21,7 @@ namespace JiShe.IoT typeof(FileManagementHttpApiClientModule), typeof(IoTDBManagementHttpApiClientModule), typeof(DynamicMenuManagementHttpApiClientModule), + typeof(CTWingManagementHttpApiClientModule), typeof(DeviceManagementHttpApiClientModule) )] public class IoTHttpApiClientModule : AbpModule diff --git a/src/JiShe.IoT.HttpApi/IoTHttpApiModule.cs b/src/JiShe.IoT.HttpApi/IoTHttpApiModule.cs index bedadad..415325a 100644 --- a/src/JiShe.IoT.HttpApi/IoTHttpApiModule.cs +++ b/src/JiShe.IoT.HttpApi/IoTHttpApiModule.cs @@ -1,3 +1,4 @@ +using JiShe.ServicePro.CTWingManagement; using JiShe.ServicePro.DataDictionaryManagement; using JiShe.ServicePro.DeviceManagement; using JiShe.ServicePro.DynamicMenuManagement; @@ -18,6 +19,7 @@ namespace JiShe.IoT typeof(FileManagementHttpApiModule), typeof(IoTDBManagementHttpApiModule), typeof(DynamicMenuManagementHttpApiModule), + typeof(CTWingManagementHttpApiModule), typeof(DeviceManagementHttpApiModule) )] public class IoTHttpApiModule : AbpModule