From f349e8a9bd43e165768e5d81aeacc1a44125aeb5 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Fri, 22 Aug 2025 09:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E9=80=9A?= =?UTF-8?q?=E9=81=93=E5=86=85=E5=AD=98=E6=8E=A7=E5=88=B6=EF=BC=8C=E8=BD=AC?= =?UTF-8?q?=E4=B8=BA=E9=80=9A=E7=94=A8=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs | 7 ++++++- .../JiShe.IoT.HttpApi.Host.csproj | 3 ++- .../BusinessSystemAggregationService.cs | 12 +----------- .../CTWingAggregation/CTWingAggregationService.cs | 7 ------- .../OneNETAggregation/OneNETAggregationService.cs | 2 -- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs index 1dd10bd..0a1c8b3 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs @@ -1,4 +1,4 @@ -using JiShe.ServicePro.ServerOptions; +using JiShe.ServicePro.Core; using JiShe.ServicePro.SwaggerConfigs; using System.Reflection; using Volo.Abp.BlobStoring.FileSystem; @@ -51,6 +51,11 @@ namespace JiShe.IoT { configuration.GetSection(nameof(ServerApplicationOptions)).Bind(options); }); + + Configure(options => + { + configuration.GetSection(nameof(DataChannelOptions)).Bind(options); + }); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj index dca879f..0748d96 100644 --- a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj +++ b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj @@ -6,7 +6,8 @@ JiShe.IoT true JiShe.IoT-4681b4fd-151f-4221-84a4-929d86723e4c - + true + diff --git a/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs b/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs index fa25ccd..dbb79ee 100644 --- a/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs +++ b/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs @@ -1,6 +1,4 @@ -using JiShe.IoT.OneNETAggregation.Dto; -using JiShe.IoT.Workshops; -using JiShe.ServicePro; +using JiShe.ServicePro; using JiShe.ServicePro.Core; using JiShe.ServicePro.DeviceManagement.DeviceInfos; using JiShe.ServicePro.Dto; @@ -8,15 +6,7 @@ using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; using JiShe.ServicePro.FreeRedisProvider; using JiShe.ServicePro.Kafka.Consts; -using JiShe.ServicePro.Kafka.Producer; -using JiShe.ServicePro.ServerOptions; using Microsoft.Extensions.Options; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; namespace JiShe.IoT.BusinessSystemAggregation { diff --git a/src/JiShe.IoT.Application/CTWingAggregation/CTWingAggregationService.cs b/src/JiShe.IoT.Application/CTWingAggregation/CTWingAggregationService.cs index 326ad2a..90e016e 100644 --- a/src/JiShe.IoT.Application/CTWingAggregation/CTWingAggregationService.cs +++ b/src/JiShe.IoT.Application/CTWingAggregation/CTWingAggregationService.cs @@ -1,19 +1,12 @@ using JiShe.IoT.CTWingAggregation.Dto; using JiShe.IoT.DeviceAggregation; using JiShe.IoT.DeviceAggregation.Dto; -using JiShe.IoT.OneNETAggregation.Dto; using JiShe.IoT.Workshops; using JiShe.ServicePro; using JiShe.ServicePro.Core; -using JiShe.ServicePro.CTWingManagement.CTWingDevices; using JiShe.ServicePro.CTWingManagement.CTWingProduct; -using JiShe.ServicePro.DeviceManagement.DeviceInfos; -using JiShe.ServicePro.DeviceManagement.DeviceInfos.Dto; using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; -using JiShe.ServicePro.FreeRedisProvider; -using JiShe.ServicePro.ServerOptions; -using Mapster; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs b/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs index 7cf20be..cbc3e7d 100644 --- a/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs +++ b/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs @@ -6,9 +6,7 @@ using JiShe.ServicePro; using JiShe.ServicePro.Core; using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; -using JiShe.ServicePro.OneNETManagement.OneNETDevices; using JiShe.ServicePro.OneNETManagement.OneNETProducts; -using JiShe.ServicePro.ServerOptions; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options;