admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:1db4a63f97875d222f5a9240bc06957df6a5c808
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:0719562ad5b70ba3af7c0c870254c0abe73768da
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "1db4a63f97875d222f5a9240bc06957df6a5c808" and "0719562ad5b70ba3af7c0c870254c0abe73768da" have entirely different histories.
1db4a63f97 ... 0719562ad5

5 changed files with 9 additions and 27 deletions
Show Stats Expand all files Collapse all files

14
JiShe.IoT.Admin.sln
View File

@ -264,10 +264,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETMana
EndProject 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}" 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 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -718,14 +714,6 @@ Global
{2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Release|Any CPU
{2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -851,8 +839,6 @@ Global
{548F272E-28F3-A49A-BBE7-7EAC93B5F13E} = {DF4443B1-748B-4090-95E2-392BB60A009F} {548F272E-28F3-A49A-BBE7-7EAC93B5F13E} = {DF4443B1-748B-4090-95E2-392BB60A009F}
{00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25} = {7F59CDB4-0311-415F-AC7E-47436F2868FA} {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25} = {7F59CDB4-0311-415F-AC7E-47436F2868FA}
{2115F8BF-63C3-957E-6F75-6AEB5D1DA649} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {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 EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit 39fae252a272635ec7fd926b3e3d25b183b3fc7a Subproject commit 0064d257f8db0c44d4d40bca5460a56bf87111a8

14
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
View File

@ -151,10 +151,11 @@ public partial class IoTHttpApiHostModule
// 文件下载类型 // 文件下载类型
options.MapType<FileContentResult>(() => new OpenApiSchema() { Type = "file" }); options.MapType<FileContentResult>(() => 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 configuration = context.Services.GetConfiguration();
var groupNames = EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>(); var groupNames = EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>();
var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>(); var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>();
groupNames.ForEach(group => groupNames.ForEach(group =>
@ -166,15 +167,10 @@ public partial class IoTHttpApiHostModule
} }
}); });
options.DocInclusionPredicate((docName, description) => options.DocInclusionPredicate((docName, description) => {
{
if (docName == "AbpPro")
{
return true;
}
return description.GroupName == docName; return description.GroupName == docName;
}); });
//options.EnableAnnotations(enableAnnotationsForInheritance: true, enableAnnotationsForPolymorphism: true); // 启用注解 //options.EnableAnnotations(enableAnnotationsForInheritance: true, enableAnnotationsForPolymorphism: true); // 启用注解
options.DocumentFilter<HiddenAbpDefaultApiFilter>(); options.DocumentFilter<HiddenAbpDefaultApiFilter>();
options.SchemaFilter<EnumSchemaFilter>(); options.SchemaFilter<EnumSchemaFilter>();

2
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
View File

@ -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.DocExpansion(DocExpansion.None);
options.DefaultModelsExpandDepth(-1); options.DefaultModelsExpandDepth(-1);

2
host/JiShe.IoT.HttpApi.Host/appsettings.json
View File

@ -31,7 +31,7 @@
}, },
"App": { "App": {
"SelfUrl": "http://localhost:44315", "SelfUrl": "http://localhost:44315",
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://10.10.70.11:4200" "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100"
}, },
"ExcludeSwaggerGroup": [ "ExcludeSwaggerGroup": [
"FileManagement", "FileManagement",