From d50ae45c1063d8ef0bd94de6ec5699550421b5af Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 7 Jul 2025 13:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JiShe.ServicePro                                |  2 +-
 .../IoTHttpApiHostModule.Configure.cs           |  2 +-
 .../EntityFrameworkCore/IoTDbContext.cs         | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/JiShe.ServicePro b/JiShe.ServicePro
index e6687c0..07a8322 160000
--- a/JiShe.ServicePro
+++ b/JiShe.ServicePro
@@ -1 +1 @@
-Subproject commit e6687c0b95ccd58c9f86e97d172f2858780efbee
+Subproject commit 07a83224a090c8ca0d2c3058507fd6e738846fac
diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
index 627a8ce..6718777 100644
--- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
+++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
@@ -124,7 +124,7 @@ public partial class IoTHttpApiHostModule
         
         context.Services
             .AddDataProtection()
-            .PersistKeysToStackFreeRedis("JiSheIoTAdmin-Protection-Keys");
+            .PersistKeysToStackFreeRedis($"{RedisConst.CachePersistKeys}JiSheIoTAdmin-Protection-Keys");
     }
 
     /// <summary>
diff --git a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs
index 9284e1b..8fbf798 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs
+++ b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs
@@ -1,4 +1,5 @@
 using JiShe.ServicePro.BasicManagement.UserRefreshTokens;
+using JiShe.ServicePro.CTWingManagement.EntityFrameworkCore;
 using JiShe.ServicePro.DeviceManagement.EntityFrameworkCore;
 using JiShe.ServicePro.DeviceManagement.Focuses;
 using JiShe.ServicePro.DeviceManagement.Meters;
@@ -6,6 +7,7 @@ using JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore;
 using JiShe.ServicePro.DynamicMenuManagement.Menus;
 using JiShe.ServicePro.FileManagement.EntityFrameworkCore;
 using JiShe.ServicePro.FileManagement.Files;
+using JiShe.ServicePro.OneNETManagement.EntityFrameworkCore;
 using JiShe.ServicePro.TemplateManagement.EntityFrameworkCore;
 using JiShe.ServicePro.TemplateManagement.TextTemplates;
 
@@ -20,6 +22,8 @@ namespace JiShe.IoT.EntityFrameworkCore
         ITemplateManagementDbContext,
         IDynamicMenuManagementDbContext,
         IFileManagementDbContext,
+        ICTWingManagementDbContext,
+        IOneNETManagementDbContext,
         IDeviceManagementDbContext
     {
         public DbSet<IdentityUser> Users { get; set; }
@@ -61,6 +65,12 @@ namespace JiShe.IoT.EntityFrameworkCore
         public DbSet<FocusInfo> FocusInfo { get; set; }
         public DbSet<MeterInfo> MeterInfo { get; set; }
 
+        // CTWing管理
+
+        // OneNET管理
+
+
+
         public IoTDbContext(DbContextOptions<IoTDbContext> options)
             : base(options)
         {
@@ -96,6 +106,13 @@ namespace JiShe.IoT.EntityFrameworkCore
 
             // 设备管理
             builder.ConfigureDeviceManagement();
+
+            // CTWing管理
+            builder.ConfigureCTWingManagement();
+
+            // OneNET管理
+            builder.ConfigureOneNETManagement();
+
         }