diff --git a/JiShe.IoT.Admin.sln b/JiShe.IoT.Admin.sln index 3da7bb7..13acb96 100644 --- a/JiShe.IoT.Admin.sln +++ b/JiShe.IoT.Admin.sln @@ -248,6 +248,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.TwoFactor" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.DataDictionaryManagement.Application.Contracts", "JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.Application.Contracts\JiShe.ServicePro.DataDictionaryManagement.Application.Contracts.csproj", "{5D5FD924-B1C6-6ABF-0CC3-92529F168948}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.HttpApi.Client", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.HttpApi.Client\JiShe.ServicePro.OneNETManagement.HttpApi.Client.csproj", "{FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.HttpApi", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.HttpApi\JiShe.ServicePro.OneNETManagement.HttpApi.csproj", "{4013B433-7175-F34D-94F0-0FB2ED385248}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.EntityFrameworkCore", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.EntityFrameworkCore\JiShe.ServicePro.OneNETManagement.EntityFrameworkCore.csproj", "{539353FB-DC01-27B4-527D-F0B125682091}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.Domain.Shared", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.Domain.Shared\JiShe.ServicePro.OneNETManagement.Domain.Shared.csproj", "{83F40CA2-B00D-A056-A920-525AFFD76FA7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.Domain", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.Domain\JiShe.ServicePro.OneNETManagement.Domain.csproj", "{A5585C65-378D-F06C-E463-910FA9D86BF5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.Application.Contracts", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.Application.Contracts\JiShe.ServicePro.OneNETManagement.Application.Contracts.csproj", "{548F272E-28F3-A49A-BBE7-7EAC93B5F13E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.OneNETManagement.Application", "JiShe.ServicePro\modules\OneNETManagement\src\JiShe.ServicePro.OneNETManagement.Application\JiShe.ServicePro.OneNETManagement.Application.csproj", "{00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25}" +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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -666,6 +682,38 @@ Global {5D5FD924-B1C6-6ABF-0CC3-92529F168948}.Debug|Any CPU.Build.0 = Debug|Any CPU {5D5FD924-B1C6-6ABF-0CC3-92529F168948}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D5FD924-B1C6-6ABF-0CC3-92529F168948}.Release|Any CPU.Build.0 = Release|Any CPU + {FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45}.Release|Any CPU.Build.0 = Release|Any CPU + {4013B433-7175-F34D-94F0-0FB2ED385248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4013B433-7175-F34D-94F0-0FB2ED385248}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4013B433-7175-F34D-94F0-0FB2ED385248}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4013B433-7175-F34D-94F0-0FB2ED385248}.Release|Any CPU.Build.0 = Release|Any CPU + {539353FB-DC01-27B4-527D-F0B125682091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {539353FB-DC01-27B4-527D-F0B125682091}.Debug|Any CPU.Build.0 = Debug|Any CPU + {539353FB-DC01-27B4-527D-F0B125682091}.Release|Any CPU.ActiveCfg = Release|Any CPU + {539353FB-DC01-27B4-527D-F0B125682091}.Release|Any CPU.Build.0 = Release|Any CPU + {83F40CA2-B00D-A056-A920-525AFFD76FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83F40CA2-B00D-A056-A920-525AFFD76FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83F40CA2-B00D-A056-A920-525AFFD76FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83F40CA2-B00D-A056-A920-525AFFD76FA7}.Release|Any CPU.Build.0 = Release|Any CPU + {A5585C65-378D-F06C-E463-910FA9D86BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5585C65-378D-F06C-E463-910FA9D86BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5585C65-378D-F06C-E463-910FA9D86BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5585C65-378D-F06C-E463-910FA9D86BF5}.Release|Any CPU.Build.0 = Release|Any CPU + {548F272E-28F3-A49A-BBE7-7EAC93B5F13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {548F272E-28F3-A49A-BBE7-7EAC93B5F13E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {548F272E-28F3-A49A-BBE7-7EAC93B5F13E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {548F272E-28F3-A49A-BBE7-7EAC93B5F13E}.Release|Any CPU.Build.0 = Release|Any CPU + {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00C513F4-045A-2F7A-0BD7-9D3D3A9DAB25}.Release|Any CPU.Build.0 = Release|Any CPU + {2115F8BF-63C3-957E-6F75-6AEB5D1DA649}.Debug|Any CPU.ActiveCfg = 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.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -783,6 +831,14 @@ Global {5D6E32D8-544B-4449-8B33-4CCD3D300CAB} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {236F692F-39CB-8BAD-3E28-CB1D28E70909} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {5D5FD924-B1C6-6ABF-0CC3-92529F168948} = {DF4443B1-748B-4090-95E2-392BB60A009F} + {FDFBFB80-A8B4-E6AC-9E96-2F9F5B284F45} = {50CC6F14-90E0-4E62-B38C-1C85AD5F8BBF} + {4013B433-7175-F34D-94F0-0FB2ED385248} = {57370721-7523-461A-AA5D-836D59105D89} + {539353FB-DC01-27B4-527D-F0B125682091} = {2DA3880A-B258-4EBE-A5E1-C14B646F3C63} + {83F40CA2-B00D-A056-A920-525AFFD76FA7} = {D9FCBD0B-51A1-4527-83DC-ACA7B06F91F7} + {A5585C65-378D-F06C-E463-910FA9D86BF5} = {73E6E64F-DA5A-437A-A147-B9CA9CCB038D} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 9534e7e..2697db9 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 9534e7ecb47db3eaedc22b8fb23287a5f7c0c66b +Subproject commit 2697db901ef0138e7d4a241e8454f05ac9fe7dd8 diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs index 5e47abb..627a8ce 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs @@ -1,12 +1,9 @@ using Hangfire.Redis.StackExchange; -using JiShe.ServicePro.Core; using JiShe.ServicePro.FreeRedisProvider; using JiShe.ServicePro.SwaggerConfigs; using Medallion.Threading; using Medallion.Threading.Redis; -using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.CodeAnalysis; -using System.Reflection; using Volo.Abp.BlobStoring; using Volo.Abp.BlobStoring.FileSystem; @@ -158,7 +155,7 @@ public partial class IoTHttpApiHostModule // 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 => diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json index ddd79ad..a09a17e 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json @@ -57,7 +57,7 @@ "TableModelClusterList": [ "172.21.40.198:6667", "172.21.40.197:6667", "172.21.40.199:6667" ], "PoolSize": 32, "TableModelDataBaseName": "energy", - "OpenDebugMode": true, + "OpenDebugMode": false, "UseTableSessionPoolByDefault": false }, "ServerApplicationOptions": { diff --git a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj index 4886493..c4910d4 100644 --- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj +++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj @@ -26,7 +26,7 @@ - + @@ -40,6 +40,7 @@ + \ No newline at end of file diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj index 672c090..9e39949 100644 --- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj +++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj @@ -19,6 +19,7 @@ + @@ -32,8 +33,8 @@ - + diff --git a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj index cc08016..c2584d4 100644 --- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj +++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj @@ -21,7 +21,7 @@ - + @@ -40,6 +40,7 @@ + diff --git a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj index ed89e1b..29650bc 100644 --- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj +++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj @@ -17,7 +17,7 @@ - + @@ -31,6 +31,7 @@ + diff --git a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj index 1ef2042..eac1b1d 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj +++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj @@ -20,7 +20,7 @@ - + @@ -34,6 +34,7 @@ + diff --git a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj index efbc935..406824c 100644 --- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj +++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj @@ -20,6 +20,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj index 6781f4e..b8cca01 100644 --- a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj +++ b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj @@ -24,21 +24,21 @@ - - - - - - - - - + + + + + + + + +