From f11b7f7ab4c76507ef076a01752a0ec6da8f24b4 Mon Sep 17 00:00:00 2001 From: "2248356998 qq.com" <2248356998@qq.com> Date: Sun, 13 Jul 2025 22:47:14 +0800 Subject: [PATCH] 10.9.37 --- .../Aop/OperDescAttribute.cs | 1 - .../Entity/SysDict.cs | 4 - .../Entity/SysOperateLog.cs | 4 - .../Entity/SysOrg.cs | 4 - .../Entity/SysPosition.cs | 4 +- .../Entity/SysRelation.cs | 2 - .../Entity/SysResource.cs | 4 - .../Entity/SysRole.cs | 4 - .../Entity/SysUser.cs | 5 - .../Entity/VerificatInfo.cs | 5 +- .../Filter/RequestAuditFilter.cs | 2 +- .../GlobalUsings.cs | 13 +- .../Job/Hardware/HardwareInfo.cs | 2 - .../Job/Hardware/HardwareJob.cs | 3 - .../Job/Hardware/HistoryHardwareInfo.cs | 2 - .../Logging/DatabaseLoggingWriter.cs | 2 - .../Mapper/AdminMapper.cs | 2 - .../OAuth/AdminOAuthHandler.cs | 1 - .../Provider/BlazorAuthenticationHandler.cs | 3 +- .../Provider/UnifyResultProvider.cs | 2 - .../ApiPermission/ApiPermissionService.cs | 6 +- .../Services/Auth/AuthService.cs | 1 - .../Services/Dict/ISysDictService.cs | 2 - .../Services/Dict/SysDictService.cs | 3 - .../Services/File/FileService.cs | 1 - .../OperateLog/Dto/OperateLogInput.cs | 2 - .../OperateLog/ISysOperateLogService.cs | 2 - .../OperateLog/SysOperateLogService.cs | 4 - .../Services/Org/ISysOrgService.cs | 4 - .../Services/Org/SysOrgService.cs | 3 - .../Services/Pos/ISysPositionService.cs | 4 - .../Services/Pos/SysPositionService.cs | 3 - .../Services/Resource/Dto/ResourceInput.cs | 2 - .../Services/Resource/ISysResourceService.cs | 2 - .../Services/Resource/SysResourceService.cs | 3 - .../Services/Role/ISysRoleService.cs | 4 - .../Services/Role/SysRoleService.cs | 3 - .../Services/Session/Dto/SessionOutput.cs | 2 - .../Services/Session/ISessionService.cs | 2 - .../Services/Session/SessionService.cs | 4 - .../Services/User/Dto/UserOutput.cs | 2 - .../Services/User/ISysUserService.cs | 2 - .../Services/User/SysUserService.cs | 6 +- .../Services/UserCenter/UserCenterService.cs | 5 +- .../VerificatInfo/VerificatInfoService.cs | 2 - .../Startup.cs | 3 - .../Util/ImportExportUtil.cs | 2 - .../Util/OpenApiUtil.cs | 2 - .../Util/OrgUtil.cs | 2 - .../Util/PositionUtil.cs | 2 - .../Util/RoleUtil.cs | 2 - .../Util/UserUtil.cs | 2 - .../Util/VerificatInfoUtil.cs | 1 - .../Components/ChoiceModuleComponent.razor.cs | 1 - .../Context/BlazorAppContext.cs | 1 - .../ThingsGateway.Admin.Razor/GlobalUsings.cs | 5 +- .../Pages/AppConfig/EditPagePolicy.razor.cs | 1 - .../Pages/Org/OrgTree.razor.cs | 2 - .../Pages/Org/SysOrgPage.razor.cs | 1 - .../Pages/Position/PositionTree.razor.cs | 2 - .../Pages/Role/RoleTree.razor.cs | 2 - .../Pages/Role/SysRoleEdit.razor.cs | 1 - .../Pages/Role/SysRolePage.razor.cs | 1 - .../Pages/User/SysUserEdit.razor.cs | 1 - .../Pages/User/SysUserPage.razor.cs | 1 - .../Services}/AuthRazorService.cs | 6 +- .../Services}/HybridAuthRazorService.cs | 4 +- .../Services}/IAuthRazorService.cs | 4 +- .../ThingsGateway.Admin.Razor/Startup.cs | 1 + .../ThingsGateway.Admin.Razor.csproj | 1 + .../ThingsGateway.Admin.Razor/_Imports.razor | 2 +- .../Configuration/App.Development.json | 1 + .../Configuration/App.json | 1 + .../Layout/Login.razor | 1 + .../Layout/Login.razor.cs | 2 + .../Layout/MainLayout.razor | 2 + .../Layout/MainLayout.razor.cs | 1 + .../Program/Program.cs | 3 +- .../Program/SingleFilePublish.cs | 1 + .../Program/Startup.cs | 1 + .../ThingsGateway.AdminServer.csproj | 4 +- .../Attributes/IgnoreExcelAttribute.cs | 2 +- .../Attributes/IgnoreSeedDataAttribute.cs | 2 +- .../Common/ConcurrentList.cs | 3 +- .../Common/EncodingMapper.cs | 2 +- .../Common/IDriverUIBase.cs | 2 +- .../Common/ImportPreviewOutput.cs | 4 +- .../Common/ModelValueValidateForm.cs | 2 +- .../Common/RandomHelper.cs | 3 +- .../Data/BasePageInput.cs | 2 +- .../Data/IBasePageInput.cs | 2 +- .../Data/IPrimaryIdEntity.cs | 2 +- .../Data/SqlSugarPagedList.cs | 2 +- .../Extensions/DisplayExtensions.cs | 2 +- .../Extensions/GenericExtensions.cs | 2 +- .../Extensions/JSRuntimeExtensions.cs | 6 +- .../Extensions/LocalizerExtensions.cs | 2 +- .../Extensions/ObjectExtensions.cs | 6 +- .../Extensions/ParallelExtensions.cs | 7 +- .../Extensions/StringExtensions.cs | 5 +- .../ThingsGateway.Common}/GlobalUsings.cs | 11 +- .../Localization/Json/CacheManager.cs | 5 +- .../Localization/Json/CacheManagerHelpers.cs | 2 +- ...LocalizationServiceCollectionExtensions.cs | 4 +- .../Localization/Json/JsonStringLocalizer.cs | 3 +- .../Json/JsonStringLocalizerFactory.cs | 2 +- .../Json/LocalizationOptionsExtensions.cs | 2 +- .../Options/MenuOptions.cs | 2 +- .../Options/WebsiteOptions.cs | 3 +- src/Admin/ThingsGateway.Common/Startup.cs | 40 ++ .../ThingsGateway.Common.csproj | 36 ++ .../UnifyResult/UnifyResult.cs | 2 +- .../Util/LocalizerUtil.cs | 2 +- .../ThingsGateway.DB/Const/ClaimConst.cs | 2 +- .../ThingsGateway.DB/Entity/BaseEntity.cs | 6 +- .../Extensions/ExportExcelExtensions.cs | 4 +- .../Extensions/FileExtensions.cs | 2 +- .../Extensions/QueryPageOptionsExtensions.cs | 4 +- .../Extensions/SqlSugarExtensions.cs | 4 +- src/Admin/ThingsGateway.DB/GlobalUsings.cs | 8 +- .../AppService/ClaimsPrincipalService.cs | 2 +- .../AppService/IClaimsPrincipalService.cs | 2 +- .../SugarAopService/ISugarAopService.cs | 5 +- .../SugarAopService/SugarAopService.cs | 4 +- .../Services/SugarService/BaseService.cs | 6 +- .../SqlSugar/CodeFirstUtils.cs | 4 +- .../ThingsGateway.DB/SqlSugar/DbContext.cs | 3 +- .../SqlSugar/ISqlSugarEntitySeedData.cs | 2 +- .../ThingsGateway.DB/SqlSugar/SeedDataUtil.cs | 3 +- .../SqlSugar/SqlSugarOptions.cs | 3 +- src/Admin/ThingsGateway.DB/Startup.cs | 4 +- .../ThingsGateway.DB/Static/UserManager.cs | 2 +- .../ThingsGateway.DB/ThingsGateway.DB.csproj | 5 +- .../ThingsGateway.DB/Util/CommonUtils.cs | 2 +- src/Admin/ThingsGateway.Furion/App/App.cs | 35 -- .../App/Options/AppSettingsOptions.cs | 11 - .../Filters/DataValidationFilter.cs | 3 - .../Filters/DataValidationPageFilter.cs | 2 - .../Filters/FriendlyExceptionFilter.cs | 33 -- .../Assets/index-mini-profiler.html | 472 ------------------ .../Builders/SpecificationDocumentBuilder.cs | 2 +- ...ionDocumentApplicationBuilderExtensions.cs | 3 - ...tionDocumentServiceCollectionExtensions.cs | 25 - .../ThingsGateway.Furion.csproj | 6 - .../Filters/SucceededUnifyResultFilter.cs | 2 - .../Components/CultureChooser.razor.cs | 1 + .../Components/DefaultTable.razor.cs | 1 + .../EditorForm/EditorFormObject.razor.cs | 2 - src/Admin/ThingsGateway.Razor/GlobalUsings.cs | 4 +- .../Services/DefaultMenuService.cs | 2 - src/Admin/ThingsGateway.Razor/Startup.cs | 15 - .../ThingsGateway.Razor.csproj | 2 +- src/Base1.sln | 11 +- src/Directory.Build.props | 10 +- .../ExpressionEvaluatorExtension.cs | 5 +- .../ConverterConfigComponent.razor.cs | 2 +- .../DebugPages/DeviceComponent.razor | 1 + .../Common/InternalTableColumn.cs | 2 - ...StringOrdinalIgnoreCaseEqualityComparer.cs | 2 - .../Const/ExportString.cs | 2 - .../Controller/ControlController.cs | 1 - .../Controller/RuntimeInfoController.cs | 1 - .../BusinessBaseWithCacheIntervalScript.cs | 1 - .../Business/DB/BusinessDatabaseUtil.cs | 2 - .../Driver/CacheDB/CacheDB.cs | 1 - .../Driver/CacheDB/CacheDBItem.cs | 2 - .../Driver/Collect/CollectBase.cs | 1 + .../Driver/Collect/CollectFoundationBase.cs | 1 + .../Driver/DriverBase.cs | 2 - .../Driver/DynamicModelExtension.cs | 2 +- .../Entity/BackendLog.cs | 2 - .../Entity/Channel.cs | 3 - .../Entity/Device.cs | 2 - .../Entity/RpcLog.cs | 2 - .../Entity/Variable.cs | 4 - ...erviceCollectionHostedServiceExtensions.cs | 2 - .../GlobalUsings.cs | 7 + .../BackendLogDatabaseLoggingWriter.cs | 1 - .../Model/AlarmVariable.cs | 2 - .../Model/DriverMethodInfo.cs | 2 - .../Model/PluginInfo.cs | 2 - .../Model/VariableRunTime.property.cs | 2 - .../Services/Channel/ChannelService.cs | 3 +- .../Services/Channel/ChannelServiceHelpers.cs | 2 + .../Services/Channel/IChannelService.cs | 2 - .../Services/Device/DeviceService.cs | 3 +- .../Services/Device/DeviceServiceHelpers.cs | 2 + .../Services/Device/IDeviceService.cs | 2 - .../Services/GatewayLogs/BackendLogService.cs | 2 - .../Services/GatewayLogs/RpcLogService.cs | 2 - .../GatewayMonitor/AlarmManage/AlarmTask.cs | 1 + .../ChannelManage/ChannelThreadManage.cs | 1 + .../DeviceManage/DeviceThreadManage.cs | 4 +- .../GatewayMonitorHostedService.cs | 3 +- .../Services/UpdateZipFileHostedService.cs | 1 - .../Services/Plugin/PluginService.cs | 2 - .../Services/Plugin/PluginServiceUtil.cs | 1 - .../Services/Rpc/RpcService.cs | 3 +- .../RulesEngine/Attributes/CategoryNode.cs | 4 +- .../Services/RulesEngine/Entity/Rules.cs | 1 - .../Node/Trigger/AlarmChangedTriggerNode.cs | 1 + .../Node/Trigger/DeviceChangedTriggerNode.cs | 1 + .../Node/Trigger/ValueChangedTriggerNode.cs | 1 + .../Services/RulesEngineHostedService.cs | 1 - .../RulesEngine/Services/RulesService.cs | 1 - .../Services/RuntimeServiceHelper.cs | 1 + .../Services/Variable/IVariableService.cs | 2 - .../Services/Variable/VariableService.cs | 3 +- .../Variable/VariableServiceHelpers.cs | 2 + .../Startup.cs | 2 - .../Components/TcpServiceComponent.razor.cs | 2 +- .../GlobalUsings.cs | 1 + .../Channel/ChannelCopyComponent.razor.cs | 2 +- .../Channel/ChannelTable.razor.cs | 2 +- .../Device/DeviceCopyComponent.razor.cs | 2 +- .../Device/DeviceTable.razor.cs | 2 +- .../Variable/VariableCopyComponent.razor.cs | 2 +- .../Variable/VariableEditComponent.razor | 1 + .../Variable/VariableRuntimeInfo.razor.cs | 2 +- .../RealAlarmPage/RealAlarmPage.razor.cs | 2 +- .../GatewayExport/GatewayExportService.cs | 2 +- .../HybridGatewayExportService.cs | 4 +- .../GatewayExport/IGatewayExportService.cs | 2 +- .../ThingsGateway.Gateway.Razor/Startup.cs | 1 + src/PackNuget.props | 5 +- .../MainLayout.razor | 1 + .../MainLayout.razor.cs | 1 + .../Mapper/GatewayMapper.cs | 2 +- .../QuestDB/Entity/QuestDBHistoryValue.cs | 1 + .../QuestDB/QuestDBProducer.cs | 3 +- .../QuestDB/Razor/QuestDBPage.razor.cs | 2 +- .../SqlDB/Entity/SQLHistoryValue.cs | 1 + .../SqlDB/Entity/SQLRealValue.cs | 1 + .../SqlDB/Razor/SqlDBPage.razor.cs | 2 +- .../Razor/SqlDBProducerPropertyRazor.razor.cs | 2 +- .../SplitTable/SqlDBBusinessDatabaseUtil.cs | 2 +- .../SqlDB/SqlDBProducer.cs | 3 +- .../Razor/HistoryAlarmPage.razor.cs | 2 +- .../SqlHistoryAlarm/SqlHistoryAlarm.cs | 3 +- .../TDengineDB/TDengineDBHistoryValue.cs | 1 + .../TDengineDB/TDengineDBPage.razor.cs | 2 +- .../TDengineDB/TDengineDBProducer.cs | 3 +- .../Dlt645_2007AddressComponent.razor.cs | 1 + .../Pages/ModbusAddressComponent.razor.cs | 1 + .../MqttPropertyRazor.razor.cs | 2 +- .../Pages/OpcDaImportVariable.razor.cs | 7 +- .../OpcUaServer/OpcUaServer.cs | 37 ++ .../Pages/OpcUaImportVariable.razor.cs | 8 +- .../Pages/OpcUaMasterRuntimeRazor.razor.cs | 1 + .../Pages/SiemensS7AddressComponent.razor.cs | 1 + src/ThingsGateway.OnlyApi/Program.cs | 106 ---- .../Properties/launchSettings.json | 47 -- src/ThingsGateway.OnlyApi/Startup.cs | 372 -------------- .../ThingsGateway.OnlyApi.csproj | 115 ----- src/ThingsGateway.OnlyApi/favicon.ico | Bin 4286 -> 0 bytes src/ThingsGateway.Photino/Startup.cs | 3 +- .../Configuration/App.Development.json | 1 + .../Configuration/App.json | 1 + .../Configuration/Website.Demo.json | 3 +- .../Configuration/Website.PostgreSQL .json | 3 +- .../Configuration/Website.json | 3 +- src/ThingsGateway.Server/Layout/Login.razor | 1 + .../Layout/Login.razor.cs | 2 + .../Layout/MainLayout.razor | 2 + .../Layout/MainLayout.razor.cs | 1 + src/ThingsGateway.Server/Program/Program.cs | 3 +- .../Program/SingleFilePublish.cs | 1 + src/ThingsGateway.Server/Program/Startup.cs | 22 +- .../targets/PluginPublish.targets | 4 +- src/ThingsGateway.sln | 9 +- .../Pages/GatewayOnlinePage.razor.cs | 2 +- .../Services/UpdateZipFileService.cs | 2 +- src/Upgrade/ThingsGateway.Upgrade/Startup.cs | 2 +- .../Layout/Login.razor | 1 + .../Layout/Login.razor.cs | 1 + .../Layout/MainLayout.razor | 2 + .../Layout/MainLayout.razor.cs | 2 + .../Program/Startup.cs | 1 + .../Program/Startup1.cs | 2 + .../SeedData/SysRelationSeedData.cs | 2 + .../SeedData/SysResourceSeedData.cs | 2 + 281 files changed, 427 insertions(+), 1630 deletions(-) rename src/Admin/{ThingsGateway.Admin.Application/Services/Auth => ThingsGateway.Admin.Razor/Services}/AuthRazorService.cs (95%) rename src/Admin/{ThingsGateway.Admin.Application/Services/Auth => ThingsGateway.Admin.Razor/Services}/HybridAuthRazorService.cs (95%) rename src/Admin/{ThingsGateway.Admin.Application/Services/Auth => ThingsGateway.Admin.Razor/Services}/IAuthRazorService.cs (92%) rename src/Admin/{ThingsGateway.DB => ThingsGateway.Common}/Attributes/IgnoreExcelAttribute.cs (94%) rename src/Admin/{ThingsGateway.DB => ThingsGateway.Common}/Attributes/IgnoreSeedDataAttribute.cs (96%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/ConcurrentList.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/EncodingMapper.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/IDriverUIBase.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/ImportPreviewOutput.cs (96%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/ModelValueValidateForm.cs (95%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Common/RandomHelper.cs (98%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Data/BasePageInput.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Data/IBasePageInput.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Data/IPrimaryIdEntity.cs (96%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Data/SqlSugarPagedList.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/DisplayExtensions.cs (96%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/GenericExtensions.cs (98%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/JSRuntimeExtensions.cs (92%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/LocalizerExtensions.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/ObjectExtensions.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/ParallelExtensions.cs (98%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Extensions/StringExtensions.cs (98%) rename src/{ThingsGateway.OnlyApi => Admin/ThingsGateway.Common}/GlobalUsings.cs (70%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/CacheManager.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/CacheManagerHelpers.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs (92%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/JsonStringLocalizer.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/JsonStringLocalizerFactory.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Localization/Json/LocalizationOptionsExtensions.cs (99%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Options/MenuOptions.cs (96%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Options/WebsiteOptions.cs (96%) create mode 100644 src/Admin/ThingsGateway.Common/Startup.cs create mode 100644 src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/UnifyResult/UnifyResult.cs (97%) rename src/Admin/{ThingsGateway.Razor => ThingsGateway.Common}/Util/LocalizerUtil.cs (99%) delete mode 100644 src/Admin/ThingsGateway.Furion/SpecificationDocument/Assets/index-mini-profiler.html rename src/Gateway/{ThingsGateway.Gateway.Application => ThingsGateway.Gateway.Razor}/Services/GatewayExport/GatewayExportService.cs (98%) rename src/Gateway/{ThingsGateway.Gateway.Application => ThingsGateway.Gateway.Razor}/Services/GatewayExport/HybridGatewayExportService.cs (98%) rename src/Gateway/{ThingsGateway.Gateway.Application => ThingsGateway.Gateway.Razor}/Services/GatewayExport/IGatewayExportService.cs (94%) delete mode 100644 src/ThingsGateway.OnlyApi/Program.cs delete mode 100644 src/ThingsGateway.OnlyApi/Properties/launchSettings.json delete mode 100644 src/ThingsGateway.OnlyApi/Startup.cs delete mode 100644 src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj delete mode 100644 src/ThingsGateway.OnlyApi/favicon.ico diff --git a/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs b/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs index 2a728f57c..556a79bda 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs @@ -20,7 +20,6 @@ using System.Collections.Concurrent; using ThingsGateway.Extension; using ThingsGateway.FriendlyException; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs index 8707cc4a4..8215aa525 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs @@ -8,12 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.ComponentModel.DataAnnotations; -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; [SugarTable("sys_dict", TableDescription = "字典表")] diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs index 53a19cf22..5ab032bc1 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs @@ -8,10 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs index 42e316a06..da7de367a 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs @@ -8,12 +8,8 @@ // QQ群：605534569 // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.ComponentModel.DataAnnotations; -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs index 14c7172ca..e74f86dfd 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs @@ -8,11 +8,9 @@ // QQ群：605534569 // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.ComponentModel.DataAnnotations; -using ThingsGateway.SqlSugar; + namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs index f0488628d..021397c17 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs index 21de2e2fb..75545b6a6 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs @@ -8,16 +8,12 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Microsoft.AspNetCore.Components.Routing; using Newtonsoft.Json; using System.ComponentModel.DataAnnotations; -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs index 7119b59bc..3dcf2f2df 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs @@ -8,12 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.ComponentModel.DataAnnotations; -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs index 2c205fa54..f2403c53f 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs @@ -8,14 +8,9 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Riok.Mapperly.Abstractions; using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; - -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs index c64c85799..7489ee91a 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs @@ -8,10 +8,7 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.List; -using ThingsGateway.SqlSugar; +using ThingsGateway.Common.List; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs b/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs index 3481ae06f..8b876a5e1 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs @@ -79,7 +79,7 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter logData.TimeOperationElapsedMilliseconds = timeOperation.ElapsedMilliseconds; - var resultHttpContext = (resultContext as FilterContext).HttpContext; + var resultHttpContext = (resultContext as Microsoft.AspNetCore.Mvc.Filters.FilterContext).HttpContext; // 获取 HttpContext 和 HttpRequest 对象 var httpContext = context.HttpContext; diff --git a/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs b/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs index ec2e58001..59d3021d1 100644 --- a/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs +++ b/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs @@ -8,4 +8,15 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -global using ThingsGateway.NewLife.Extension; \ No newline at end of file +global using BootstrapBlazor.Components; + +global using Microsoft.Extensions.Localization; +global using Microsoft.Extensions.Options; + +global using System.Diagnostics.CodeAnalysis; +global using System.Globalization; + +global using ThingsGateway.Common; +global using ThingsGateway.DB; +global using ThingsGateway.NewLife.Extension; +global using ThingsGateway.SqlSugar; diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs index 746740244..2d79d67b9 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.NewLife; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs index 3d58948c8..5f7845621 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs @@ -9,9 +9,7 @@ // ------------------------------------------------------------------------------ using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using System.Runtime.InteropServices; @@ -20,7 +18,6 @@ using ThingsGateway.NewLife; using ThingsGateway.NewLife.Caching; using ThingsGateway.NewLife.Threading; using ThingsGateway.Schedule; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs index 0681bb945..d86bb6011 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs b/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs index 82c09b135..326e325a8 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs @@ -15,8 +15,6 @@ using ThingsGateway.Extension; using ThingsGateway.FriendlyException; using ThingsGateway.Logging; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.Razor; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs index 3670b494e..a30ed2af6 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Riok.Mapperly.Abstractions; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs b/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs index 2dec57dae..3c3f90952 100644 --- a/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs +++ b/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using System.Collections.Concurrent; using System.Security.Claims; diff --git a/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs b/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs index 5e7b3df51..3aa0947fd 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Http; using System.Security.Claims; @@ -116,7 +115,7 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler { // 路由名称 var routeName = routeData.PageType.CustomAttributes.FirstOrDefault(x => - x.AttributeType == typeof(RouteAttribute))?.ConstructorArguments?[0].Value as string; + x.AttributeType == typeof(Microsoft.AspNetCore.Components.RouteAttribute))?.ConstructorArguments?[0].Value as string; if (routeName == null) return true; if ((!user.PermissionCodeList.Contains(routeName.CutStart("/")) && !user.PermissionCodeList.Contains(routeName))) //如果当前路由信息不包含在角色授权路由列表中则认证失败 diff --git a/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs b/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs index b33aa403a..26bf76b63 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs @@ -11,11 +11,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.Extensions.Localization; using ThingsGateway.DataValidation; using ThingsGateway.FriendlyException; -using ThingsGateway.Razor; using ThingsGateway.UnifyResult; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs index de85f267b..73a1980aa 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs @@ -9,19 +9,15 @@ // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.Controllers; -using Microsoft.Extensions.Options; using Swashbuckle.AspNetCore.SwaggerGen; -using System.Globalization; using System.Reflection; -using ThingsGateway.Extension; +using ThingsGateway.Common.Extension; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs index a1ef19909..1e00675cc 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Localization; using System.Security.Claims; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs index 749705012..8d588b3f8 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs index 27ac425d9..d4a05aef7 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs @@ -8,11 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.FriendlyException; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.Razor; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs index b6f1a95f7..3e4c43ead 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Localization; using System.Text; using System.Web; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs index 8d8c02bf0..3ed7d48f1 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.Extension.Generic; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs index a26f259be..9e61dad86 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs index 566c38322..df668ae42 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs @@ -8,12 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.Data; -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; internal sealed class SysOperateLogService : BaseService, ISysOperateLogService diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs index d66ebeccd..9ab248d19 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs @@ -8,10 +8,6 @@ // QQ群：605534569 // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs index 455042831..b81fb1f15 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs @@ -8,11 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.Extension.Generic; using ThingsGateway.FriendlyException; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs index 595838854..c9e2b40ed 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs @@ -8,10 +8,6 @@ // QQ群：605534569 // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs index 236a4ef1f..6e3ace77f 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs @@ -8,10 +8,7 @@ // QQ群：605534569 // ------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.FriendlyException; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs index d054195b5..dd9aab809 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.ComponentModel.DataAnnotations; using ThingsGateway.Extension.Generic; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs index b5bb445b7..53b9c7a49 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs index e7424f6de..c60a27590 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs @@ -8,12 +8,9 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Microsoft.Extensions.DependencyInjection; using ThingsGateway.FriendlyException; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs index 56aabef67..9f8ace433 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs @@ -8,10 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs index 42c28e952..fe4ce42b7 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs @@ -8,11 +8,8 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.FriendlyException; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs index b57400a81..14e7f7238 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs index 4694d9238..78f1dd3d9 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; public interface ISessionService diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs index ecf67f3b5..c8a34d811 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs @@ -8,10 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; internal sealed class SessionService : BaseService, ISessionService diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs index 6cbea9a54..eb2caa500 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs index e96dcee58..abd6cf890 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs index 229e010a3..205c41302 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs @@ -8,14 +8,12 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - +using ThingsGateway.Common.Extension; +using ThingsGateway.Common.Extension.Generic; using ThingsGateway.DataEncryption; -using ThingsGateway.Extension; using ThingsGateway.Extension.Generic; using ThingsGateway.FriendlyException; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs index bbddc5552..2b0f2b81e 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs @@ -8,16 +8,13 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using System.Text.RegularExpressions; +using ThingsGateway.Common.Extension; using ThingsGateway.DataEncryption; -using ThingsGateway.Extension; using ThingsGateway.Extension.Generic; using ThingsGateway.FriendlyException; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.Razor; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs index b46cd5655..0cb1b8752 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using ThingsGateway.SqlSugar; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Startup.cs b/src/Admin/ThingsGateway.Admin.Application/Startup.cs index e29f17138..fee1cd481 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Startup.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Startup.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -43,7 +41,6 @@ public class Startup : AppStartup services.AddSingleton(); - services.AddScoped(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs index f4070d2b0..a0d2013f2 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - using ThingsGateway.NewLife; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs index c880c59fd..aeea1570a 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs index 47e32c047..852c42a4d 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs index d136baa7e..2edf2c037 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs index 62add004c..336f4c736 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs index 35948a5da..e1b3b0564 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs @@ -8,8 +8,6 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - namespace ThingsGateway.Admin.Application; /// diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs index fc80595d9..503d25eac 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs @@ -9,7 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Extension.Generic; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Application; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs index 4b4104b40..6b6856cae 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs @@ -9,7 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs b/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs index 837f33cfb..dae2bc2e6 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs @@ -10,7 +10,6 @@ using ThingsGateway.Admin.Application; using ThingsGateway.NewLife; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs b/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs index e0348f1fb..b9183193e 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs @@ -16,7 +16,10 @@ global using Microsoft.Extensions.Options; global using System.Diagnostics.CodeAnalysis; +global using ThingsGateway.Common; +global using ThingsGateway.DB; +global using ThingsGateway.NewLife.Extension; global using ThingsGateway.Razor; - +global using ThingsGateway.SqlSugar; [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")] [assembly: GlobalGenerateSetParametersAsync(true)] \ No newline at end of file diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs index d4fa93972..3f1b366e7 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Components.Forms; using ThingsGateway.Admin.Application; using ThingsGateway.Extension.Generic; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs index f56b09149..afe4878d8 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs @@ -9,8 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs index ca37e1697..10ed34f7e 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs @@ -9,7 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs index 780a9a6eb..4ac79c374 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs @@ -9,8 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs index b027869c5..81f07bf4c 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs @@ -9,8 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; -using ThingsGateway.SqlSugar; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs index 6b1465473..3b4c2b3c2 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs @@ -10,7 +10,6 @@ using ThingsGateway.Admin.Application; using ThingsGateway.Extension.Generic; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs index fcc463ddf..1f0b81735 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs @@ -9,7 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs index 6b74b8563..efde7c83d 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Components.Forms; using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs index 5349f1607..14d4977d3 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs @@ -9,7 +9,6 @@ //------------------------------------------------------------------------------ using ThingsGateway.Admin.Application; -using ThingsGateway.NewLife.Extension; namespace ThingsGateway.Admin.Razor; diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs similarity index 95% rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs rename to src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs index d177563cf..32dbbfa56 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs @@ -8,13 +8,11 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using BootstrapBlazor.Components; - +using ThingsGateway.Admin.Application; using ThingsGateway.NewLife.Json.Extension; -using ThingsGateway.Razor; -namespace ThingsGateway.Admin.Application; +namespace ThingsGateway.Admin.Razor; internal sealed class AuthRazorService : IAuthRazorService { diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs similarity index 95% rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs rename to src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs index 648a96c0c..0d24db78f 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs @@ -8,9 +8,9 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using ThingsGateway.Razor; +using ThingsGateway.Admin.Application; -namespace ThingsGateway.Admin.Application; +namespace ThingsGateway.Admin.Razor; public class HybridAuthRazorService : IAuthRazorService diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs similarity index 92% rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs rename to src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs index 768d6a237..2aa1f2e1d 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs @@ -8,9 +8,9 @@ // QQ群：605534569 //------------------------------------------------------------------------------ -using ThingsGateway.Razor; +using ThingsGateway.Admin.Application; -namespace ThingsGateway.Admin.Application; +namespace ThingsGateway.Admin.Razor; public interface IAuthRazorService { diff --git a/src/Admin/ThingsGateway.Admin.Razor/Startup.cs b/src/Admin/ThingsGateway.Admin.Razor/Startup.cs index 0eeca4767..e7a856ce2 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/Startup.cs +++ b/src/Admin/ThingsGateway.Admin.Razor/Startup.cs @@ -18,6 +18,7 @@ public class Startup : AppStartup public void Configure(IServiceCollection services) { services.AddScoped(); + services.AddScoped(); services.AddBootstrapBlazorTableExportService(); } } diff --git a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj index 85ddbbc0b..5eebba412 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj +++ b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj @@ -37,6 +37,7 @@ + diff --git a/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor b/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor index d77ed7b7b..45cc1c367 100644 --- a/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor +++ b/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor @@ -15,5 +15,5 @@ @using BootstrapBlazor.Components - +@using ThingsGateway.Common.Extension; @using ThingsGateway.Razor; \ No newline at end of file diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json index 1a7f4775e..fd7f1f770 100644 --- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json +++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json @@ -14,6 +14,7 @@ "ThingsGateway.SqlSugar", "ThingsGateway.Admin.Application", "ThingsGateway.Admin.Razor", + "ThingsGateway.Common", "ThingsGateway.DB", "ThingsGateway.Razor" ] diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json index 0beae8fbc..94d401591 100644 --- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json +++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json @@ -14,6 +14,7 @@ "ThingsGateway.SqlSugar", "ThingsGateway.Admin.Application", "ThingsGateway.Admin.Razor", + "ThingsGateway.Common", "ThingsGateway.DB", "ThingsGateway.Razor" ] diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor index 7038308d7..cb944daef 100644 --- a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor +++ b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor @@ -6,6 +6,7 @@ @using ThingsGateway.Admin.Razor @using ThingsGateway.Extension; @using ThingsGateway.Razor +@using ThingsGateway.Common.Extension;