From 0b698057ce7ee32308177d86f0ee47427d3688ce Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Mon, 28 Jul 2025 17:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96OneNET=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiShe.IoT.Admin.sln | 14 ++++++++++++++ JiShe.ServicePro | 2 +- .../IoTHttpApiHostModule.Configure.cs | 16 ++++++++++------ .../IoTHttpApiHostModule.cs | 2 +- host/JiShe.IoT.HttpApi.Host/appsettings.json | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/JiShe.IoT.Admin.sln b/JiShe.IoT.Admin.sln index 13acb96..a9d1c7c 100644 --- a/JiShe.IoT.Admin.sln +++ b/JiShe.IoT.Admin.sln @@ -264,6 +264,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETMana EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNET.Provider", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.OneNET.Provider\JiShe.ServicePro.OneNET.Provider.csproj", "{2115F8BF-63C3-957E-6F75-6AEB5D1DA649}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.PulsarProvider", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.PulsarProvider\JiShe.ServicePro.PulsarProvider.csproj", "{12DCB751-4433-B3F1-67D3-0F15E3E2BC8B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.ModelBinder.Provider", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.ModelBinder.Provider\JiShe.ServicePro.ModelBinder.Provider.csproj", "{6A26D2DE-215B-CB11-F882-3984B2EE7AA6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -714,6 +718,14 @@ Global {2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Debug|Any CPU.Build.0 = Debug|Any CPU {2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Release|Any CPU.ActiveCfg = Release|Any CPU {2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Release|Any CPU.Build.0 = Release|Any CPU + {12DCB751-4433-B3F1-67D3-0F15E3E2BC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12DCB751-4433-B3F1-67D3-0F15E3E2BC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12DCB751-4433-B3F1-67D3-0F15E3E2BC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12DCB751-4433-B3F1-67D3-0F15E3E2BC8B}.Release|Any CPU.Build.0 = Release|Any CPU + {6A26D2DE-215B-CB11-F882-3984B2EE7AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A26D2DE-215B-CB11-F882-3984B2EE7AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A26D2DE-215B-CB11-F882-3984B2EE7AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A26D2DE-215B-CB11-F882-3984B2EE7AA6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -839,6 +851,8 @@ Global {548F272E-28F3-A49A-BBE7-7EAC93B5F13E} = {DF4443B1-748B-4090-95E2-392BB60A009F} {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25} = {7F59CDB4-0311-415F-AC7E-47436F2868FA} {2115F8BF-63C3-957E-6F75-6AEB5D1DA649} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} + {12DCB751-4433-B3F1-67D3-0F15E3E2BC8B} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} + {6A26D2DE-215B-CB11-F882-3984B2EE7AA6} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 0064d25..acf503f 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 0064d257f8db0c44d4d40bca5460a56bf87111a8 +Subproject commit acf503fb7eaaef12ac4709413ca944d6b133fe85 diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs index 6718777..8ef3811 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs @@ -121,7 +121,7 @@ public partial class IoTHttpApiHostModule Configure( options => { options.KeyPrefix = "JiSheIoT:"; }); var configuration = context.Services.GetConfiguration(); - + context.Services .AddDataProtection() .PersistKeysToStackFreeRedis($"{RedisConst.CachePersistKeys}JiSheIoTAdmin-Protection-Keys"); @@ -151,11 +151,10 @@ public partial class IoTHttpApiHostModule // 文件下载类型 options.MapType(() => new OpenApiSchema() { Type = "file" }); - //options.SwaggerDoc("AbpPro", - // new OpenApiInfo { Title = "AbpPro API", Version = "v1" }); + options.SwaggerDoc("AbpPro", new OpenApiInfo { Title = "AbpPro API", Version = "v1" }); var configuration = context.Services.GetConfiguration(); - var groupNames = EnumExtensions.GetEnumTypeValueNameList(); + var groupNames = EnumExtensions.GetEnumTypeValueNameList(); var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get>() ?? new List(); groupNames.ForEach(group => @@ -167,10 +166,15 @@ public partial class IoTHttpApiHostModule } }); - options.DocInclusionPredicate((docName, description) => { - + options.DocInclusionPredicate((docName, description) => + { + if (docName == "AbpPro") + { + return true; + } return description.GroupName == docName; }); + //options.EnableAnnotations(enableAnnotationsForInheritance: true, enableAnnotationsForPolymorphism: true); // 启用注解 options.DocumentFilter(); options.SchemaFilter(); diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs index 200850c..1dd10bd 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs @@ -89,7 +89,7 @@ namespace JiShe.IoT } }); - //options.SwaggerEndpoint("/swagger/AbpPro/swagger.json", "AbpPro API"); + options.SwaggerEndpoint("/swagger/AbpPro/swagger.json", "AbpPro API"); options.DocExpansion(DocExpansion.None); options.DefaultModelsExpandDepth(-1); diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.json b/host/JiShe.IoT.HttpApi.Host/appsettings.json index b070e93..4f7576f 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.json @@ -31,7 +31,7 @@ }, "App": { "SelfUrl": "http://localhost:44315", - "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100" + "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://10.10.70.11:4200" }, "ExcludeSwaggerGroup": [ "FileManagement",