From d75c03414606da84df19df12f8ed0a832cbba553 Mon Sep 17 00:00:00 2001 From: 李曜臣 Date: Wed, 21 Oct 2026 16:00:27 +0800 Subject: [PATCH] 2026-10-21泰鄂代码优化 --- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateTimeHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MD5Hepler.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerCheckExpiredOutputDto.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerListItemDto.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Reports/ReportsTemplatePrintStatGetListInputVo.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/UsAppProductCategoryNodeDto.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IAuthSessionAppService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IReportsAppService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IUsAppAuthAppService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Json/StringOrFirstArrayItemJsonConverter.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs | 2 ++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AllScopeBindingHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AuthScopeQueryHelper.cs | 36 ++++++++++++++++++------------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/BoundLabelBindingHelper.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/CategoryAppearanceStorageHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/GroupListScopeHelper.cs | 7 +++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelAlertTimerDisplayHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelBatchTemplateDefaultsHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelEntityPartnerScopeHelper.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelRegionScopeHelper.cs | 14 +++++++------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelReportDateRangeHelper.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplatePrintOrientationHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplateScopeHelper.cs | 16 ++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationBatchExcelHelper.cs | 18 +++++++++--------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationRegionScopeHelper.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationScopeBindingHelper.cs | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/PartnerScopeHelper.cs | 7 +++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/ProductBatchExcelHelper.cs | 14 +++++++------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberBatchExcelHelper.cs | 28 ++++++++++++++-------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberRoleHelper.cs | 3 ++- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TenantContextGuard.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TrainingFileScopeHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppAuthScopeHelper.cs | 16 ++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppPrintLogScopeHelper.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/MultiTenancy/EmbeddedTenantSqlScripts.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs | 12 ++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AlertTemplateAppService.cs | 10 +++++----- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AppUpdateAppService.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AuthSessionAppService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/FlTeamMemberScopeDbEntity.cs | 4 ++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAlertTimerAppService.cs | 26 +++++++++++++------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAppService.cs | 66 +++++++++++++++++++++++++++++++++--------------------------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelCategoryAppService.cs | 16 ++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelMultipleOptionAppService.cs | 14 +++++++------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTemplateAppService.cs | 22 +++++++++++----------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTypeAppService.cs | 20 ++++++++++---------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LocationAppService.cs | 36 +++++++++++++++++++++--------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs | 40 +++++++++++++++++++++++++++------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductAppService.cs | 68 ++++++++++++++++++++++++++++++++++---------------------------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductCategoryAppService.cs | 20 ++++++++++---------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductLocationAppService.cs | 24 ++++++++++++------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleAppService.cs | 20 ++++++++++---------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleMenuAppService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ReportsAppService.cs | 24 ++++++++++++------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TeamMemberAppService.cs | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TrainingAppService.cs | 34 +++++++++++++++++----------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppAuthAppService.cs | 48 ++++++++++++++++++++++++------------------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppLabelingAppService.cs | 48 ++++++++++++++++++++++++------------------------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppTrainingAppService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_alert_timer.sql | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_team_member_scope.sql | 10 ++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/seed_platform_statistics_agents_host.sql | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThCompanyListItemDto.cs | 6 ++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantInputVo.cs | 7 +++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantOutputDto.cs | 3 +++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThUpdateCompanyValidityInputVo.cs | 19 +++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentDto.cs | 31 +++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentGetListInput.cs | 18 ++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentSaveInputVo.cs | 25 +++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyGetListInput.cs | 12 ++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyItemDto.cs | 25 +++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsOverviewDto.cs | 27 +++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThMultiTenancyAppService.cs | 5 +++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformAgentAppService.cs | 36 ++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformStatisticsAppService.cs | 22 ++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Filters/FoodLabelingBusinessTenantActionFilter.cs | 30 ++++++++++++++++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/FoodLabelingThTenantDatabaseMigrationContributor.cs | 30 +++++++++++++++++++++++++----- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantAdminAccountBootstrapper.cs | 33 +++++++++++++++++++++++---------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantBusinessDatabaseAccessor.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantCompanyMenuSyncService.cs | 40 +++++++++++++++++++++++++--------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantDatabaseBootstrapper.cs | 12 ++++++------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantResolveHelper.cs | 12 ++++++------ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantSelectCredentialCipher.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActor.cs | 19 +++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActorResolver.cs | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformTenantStatsReader.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantHostDataAccessor.cs | 14 +++++++------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantValidityGuard.cs | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThWebPlatformLoginHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAppAuthAppService.cs | 44 +++++++++++++++++++++++++++----------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAuthSessionAppService.cs | 9 +++++++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThMultiTenancyAppService.cs | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformAgentAppService.cs | 508 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformStatisticsAppService.cs | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThRbacMenuAppService.cs | 34 +++++++++++++++++----------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantProvisioningAppService.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantScopedRbacRoleAppService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThWebAuthAppService.cs | 32 ++++++++++++++++++-------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Domain/Entities/ThPlatformAgentEntity.cs | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/alter_yitenant_expire_time.sql | 7 +++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/seed_platform_statistics_agents_host.sql | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IAccountService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs | 30 +++++++++++++++--------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/ConfigConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DeptConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DictionaryConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/MenuConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/PostConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/RoleConst.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs | 30 ++++++++++++++++++++---------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/PermissionGlobalAttribute.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs | 2 +- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AliyunManger.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/FileManager.cs | 6 +++--- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs | 8 ++++---- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs | 28 ++++++++++++++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserRoleDataSeed.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application/TenantService.cs | 32 ++++++++++++++++---------------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/SqlSugarAndConfigurationTenantStore.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/TenantAggregateRoot.cs | 6 ++++++ 泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs | 4 ++-- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 16 ++++++++-------- 泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json | 8 +++++++- 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts | 2 ++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-agents.ts | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-statistics.ts | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/management/account-management/team-members/team-member-modal.vue | 6 ++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/agent-modal.vue | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/data.ts | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/index.vue | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/data.ts | 39 +++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/index.vue | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/shared/use-account-lookups.ts | 1 + 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs | 2 ++ 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs | 12 ++++++++++++ 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs | 36 +++++++++++++++++++++++++++--------- 美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 16 ++++++++-------- 美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json | 3 +++ 美国版/scripts/泰鄂测试版部署.ps1 | 68 +++++++++++++++++++++++++++++++++++++++++++------------------------- 项目相关文档/2026-10-20接口文档.md | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 项目相关文档/seed_platform_statistics_agents_menus.sql | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 项目相关文档/平台统计与代理角色-后端改造方案.md | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 162 files changed, 5056 insertions(+), 773 deletions(-) create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/seed_platform_statistics_agents_host.sql create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThUpdateCompanyValidityInputVo.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentDto.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentGetListInput.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentSaveInputVo.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyGetListInput.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyItemDto.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsOverviewDto.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformAgentAppService.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformStatisticsAppService.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActor.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActorResolver.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformTenantStatsReader.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantValidityGuard.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformAgentAppService.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformStatisticsAppService.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Domain/Entities/ThPlatformAgentEntity.cs create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/alter_yitenant_expire_time.sql create mode 100644 泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/seed_platform_statistics_agents_host.sql create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-agents.ts create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-statistics.ts create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/agent-modal.vue create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/data.ts create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/index.vue create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/data.ts create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/index.vue create mode 100644 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs create mode 100644 美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs create mode 100644 项目相关文档/2026-10-20接口文档.md create mode 100644 项目相关文档/seed_platform_statistics_agents_menus.sql create mode 100644 项目相关文档/平台统计与代理角色-后端改造方案.md diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs index 5904889..19e8121 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.AspNetCore.Authentication.OAuth if (model.error != null) { - throw new Exception($"第三方授权返回错误,错误码:【{model.error}】,错误详情:【{model.error_description}】"); + throw new Exception($"Third-party authorization failed. Code: [{model.error}]. Details: [{model.error_description}]"); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs index 8e4ce9d..7463b9a 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs @@ -54,7 +54,7 @@ namespace Yi.Framework.AspNetCore.Authentication.OAuth var content = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - throw new Exception($"授权服务器请求错误,请求地址:{queryUrl},错误信息:{content}"); + throw new Exception($"Authorization server request failed. URL: {queryUrl}. Error: {content}"); } VerifyErrResponse(content); var model = Newtonsoft.Json.JsonConvert.DeserializeObject(content); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs index 34ab204..337e175 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs @@ -109,7 +109,7 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter // 非友好异常也必须带上 errors,避免前端 errors:null 无提示 var baseEx = exception.GetBaseException(); errors = string.IsNullOrWhiteSpace(baseEx.Message) - ? "服务器内部错误" + ? "Internal server error" : baseEx.Message; statusCode = StatusCodes.Status500InternalServerError; } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs index 033b8a8..40a683a 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs @@ -77,7 +77,7 @@ public class RESTfulResultProvider : IUnifyResultProvider,ITransientDependency } /// - /// 验证失败/业务异常返回值 + /// 验证失败/Business error.返回值 /// /// /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateHelper.cs index 620da6d..c230791 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateHelper.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Core.Helper public static string TimeSubTract(DateTime time1, DateTime time2) { TimeSpan subTract = time1.Subtract(time2); - return $"{subTract.Days} 天 {subTract.Hours} 时 {subTract.Minutes} 分 "; + return $"{subTract.Days} days. {subTract.Hours} 时 {subTract.Minutes} 分 "; } /// /// 时间戳转本地时间-时间戳精确到秒 diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateTimeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateTimeHelper.cs index 41b069c..dec2761 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateTimeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/DateTimeHelper.cs @@ -85,7 +85,7 @@ namespace Yi.Framework.Core.Helper string sMilliSecond = milliSecond < 10 ? "0" + milliSecond : "" + milliSecond;//毫秒 sMilliSecond = milliSecond < 100 ? "0" + sMilliSecond : "" + sMilliSecond; - return string.Format("{0} 天 {1} 小时 {2} 分 {3} 秒", sDay, sHour, sMinute, sSecond); + return string.Format("{0} days. {1} 小时 {2} 分 {3} 秒", sDay, sHour, sMinute, sSecond); } #endregion diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MD5Hepler.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MD5Hepler.cs index d6ce9ab..a873023 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MD5Hepler.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MD5Hepler.cs @@ -86,7 +86,7 @@ namespace Yi.Framework.Core.Helper } catch { - throw new Exception($"错误的 password 字符串:【{password}】"); + throw new Exception($"Invalid password string: [{password}]"); } return pwd; } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs index dbf3151..d464108 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/RSAFileHelper.cs @@ -24,7 +24,7 @@ namespace Yi.Framework.Core.Helper string rootPath = Directory.GetCurrentDirectory(); string filePath = Path.Combine(rootPath, fileName); if (!File.Exists(filePath)) - throw new Exception("文件不存在"); + throw new Exception("File does not exist."); string key = File.ReadAllText(filePath); var rsa = RSA.Create(); rsa.ImportFromPem(key.AsSpan()); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs index ed2d54a..b250d1c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs @@ -99,7 +99,7 @@ namespace Yi.Framework.Ddd.Application // 建议实现两种缓存策略: // 1. 全表缓存: 适用于数据量小且变动不频繁的场景 // 2. 按需缓存: 仅缓存常用数据,适用于大数据量场景 - throw new NotImplementedException("请实现具体的缓存查询策略"); + throw new NotImplementedException("Implement a concrete cache query strategy."); } /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs index 3741892..ae231bc 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs @@ -259,7 +259,7 @@ namespace Yi.Framework.Ddd.Application /// public virtual Task PostImportExcelAsync(List input) { - throw new NotImplementedException("请在实现类中重写此方法以支持Excel导入"); + throw new NotImplementedException("Override this method in the implementation class to support Excel import."); } } } \ No newline at end of file diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs index 7cf18ee..bf239ce 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs @@ -395,7 +395,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories catch (VersionExceptions ex) { throw new AbpDbConcurrencyException( - $"{ex.Message}[更新失败:ConcurrencyStamp不是最新版本],entityInfo:{updateObj}", ex); + $"{ex.Message}[Update failed: ConcurrencyStamp is not the latest version], entityInfo: {updateObj}", ex); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs index dd28a19..4a14c7b 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs @@ -184,7 +184,7 @@ namespace Yi.Framework.SqlSugarCore // 验证数据库类型配置 if (dbConnOptions.DbType is null) { - throw new ArgumentException("未配置数据库类型(DbType)"); + throw new ArgumentException("Database type (DbType) is not configured."); } // 配置读写分离 @@ -193,7 +193,7 @@ namespace Yi.Framework.SqlSugarCore { if (dbConnOptions.ReadUrl is null) { - throw new ArgumentException("启用读写分离但未配置读库连接字符串"); + throw new ArgumentException("Read/write splitting is enabled but read database connection string is not configured."); } slaveConfigs.AddRange(dbConnOptions.ReadUrl.Select(url => @@ -327,7 +327,7 @@ namespace Yi.Framework.SqlSugarCore break; default: - throw new NotImplementedException($"数据库类型 {DbConnectionOptions.DbType} 的备份操作尚未实现"); + throw new NotImplementedException($"Backup is not implemented for database type {DbConnectionOptions.DbType}."); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs index fa87991..81eb1a7 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs @@ -51,7 +51,7 @@ public class TenantConfigurationWrapper : ITransientDependency var config = await TenantStoreService.FindAsync(CurrentTenantService.Id.Value); if (config == null) { - throw new ApplicationException($"未找到租户信息,租户Id:{CurrentTenantService.Id}"); + throw new ApplicationException($"Tenant information not found. Tenant Id: {CurrentTenantService.Id}"); } return config; } @@ -62,7 +62,7 @@ public class TenantConfigurationWrapper : ITransientDependency var config = await TenantStoreService.FindAsync(CurrentTenantService.Name); if (config == null) { - throw new ApplicationException($"未找到租户信息,租户名称:{CurrentTenantService.Name}"); + throw new ApplicationException($"Tenant information not found. Tenant name: {CurrentTenantService.Name}"); } return config; } @@ -78,7 +78,7 @@ public class TenantConfigurationWrapper : ITransientDependency { if (string.IsNullOrWhiteSpace(DbConnectionOptions.Url)) { - throw new ApplicationException("未配置主库连接字符串 DbConnOptions.Url"); + throw new ApplicationException("Host database connection string DbConnOptions.Url is not configured."); } return new TenantConfiguration diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerCheckExpiredOutputDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerCheckExpiredOutputDto.cs index a95796d..168ee67 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerCheckExpiredOutputDto.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerCheckExpiredOutputDto.cs @@ -31,6 +31,6 @@ public class LabelAlertTimerCheckExpiredOutputDto public string? FormattedExpiresAt { get; set; } - /// 固定文案:亲爱的{userName},您的{labelName}标签已过期,请及时处理 + /// 固定文案:Hi {userName}, your {labelName} label has expired. Please take action. public string? ExpiredMessageTemplate { get; set; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerListItemDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerListItemDto.cs index 97555c5..d5940f3 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerListItemDto.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelAlertTimer/LabelAlertTimerListItemDto.cs @@ -53,6 +53,6 @@ public class LabelAlertTimerListItemDto public string? PrintedByUserName { get; set; } - /// 固定文案:亲爱的{userName},您的{labelName}标签已过期,请及时处理 + /// 固定文案:Hi {userName}, your {labelName} label has expired. Please take action. public string ExpiredMessageTemplate { get; set; } = string.Empty; } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Reports/ReportsTemplatePrintStatGetListInputVo.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Reports/ReportsTemplatePrintStatGetListInputVo.cs index 2f4fe7a..5446ead 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Reports/ReportsTemplatePrintStatGetListInputVo.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Reports/ReportsTemplatePrintStatGetListInputVo.cs @@ -16,7 +16,7 @@ public class ReportsTemplatePrintStatGetListInputVo : PagedAndSortedResultReques /// 门店(location.Id) public string? LocationId { get; set; } - /// 统计开始日期(含);未传时与 组成默认近 30 天 + /// 统计开始日期(含);未传时与 组成默认近 30 days. public DateTime? StartDate { get; set; } /// 统计结束日期(含);未传时默认为今天 diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/UsAppProductCategoryNodeDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/UsAppProductCategoryNodeDto.cs index 410bcb8..f424e99 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/UsAppProductCategoryNodeDto.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/UsAppProductCategoryNodeDto.cs @@ -5,10 +5,10 @@ namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling; /// public class UsAppProductCategoryNodeDto { - /// 产品分类Id;当产品未归类或分类不存在时为空 + /// 产品分类Id;当产品未归类或Category not found.时为空 public string? CategoryId { get; set; } - /// 产品分类图片地址;当产品未归类或分类不存在时为空 + /// 产品分类图片地址;当产品未归类或Category not found.时为空 public string? CategoryPhotoUrl { get; set; } /// 分类显示名;空为「无」 diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IAuthSessionAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IAuthSessionAppService.cs index 2df43a9..6718f02 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IAuthSessionAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IAuthSessionAppService.cs @@ -21,7 +21,7 @@ public interface IAuthSessionAppService : IApplicationService /// /// 用户简要信息、权限码与菜单树 /// 成功 - /// 未登录或令牌无效 + /// You are not signed in.或令牌无效 /// 服务器错误 Task GetMyMenusAsync(); @@ -29,7 +29,7 @@ public interface IAuthSessionAppService : IApplicationService /// 退出登录:清除服务端用户信息缓存(JWT 仍由前端丢弃) /// /// - /// 与框架 AccountService.PostLogout 一致;未登录时返回 false。 + /// 与框架 AccountService.PostLogout 一致;You are not signed in.时返回 false。 /// /// 是否执行了缓存清理(已登录为 true) /// 成功 diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IReportsAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IReportsAppService.cs index 8d0a88a..bc9fd61 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IReportsAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IReportsAppService.cs @@ -58,7 +58,7 @@ public interface IReportsAppService : IApplicationService /// /// 参数说明: /// - SkipCount / MaxResultCount: 分页(SkipCount 为 1-based 页码约定,与项目其它列表一致) - /// - StartDate / EndDate: 统计区间(含起止日;默认近 30 天至今天) + /// - StartDate / EndDate: 统计区间(含起止日;默认近 30 days.至今天) /// - PartnerId / GroupId / LocationId: 组织范围筛选 /// - Keyword: 模板名称模糊匹配 /// - Sorting: 可选 PrintedCount desc(默认按打印数降序) @@ -66,7 +66,7 @@ public interface IReportsAppService : IApplicationService /// 分页与筛选条件 /// 各模板打印数量列表 /// 成功返回分页统计 - /// 入参无效或未登录 + /// 入参无效或You are not signed in. /// 服务器错误 Task> GetTemplatePrintStatListAsync( ReportsTemplatePrintStatGetListInputVo input); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IUsAppAuthAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IUsAppAuthAppService.cs index 18db503..f916d74 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IUsAppAuthAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IUsAppAuthAppService.cs @@ -45,7 +45,7 @@ public interface IUsAppAuthAppService : IApplicationService /// /// 资料 DTO /// 成功 - /// 未登录或用户不存在 + /// You are not signed in.或User not found. /// 服务器错误 Task GetMyProfileAsync(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Json/StringOrFirstArrayItemJsonConverter.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Json/StringOrFirstArrayItemJsonConverter.cs index fce83cd..7928c2e 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Json/StringOrFirstArrayItemJsonConverter.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Json/StringOrFirstArrayItemJsonConverter.cs @@ -33,7 +33,7 @@ public sealed class StringOrFirstArrayItemJsonConverter : JsonConverter if (reader.TokenType != JsonTokenType.String) { - throw new JsonException("partnerId 数组元素必须是字符串"); + throw new JsonException("partnerId array elements must be strings."); } var item = reader.GetString()?.Trim(); @@ -46,7 +46,7 @@ public sealed class StringOrFirstArrayItemJsonConverter : JsonConverter return first; } default: - throw new JsonException($"无法将 JSON token {reader.TokenType} 转为字符串(partnerId)"); + throw new JsonException($"Cannot convert JSON token {reader.TokenType} to string (partnerId)."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs index 679bc51..8ae93bb 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs @@ -25,6 +25,8 @@ public class FoodLabelingApplicationModule : AbpModule context.Services.GetConfiguration().GetSection(FoodLabelingBatchImportOptions.SectionName)); Configure( context.Services.GetConfiguration().GetSection(FoodLabelingAppUpdateOptions.SectionName)); + Configure( + context.Services.GetConfiguration().GetSection(FoodLabelingPictureOptions.SectionName)); // 任意业务写接口成功后刷新系统编辑时间戳,供 my-menus.lastUpdated 使用 Configure(options => diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AllScopeBindingHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AllScopeBindingHelper.cs index 63aebad..3951a76 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AllScopeBindingHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AllScopeBindingHelper.cs @@ -574,7 +574,7 @@ public static class AllScopeBindingHelper if (availabilityType != ScopeAll && availabilityType != ScopeSpecified) { - throw new UserFriendlyException("门店可用范围不合法(ALL/SPECIFIED)"); + throw new UserFriendlyException("Invalid location availability scope (ALL/SPECIFIED)."); } var locationSpecified = string.Equals(availabilityType, ScopeSpecified, StringComparison.OrdinalIgnoreCase); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AuthScopeQueryHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AuthScopeQueryHelper.cs index be7c640..80fb408 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AuthScopeQueryHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/AuthScopeQueryHelper.cs @@ -19,7 +19,7 @@ public static class AuthScopeQueryHelper { if (!currentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } } @@ -52,7 +52,7 @@ public static class AuthScopeQueryHelper { EnsureLoggedIn(currentUser); - var pid = RequireNonEmpty(partnerId, "公司标识不能为空"); + var pid = RequireNonEmpty(partnerId, "Company identifier is required."); await EnsurePartnerAccessibleAsync(currentUser, dbContext, pid); var listScope = await GroupListScopeHelper.ResolveAsync(currentUser, dbContext); @@ -80,15 +80,15 @@ public static class AuthScopeQueryHelper { EnsureLoggedIn(currentUser); - var pid = RequireNonEmpty(partnerId, "公司标识不能为空"); - var gid = RequireNonEmpty(groupId, "区域标识不能为空"); + var pid = RequireNonEmpty(partnerId, "Company identifier is required."); + var gid = RequireNonEmpty(groupId, "Region identifier is required."); await EnsurePartnerAccessibleAsync(currentUser, dbContext, pid); var group = await dbContext.SqlSugarClient.Queryable() .FirstAsync(g => !g.IsDeleted && g.Id == gid && g.PartnerId == pid); if (group is null) { - throw new UserFriendlyException("区域不存在或不属于所选公司"); + throw new UserFriendlyException("Region not found or does not belong to the selected company."); } var groupScope = await GroupListScopeHelper.ResolveAsync(currentUser, dbContext); @@ -98,12 +98,12 @@ public static class AuthScopeQueryHelper var allowedGroup = groupScope.AllowedGroupIds; if (allowedPartner.Count > 0 && !allowedPartner.Contains(pid, StringComparer.OrdinalIgnoreCase)) { - throw new UserFriendlyException("无权查看该区域"); + throw new UserFriendlyException("You do not have permission to view this region."); } if (allowedGroup.Count > 0 && !allowedGroup.Contains(gid, StringComparer.OrdinalIgnoreCase)) { - throw new UserFriendlyException("无权查看该区域"); + throw new UserFriendlyException("You do not have permission to view this region."); } } @@ -111,7 +111,7 @@ public static class AuthScopeQueryHelper .FirstAsync(p => !p.IsDeleted && p.Id == pid); if (partner is null) { - throw new UserFriendlyException("公司不存在"); + throw new UserFriendlyException("Company not found."); } var partnerKeys = new List { partner.Id, partner.PartnerName ?? string.Empty } @@ -263,7 +263,7 @@ public static class AuthScopeQueryHelper if (!scope.AllowedPartnerIds.Contains(partnerId)) { - throw new UserFriendlyException("无权查看该公司"); + throw new UserFriendlyException("You do not have permission to view this company."); } } @@ -288,13 +288,13 @@ public static class AuthScopeQueryHelper ISqlSugarDbContext dbContext, AuthScopeSelectLocationInputVo input) { - var pid = RequireNonEmpty(input.PartnerId, "请选择公司"); + var pid = RequireNonEmpty(input.PartnerId, "Select a company."); var gid = RequireNonEmpty(input.GroupId, "请选择区域"); - var lid = RequireNonEmpty(input.LocationId, "请选择门店"); + var lid = RequireNonEmpty(input.LocationId, "Select a location."); if (!Guid.TryParse(lid, out var locationGuid)) { - throw new UserFriendlyException("无效的门店标识"); + throw new UserFriendlyException("Invalid location identifier."); } await EnsurePartnerAccessibleAsync(currentUser, dbContext, pid); @@ -303,21 +303,21 @@ public static class AuthScopeQueryHelper .FirstAsync(g => !g.IsDeleted && g.Id == gid && g.PartnerId == pid); if (group is null) { - throw new UserFriendlyException("区域不存在或不属于所选公司"); + throw new UserFriendlyException("Region not found or does not belong to the selected company."); } var partner = await dbContext.SqlSugarClient.Queryable() .FirstAsync(p => !p.IsDeleted && p.Id == pid); if (partner is null) { - throw new UserFriendlyException("公司不存在"); + throw new UserFriendlyException("Company not found."); } var loc = await dbContext.SqlSugarClient.Queryable() .FirstAsync(x => !x.IsDeleted && x.Id == locationGuid); if (loc is null) { - throw new UserFriendlyException("门店不存在或已删除"); + throw new UserFriendlyException("Location not found or removed."); } var partnerKeys = new List { partner.Id, partner.PartnerName ?? string.Empty } @@ -331,7 +331,7 @@ public static class AuthScopeQueryHelper if (!partnerKeys.Contains(locPartner, StringComparer.Ordinal) || !string.Equals(locGroup, groupName, StringComparison.Ordinal)) { - throw new UserFriendlyException("门店与所选公司/区域不匹配"); + throw new UserFriendlyException("Location does not match the selected company/region."); } return new AuthScopeSelectLocationOutputDto @@ -359,14 +359,14 @@ public static class AuthScopeQueryHelper { if (!Guid.TryParse(locationId.Trim(), out var locationGuid)) { - throw new UserFriendlyException("无效的门店标识"); + throw new UserFriendlyException("Invalid location identifier."); } var loc = await dbContext.SqlSugarClient.Queryable() .FirstAsync(x => !x.IsDeleted && x.Id == locationGuid); if (loc is null) { - throw new UserFriendlyException("门店不存在或已删除"); + throw new UserFriendlyException("Location not found or removed."); } var pid = (partnerId ?? string.Empty).Trim(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/BoundLabelBindingHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/BoundLabelBindingHelper.cs index 97de8ba..988970b 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/BoundLabelBindingHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/BoundLabelBindingHelper.cs @@ -63,7 +63,7 @@ public static class BoundLabelBindingHelper } catch (Exception ex) when (throwIfMissing) { - throw new UserFriendlyException($"绑定标签表未初始化,请执行 fl_bound_label.sql:{ex.Message}"); + throw new UserFriendlyException($"Bound label table is not initialized. Run fl_bound_label.sql: {ex.Message}"); } catch { @@ -78,7 +78,7 @@ public static class BoundLabelBindingHelper if (throwIfMissing) { - throw new UserFriendlyException("绑定标签表未初始化,请执行 fl_bound_label.sql"); + throw new UserFriendlyException("Bound label table is not initialized. Run fl_bound_label.sql."); } } @@ -331,7 +331,7 @@ public static class BoundLabelBindingHelper { if (throwIfMissing) { - throw new UserFriendlyException($"绑定标签不存在:{token}"); + throw new UserFriendlyException($"Bound label not found: {token}"); } continue; @@ -374,7 +374,7 @@ public static class BoundLabelBindingHelper { if (throwIfMissing) { - throw new UserFriendlyException($"绑定培训文件不存在:{token}"); + throw new UserFriendlyException($"Bound training file not found: {token}"); } continue; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/CategoryAppearanceStorageHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/CategoryAppearanceStorageHelper.cs index 7faa3ec..1fd6912 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/CategoryAppearanceStorageHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/CategoryAppearanceStorageHelper.cs @@ -36,7 +36,7 @@ public static class CategoryAppearanceStorageHelper } catch (JsonException) { - throw new UserFriendlyException("按钮外观格式不正确,须为合法 JSON(或兼容旧的 TEXT/COLOR/IMAGE)"); + throw new UserFriendlyException("Invalid button appearance format; must be valid JSON (or legacy TEXT/COLOR/IMAGE)."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs new file mode 100644 index 0000000..3de3d74 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs @@ -0,0 +1,48 @@ +using System.Runtime.InteropServices; + +namespace FoodLabeling.Application.Helpers; + +/// 解析图片物理根目录:优先配置,Linux 用 /www/wwwroot/picture/...,Windows 回落到 wwwroot/picture。 +public static class FoodLabelingPictureRoot +{ + public const string LinuxSharedRoot = "/www/wwwroot/picture"; + public const string RequestPath = "/picture"; + + public static string Resolve(string? configuredRoot, string contentRootPath, string? webRootPath) + { + var configured = (configuredRoot ?? string.Empty).Trim(); + if (!string.IsNullOrWhiteSpace(configured) && CanUseConfiguredPath(configured)) + { + Directory.CreateDirectory(configured); + return configured; + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || Directory.Exists("/www/wwwroot")) + { + var linux = string.IsNullOrWhiteSpace(configured) + ? Path.Combine(LinuxSharedRoot, "local") + : configured; + Directory.CreateDirectory(linux); + return linux; + } + + var localBase = !string.IsNullOrWhiteSpace(webRootPath) + ? webRootPath + : Path.Combine(contentRootPath, "wwwroot"); + var local = Path.Combine(localBase, "picture"); + Directory.CreateDirectory(local); + return local; + } + + private static bool CanUseConfiguredPath(string path) + { + var unix = path.Replace('\\', '/'); + var isLinuxWww = unix.StartsWith("/www/wwwroot/", StringComparison.OrdinalIgnoreCase); + if (isLinuxWww && !RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && !Directory.Exists("/www/wwwroot")) + { + return false; + } + + return true; + } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/GroupListScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/GroupListScopeHelper.cs index 80d8782..35eceed 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/GroupListScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/GroupListScopeHelper.cs @@ -43,6 +43,13 @@ public static class GroupListScopeHelper } var db = dbContext.SqlSugarClient; + var allScopePartnerIds = await LocationScopeBindingHelper.LoadLocationAllPartnerIdsAsync( + db, currentUser.Id.Value); + if (allScopePartnerIds.Count > 0) + { + return new GroupListScope { AllowedPartnerIds = allScopePartnerIds }; + } + var locationIds = await LocationScopeBindingHelper.ResolveBoundLocationIdsForUserAsync( db, currentUser.Id.Value); if (locationIds.Count == 0) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelAlertTimerDisplayHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelAlertTimerDisplayHelper.cs index 29a5a4f..2c478e2 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelAlertTimerDisplayHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelAlertTimerDisplayHelper.cs @@ -6,7 +6,7 @@ namespace FoodLabeling.Application.Helpers; /// 告警计时器展示字段(格式化过期时刻、弹窗文案、状态) public static class LabelAlertTimerDisplayHelper { - public const string ExpiredMessageTemplate = "亲爱的{userName},您的{labelName}标签已过期,请及时处理"; + public const string ExpiredMessageTemplate = "Hi {userName}, your {labelName} label has expired. Please take action."; public const string StatusRunning = "running"; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelBatchTemplateDefaultsHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelBatchTemplateDefaultsHelper.cs index 56b5ebb..c3c1600 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelBatchTemplateDefaultsHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelBatchTemplateDefaultsHelper.cs @@ -222,7 +222,7 @@ public static class LabelBatchTemplateDefaultsHelper if (!duplicateCheckSet.Add(key)) { throw new UserFriendlyException( - $"模板默认值绑定重复:产品[{row.ProductId}]与标签类型[{row.LabelTypeId}]只能存在一条"); + $"Duplicate template default binding: product [{row.ProductId}] and label type [{row.LabelTypeId}] may only have one binding."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelEntityPartnerScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelEntityPartnerScopeHelper.cs index 6483617..1d6bd91 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelEntityPartnerScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelEntityPartnerScopeHelper.cs @@ -132,7 +132,7 @@ public static class LabelEntityPartnerScopeHelper if (string.Equals(partnerType, ScopeSpecified, StringComparison.OrdinalIgnoreCase) && normalizedPartnerIds.Count == 0) { - throw new UserFriendlyException("指定适用 Company 时,partnerIds/companyIds 不能为空"); + throw new UserFriendlyException("When specifying applicable Company, partnerIds/companyIds is required."); } if (normalizedPartnerIds.Count > 0) @@ -192,7 +192,7 @@ public static class LabelEntityPartnerScopeHelper if (needsPartnerRows && !hasTable) { throw new UserFriendlyException( - "Company 适用范围关联表尚未就绪,请联系管理员执行数据库迁移(fl_label_entity_partner_scope.sql 或 fl_product_category_partner_scope.sql)后重试"); + "Company scope association table is not ready. Ask an administrator to run fl_label_entity_partner_scope.sql or fl_product_category_partner_scope.sql, then retry."); } if (hasTable) @@ -595,7 +595,7 @@ public static class LabelEntityPartnerScopeHelper { if (type != ScopeAll && type != ScopeSpecified) { - throw new UserFriendlyException("适用 Company 范围不合法(ALL/SPECIFIED)"); + throw new UserFriendlyException("Invalid applicable Company scope (ALL/SPECIFIED)."); } } @@ -617,7 +617,7 @@ public static class LabelEntityPartnerScopeHelper .CountAsync(); if (count != partnerIds.Count) { - throw new UserFriendlyException("存在无效的 Company(partnerIds/companyIds),请刷新后重试"); + throw new UserFriendlyException("Invalid Company (partnerIds/companyIds). Refresh and try again."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelRegionScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelRegionScopeHelper.cs index d38cc65..0152dc4 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelRegionScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelRegionScopeHelper.cs @@ -104,13 +104,13 @@ public static class LabelRegionScopeHelper if (type != AppliedRegionAll && type != AppliedRegionSpecified) { - throw new UserFriendlyException("适用 Region 范围不合法(ALL/SPECIFIED)"); + throw new UserFriendlyException("Invalid applicable Region scope (ALL/SPECIFIED)."); } if (mergedRegionIds.Count == 0 && explicitLocationIds.Count == 0 && !string.Equals(type, AppliedRegionAll, StringComparison.OrdinalIgnoreCase)) { - throw new UserFriendlyException("请指定 Region(regionIds)和/或门店(locationIds)"); + throw new UserFriendlyException("Specify Region (regionIds) and/or location(s) (locationIds)."); } if (mergedRegionIds.Count > 0) @@ -196,7 +196,7 @@ public static class LabelRegionScopeHelper { if (allLocationsInRegions.Count == 0) { - throw new UserFriendlyException("指定 Region 下未匹配到有效门店,请检查 Region 或 locationIds"); + throw new UserFriendlyException("No valid locations matched under the specified Region. Check Region or locationIds."); } return new LabelRegionScopeSaveResult @@ -212,7 +212,7 @@ public static class LabelRegionScopeHelper db, resolvedPartnerContext, mergedRegionIds, explicitLocationIds); if (mergedLocations.Count == 0) { - throw new UserFriendlyException("指定 Region 下未匹配到有效门店,请检查 Region 或 locationIds"); + throw new UserFriendlyException("No valid locations matched under the specified Region. Check Region or locationIds."); } var invalid = explicitLocationIds @@ -220,7 +220,7 @@ public static class LabelRegionScopeHelper .ToList(); if (invalid.Count > 0) { - throw new UserFriendlyException("所选门店必须属于所选 Region"); + throw new UserFriendlyException("Selected locations must belong to the selected Region."); } return new LabelRegionScopeSaveResult @@ -691,7 +691,7 @@ public static class LabelRegionScopeHelper var groupIds = await ResolveGroupIdsForLocationAsync(db, locationId); if (!await LabelAppliesToLocationAsync(db, label, locationId, groupIds)) { - throw new UserFriendlyException("??????????????? Region"); + throw new UserFriendlyException("This label does not apply to the location's Region."); } } @@ -929,7 +929,7 @@ public static class LabelRegionScopeHelper .CountAsync(); if (count != ids.Count) { - throw new UserFriendlyException("存在无效的 Region Id,请刷新后重试"); + throw new UserFriendlyException("Invalid Region Id(s). Refresh and try again."); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelReportDateRangeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelReportDateRangeHelper.cs index b727252..02a11ae 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelReportDateRangeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelReportDateRangeHelper.cs @@ -34,7 +34,7 @@ public static class LabelReportDateRangeHelper case "custom": if (!startDate.HasValue || !endDate.HasValue) { - throw new UserFriendlyException("自定义日期须同时传入 startDate 与 endDate"); + throw new UserFriendlyException("For custom dates, pass both startDate and endDate."); } startDay = startDate.Value.Date; @@ -42,7 +42,7 @@ public static class LabelReportDateRangeHelper endExcl = endDay.AddDays(1); if (startDay > endDay) { - throw new UserFriendlyException("开始日期不能晚于结束日期"); + throw new UserFriendlyException("Start date cannot be after end date."); } break; @@ -60,7 +60,7 @@ public static class LabelReportDateRangeHelper var dayCount = Math.Max(1, (int)Math.Ceiling((endExcl - startDay).TotalDays)); if (dayCount > MaxRangeDays) { - throw new UserFriendlyException($"统计区间不能超过 {MaxRangeDays} 天"); + throw new UserFriendlyException($"Statistics range cannot exceed {MaxRangeDays} days."); } return new LabelReportResolvedRange diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplatePrintOrientationHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplatePrintOrientationHelper.cs index 280e4ef..e8b2cdb 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplatePrintOrientationHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplatePrintOrientationHelper.cs @@ -38,6 +38,6 @@ public static class LabelTemplatePrintOrientationHelper return; } - throw new UserFriendlyException("printOrientation 仅支持 vertical 或 horizontal"); + throw new UserFriendlyException("printOrientation supports only vertical or horizontal."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplateScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplateScopeHelper.cs index fdc8757..9817324 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplateScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LabelTemplateScopeHelper.cs @@ -132,17 +132,17 @@ public static class LabelTemplateScopeHelper if (string.Equals(partnerType, ScopeSpecified, StringComparison.OrdinalIgnoreCase) && partnerIds.Count == 0) { - throw new UserFriendlyException("指定适用 Company 时,partnerIds/companyIds 不能为空"); + throw new UserFriendlyException("When specifying applicable Company, partnerIds/companyIds is required."); } if (string.Equals(regionType, ScopeSpecified, StringComparison.OrdinalIgnoreCase) && regionIds.Count == 0) { - throw new UserFriendlyException("指定适用 Region 时,regionIds/groupIds 不能为空"); + throw new UserFriendlyException("When specifying applicable Region, regionIds/groupIds is required."); } if (string.Equals(locationType, ScopeSpecified, StringComparison.OrdinalIgnoreCase) && locationIds.Count == 0) { - throw new UserFriendlyException("指定适用门店时,locationIds/appliedLocationIds 不能为空"); + throw new UserFriendlyException("When specifying applicable locations, locationIds/appliedLocationIds is required."); } if (partnerIds.Count > 0) @@ -175,7 +175,7 @@ public static class LabelTemplateScopeHelper string.Equals(locationType, ScopeSpecified, StringComparison.OrdinalIgnoreCase) ? locationIds : null); if (merged.Count == 0) { - throw new UserFriendlyException("指定适用范围后至少需要匹配到一个有效门店"); + throw new UserFriendlyException("After specifying scope, at least one valid location must match."); } } @@ -209,7 +209,7 @@ public static class LabelTemplateScopeHelper if (needsPartnerRows && !hasPartnerTable) { throw new UserFriendlyException( - "Company 适用范围关联表尚未就绪,请联系管理员执行数据库迁移(fl_label_template_scope.sql)后重试"); + "Company scope association table is not ready. Ask an administrator to run fl_label_template_scope.sql, then retry."); } if (hasPartnerTable) @@ -602,7 +602,7 @@ public static class LabelTemplateScopeHelper { if (type != ScopeAll && type != ScopeSpecified) { - throw new UserFriendlyException($"适用{label}范围不合法(ALL/SPECIFIED)"); + throw new UserFriendlyException($"Invalid applicable {label} scope (ALL/SPECIFIED)."); } } @@ -672,7 +672,7 @@ public static class LabelTemplateScopeHelper .CountAsync(); if (count != partnerIds.Count) { - throw new UserFriendlyException("存在无效的 Company(partnerIds/companyIds),请刷新后重试"); + throw new UserFriendlyException("Invalid Company (partnerIds/companyIds). Refresh and try again."); } } @@ -689,7 +689,7 @@ public static class LabelTemplateScopeHelper .CountAsync(); if (count != ids.Count) { - throw new UserFriendlyException("存在无效的 Region(regionIds/groupIds),请刷新后重试"); + throw new UserFriendlyException("Invalid Region (regionIds/groupIds). Refresh and try again."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationBatchExcelHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationBatchExcelHelper.cs index ece9923..a803849 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationBatchExcelHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationBatchExcelHelper.cs @@ -73,7 +73,7 @@ public static class LocationBatchExcelHelper parseErrors.Add(new LocationBatchImportErrorDto { RowNumber = 0, - Message = "Excel 中无工作表" + Message = "The Excel file has no worksheets." }); return result; } @@ -81,7 +81,7 @@ public static class LocationBatchExcelHelper var headerRow = ws.Row(1); if (!headerRow.CellsUsed().Any()) { - parseErrors.Add(new LocationBatchImportErrorDto { RowNumber = 1, Message = "表头为空" }); + parseErrors.Add(new LocationBatchImportErrorDto { RowNumber = 1, Message = "Header row is empty." }); return result; } @@ -91,7 +91,7 @@ public static class LocationBatchExcelHelper parseErrors.Add(new LocationBatchImportErrorDto { RowNumber = 1, - Message = "未找到「Location ID」列(或同义表头),请使用官方模板" + Message = "Location ID column was not found (or equivalent header). Use the official template." }); return result; } @@ -105,7 +105,7 @@ public static class LocationBatchExcelHelper parseErrors.Add(new LocationBatchImportErrorDto { RowNumber = rowNum, - Message = $"已超过单次导入上限 {maxRows} 行,后续行已忽略" + Message = $"Import exceeds the limit of {maxRows} rows; remaining rows were skipped." }); break; } @@ -117,7 +117,7 @@ public static class LocationBatchExcelHelper } dataRowCount++; - var errPrefix = $"第 {rowNum} 行"; + var errPrefix = $"Row {rowNum}"; try { var input = BuildCreateInputFromRow(colMap, ws, rowNum, out var rowErrs); @@ -257,12 +257,12 @@ public static class LocationBatchExcelHelper if (string.IsNullOrWhiteSpace(locationCode)) { - errors.Add("Location ID 不能为空"); + errors.Add("Location ID is required."); } if (string.IsNullOrWhiteSpace(locationName)) { - errors.Add("Location Name 不能为空"); + errors.Add("Location Name is required."); } decimal? lat = null; @@ -270,7 +270,7 @@ public static class LocationBatchExcelHelper { if (!decimal.TryParse(latStr, NumberStyles.Any, CultureInfo.InvariantCulture, out var latVal)) { - errors.Add("Latitude 格式不正确"); + errors.Add("Latitude format is invalid."); } else { @@ -283,7 +283,7 @@ public static class LocationBatchExcelHelper { if (!decimal.TryParse(lngStr, NumberStyles.Any, CultureInfo.InvariantCulture, out var lngVal)) { - errors.Add("Longitude 格式不正确"); + errors.Add("Longitude format is invalid."); } else { diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationRegionScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationRegionScopeHelper.cs index b0942ee..aad3a47 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationRegionScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationRegionScopeHelper.cs @@ -21,6 +21,11 @@ public static class LocationRegionScopeHelper public IReadOnlyList<(string Partner, string GroupName)> RegionKeys { get; init; } = Array.Empty<(string, string)>(); + + /// + /// Location=ALL 时按 Company 匹配 location.Partner(Id 或名称),不依赖 Region 名是否已对齐。 + /// + public IReadOnlyList PartnerKeys { get; init; } = Array.Empty(); } /// @@ -42,6 +47,12 @@ public static class LocationRegionScopeHelper } var db = dbContext.SqlSugarClient; + var allScopePartnerIds = await LocationScopeBindingHelper.LoadLocationAllPartnerIdsAsync( + db, currentUser.Id.Value); + if (allScopePartnerIds.Count > 0) + { + return await ResolveLocationListScopeFromPartnerIdsAsync(db, allScopePartnerIds); + } if (await TeamMemberRoleHelper.IsCompanyAdminUserAsync(db, currentUser)) { @@ -49,10 +60,11 @@ public static class LocationRegionScopeHelper } var userId = currentUser.Id.Value.ToString(); + var userIdLower = TeamMemberListScopeHelper.UserKey(currentUser.Id.Value); var rows = await db.Queryable() .InnerJoin((ul, loc) => !loc.IsDeleted && ul.LocationId == loc.Id.ToString()) - .Where(ul => !ul.IsDeleted && ul.UserId == userId) + .Where(ul => !ul.IsDeleted && (ul.UserId == userId || ul.UserId == userIdLower)) .Select((ul, loc) => new { loc.Partner, loc.GroupName }) .ToListAsync(); @@ -76,6 +88,13 @@ public static class LocationRegionScopeHelper } var partnerIds = await LocationScopeBindingHelper.ResolvePartnerIdsFromLocationIdsAsync(db, locationIds); + return await ResolveLocationListScopeFromPartnerIdsAsync(db, partnerIds); + } + + private static async Task ResolveLocationListScopeFromPartnerIdsAsync( + ISqlSugarClient db, + IReadOnlyList partnerIds) + { if (partnerIds.Count == 0) { return new LocationListScopeFilter(); @@ -91,6 +110,28 @@ public static class LocationRegionScopeHelper .Select(g => new { g.PartnerId, g.GroupName }) .ToListAsync(); + var partnerKeys = new HashSet(StringComparer.OrdinalIgnoreCase); + foreach (var partner in partners) + { + if (!string.IsNullOrWhiteSpace(partner.Id)) + { + partnerKeys.Add(partner.Id.Trim()); + } + + if (!string.IsNullOrWhiteSpace(partner.PartnerName)) + { + partnerKeys.Add(partner.PartnerName.Trim()); + } + } + + foreach (var pid in partnerIds) + { + if (!string.IsNullOrWhiteSpace(pid)) + { + partnerKeys.Add(pid.Trim()); + } + } + var keys = new HashSet<(string Partner, string GroupName)>(); foreach (var group in groups) { @@ -115,7 +156,11 @@ public static class LocationRegionScopeHelper } } - return new LocationListScopeFilter { RegionKeys = keys.ToList() }; + return new LocationListScopeFilter + { + PartnerKeys = partnerKeys.ToList(), + RegionKeys = keys.ToList() + }; } /// @@ -130,6 +175,12 @@ public static class LocationRegionScopeHelper return query; } + if (scope.PartnerKeys.Count > 0) + { + var partnerKeys = scope.PartnerKeys.ToList(); + return query.Where(x => partnerKeys.Contains(x.Partner!)); + } + if (scope.RegionKeys.Count == 0) { return query.Where(_ => false); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationScopeBindingHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationScopeBindingHelper.cs index ad1fdba..40dc2e4 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationScopeBindingHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/LocationScopeBindingHelper.cs @@ -71,6 +71,23 @@ public static class LocationScopeBindingHelper ICurrentUser? currentUser) { var locationIds = await ResolveBoundLocationIdsForUserAsync(db, userId); + var allScopePartnerIds = await LoadLocationAllPartnerIdsAsync(db, userId); + if (allScopePartnerIds.Count > 0) + { + var fromAll = await ResolveLocationIdsFromPartnerIdsAsync(db, allScopePartnerIds); + if (fromAll.Count > 0) + { + return fromAll + .Select(TeamMemberListScopeHelper.NormalizeScopeKey) + .Where(x => !string.IsNullOrEmpty(x)) + .Distinct(StringComparer.OrdinalIgnoreCase) + .OrderBy(x => x, StringComparer.Ordinal) + .ToList(); + } + + return locationIds; + } + if (locationIds.Count == 0) { return locationIds; @@ -348,7 +365,8 @@ public static class LocationScopeBindingHelper ISqlSugarClient db, IReadOnlyList? partnerIds, IReadOnlyList? regionIds, - IReadOnlyList? locationIds) + IReadOnlyList? locationIds, + bool allowEmptyAll = false) { var normalizedPartners = NormalizeIds(partnerIds); var locationHasAll = ContainsAllScopeSentinel(locationIds); @@ -362,13 +380,14 @@ public static class LocationScopeBindingHelper var expanded = await ExpandScopedAllLocationsForSaveAsync( db, normalizedPartners.Count > 0 ? normalizedPartners : null, - concreteRegions.Count > 0 ? concreteRegions : null); + concreteRegions.Count > 0 ? concreteRegions : null, + allowEmptyAll); if (expanded is not null) { return expanded; } - throw new UserFriendlyException("选择全部门店时需指定 Company(partnerId / partnerIds)或 Region"); + throw new UserFriendlyException("When selecting all locations, specify Company (partnerId / partnerIds) or Region."); } // 2. 具体门店 +(无区域 / 区域为 ALL)→ 只绑这些门店,避免 regionIds=ALL 盖掉单店 @@ -382,7 +401,7 @@ public static class LocationScopeBindingHelper { if (normalizedPartners.Count == 0) { - throw new UserFriendlyException("选择全部 Region 时需指定 Company(partnerId / partnerIds)"); + throw new UserFriendlyException("When selecting all Regions, specify Company (partnerId / partnerIds)."); } return await AllScopeBindingHelper.ResolveAllLocationIdsAsync(db, normalizedPartners, null); @@ -446,7 +465,7 @@ public static class LocationScopeBindingHelper || (ContainsAllScopeSentinel(regionIds) && FilterConcreteScopeIds(locationIds).Count == 0)) { - throw new UserFriendlyException("门店范围含 ALL 哨兵时应归档为 ALL,不应进入 SPECIFIED 落库校验"); + throw new UserFriendlyException("When location scope includes the ALL sentinel, persist as ALL; do not run SPECIFIED persistence validation."); } var concreteRegions = FilterConcreteScopeIds(regionIds); @@ -466,7 +485,7 @@ public static class LocationScopeBindingHelper concreteLocations); if (merged.Count == 0) { - throw new UserFriendlyException("指定适用区域或门店时,至少需要匹配到一个有效门店"); + throw new UserFriendlyException("When specifying applicable regions or locations, at least one valid location must match."); } await ValidateLocationIdsExistAsync(db, merged); @@ -479,7 +498,8 @@ public static class LocationScopeBindingHelper public static async Task?> ExpandScopedAllLocationsForSaveAsync( ISqlSugarClient db, IReadOnlyList? partnerIds, - IReadOnlyList? regionIds) + IReadOnlyList? regionIds, + bool allowEmpty = false) { var concreteRegions = FilterConcreteScopeIds(regionIds); if (concreteRegions.Count > 0) @@ -496,7 +516,12 @@ public static class LocationScopeBindingHelper if (fromRegions.Count == 0) { - throw new UserFriendlyException("指定 Region 下未匹配到有效门店"); + if (allowEmpty) + { + return fromRegions; + } + + throw new UserFriendlyException("No valid locations matched under the specified Region."); } await ValidateLocationIdsExistAsync(db, fromRegions); @@ -509,7 +534,12 @@ public static class LocationScopeBindingHelper var fromPartners = await ResolveLocationIdsFromPartnerIdsAsync(db, concretePartners); if (fromPartners.Count == 0) { - throw new UserFriendlyException("指定 Company 下未匹配到有效门店"); + if (allowEmpty) + { + return fromPartners; + } + + throw new UserFriendlyException("No valid locations matched under the specified Company."); } await ValidateLocationIdsExistAsync(db, fromPartners); @@ -605,7 +635,7 @@ public static class LocationScopeBindingHelper } var locIds = await db.Queryable() - .Where(x => !x.IsDeleted && x.Partner == pName) + .Where(x => !x.IsDeleted && (x.Partner == pName || x.Partner == pid)) .Select(x => SqlFunc.ToString(x.Id)) .ToListAsync(); foreach (var lid in locIds.Where(x => !string.IsNullOrWhiteSpace(x))) @@ -772,7 +802,7 @@ public static class LocationScopeBindingHelper { if (!Guid.TryParse(id, out _)) { - throw new UserFriendlyException("门店Id格式不正确"); + throw new UserFriendlyException("Invalid locationId format."); } } @@ -782,7 +812,7 @@ public static class LocationScopeBindingHelper .CountAsync(); if (existCount != ids.Count) { - throw new UserFriendlyException("门店不存在"); + throw new UserFriendlyException("Location not found."); } } @@ -879,6 +909,133 @@ public static class LocationScopeBindingHelper } /// + /// 新建门店后:给 Location=ALL 且 Company 匹配的成员补 userlocation。 + /// + public static async Task BindLocationAllScopeUsersToNewLocationAsync( + ISqlSugarClient db, + IGuidGenerator guidGenerator, + string locationId, + string? locationPartnerField, + string? creatorId) + { + if (string.IsNullOrWhiteSpace(locationId) || !Guid.TryParse(locationId, out _)) + { + return; + } + + var partnerIds = await ResolvePartnerIdsFromLocationIdsAsync(db, new List { locationId }); + if (partnerIds.Count == 0) + { + partnerIds = await ResolvePartnerIdsFromPartnerNamesAsync(db, locationPartnerField); + } + + if (partnerIds.Count == 0) + { + return; + } + + var partnerSet = new HashSet( + partnerIds.Select(id => Guid.TryParse(id, out var g) ? g.ToString("D") : id.Trim()), + StringComparer.OrdinalIgnoreCase); + var scopes = await db.Queryable().ToListAsync(); + scopes = scopes + .Where(x => AllScopeBindingHelper.IsDeclaredAll(x.AppliedLocationType)) + .ToList(); + if (scopes.Count == 0) + { + return; + } + + var userGuids = scopes + .Select(x => Guid.TryParse(x.UserId, out var id) ? id : Guid.Empty) + .Where(x => x != Guid.Empty) + .Distinct() + .ToList(); + var activeUsers = userGuids.Count == 0 + ? new List() + : await db.Queryable() + .Where(u => !u.IsDeleted && userGuids.Contains(u.Id)) + .Select(u => u.Id) + .ToListAsync(); + var activeSet = activeUsers.ToHashSet(); + + foreach (var scope in scopes) + { + if (!Guid.TryParse(scope.UserId, out var userId) || !activeSet.Contains(userId)) + { + continue; + } + + var scopePartners = SplitPartnerIds(scope.PartnerIds); + if (scopePartners.Count == 0 + || !scopePartners.Any(id => + partnerSet.Contains(id) + || (Guid.TryParse(id, out var g) && partnerSet.Contains(g.ToString("D"))))) + { + continue; + } + + await AppendUserLocationBindingsAsync( + db, guidGenerator, userId, new List { locationId }, creatorId); + } + } + + public static async Task EnsurePartnerIdsExistAsync(ISqlSugarClient db, IReadOnlyList partnerIds) + { + var ids = NormalizeIds(partnerIds); + if (ids.Count == 0) + { + throw new UserFriendlyException("When selecting all locations, specify Company (partnerId / partnerIds)."); + } + + var existing = await db.Queryable() + .Where(x => !x.IsDeleted && ids.Contains(x.Id)) + .Select(x => x.Id) + .ToListAsync(); + if (existing.Count != ids.Count) + { + throw new UserFriendlyException("The specified Company does not exist or was removed."); + } + } + + public static List SplitPartnerIds(string? raw) + { + if (string.IsNullOrWhiteSpace(raw)) + { + return new List(); + } + + return raw.Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + .Where(x => Guid.TryParse(x, out _)) + .Select(x => Guid.Parse(x).ToString("D")) + .Distinct(StringComparer.OrdinalIgnoreCase) + .ToList(); + } + + public static string? JoinPartnerIds(IReadOnlyList? partnerIds) + { + var ids = NormalizeIds(partnerIds) + .Select(x => Guid.TryParse(x, out var g) ? g.ToString("D") : x) + .Distinct(StringComparer.OrdinalIgnoreCase) + .ToList(); + return ids.Count == 0 ? null : string.Join(',', ids); + } + + public static async Task> LoadLocationAllPartnerIdsAsync(ISqlSugarClient db, Guid userId) + { + var userIdD = userId.ToString("D"); + var userIdLower = TeamMemberListScopeHelper.UserKey(userId); + var row = await db.Queryable() + .FirstAsync(x => x.UserId == userIdD || x.UserId == userIdLower); + if (row is null || !AllScopeBindingHelper.IsDeclaredAll(row.AppliedLocationType)) + { + return new List(); + } + + return SplitPartnerIds(row.PartnerIds); + } + + /// /// 追加 userlocation 绑定(幂等;仅插入当前用户尚未绑定的门店)。 /// public static async Task AppendUserLocationBindingsAsync( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/PartnerScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/PartnerScopeHelper.cs index 3ec97d9..d5321e2 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/PartnerScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/PartnerScopeHelper.cs @@ -39,6 +39,13 @@ public static class PartnerScopeHelper } var db = dbContext.SqlSugarClient; + var allScopePartnerIds = await LocationScopeBindingHelper.LoadLocationAllPartnerIdsAsync( + db, currentUser.Id.Value); + if (allScopePartnerIds.Count > 0) + { + return new PartnerScopeFilter { AllowedPartnerIds = allScopePartnerIds }; + } + var locationIds = await LocationScopeBindingHelper.ResolveBoundLocationIdsForUserAsync( db, currentUser.Id.Value); if (locationIds.Count == 0) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/ProductBatchExcelHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/ProductBatchExcelHelper.cs index ca552af..e6b11de 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/ProductBatchExcelHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/ProductBatchExcelHelper.cs @@ -62,14 +62,14 @@ public static class ProductBatchExcelHelper ?? wb.Worksheets.FirstOrDefault(); if (ws is null) { - parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = 0, Message = "Excel 中无工作表" }); + parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = 0, Message = "The Excel file has no worksheets." }); return result; } var headerRow = ws.Row(1); if (!headerRow.CellsUsed().Any()) { - parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = 1, Message = "表头为空" }); + parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = 1, Message = "Header row is empty." }); return result; } @@ -79,7 +79,7 @@ public static class ProductBatchExcelHelper parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = 1, - Message = "未找到「Product」与「Product Category」列(或同义表头),请使用官方模板" + Message = "Product and Product Category columns were not found (or equivalent headers). Use the official template." }); return result; } @@ -93,7 +93,7 @@ public static class ProductBatchExcelHelper parseErrors.Add(new ProductBatchImportErrorDto { RowNumber = rowNum, - Message = $"已超过单次导入上限 {maxRows} 行,后续行已忽略" + Message = $"Import exceeds the limit of {maxRows} rows; remaining rows were skipped." }); break; } @@ -114,16 +114,16 @@ public static class ProductBatchExcelHelper } dataRowCount++; - var errPrefix = $"第 {rowNum} 行"; + var errPrefix = $"Row {rowNum}"; var rowErrs = new List(); if (string.IsNullOrWhiteSpace(productName)) { - rowErrs.Add("Product 不能为空"); + rowErrs.Add("Product is required."); } if (string.IsNullOrWhiteSpace(categoryName)) { - rowErrs.Add("Product Category 不能为空"); + rowErrs.Add("Product Category is required."); } if (rowErrs.Count > 0) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberBatchExcelHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberBatchExcelHelper.cs index 5c46776..a6c5eb6 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberBatchExcelHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberBatchExcelHelper.cs @@ -80,7 +80,7 @@ public static class TeamMemberBatchExcelHelper parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 0, - Message = "未配置默认导入密码 FoodLabeling:BatchImport:TeamMemberImportDefaultPassword" + Message = "Default import password is not configured (FoodLabeling:BatchImport:TeamMemberImportDefaultPassword)." }); return result; } @@ -89,14 +89,14 @@ public static class TeamMemberBatchExcelHelper var ws = wb.Worksheets.FirstOrDefault(); if (ws is null) { - parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 0, Message = "Excel 中无工作表" }); + parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 0, Message = "The Excel file has no worksheets." }); return result; } var headerRow = ws.Row(1); if (!headerRow.CellsUsed().Any()) { - parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 1, Message = "表头为空" }); + parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 1, Message = "Header row is empty." }); return result; } @@ -106,7 +106,7 @@ public static class TeamMemberBatchExcelHelper parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = 1, - Message = "未找到「Name」与「Email」列(或同义表头),请使用官方模板" + Message = "Name and Email columns were not found (or equivalent headers). Use the official template." }); return result; } @@ -120,7 +120,7 @@ public static class TeamMemberBatchExcelHelper parseErrors.Add(new TeamMemberBatchImportErrorDto { RowNumber = rowNum, - Message = $"已超过单次导入上限 {maxRows} 行,后续行已忽略" + Message = $"Import exceeds the limit of {maxRows} rows; remaining rows were skipped." }); break; } @@ -133,7 +133,7 @@ public static class TeamMemberBatchExcelHelper } dataRowCount++; - var errPrefix = $"第 {rowNum} 行"; + var errPrefix = $"Row {rowNum}"; try { var input = BuildCreateInputFromRow( @@ -280,12 +280,12 @@ public static class TeamMemberBatchExcelHelper if (string.IsNullOrWhiteSpace(fullName)) { - errors.Add("Name 不能为空"); + errors.Add("Name is required."); } if (string.IsNullOrWhiteSpace(email)) { - errors.Add("Email 不能为空"); + errors.Add("Email is required."); } var login = string.IsNullOrWhiteSpace(userName) ? email.Trim() : userName.Trim(); @@ -293,13 +293,13 @@ public static class TeamMemberBatchExcelHelper if (string.IsNullOrWhiteSpace(login)) { - errors.Add("登录账号不能为空(可填 UserName 列,否则使用 Email)"); + errors.Add("Login account is required (fill UserName, or Email will be used)."); } var pwd = string.IsNullOrWhiteSpace(password) ? defaultPassword : password.Trim(); if (string.IsNullOrWhiteSpace(pwd)) { - errors.Add("Password 不能为空且未配置默认密码"); + errors.Add("Password is required and no default password is configured."); } long? phone = null; @@ -308,7 +308,7 @@ public static class TeamMemberBatchExcelHelper if (!long.TryParse(RegexDigitsOnly(phoneStr), NumberStyles.Integer, CultureInfo.InvariantCulture, out var p)) { - errors.Add("Phone 格式不正确(需为数字)"); + errors.Add("Phone format is invalid (digits only)."); } else { @@ -323,11 +323,11 @@ public static class TeamMemberBatchExcelHelper } else if (string.IsNullOrWhiteSpace(roleName)) { - errors.Add("Role Name 不能为空(或填写有效的 Role Id Guid)"); + errors.Add("Role Name is required (or provide a valid Role Id Guid)."); } else if (!roleNameToId.TryGetValue(NormalizeRoleKey(roleName), out var rid)) { - errors.Add($"未找到角色「{roleName.Trim()}」,请与系统角色名称一致"); + errors.Add($"Role \"{roleName.Trim()}\" was not found. Use a role name that matches the system."); } else { @@ -340,7 +340,7 @@ public static class TeamMemberBatchExcelHelper if (regionTokens.Count == 0 && locationTokens.Count == 0 && !isCompanyAdmin) { - errors.Add("Region 与 Assigned Location Ids 至少填一项(均可留空时仅适用于 Company Admin 且已在 Web 端配置 Company)"); + errors.Add("Fill at least one of Region or Assigned Location Ids (both can be empty only for Company Admin with Company configured on Web)."); } if (errors.Count > 0) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberRoleHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberRoleHelper.cs index 50aee70..fd5b55c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberRoleHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TeamMemberRoleHelper.cs @@ -25,7 +25,8 @@ public static class TeamMemberRoleHelper } var name = roleName.Trim(); - if (string.Equals(name, "Company Admin", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(name, "Company Admin", StringComparison.OrdinalIgnoreCase) + || string.Equals(name, "公司管理员", StringComparison.Ordinal)) { return true; } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TenantContextGuard.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TenantContextGuard.cs index 9c748e4..345bd51 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TenantContextGuard.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TenantContextGuard.cs @@ -13,7 +13,7 @@ public static class TenantContextGuard /// 平台主库登录(JWT/__tenant 均无业务租户)时访问 fl_* 等业务表的友好提示。 /// public const string PlatformCannotAccessBusinessDataMessage = - "当前为平台主库登录,无法访问公司业务数据(标签/产品/成员等)。请选择具体公司登录,或使用平台「公司管理」相关接口。"; + "You are signed in to the platform host database and cannot access company business data (labels, products, team members, etc.). Sign in to a specific company or use platform company-management APIs."; public static void EnsureTenantResolved(ICurrentTenant currentTenant, string? operation = null) { @@ -23,10 +23,10 @@ public static class TenantContextGuard } var hint = string.IsNullOrWhiteSpace(operation) - ? "未识别租户上下文" - : $"{operation}:未识别租户上下文"; + ? "Tenant context could not be resolved" + : $"{operation}: tenant context could not be resolved"; throw new UserFriendlyException( - $"{hint}。请使用泰额登录接口(th-web-auth / th-app-auth)选择具体公司登录,或请求头 __tenant 携带租户 Id。"); + $"{hint}. Sign in to a specific company via th-web-auth / th-app-auth, or send the tenant Id in the __tenant header."); } /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TrainingFileScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TrainingFileScopeHelper.cs index 543fa71..7d90db8 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TrainingFileScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/TrainingFileScopeHelper.cs @@ -377,7 +377,7 @@ public static class TrainingFileScopeHelper var missing = groupIds.Where(id => !existingSet.Contains(id)).ToList(); if (missing.Count > 0) { - throw new UserFriendlyException("存在无效的 Region Id"); + throw new UserFriendlyException("Invalid Region Id(s)."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppAuthScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppAuthScopeHelper.cs index 21771b0..35ce5c5 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppAuthScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppAuthScopeHelper.cs @@ -23,7 +23,7 @@ public static class UsAppAuthScopeHelper { if (currentUser.Id is null) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var kind = currentUser.FindClaim(UsAppJwtClaims.ClientKind)?.Value; @@ -32,12 +32,12 @@ public static class UsAppAuthScopeHelper || string.Equals(kind, UsAppJwtClaims.ClientKindThApp, StringComparison.Ordinal); if (!isAppToken) { - throw new UserFriendlyException("请使用 App 登录令牌调用该接口"); + throw new UserFriendlyException("Use an App sign-in token to call this API."); } if (!await CanUseAdminScopeApisAsync(db, currentUser)) { - throw new UserFriendlyException("仅管理员或 Company Admin 可使用公司/区域/门店筛选接口"); + throw new UserFriendlyException("Only administrators or Company Admin may use company/region/location filter APIs."); } } @@ -86,7 +86,7 @@ public static class UsAppAuthScopeHelper var pid = partnerId.Trim(); if (string.IsNullOrEmpty(pid)) { - throw new UserFriendlyException("请选择公司"); + throw new UserFriendlyException("Select a company."); } return await db.Queryable() @@ -155,7 +155,7 @@ public static class UsAppAuthScopeHelper var locationId = input.LocationId?.Trim() ?? string.Empty; if (string.IsNullOrEmpty(partnerId) || string.IsNullOrEmpty(groupId) || string.IsNullOrEmpty(locationId)) { - throw new UserFriendlyException("请选择公司、区域和门店"); + throw new UserFriendlyException("Select company, region, and location."); } if (!ReportsRoleHelper.IsAdminRole(currentUser)) @@ -170,19 +170,19 @@ public static class UsAppAuthScopeHelper null); if (scopedIds is null || !scopedIds.Contains(locationId)) { - throw new UserFriendlyException("门店与所选公司/区域不匹配"); + throw new UserFriendlyException("Location does not match the selected company/region."); } if (!Guid.TryParse(locationId, out var locationGuid)) { - throw new UserFriendlyException("无效的门店标识"); + throw new UserFriendlyException("Invalid location identifier."); } var loc = await db.Queryable() .FirstAsync(x => !x.IsDeleted && x.Id == locationGuid); if (loc is null) { - throw new UserFriendlyException("门店不存在或已删除"); + throw new UserFriendlyException("Location not found or removed."); } var partner = await db.Queryable() diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppPrintLogScopeHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppPrintLogScopeHelper.cs index bab9569..3754dfb 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppPrintLogScopeHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/UsAppPrintLogScopeHelper.cs @@ -71,20 +71,20 @@ public static class UsAppPrintLogScopeHelper if (currentUser.Id is null) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var lid = TeamMemberListScopeHelper.NormalizeScopeKey(locationId); if (string.IsNullOrEmpty(lid)) { - throw new UserFriendlyException("门店参数无效"); + throw new UserFriendlyException("Invalid location parameter."); } var accessible = await LocationScopeBindingHelper.ResolveAppAccessibleLocationIdsForUserAsync( db, currentUser.Id.Value, currentUser); if (!accessible.Contains(lid, StringComparer.OrdinalIgnoreCase)) { - throw new UserFriendlyException("当前账号未绑定该门店,无法查看"); + throw new UserFriendlyException("This account is not bound to that location; access denied."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/MultiTenancy/EmbeddedTenantSqlScripts.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/MultiTenancy/EmbeddedTenantSqlScripts.cs index bc96c11..834573f 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/MultiTenancy/EmbeddedTenantSqlScripts.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/MultiTenancy/EmbeddedTenantSqlScripts.cs @@ -19,7 +19,7 @@ public static class EmbeddedTenantSqlScripts { var available = string.Join(", ", assembly.GetManifestResourceNames()); throw new InvalidOperationException( - $"未找到嵌入 SQL 资源「{resourceName}」。可用资源:{available}"); + $"Embedded SQL resource not found: \"{resourceName}\". Available resources: {available}"); } using (stream) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs new file mode 100644 index 0000000..bd62d4c --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs @@ -0,0 +1,12 @@ +namespace FoodLabeling.Application.Options; + +/// +/// 产品/类别图片落盘目录。Linux 统一在 /www/wwwroot/picture/{版本},与 API 发布目录分离,避免部署清空图片。 +/// +public class FoodLabelingPictureOptions +{ + public const string SectionName = "FoodLabeling:Picture"; + + /// 物理根目录,例如 /www/wwwroot/picture/tetest。 + public string RootPath { get; set; } = string.Empty; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AlertTemplateAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AlertTemplateAppService.cs index 693f2d9..b1e3b4c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AlertTemplateAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AlertTemplateAppService.cs @@ -218,14 +218,14 @@ public class AlertTemplateAppService : ApplicationService, IAlertTemplateAppServ var tid = id?.Trim(); if (string.IsNullOrWhiteSpace(tid)) { - throw new UserFriendlyException("模板Id不能为空"); + throw new UserFriendlyException("Template Id is required."); } var entity = await _dbContext.SqlSugarClient.Queryable() .FirstAsync(x => x.Id == tid && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("告警模板不存在"); + throw new UserFriendlyException("Alert template not found."); } return entity; @@ -235,19 +235,19 @@ public class AlertTemplateAppService : ApplicationService, IAlertTemplateAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } var name = input.TemplateName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("模板名称不能为空"); + throw new UserFriendlyException("Template name is required."); } var format = input.DateTimeFormat?.Trim(); if (string.IsNullOrWhiteSpace(format)) { - throw new UserFriendlyException("日期时间格式不能为空"); + throw new UserFriendlyException("Date/time format is required."); } return (name, format); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AppUpdateAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AppUpdateAppService.cs index 1afffdd..23d4351 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AppUpdateAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AppUpdateAppService.cs @@ -108,8 +108,8 @@ public class AppUpdateAppService : ApplicationService, IAppUpdateAppService if (apk is not { Exists: true, Length: > 0 }) { throw new UserFriendlyException( - "APK 文件不存在,请放到: " + _options.ApkPath - + "(当前工作目录=" + Environment.CurrentDirectory + ")"); + "APK file not found. Place it at: " + _options.ApkPath + + " (current working directory=" + Environment.CurrentDirectory + ")"); } var (_, remoteName) = AppUpdateVersionResolver.Resolve(apk, _options); @@ -124,7 +124,7 @@ public class AppUpdateAppService : ApplicationService, IAppUpdateAppService { if (!_options.Enabled) { - throw new UserFriendlyException("App 更新未启用"); + throw new UserFriendlyException("App update is not enabled."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AuthSessionAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AuthSessionAppService.cs index a2914bb..87b7915 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AuthSessionAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/AuthSessionAppService.cs @@ -53,7 +53,7 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } // 避免走 UserManager.GetInfoAsync -> UserRepository.GetUserAllInfoAsync 的导航加载 @@ -62,7 +62,7 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService var user = await _userRepository.GetByIdAsync(userId); if (user is null || user.IsDeleted) { - throw new UserFriendlyException("用户不存在"); + throw new UserFriendlyException("User not found."); } var userRoleIds = await _dbContext.SqlSugarClient.Queryable() diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/FlTeamMemberScopeDbEntity.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/FlTeamMemberScopeDbEntity.cs index bf0ac0a..5393317 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/FlTeamMemberScopeDbEntity.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/FlTeamMemberScopeDbEntity.cs @@ -21,6 +21,10 @@ public class FlTeamMemberScopeDbEntity [SugarColumn(Length = 20)] public string AppliedLocationType { get; set; } = "SPECIFIED"; + /// Location=ALL 时绑定的 Company(fl_partner.Id,逗号分隔) + [SugarColumn(Length = 2000, IsNullable = true)] + public string? PartnerIds { get; set; } + public DateTime? CreationTime { get; set; } public DateTime? LastModificationTime { get; set; } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAlertTimerAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAlertTimerAppService.cs index ddf0faf..9c5dfbc 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAlertTimerAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAlertTimerAppService.cs @@ -53,7 +53,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp /// 分页查询入参 /// 分页计时器列表(含 remainingTime 倒计时秒数) /// 成功返回分页列表 - /// 参数错误或未登录/无门店权限 + /// 参数错误或You are not signed in./无门店权限 /// 服务器错误 [Authorize] [HttpPost("label-alert-timer/list")] @@ -62,12 +62,12 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationId = input.LocationId?.Trim(); @@ -120,7 +120,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp /// 分页查询入参 /// 分页告警列表(含倒计时) /// 成功返回分页列表 - /// 未登录、无门店或无权限 + /// Not signed in, no locations, or no permission /// 服务器错误 [Authorize] [HttpPost("label-alert-timer/app-list")] @@ -129,12 +129,12 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationId = input.LocationId?.Trim(); @@ -148,7 +148,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("请先选择门店或传入 locationId"); + throw new UserFriendlyException("Select a location or pass locationId."); } await UsAppPrintLogScopeHelper.EnsureUserCanAccessLocationAsync( @@ -174,12 +174,12 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp var timerId = id?.Trim(); if (string.IsNullOrWhiteSpace(timerId)) { - throw new UserFriendlyException("计时器Id不能为空"); + throw new UserFriendlyException("Timer Id is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var db = _dbContext.SqlSugarClient; @@ -190,7 +190,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp .FirstOrDefault(); if (row is null) { - throw new UserFriendlyException("计时器不存在或已删除"); + throw new UserFriendlyException("Timer not found or removed."); } await UsAppPrintLogScopeHelper.EnsureUserCanAccessLocationAsync( @@ -236,7 +236,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } var timerId = input.TimerId?.Trim(); @@ -246,7 +246,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp string.IsNullOrWhiteSpace(batchId) && string.IsNullOrWhiteSpace(printTaskId)) { - throw new UserFriendlyException("请至少提供 timerId、batchId 或 printTaskId 之一"); + throw new UserFriendlyException("Provide at least one of timerId, batchId, or printTaskId."); } var db = _dbContext.SqlSugarClient; @@ -297,7 +297,7 @@ public class LabelAlertTimerAppService : ApplicationService, ILabelAlertTimerApp if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } await UsAppPrintLogScopeHelper.EnsureUserCanAccessLocationAsync( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAppService.cs index d6c05f1..6679dd2 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelAppService.cs @@ -308,7 +308,7 @@ public class LabelAppService : ApplicationService, ILabelAppService var labelCode = id?.Trim(); if (string.IsNullOrWhiteSpace(labelCode)) { - throw new UserFriendlyException("标签Code不能为空"); + throw new UserFriendlyException("labelCode is required."); } var db = _dbContext.SqlSugarClient; @@ -316,7 +316,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.LabelCode == labelCode); if (label is null) { - throw new UserFriendlyException("标签不存在"); + throw new UserFriendlyException("Label not found."); } var template = await LabelTemplateQueryHelper.QueryProjected(db) @@ -452,21 +452,21 @@ public class LabelAppService : ApplicationService, ILabelAppService var labelName = input.LabelName?.Trim(); if (string.IsNullOrWhiteSpace(labelName)) { - throw new UserFriendlyException("标签名称不能为空"); + throw new UserFriendlyException("Label name is required."); } if (input.ProductIds is null || input.ProductIds.Count == 0) { - throw new UserFriendlyException("标签至少需要绑定一个产品"); + throw new UserFriendlyException("A label must be bound to at least one product."); } if (string.IsNullOrWhiteSpace(input.TemplateCode)) { - throw new UserFriendlyException("模板编码不能为空"); + throw new UserFriendlyException("Template code is required."); } if (string.IsNullOrWhiteSpace(input.LabelCategoryId)) { - throw new UserFriendlyException("标签分类Id不能为空"); + throw new UserFriendlyException("Label category Id is required."); } await EnsureLabelTypeExistsIfProvidedAsync(input.LabelTypeId); @@ -486,7 +486,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.TemplateCode == input.TemplateCode.Trim()); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } // 唯一性校验(LabelCode) @@ -494,7 +494,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .AnyAsync(x => !x.IsDeleted && x.LabelCode == labelCode); if (exists) { - throw new UserFriendlyException("标签编码已存在"); + throw new UserFriendlyException("Label code already exists."); } // 插入 fl_label @@ -594,26 +594,26 @@ public class LabelAppService : ApplicationService, ILabelAppService /// 批量导入入参 /// 成功/失败统计与行级错误 /// 导入完成(可能部分成功) - /// 入参非法或模板不存在 + /// 入参非法或Template not found. /// 服务器错误 [UnitOfWork] public async Task BatchCreateAsync(LabelBatchCreateInputVo input) { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("批量导入行不能为空"); + throw new UserFriendlyException("Import rows cannot be empty."); } const int maxRows = 500; if (input.Items.Count > maxRows) { - throw new UserFriendlyException($"单次最多导入 {maxRows} 行"); + throw new UserFriendlyException($"Maximum {maxRows} rows per import."); } var templateCode = input.TemplateCode?.Trim(); if (string.IsNullOrWhiteSpace(templateCode)) { - throw new UserFriendlyException("模板编码不能为空"); + throw new UserFriendlyException("Template code is required."); } var db = _dbContext.SqlSugarClient; @@ -621,7 +621,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.TemplateCode == templateCode); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } var templateElements = await LabelBatchTemplateDefaultsHelper.LoadTemplateElementsAsync(db, template.Id); @@ -722,7 +722,7 @@ public class LabelAppService : ApplicationService, ILabelAppService result.Errors.Add(new LabelBatchCreateErrorDto { RowNumber = 0, - Message = $"标签已创建,但模板默认值保存失败:{ex.Message}" + Message = $"The label was created, but saving template defaults failed: {ex.Message}" }); } } @@ -762,28 +762,28 @@ public class LabelAppService : ApplicationService, ILabelAppService var labelCode = id?.Trim(); if (string.IsNullOrWhiteSpace(labelCode)) { - throw new UserFriendlyException("标签Code不能为空"); + throw new UserFriendlyException("labelCode is required."); } var label = await LabelQueryHelper.QueryProjected(_dbContext.SqlSugarClient) .FirstAsync(x => !x.IsDeleted && x.LabelCode == labelCode); if (label is null) { - throw new UserFriendlyException("标签不存在"); + throw new UserFriendlyException("Label not found."); } if (input.ProductIds is null || input.ProductIds.Count == 0) { - throw new UserFriendlyException("标签至少需要绑定一个产品"); + throw new UserFriendlyException("A label must be bound to at least one product."); } if (string.IsNullOrWhiteSpace(input.TemplateCode)) { - throw new UserFriendlyException("模板编码不能为空"); + throw new UserFriendlyException("Template code is required."); } if (string.IsNullOrWhiteSpace(input.LabelCategoryId)) { - throw new UserFriendlyException("标签分类Id不能为空"); + throw new UserFriendlyException("Label category Id is required."); } await EnsureLabelTypeExistsIfProvidedAsync(input.LabelTypeId); @@ -803,7 +803,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.TemplateCode == input.TemplateCode.Trim()); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } var oldCategoryId = label.LabelCategoryId; @@ -924,7 +924,7 @@ public class LabelAppService : ApplicationService, ILabelAppService var labelCode = input?.LabelCode?.Trim(); if (string.IsNullOrWhiteSpace(labelCode)) { - throw new UserFriendlyException("labelCode不能为空"); + throw new UserFriendlyException("labelCode is required."); } var baseTime = input?.BaseTime ?? DateTime.Now; @@ -933,7 +933,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.LabelCode == labelCode); if (label is null) { - throw new UserFriendlyException("标签不存在"); + throw new UserFriendlyException("Label not found."); } // 选择预览产品 @@ -948,14 +948,14 @@ public class LabelAppService : ApplicationService, ILabelAppService if (string.IsNullOrWhiteSpace(productId)) { - throw new UserFriendlyException("该标签未绑定产品,无法预览"); + throw new UserFriendlyException("This label has no bound products; preview is unavailable."); } var product = await _dbContext.SqlSugarClient.Queryable() .FirstAsync(x => !x.IsDeleted && x.Id == productId); if (product is null) { - throw new UserFriendlyException("预览产品不存在"); + throw new UserFriendlyException("Preview product not found."); } // 取模板头 & elements @@ -963,7 +963,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .FirstAsync(x => !x.IsDeleted && x.Id == label.TemplateId); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } var elements = await _dbContext.SqlSugarClient.Queryable() @@ -1039,7 +1039,7 @@ public class LabelAppService : ApplicationService, ILabelAppService { if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("预览/打印需要 locationId 以填充 Company 信息"); + throw new UserFriendlyException("Preview/print requires locationId to fill Company information."); } partnerForCompany = await PartnerCompanyDisplayHelper.ResolvePartnerByLocationIdAsync( @@ -1200,14 +1200,14 @@ public class LabelAppService : ApplicationService, ILabelAppService var pid = partnerId.Trim(); if (LocationScopeBindingHelper.IsAllScopeSentinel(pid)) { - throw new UserFriendlyException("标签适用 Company 不支持 ALL,请传单个具体 Company Id"); + throw new UserFriendlyException("Label applicable Company does not support ALL; pass a single Company Id."); } if (merged.Count > 0 && (merged.Count > 1 || !string.Equals(merged[0], pid, StringComparison.OrdinalIgnoreCase))) { - throw new UserFriendlyException("partnerId 与 companyIds/partnerIds 不一致"); + throw new UserFriendlyException("partnerId does not match companyIds/partnerIds."); } merged = new List { pid }; @@ -1215,13 +1215,13 @@ public class LabelAppService : ApplicationService, ILabelAppService if (AllScopeBindingHelper.HasAllScopeSentinelSelection(merged)) { - throw new UserFriendlyException("标签适用 Company 不支持 ALL,请传单个具体 Company Id"); + throw new UserFriendlyException("Label applicable Company does not support ALL; pass a single Company Id."); } var concrete = LocationScopeBindingHelper.FilterConcreteScopeIds(merged); if (concrete.Count > 1) { - throw new UserFriendlyException("标签适用 Company 仅支持单选(companyIds 最多传 1 个)"); + throw new UserFriendlyException("Label applicable Company allows only one selection (at most one companyIds entry)."); } if (concrete.Count == 0) @@ -1233,7 +1233,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .AnyAsync(x => !x.IsDeleted && x.Id == concrete[0]); if (!exists) { - throw new UserFriendlyException("存在无效的 Company(partnerId/companyIds),请刷新后重试"); + throw new UserFriendlyException("Invalid Company (partnerId/companyIds). Refresh and try again."); } return concrete[0]; @@ -1255,7 +1255,7 @@ public class LabelAppService : ApplicationService, ILabelAppService } } - throw new UserFriendlyException("无法生成唯一标签编码,请稍后重试或手动填写编码"); + throw new UserFriendlyException("Could not generate a unique label code. Retry later or enter a code manually."); } private async Task EnsureLabelTypeExistsIfProvidedAsync(string? labelTypeId) @@ -1270,7 +1270,7 @@ public class LabelAppService : ApplicationService, ILabelAppService .AnyAsync(x => !x.IsDeleted && x.Id == id); if (!exists) { - throw new UserFriendlyException("标签类型不存在"); + throw new UserFriendlyException("Label type not found."); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelCategoryAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelCategoryAppService.cs index 8aefcf1..83d0287 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelCategoryAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelCategoryAppService.cs @@ -118,7 +118,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("标签分类不存在"); + throw new UserFriendlyException("Label category not found."); } var dto = MapToGetOutput(entity); @@ -159,7 +159,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("分类名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var code = input.CategoryCode?.Trim(); @@ -215,7 +215,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("标签分类不存在"); + throw new UserFriendlyException("Label category not found."); } var codeInput = input.CategoryCode?.Trim(); @@ -228,7 +228,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("分类名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var displayText = input.DisplayText?.Trim(); @@ -280,7 +280,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ .AnyAsync(x => !x.IsDeleted && x.LabelCategoryId == id); if (used) { - throw new UserFriendlyException("该标签分类已被标签引用,无法删除"); + throw new UserFriendlyException("This label category is referenced by labels and cannot be deleted."); } await LabelEntityPartnerScopeHelper.DeletePartnerScopeRowsAsync( @@ -435,7 +435,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ } } - throw new UserFriendlyException("无法生成唯一分类编码,请稍后重试或手动填写编码"); + throw new UserFriendlyException("Could not generate a unique category code. Retry later or enter a code manually."); } private async Task EnsureLabelCategoryCodeNotDuplicatedAsync(string code, string? excludeId = null) @@ -449,7 +449,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ if (await query.AnyAsync()) { - throw new UserFriendlyException("分类编码已存在"); + throw new UserFriendlyException("Category code already exists."); } } @@ -464,7 +464,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ if (await query.AnyAsync()) { - throw new UserFriendlyException("分类名称已存在"); + throw new UserFriendlyException("Category name already exists."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelMultipleOptionAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelMultipleOptionAppService.cs index 83ed804..2aea9bf 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelMultipleOptionAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelMultipleOptionAppService.cs @@ -101,7 +101,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("多选项不存在"); + throw new UserFriendlyException("Multiple option not found."); } var dto = MapToGetOutput(entity); @@ -146,7 +146,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO var name = input.OptionName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("多选项名称不能为空"); + throw new UserFriendlyException("Multiple option name is required."); } var code = input.OptionCode?.Trim(); @@ -202,7 +202,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("多选项不存在"); + throw new UserFriendlyException("Multiple option not found."); } var codeInput = input.OptionCode?.Trim(); @@ -215,7 +215,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO var name = input.OptionName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("多选项名称不能为空"); + throw new UserFriendlyException("Multiple option name is required."); } var (partnerScope, availabilityType, appliedRegionType, mergedLocationIds) = await ResolveMultipleOptionScopeForSaveAsync(input); @@ -430,7 +430,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO } } - throw new UserFriendlyException("无法生成唯一多选项编码,请稍后重试或手动填写编码"); + throw new UserFriendlyException("Could not generate a unique multiple-option code. Retry later or enter a code manually."); } private async Task EnsureOptionCodeNotDuplicatedAsync(string code, string? excludeId = null) @@ -444,7 +444,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO if (await query.AnyAsync()) { - throw new UserFriendlyException("多选项编码已存在"); + throw new UserFriendlyException("Multiple option code already exists."); } } @@ -459,7 +459,7 @@ public class LabelMultipleOptionAppService : ApplicationService, ILabelMultipleO if (await query.AnyAsync()) { - throw new UserFriendlyException("多选项名称已存在"); + throw new UserFriendlyException("Multiple option name already exists."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTemplateAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTemplateAppService.cs index cc70a6c..099a6a1 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTemplateAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTemplateAppService.cs @@ -122,7 +122,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ .FirstAsync(x => !x.IsDeleted && x.TemplateCode == id); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } var elements = await _dbContext.SqlSugarClient.Queryable() @@ -251,18 +251,18 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ var name = input.TemplateName?.Trim(); if (string.IsNullOrWhiteSpace(code)) { - throw new UserFriendlyException("模板编码不能为空"); + throw new UserFriendlyException("Template code is required."); } if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("模板名称不能为空"); + throw new UserFriendlyException("Template name is required."); } var duplicated = await _dbContext.SqlSugarClient.Queryable() .AnyAsync(x => !x.IsDeleted && x.TemplateCode == code); if (duplicated) { - throw new UserFriendlyException("模板编码已存在"); + throw new UserFriendlyException("Template code already exists."); } await PurgeSoftDeletedTemplatesByCodeAsync(code); @@ -334,7 +334,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ .FirstAsync(x => !x.IsDeleted && x.TemplateCode == id); if (template is null) { - throw new UserFriendlyException("模板不存在"); + throw new UserFriendlyException("Template not found."); } var code = input.TemplateCode?.Trim(); @@ -345,7 +345,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ .AnyAsync(x => !x.IsDeleted && x.TemplateCode == code); if (duplicated) { - throw new UserFriendlyException("模板编码已存在"); + throw new UserFriendlyException("Template code already exists."); } } @@ -418,7 +418,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ if (used) { - throw new UserFriendlyException("该模板已被标签引用,无法删除"); + throw new UserFriendlyException("This template is referenced by labels and cannot be deleted."); } template.IsDeleted = true; @@ -498,7 +498,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ var key = $"{productId}::{labelTypeId}"; if (!duplicateCheckSet.Add(key)) { - throw new UserFriendlyException($"模板默认值绑定重复:产品[{productId}]与标签类型[{labelTypeId}]只能存在一条"); + throw new UserFriendlyException($"Duplicate template default binding: product [{productId}] and label type [{labelTypeId}] may only have one binding."); } } @@ -514,12 +514,12 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ var labelTypeId = x.LabelTypeId?.Trim(); if (string.IsNullOrWhiteSpace(productId)) { - throw new UserFriendlyException("模板默认值绑定中,产品Id不能为空"); + throw new UserFriendlyException("In template default bindings, product Id is required."); } if (string.IsNullOrWhiteSpace(labelTypeId)) { - throw new UserFriendlyException("模板默认值绑定中,标签类型Id不能为空"); + throw new UserFriendlyException("In template default bindings, label type Id is required."); } var json = x.DefaultValues is null ? null : JsonSerializer.Serialize(x.DefaultValues); @@ -604,7 +604,7 @@ public class LabelTemplateAppService : ApplicationService, ILabelTemplateAppServ var normalizedName = elementName?.Trim(); if (string.IsNullOrWhiteSpace(normalizedName)) { - throw new UserFriendlyException("组件名字不能为空"); + throw new UserFriendlyException("Component name is required."); } return normalizedName; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTypeAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTypeAppService.cs index 7fec0e1..e846aee 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTypeAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LabelTypeAppService.cs @@ -106,7 +106,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("标签类型不存在"); + throw new UserFriendlyException("Label type not found."); } var dto = MapToGetOutput(entity); @@ -147,7 +147,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService var name = input.TypeName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("类型名称不能为空"); + throw new UserFriendlyException("Type name is required."); } var code = input.TypeCode?.Trim(); @@ -161,7 +161,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .AnyAsync(x => !x.IsDeleted && x.TypeCode == code); if (codeDuplicated) { - throw new UserFriendlyException("类型编码已存在"); + throw new UserFriendlyException("Type code already exists."); } } @@ -169,7 +169,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .AnyAsync(x => !x.IsDeleted && x.TypeName == name); if (nameDuplicated) { - throw new UserFriendlyException("类型名称已存在"); + throw new UserFriendlyException("Type name already exists."); } var (partnerScope, availabilityType, appliedRegionType, mergedLocationIds) = await ResolveTypeScopeForSaveAsync(input); @@ -209,13 +209,13 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("标签类型不存在"); + throw new UserFriendlyException("Label type not found."); } var name = input.TypeName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("类型名称不能为空"); + throw new UserFriendlyException("Type name is required."); } var codeInput = input.TypeCode?.Trim(); @@ -231,7 +231,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .AnyAsync(x => !x.IsDeleted && x.Id != id && x.TypeCode == code); if (codeDuplicated) { - throw new UserFriendlyException("类型编码已存在"); + throw new UserFriendlyException("Type code already exists."); } await PurgeSoftDeletedLabelTypesByCodeAsync(code); @@ -243,7 +243,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .AnyAsync(x => !x.IsDeleted && x.Id != id && x.TypeName == name); if (nameDuplicated) { - throw new UserFriendlyException("类型名称已存在"); + throw new UserFriendlyException("Type name already exists."); } } @@ -280,7 +280,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService .AnyAsync(x => !x.IsDeleted && x.LabelTypeId == id); if (used) { - throw new UserFriendlyException("该标签类型已被标签引用,无法删除"); + throw new UserFriendlyException("This label type is referenced by labels and cannot be deleted."); } await LabelEntityPartnerScopeHelper.DeletePartnerScopeRowsAsync( @@ -317,7 +317,7 @@ public class LabelTypeAppService : ApplicationService, ILabelTypeAppService } } - throw new UserFriendlyException("无法生成唯一类型编码,请稍后重试或手动填写类型编码"); + throw new UserFriendlyException("Could not generate a unique type code. Retry later or enter a code manually."); } /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LocationAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LocationAppService.cs index acfac5a..c22a0e3 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LocationAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/LocationAppService.cs @@ -82,19 +82,19 @@ public class LocationAppService : ApplicationService, ILocationAppService var locationCode = input.LocationCode?.Trim(); if (string.IsNullOrWhiteSpace(locationCode)) { - throw new UserFriendlyException("Location ID不能为空"); + throw new UserFriendlyException("Location ID is required."); } var locationName = input.LocationName?.Trim(); if (string.IsNullOrWhiteSpace(locationName)) { - throw new UserFriendlyException("Location Name不能为空"); + throw new UserFriendlyException("Location Name is required."); } var isExist = await _locationRepository.IsAnyAsync(x => x.LocationCode == locationCode); if (isExist) { - throw new UserFriendlyException("Location ID已存在"); + throw new UserFriendlyException("Location ID already exists."); } var entity = new LocationAggregateRoot(GuidGenerator.Create()) @@ -125,6 +125,12 @@ public class LocationAppService : ApplicationService, ILocationAppService entity.Id.ToString(), entity.Partner, CurrentUser?.Id?.ToString()); + await LocationScopeBindingHelper.BindLocationAllScopeUsersToNewLocationAsync( + _dbContext.SqlSugarClient, + GuidGenerator, + entity.Id.ToString(), + entity.Partner, + CurrentUser?.Id?.ToString()); return ToListDto(entity); } @@ -139,13 +145,13 @@ public class LocationAppService : ApplicationService, ILocationAppService var entity = await _locationRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false); if (entity is null) { - throw new UserFriendlyException("门店不存在"); + throw new UserFriendlyException("Location not found."); } var locationName = input.LocationName?.Trim(); if (string.IsNullOrWhiteSpace(locationName)) { - throw new UserFriendlyException("Location Name不能为空"); + throw new UserFriendlyException("Location Name is required."); } entity.Partner = input.Partner?.Trim(); @@ -176,7 +182,7 @@ public class LocationAppService : ApplicationService, ILocationAppService var entity = await _locationRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false); if (entity is null) { - throw new UserFriendlyException("门店不存在"); + throw new UserFriendlyException("Location not found."); } await AccountManagementStructureHelper.EnsureLocationPartnerAllowedForMutationAsync( @@ -193,19 +199,19 @@ public class LocationAppService : ApplicationService, ILocationAppService var dir = opt.TemplateDirectory?.Trim(); if (string.IsNullOrWhiteSpace(dir)) { - throw new UserFriendlyException("未配置批量导入模板目录 FoodLabeling:BatchImport:TemplateDirectory"); + throw new UserFriendlyException("Batch import template directory is not configured (FoodLabeling:BatchImport:TemplateDirectory)."); } var fileName = opt.LocationTemplateFileName?.Trim(); if (string.IsNullOrWhiteSpace(fileName)) { - throw new UserFriendlyException("未配置模板文件名 FoodLabeling:BatchImport:LocationTemplateFileName"); + throw new UserFriendlyException("Template file name is not configured (FoodLabeling:BatchImport:LocationTemplateFileName)."); } var fullPath = Path.Combine(dir, fileName); if (!File.Exists(fullPath)) { - throw new UserFriendlyException($"模板文件不存在:{fullPath}"); + throw new UserFriendlyException($"Template file not found: {fullPath}"); } var stream = new FileStream(fullPath, FileMode.Open, FileAccess.Read, FileShare.Read); @@ -252,19 +258,19 @@ public class LocationAppService : ApplicationService, ILocationAppService { if (input?.File is null || input.File.Length == 0) { - throw new UserFriendlyException("请上传 Excel 文件(form 字段名:file)"); + throw new UserFriendlyException("Upload an Excel file (form field name: file)."); } var opt = _batchImportOptions.Value; if (input.File.Length > opt.MaxUploadBytes) { - throw new UserFriendlyException($"文件过大,最大允许 {opt.MaxUploadBytes / 1024 / 1024} MB"); + throw new UserFriendlyException($"File too large; maximum {opt.MaxUploadBytes / 1024 / 1024} MB allowed."); } var ext = Path.GetExtension(input.File.FileName)?.ToLowerInvariant(); if (ext != ".xlsx") { - throw new UserFriendlyException("仅支持 .xlsx 格式的 Excel 文件"); + throw new UserFriendlyException("Only .xlsx Excel files are supported."); } await using var uploadStream = input.File.OpenReadStream(); @@ -311,20 +317,20 @@ public class LocationAppService : ApplicationService, ILocationAppService { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("请至少提交一条编辑数据(items 不能为空)"); + throw new UserFriendlyException("Submit at least one row to edit (items is required)."); } var opt = _batchImportOptions.Value; var maxItems = opt.MaxBulkUpdateItems <= 0 ? 500 : opt.MaxBulkUpdateItems; if (input.Items.Count > maxItems) { - throw new UserFriendlyException($"单次批量编辑最多允许 {maxItems} 条,请分批提交"); + throw new UserFriendlyException($"Maximum {maxItems} rows per batch import. Submit in batches."); } var effectiveCount = input.Items.Count(static x => x is not null && x.Id != Guid.Empty); if (effectiveCount == 0) { - throw new UserFriendlyException("没有有效的门店 Id(请为待保存行填写 id,空行请使用 id 为空 GUID 或从列表中移除)"); + throw new UserFriendlyException("No valid location Id (set id on rows to save; remove blank rows or use an empty GUID)."); } var result = new LocationBulkUpdateResultDto(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs index 379a233..bd9a09c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs @@ -1,8 +1,11 @@ using FoodLabeling.Application.Contracts.Dtos.Picture; using FoodLabeling.Application.Contracts.IServices; +using FoodLabeling.Application.Helpers; +using FoodLabeling.Application.Options; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Options; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.Guids; @@ -23,17 +26,29 @@ public class PictureAppService : ApplicationService, IPictureAppService private readonly IGuidGenerator _guidGenerator; private readonly IHostEnvironment _hostEnvironment; + private readonly FoodLabelingPictureOptions _pictureOptions; - public PictureAppService(IGuidGenerator guidGenerator, IHostEnvironment hostEnvironment) + public PictureAppService( + IGuidGenerator guidGenerator, + IHostEnvironment hostEnvironment, + IOptions pictureOptions) { _guidGenerator = guidGenerator; _hostEnvironment = hostEnvironment; + _pictureOptions = pictureOptions.Value; } /// - /// 上传类别图片(保存到 /www/wwwroot/FoodLabelingManagementUs/picture) + /// 上传类别/产品图片(Linux 保存到 /www/wwwroot/picture/{版本}) /// - /// 返回的 Url 可直接保存到 CategoryPhotoUrl。 + /// + /// 与 API 发布目录分离,部署不会删除已上传图片。返回的 Url 可直接保存到 CategoryPhotoUrl / ProductImageUrl。 + /// + /// 上传表单 + /// 相对路径 Url,如 /picture/product/xxx.png + /// 上传成功 + /// 文件为空、过大或扩展名不支持 + /// 服务器写入失败 [HttpPost] [Consumes("multipart/form-data")] [Route("/api/app/picture/category/upload")] @@ -41,18 +56,18 @@ public class PictureAppService : ApplicationService, IPictureAppService { if (input.File is null || input.File.Length <= 0) { - throw new UserFriendlyException("请选择要上传的图片文件"); + throw new UserFriendlyException("Select an image file to upload."); } if (input.File.Length > MaxSizeBytes) { - throw new UserFriendlyException("图片大小不能超过5MB"); + throw new UserFriendlyException("Image size cannot exceed 5 MB."); } var ext = Path.GetExtension(input.File.FileName ?? string.Empty); if (string.IsNullOrWhiteSpace(ext) || !AllowedExtensions.Contains(ext)) { - throw new UserFriendlyException("仅支持上传 jpg/jpeg/png/webp/gif 格式图片"); + throw new UserFriendlyException("Only jpg/jpeg/png/webp/gif images are supported."); } var subDir = NormalizeSubDir(input.SubDir); @@ -77,12 +92,11 @@ public class PictureAppService : ApplicationService, IPictureAppService }; } - private string ResolvePictureRoot() - { - var linuxPictureRoot = "/www/wwwroot/FoodLabelingManagementUs/picture"; - var webRootPicture = Path.Combine(_hostEnvironment.ContentRootPath, "wwwroot", "FoodLabelingManagementUs", "picture"); - return Directory.Exists(linuxPictureRoot) ? linuxPictureRoot : webRootPicture; - } + private string ResolvePictureRoot() => + FoodLabelingPictureRoot.Resolve( + _pictureOptions.RootPath, + _hostEnvironment.ContentRootPath, + Path.Combine(_hostEnvironment.ContentRootPath, "wwwroot")); private static string NormalizeSubDir(string? subDir) { @@ -99,7 +113,7 @@ public class PictureAppService : ApplicationService, IPictureAppService if (s.Contains("..", StringComparison.Ordinal)) { - throw new UserFriendlyException("subDir 不能包含 .."); + throw new UserFriendlyException("subDir must not contain .."); } return s; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductAppService.cs index 712b34e..01beb8e 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductAppService.cs @@ -134,7 +134,7 @@ public class ProductAppService : ApplicationService, IProductAppService { if (id == Guid.Empty) { - throw new UserFriendlyException("产品Id不能为空"); + throw new UserFriendlyException("Product Id is required."); } var productId = id.ToString(); @@ -143,7 +143,7 @@ public class ProductAppService : ApplicationService, IProductAppService if (entity is null) { - throw new UserFriendlyException("产品不存在"); + throw new UserFriendlyException("Product not found."); } await EnsureProductVisibleToCurrentUserAsync(entity); @@ -241,7 +241,7 @@ public class ProductAppService : ApplicationService, IProductAppService var name = input.ProductName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("产品名称不能为空"); + throw new UserFriendlyException("Product name is required."); } var code = input.ProductCode?.Trim(); @@ -255,7 +255,7 @@ public class ProductAppService : ApplicationService, IProductAppService .AnyAsync(x => !x.IsDeleted && x.ProductCode == code); if (duplicated) { - throw new UserFriendlyException("产品编码已存在"); + throw new UserFriendlyException("Product code already exists."); } await PurgeSoftDeletedProductsByCodeAsync(code); @@ -292,7 +292,7 @@ public class ProductAppService : ApplicationService, IProductAppService { if (id == Guid.Empty) { - throw new UserFriendlyException("产品Id不能为空"); + throw new UserFriendlyException("Product Id is required."); } var productId = id.ToString(); @@ -300,7 +300,7 @@ public class ProductAppService : ApplicationService, IProductAppService .FirstAsync(x => !x.IsDeleted && x.Id == productId); if (entity is null) { - throw new UserFriendlyException("产品不存在"); + throw new UserFriendlyException("Product not found."); } await EnsureProductVisibleToCurrentUserAsync(entity); @@ -308,7 +308,7 @@ public class ProductAppService : ApplicationService, IProductAppService var name = input.ProductName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("产品名称不能为空"); + throw new UserFriendlyException("Product name is required."); } var codeInput = input.ProductCode?.Trim(); @@ -324,7 +324,7 @@ public class ProductAppService : ApplicationService, IProductAppService .AnyAsync(x => !x.IsDeleted && x.Id != productId && x.ProductCode == code); if (duplicated) { - throw new UserFriendlyException("产品编码已存在"); + throw new UserFriendlyException("Product code already exists."); } } @@ -354,7 +354,7 @@ public class ProductAppService : ApplicationService, IProductAppService { if (id == Guid.Empty) { - throw new UserFriendlyException("产品Id不能为空"); + throw new UserFriendlyException("Product Id is required."); } var productId = id.ToString(); @@ -362,7 +362,7 @@ public class ProductAppService : ApplicationService, IProductAppService .FirstAsync(x => !x.IsDeleted && x.Id == productId); if (entity is null) { - throw new UserFriendlyException("产品不存在"); + throw new UserFriendlyException("Product not found."); } await EnsureProductVisibleToCurrentUserAsync(entity); @@ -379,19 +379,19 @@ public class ProductAppService : ApplicationService, IProductAppService var dir = opt.TemplateDirectory?.Trim(); if (string.IsNullOrWhiteSpace(dir)) { - throw new UserFriendlyException("未配置批量导入模板目录 FoodLabeling:BatchImport:TemplateDirectory"); + throw new UserFriendlyException("Batch import template directory is not configured (FoodLabeling:BatchImport:TemplateDirectory)."); } var fileName = opt.ProductTemplateFileName?.Trim(); if (string.IsNullOrWhiteSpace(fileName)) { - throw new UserFriendlyException("未配置模板文件名 FoodLabeling:BatchImport:ProductTemplateFileName"); + throw new UserFriendlyException("Template file name is not configured (FoodLabeling:BatchImport:ProductTemplateFileName)."); } var fullPath = Path.Combine(dir, fileName); if (!File.Exists(fullPath)) { - throw new UserFriendlyException($"模板文件不存在:{fullPath}"); + throw new UserFriendlyException($"Template file not found: {fullPath}"); } var stream = new FileStream(fullPath, FileMode.Open, FileAccess.Read, FileShare.Read); @@ -441,19 +441,19 @@ public class ProductAppService : ApplicationService, IProductAppService { if (input?.File is null || input.File.Length == 0) { - throw new UserFriendlyException("请上传 Excel 文件(form 字段名:file)"); + throw new UserFriendlyException("Upload an Excel file (form field name: file)."); } var opt = _batchImportOptions.Value; if (input.File.Length > opt.MaxUploadBytes) { - throw new UserFriendlyException($"文件过大,最大允许 {opt.MaxUploadBytes / 1024 / 1024} MB"); + throw new UserFriendlyException($"File too large; maximum {opt.MaxUploadBytes / 1024 / 1024} MB allowed."); } var ext = Path.GetExtension(input.File.FileName)?.ToLowerInvariant(); if (ext != ".xlsx") { - throw new UserFriendlyException("仅支持 .xlsx 格式的 Excel 文件"); + throw new UserFriendlyException("Only .xlsx Excel files are supported."); } await using var uploadStream = input.File.OpenReadStream(); @@ -516,14 +516,14 @@ public class ProductAppService : ApplicationService, IProductAppService { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("请至少提交一条导入数据(items 不能为空)"); + throw new UserFriendlyException("Submit at least one row to import (items is required)."); } var opt = _batchImportOptions.Value; var maxRows = opt.MaxImportRows <= 0 ? 5000 : opt.MaxImportRows; if (input.Items.Count > maxRows) { - throw new UserFriendlyException($"单次批量导入最多允许 {maxRows} 条,请分批提交"); + throw new UserFriendlyException($"Maximum {maxRows} rows per batch import. Submit in batches."); } var result = new ProductBatchImportOnlineResultDto(); @@ -556,14 +556,14 @@ public class ProductAppService : ApplicationService, IProductAppService { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("请至少提交一条编辑数据(items 不能为空)"); + throw new UserFriendlyException("Submit at least one row to edit (items is required)."); } var opt = _batchImportOptions.Value; var maxItems = opt.MaxBulkUpdateItems <= 0 ? 500 : opt.MaxBulkUpdateItems; if (input.Items.Count > maxItems) { - throw new UserFriendlyException($"单次批量编辑最多允许 {maxItems} 条,请分批提交"); + throw new UserFriendlyException($"Maximum {maxItems} rows per batch import. Submit in batches."); } var effectiveCount = input.Items.Count(static x => @@ -573,7 +573,7 @@ public class ProductAppService : ApplicationService, IProductAppService g != Guid.Empty); if (effectiveCount == 0) { - throw new UserFriendlyException("没有有效的产品 Id(请为待保存行填写 Guid 格式 id)"); + throw new UserFriendlyException("No valid product Id (set a Guid id on rows to save)."); } var result = new ProductBulkUpdateResultDto(); @@ -690,7 +690,7 @@ public class ProductAppService : ApplicationService, IProductAppService { if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("登录已过期,请重新登录"); + throw new UserFriendlyException("Session expired. Please sign in again."); } if (ReportsRoleHelper.IsAdminRole(CurrentUser)) @@ -707,7 +707,7 @@ public class ProductAppService : ApplicationService, IProductAppService if (scopedLocationIds.Count == 0) { - throw new UserFriendlyException("无权访问该产品"); + throw new UserFriendlyException("You do not have permission to access this product."); } if (string.Equals(entity.AvailabilityType, AllScopeBindingHelper.ScopeAll, StringComparison.OrdinalIgnoreCase)) @@ -721,7 +721,7 @@ public class ProductAppService : ApplicationService, IProductAppService .ToListAsync(); if (!productLocationIds.Any(id => scopedLocationIds.Contains(id))) { - throw new UserFriendlyException("无权访问该产品"); + throw new UserFriendlyException("You do not have permission to access this product."); } } @@ -837,7 +837,7 @@ public class ProductAppService : ApplicationService, IProductAppService var n = categoryName.Trim(); if (string.IsNullOrWhiteSpace(n)) { - throw new UserFriendlyException("产品分类名称不能为空"); + throw new UserFriendlyException("Product category name is required."); } var lowered = n.ToLowerInvariant(); @@ -847,12 +847,12 @@ public class ProductAppService : ApplicationService, IProductAppService if (matches.Count == 0) { - throw new UserFriendlyException($"未找到产品分类「{n}」"); + throw new UserFriendlyException($"Product category not found: \"{n}\"."); } if (matches.Count > 1) { - throw new UserFriendlyException($"产品分类「{n}」存在多条记录,请在系统中使用唯一名称"); + throw new UserFriendlyException($"Product category \"{n}\" matches multiple records; use a unique name in the system."); } return matches[0].Id; @@ -888,7 +888,7 @@ public class ProductAppService : ApplicationService, IProductAppService var byId = byIdList.FirstOrDefault(); if (byId is null) { - throw new UserFriendlyException($"未找到门店 Id:{t}"); + throw new UserFriendlyException($"Location Id not found: {t}"); } return byId.Id.ToString(); @@ -903,12 +903,12 @@ public class ProductAppService : ApplicationService, IProductAppService if (matches.Count == 0) { - throw new UserFriendlyException($"未找到门店:{t}"); + throw new UserFriendlyException($"Location not found: {t}"); } if (matches.Count > 1) { - throw new UserFriendlyException($"门店「{t}」存在多条匹配,请使用 Location Code 或 Guid"); + throw new UserFriendlyException($"Location \"{t}\" matches multiple records; use Location Code or Guid."); } return matches[0].Id.ToString(); @@ -930,7 +930,7 @@ public class ProductAppService : ApplicationService, IProductAppService } } - throw new UserFriendlyException("无法生成唯一产品编码,请稍后重试或手动填写产品编码"); + throw new UserFriendlyException("Could not generate a unique product code. Retry later or enter a code manually."); } private static void ApplyProductAppearanceToEntity(FlProductDbEntity entity, ProductCreateInputVo input) @@ -1019,13 +1019,13 @@ public class ProductAppService : ApplicationService, IProductAppService if (AllScopeBindingHelper.HasAllScopeSentinelSelection(companyIds) || LocationScopeBindingHelper.IsAllScopeSentinel(input.PartnerId)) { - throw new UserFriendlyException("产品适用 Company 不支持 ALL,请传单个具体 Company Id"); + throw new UserFriendlyException("Product applicable Company does not support ALL; pass a single Company Id."); } var concreteCompanyIds = LocationScopeBindingHelper.FilterConcreteScopeIds(companyIds); if (concreteCompanyIds.Count > 1) { - throw new UserFriendlyException("产品适用 Company 仅支持单选(companyIds 最多传 1 个)"); + throw new UserFriendlyException("Product applicable Company allows only one selection (at most one companyIds entry)."); } var fromCompanyIds = concreteCompanyIds.Count == 1 ? concreteCompanyIds[0] : null; @@ -1038,7 +1038,7 @@ public class ProductAppService : ApplicationService, IProductAppService if (!string.IsNullOrWhiteSpace(fromCompanyIds) && !string.Equals(fromPartnerId, fromCompanyIds, StringComparison.OrdinalIgnoreCase)) { - throw new UserFriendlyException("partnerId 与 companyIds 不一致"); + throw new UserFriendlyException("partnerId does not match companyIds."); } return fromPartnerId; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductCategoryAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductCategoryAppService.cs index 1311db7..270376b 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductCategoryAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductCategoryAppService.cs @@ -124,7 +124,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("类别不存在"); + throw new UserFriendlyException("Category not found."); } await EnsureCategoryVisibleToCurrentUserAsync(entity); @@ -170,7 +170,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("类别名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var code = input.CategoryCode?.Trim(); @@ -229,7 +229,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("类别不存在"); + throw new UserFriendlyException("Category not found."); } await EnsureCategoryVisibleToCurrentUserAsync(entity); @@ -244,7 +244,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("类别名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var displayText = input.DisplayText?.Trim(); @@ -302,7 +302,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp .AnyAsync(x => !x.IsDeleted && x.CategoryId == id); if (usedByProduct) { - throw new UserFriendlyException("该类别已被产品引用,无法删除"); + throw new UserFriendlyException("This category is referenced by products and cannot be deleted."); } entity.IsDeleted = true; @@ -433,7 +433,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp if (scopedLocationIds.Count == 0) { - throw new UserFriendlyException("无权访问该类别"); + throw new UserFriendlyException("You do not have permission to access this category."); } if (string.Equals(entity.AvailabilityType, "ALL", StringComparison.OrdinalIgnoreCase)) @@ -445,7 +445,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp .AnyAsync(cl => cl.CategoryId == entity.Id && scopedLocationIds.Contains(cl.LocationId)); if (!visible) { - throw new UserFriendlyException("无权访问该类别"); + throw new UserFriendlyException("You do not have permission to access this category."); } } @@ -697,7 +697,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp } } - throw new UserFriendlyException("无法生成唯一类别编码,请稍后重试或手动填写编码"); + throw new UserFriendlyException("Could not generate a unique category code. Retry later or enter a code manually."); } private async Task EnsureCategoryCodeNotDuplicatedAsync(string code, string? excludeId = null) @@ -711,7 +711,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp if (await query.AnyAsync()) { - throw new UserFriendlyException("类别编码已存在"); + throw new UserFriendlyException("Category code already exists."); } } @@ -726,7 +726,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp if (await query.AnyAsync()) { - throw new UserFriendlyException("类别名称已存在"); + throw new UserFriendlyException("Category name already exists."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductLocationAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductLocationAppService.cs index 0bec691..c88200b 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductLocationAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ProductLocationAppService.cs @@ -209,7 +209,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp var locationId = id?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var hasAvailabilityColumn = await ProductScopeSchemaHelper.HasAvailabilityTypeColumnAsync( @@ -292,7 +292,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var productIds = input.ProductIds? @@ -303,20 +303,20 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp if (productIds.Count == 0) { - throw new UserFriendlyException("ProductIds至少1个"); + throw new UserFriendlyException("At least one ProductId is required."); } // 校验门店存在 if (!Guid.TryParse(locationId, out var gid)) { - throw new UserFriendlyException("门店Id格式不正确"); + throw new UserFriendlyException("Invalid locationId format."); } var locExists = await _dbContext.SqlSugarClient.Queryable() .AnyAsync(x => !x.IsDeleted && x.Id == gid); if (!locExists) { - throw new UserFriendlyException("门店不存在"); + throw new UserFriendlyException("Location not found."); } // 校验产品存在 @@ -325,7 +325,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp .CountAsync(); if (productExistsCount != productIds.Count) { - throw new UserFriendlyException("产品不存在"); + throw new UserFriendlyException("Product not found."); } // 去重:避免唯一键重复 @@ -358,7 +358,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp var locationId = id?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var productIds = input.ProductIds? @@ -369,19 +369,19 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp if (productIds.Count == 0) { - throw new UserFriendlyException("ProductIds至少1个"); + throw new UserFriendlyException("At least one ProductId is required."); } if (!Guid.TryParse(locationId, out var gid)) { - throw new UserFriendlyException("门店Id格式不正确"); + throw new UserFriendlyException("Invalid locationId format."); } var locExists = await _dbContext.SqlSugarClient.Queryable() .AnyAsync(x => !x.IsDeleted && x.Id == gid); if (!locExists) { - throw new UserFriendlyException("门店不存在"); + throw new UserFriendlyException("Location not found."); } var productExistsCount = await _dbContext.SqlSugarClient.Queryable() @@ -389,7 +389,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp .CountAsync(); if (productExistsCount != productIds.Count) { - throw new UserFriendlyException("产品不存在"); + throw new UserFriendlyException("Product not found."); } // 替换:先删后建 @@ -414,7 +414,7 @@ public class ProductLocationAppService : ApplicationService, IProductLocationApp var locationId = id?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } await _dbContext.SqlSugarClient.Deleteable() diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs index eb8f55f..d4bc384 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs @@ -56,7 +56,7 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService .SingleAsync(); if (entity is null) { - throw new UserFriendlyException("权限不存在"); + throw new UserFriendlyException("Permission not found."); } return new RbacMenuGetListOutputDto @@ -80,7 +80,7 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService var name = input.MenuName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("权限名称不能为空"); + throw new UserFriendlyException("Permission name is required."); } var entity = new MenuDbEntity @@ -114,13 +114,13 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService .SingleAsync(); if (entity is null) { - throw new UserFriendlyException("权限不存在"); + throw new UserFriendlyException("Permission not found."); } var name = input.MenuName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("权限名称不能为空"); + throw new UserFriendlyException("Permission name is required."); } entity.MenuName = name; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleAppService.cs index 4a36752..fbfdc50 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleAppService.cs @@ -101,7 +101,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService var entity = await _roleRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false); if (entity is null) { - throw new UserFriendlyException("角色不存在"); + throw new UserFriendlyException("Role not found."); } var menuIds = await _roleMenuRepository._DbQueryable @@ -135,18 +135,18 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService var roleCode = input.RoleCode?.Trim(); if (string.IsNullOrWhiteSpace(roleName)) { - throw new UserFriendlyException("角色名称不能为空"); + throw new UserFriendlyException("Role name is required."); } if (string.IsNullOrWhiteSpace(roleCode)) { - throw new UserFriendlyException("角色编码不能为空"); + throw new UserFriendlyException("Role code is required."); } var isExist = await _roleRepository.IsAnyAsync(x => x.RoleCode == roleCode || x.RoleName == roleName); if (isExist) { - throw new UserFriendlyException("角色名称或编码已存在"); + throw new UserFriendlyException("Role name or code already exists."); } var entity = new RoleAggregateRoot @@ -176,19 +176,19 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService var entity = await _roleRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false); if (entity is null) { - throw new UserFriendlyException("角色不存在"); + throw new UserFriendlyException("Role not found."); } var roleName = input.RoleName?.Trim(); var roleCode = input.RoleCode?.Trim(); if (string.IsNullOrWhiteSpace(roleName)) { - throw new UserFriendlyException("角色名称不能为空"); + throw new UserFriendlyException("Role name is required."); } if (string.IsNullOrWhiteSpace(roleCode)) { - throw new UserFriendlyException("角色编码不能为空"); + throw new UserFriendlyException("Role code is required."); } var isExist = await _roleRepository._DbQueryable @@ -196,7 +196,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService .AnyAsync(x => x.RoleCode == roleCode || x.RoleName == roleName); if (isExist) { - throw new UserFriendlyException("角色名称或编码已存在"); + throw new UserFriendlyException("Role name or code already exists."); } entity.RoleName = roleName; @@ -241,7 +241,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService var menuIds = ParseMenuPermissionKeys(input.MenuPermissionKeys); if (menuIds.Count == 0) { - throw new UserFriendlyException("menuPermissionKeys 未包含有效的菜单 Id(Guid)"); + throw new UserFriendlyException("menuPermissionKeys contains no valid menu Id (Guid)."); } await SetRoleMenusAsync(roleId, menuIds); @@ -261,7 +261,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService if (menuIds.Count == 0) { throw new UserFriendlyException( - "accessPermissions 未匹配到任何菜单,请确认权限码与菜单 Router 一致,或先执行 menu_backfill_permission_code.sql 回填 Menu.PermissionCode"); + "accessPermissions matched no menus. Verify permission codes match menu Router, or run menu_backfill_permission_code.sql to backfill Menu.PermissionCode."); } await SetRoleMenusAsync(roleId, menuIds); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleMenuAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleMenuAppService.cs index ff3dd07..b79f975 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleMenuAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacRoleMenuAppService.cs @@ -37,7 +37,7 @@ public class RbacRoleMenuAppService : ApplicationService, IRbacRoleMenuAppServic var role = await _roleRepository.GetSingleAsync(x => x.Id == input.RoleId && x.IsDeleted == false); if (role is null) { - throw new UserFriendlyException("角色不存在"); + throw new UserFriendlyException("Role not found."); } var menuIds = input.MenuIds?.Distinct().ToList() ?? new List(); @@ -90,7 +90,7 @@ public class RbacRoleMenuAppService : ApplicationService, IRbacRoleMenuAppServic var role = await _roleRepository.GetSingleAsync(x => x.Id == input.RoleId && x.IsDeleted == false); if (role is null) { - throw new UserFriendlyException("角色不存在"); + throw new UserFriendlyException("Role not found."); } var menuIds = input.MenuIds?.Distinct().ToList() ?? new List(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ReportsAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ReportsAppService.cs index efcee4b..9447938 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ReportsAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/ReportsAppService.cs @@ -43,12 +43,12 @@ public class ReportsAppService : ApplicationService, IReportsAppService { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationIds = await ReportsLocationScopeHelper.ResolveReportLocationIdsAsync( @@ -165,12 +165,12 @@ public class ReportsAppService : ApplicationService, IReportsAppService QuestPDF.Settings.License = LicenseType.Community; if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationIds = await ReportsLocationScopeHelper.ResolveReportLocationIdsAsync( @@ -201,7 +201,7 @@ public class ReportsAppService : ApplicationService, IReportsAppService var count = await query.CountAsync(); if (count > ExportPdfMaxRows) { - throw new UserFriendlyException($"导出数据超过上限 {ExportPdfMaxRows} 条,请缩小筛选范围"); + throw new UserFriendlyException($"Export exceeds the maximum of {ExportPdfMaxRows} rows. Narrow your filters and try again."); } var rows = await query.Take(ExportPdfMaxRows) @@ -311,12 +311,12 @@ public class ReportsAppService : ApplicationService, IReportsAppService { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationIds = await ReportsLocationScopeHelper.ResolveReportLocationIdsAsync( @@ -361,7 +361,7 @@ public class ReportsAppService : ApplicationService, IReportsAppService var count = await query.CountAsync(); if (count > ExportPdfMaxRows) { - throw new UserFriendlyException($"导出数据超过上限 {ExportPdfMaxRows} 条,请缩小筛选范围"); + throw new UserFriendlyException($"Export exceeds the maximum of {ExportPdfMaxRows} rows. Narrow your filters and try again."); } var pageRows = await query.Take(ExportPdfMaxRows) @@ -415,12 +415,12 @@ public class ReportsAppService : ApplicationService, IReportsAppService { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationIds = await ReportsLocationScopeHelper.ResolveReportLocationIdsAsync( @@ -494,12 +494,12 @@ public class ReportsAppService : ApplicationService, IReportsAppService { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationIds = await ReportsLocationScopeHelper.ResolveReportLocationIdsAsync( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TeamMemberAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TeamMemberAppService.cs index 9088abf..7b092ca 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TeamMemberAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TeamMemberAppService.cs @@ -20,6 +20,7 @@ using Yi.Framework.Rbac.Domain.Entities; using Yi.Framework.Rbac.Domain.Entities.ValueObjects; using Yi.Framework.Rbac.Domain.Helpers; using Yi.Framework.Rbac.Domain.Managers; +using Yi.Framework.Rbac.Domain.Shared.Consts; using Yi.Framework.SqlSugarCore.Abstractions; namespace FoodLabeling.Application.Services; @@ -95,7 +96,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService var user = await _userRepository.GetByIdAsync(id); if (user is null || user.IsDeleted) { - throw new UserFriendlyException("成员不存在"); + throw new UserFriendlyException("Team member not found."); } var userIdString = id.ToString(); @@ -127,13 +128,18 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService }) .ToList(); - var role = await _dbContext.SqlSugarClient.Queryable() - .FirstAsync(x => x.UserId == id); + var role = await LoadPreferredUserRoleAsync(id); var scopeLocationIds = assigned.Select(x => x.Id).ToList(); var (partnerIds, regionIds, _) = await LocationScopeBindingHelper.ResolveMemberScopeFromLocationIdsAsync( _dbContext.SqlSugarClient, scopeLocationIds); + var dim = await LoadTeamMemberScopeAsync(id); + if (partnerIds.Count == 0 && dim.PartnerIds.Count > 0) + { + partnerIds = dim.PartnerIds; + } + if (await TeamMemberRoleHelper.IsCompanyAdminRoleAsync(_dbContext.SqlSugarClient, role?.RoleId) && partnerIds.Count > 0) { @@ -142,7 +148,6 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService scopeLocationIds = assigned.Select(x => x.Id).ToList(); } - var dim = await LoadTeamMemberScopeAsync(id); // 库中存展开 Guid;结合 Applied* 维度回显 ["ALL"],与新增传 ALL 对称 (regionIds, scopeLocationIds, assigned) = await TeamMemberScopeDisplayHelper.CollapseScopeIdsToAllSentinelForEditAsync( @@ -205,7 +210,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService /// /// 参数说明: /// - partnerId / partnerIds: 展开 ALL 时的 Company 上下文(必填) - /// - locationIds / locations: 可含 ALL;按该公司全部门店落库;列表 assignedLocations 展示 All Location + /// - locationIds / locations: 可含 ALL;按该公司全部门店落库;该公司暂无门店时仍可保存,后续新建门店会自动绑定;列表 assignedLocations 展示 All Location /// - regionIds / groupIds: 可含 ALL;为 ALL 且同时有具体 locationIds 时以门店为准;含具体 Guid 时按 Region 展开(忽略同传 locationIds) /// - 优先级:location ALL →(具体 location 且 region 空/ALL)→ region ALL → 具体 region → 具体 location → 仅 Company /// @@ -259,7 +264,8 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService } await UpsertUserLocationsAsync(user.Id, scope.LocationIds); - await UpsertTeamMemberScopeAsync(user.Id, scope.AppliedRegionType, scope.AppliedLocationType); + await UpsertTeamMemberScopeAsync( + user.Id, scope.AppliedRegionType, scope.AppliedLocationType, scope.PartnerIds); return await GetAsync(user.Id); } @@ -301,7 +307,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService /// 更新请求体 /// 更新后的成员详情 /// 更新成功 - /// 参数不合法或成员不存在 + /// 参数不合法或Team member not found. /// 服务器错误 public async Task UpdateAsync(Guid id, TeamMemberUpdateInputVo input) { @@ -320,7 +326,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService var user = await _userRepository.GetByIdAsync(id); if (user is null || user.IsDeleted) { - throw new UserFriendlyException("成员不存在"); + throw new UserFriendlyException("Team member not found."); } user.Name = input.FullName.Trim(); @@ -356,7 +362,8 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService } await UpsertUserLocationsAsync(id, scope.LocationIds); - await UpsertTeamMemberScopeAsync(id, scope.AppliedRegionType, scope.AppliedLocationType); + await UpsertTeamMemberScopeAsync( + id, scope.AppliedRegionType, scope.AppliedLocationType, scope.PartnerIds); return await GetAsync(id); } @@ -512,19 +519,19 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService { if (input?.File is null || input.File.Length == 0) { - throw new UserFriendlyException("请上传 Excel 文件(form 字段名:file)"); + throw new UserFriendlyException("Upload an Excel file (form field name: file)."); } var opt = _batchImportOptions.Value; if (input.File.Length > opt.MaxUploadBytes) { - throw new UserFriendlyException($"文件过大,最大允许 {opt.MaxUploadBytes / 1024 / 1024} MB"); + throw new UserFriendlyException($"File too large; maximum {opt.MaxUploadBytes / 1024 / 1024} MB allowed."); } var ext = Path.GetExtension(input.File.FileName)?.ToLowerInvariant(); if (ext != ".xlsx") { - throw new UserFriendlyException("仅支持 .xlsx 格式的 Excel 文件"); + throw new UserFriendlyException("Only .xlsx Excel files are supported."); } var roleMap = await BuildRoleNameToIdMapAsync(); @@ -586,14 +593,14 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("请至少提交一条导入数据(items 不能为空)"); + throw new UserFriendlyException("Submit at least one row to import (items is required)."); } var opt = _batchImportOptions.Value; var maxRows = opt.MaxImportRows <= 0 ? 5000 : opt.MaxImportRows; if (input.Items.Count > maxRows) { - throw new UserFriendlyException($"单次批量导入最多允许 {maxRows} 条,请分批提交"); + throw new UserFriendlyException($"Maximum {maxRows} rows per batch import. Submit in batches."); } var defaultPassword = opt.TeamMemberImportDefaultPassword?.Trim() ?? string.Empty; @@ -608,7 +615,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService if (string.IsNullOrEmpty(defaultPassword)) { throw new UserFriendlyException( - "未配置默认导入密码 FoodLabeling:BatchImport:TeamMemberImportDefaultPassword"); + "Default import password is not configured (FoodLabeling:BatchImport:TeamMemberImportDefaultPassword)."); } vo.Password = defaultPassword; @@ -638,20 +645,20 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService { if (input?.Items is null || input.Items.Count == 0) { - throw new UserFriendlyException("请至少提交一条编辑数据(items 不能为空)"); + throw new UserFriendlyException("Submit at least one row to edit (items is required)."); } var opt = _batchImportOptions.Value; var maxItems = opt.MaxBulkUpdateItems <= 0 ? 500 : opt.MaxBulkUpdateItems; if (input.Items.Count > maxItems) { - throw new UserFriendlyException($"单次批量编辑最多允许 {maxItems} 条,请分批提交"); + throw new UserFriendlyException($"Maximum {maxItems} rows per batch import. Submit in batches."); } var effectiveCount = input.Items.Count(static x => x is not null && x.Id != Guid.Empty); if (effectiveCount == 0) { - throw new UserFriendlyException("没有有效的成员 Id(请为待保存行填写 id)"); + throw new UserFriendlyException("No valid member Id (set id on rows to save)."); } var result = new TeamMemberBulkUpdateResultDto(); @@ -716,7 +723,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService .FirstAsync(); if (byId is null) { - throw new UserFriendlyException($"无效门店 Id:{key}"); + throw new UserFriendlyException($"Invalid location Id: {key}"); } result.Add(byId.Id.ToString()); @@ -728,7 +735,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService .FirstAsync(); if (byCode is null) { - throw new UserFriendlyException($"未找到门店 LocationCode:{key}(亦可填 location.Id Guid)"); + throw new UserFriendlyException($"Location LocationCode not found: {key} (you may also use location.Id Guid)"); } result.Add(byCode.Id.ToString()); @@ -758,7 +765,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService .FirstAsync(); if (byId is null) { - throw new UserFriendlyException($"无效 Region Id:{key}"); + throw new UserFriendlyException($"Invalid Region Id: {key}"); } result.Add(byId.Id.Trim()); @@ -774,13 +781,13 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService if (matches.Count == 0) { - throw new UserFriendlyException($"未找到 Region:{key}(可填 fl_group.Id 或 GroupName)"); + throw new UserFriendlyException($"Region not found: {key} (use fl_group.Id or GroupName)"); } if (matches.Count > 1) { throw new UserFriendlyException( - $"Region 名称「{key}」存在多条记录,请改用 fl_group.Id(Guid)"); + $"Region name \"{key}\" matches multiple records; use fl_group.Id (Guid)."); } result.Add(matches[0].Id.Trim()); @@ -837,11 +844,17 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService query = query.Where(u => userIds.Contains(u.Id)); } + var hideSelf = await ShouldHideCurrentUserInTeamMemberListAsync(); + var selfId = CurrentUser?.Id; + if (scopeLocationIds is not null) { if (scopeLocationIds.Count == 0) { - query = query.Where(_ => false); + // Location=ALL 且暂无门店时,Company Admin 仍应能看到自己 + query = selfId is Guid id && !hideSelf + ? query.Where(u => u.Id == id) + : query.Where(_ => false); } else { @@ -861,6 +874,11 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService .Distinct() .ToList(); + if (selfId is Guid id && !hideSelf && !allowedUserGuids.Contains(id)) + { + allowedUserGuids.Add(id); + } + if (allowedUserGuids.Count == 0) { query = query.Where(_ => false); @@ -872,9 +890,33 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService } } + if (hideSelf && selfId is Guid hideId) + { + query = query.Where(u => u.Id != hideId); + } + return query; } + /// + /// 仅 RoleCode=admin 的账号在成员列表中隐藏自己;Company Admin 等其它角色要展示当前登录账号。 + /// + private async Task ShouldHideCurrentUserInTeamMemberListAsync() + { + if (CurrentUser?.Id is null) + { + return false; + } + + if (ReportsRoleHelper.IsAdminRole(CurrentUser)) + { + return true; + } + + return await ReportsRoleHelper.IsAdminRoleFromDbAsync( + _dbContext.SqlSugarClient, CurrentUser.Id.Value); + } + private async Task> MapUsersToOutputAsync( List users, List? scopeLocationIds, @@ -890,12 +932,19 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService var userRolePairs = await _dbContext.SqlSugarClient.Queryable((ur, r) => ur.RoleId == r.Id) .Where(ur => userIds.Contains(ur.UserId)) - .Select((ur, r) => new { ur.UserId, r.Id, r.RoleName }) + .Select((ur, r) => new UserRolePickRow + { + UserId = ur.UserId, + Id = r.Id, + RoleCode = r.RoleCode, + RoleName = r.RoleName, + OrderNum = r.OrderNum + }) .ToListAsync(); var roleIdByUser = userRolePairs .GroupBy(x => x.UserId) - .ToDictionary(g => g.Key, g => (Guid?)g.First().Id); + .ToDictionary(g => g.Key, g => (Guid?)PickPreferredRole(g)?.Id); var allUserLocations = await _dbContext.SqlSugarClient.Queryable() .Where(x => !x.IsDeleted) @@ -961,13 +1010,18 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService foreach (var u in users) { roleIdByUser.TryGetValue(u.Id, out var listRoleId); - var roleName = userRolePairs.FirstOrDefault(x => x.UserId == u.Id)?.RoleName; + var roleName = PickPreferredRole(userRolePairs.Where(x => x.UserId == u.Id))?.RoleName; var userKey = TeamMemberListScopeHelper.UserKey(u.Id); assignedMap.TryGetValue(userKey, out var assigned); scopeIdsMap.TryGetValue(userKey, out var scopeIds); dimMap.TryGetValue(userKey, out var dim); var partnerIds = scopeIds?.PartnerIds ?? new List(); + if (partnerIds.Count == 0 && dim?.PartnerIds is { Count: > 0 }) + { + partnerIds = dim.PartnerIds; + } + var regionIds = scopeIds?.RegionIds ?? new List(); var assignedLocations = assigned ?? new List(); @@ -1147,17 +1201,19 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService public List RegionIds { get; init; } = new(); } - private sealed class TeamMemberScopeSaveResult + private sealed class TeamMemberScopeSaveResult { public string AppliedRegionType { get; init; } = AllScopeBindingHelper.ScopeSpecified; public string AppliedLocationType { get; init; } = AllScopeBindingHelper.ScopeSpecified; public List LocationIds { get; init; } = new(); + public List PartnerIds { get; init; } = new(); } private sealed class TeamMemberScopeDimension { public string? AppliedRegionType { get; init; } public string? AppliedLocationType { get; init; } + public List PartnerIds { get; init; } = new(); } private async Task ResolveTeamMemberScopeForSaveAsync( @@ -1210,7 +1266,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService _dbContext.SqlSugarClient, partnerIds, null, null); if (fromPartner.Count == 0) { - throw new UserFriendlyException("Company Admin 需绑定公司下门店,所选公司下暂无可用门店"); + throw new UserFriendlyException("Company Admin must be bound to locations under the company; no locations are available for the selected company."); } await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, fromPartner); @@ -1218,7 +1274,8 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService { AppliedRegionType = AllScopeBindingHelper.ScopeAll, AppliedLocationType = AllScopeBindingHelper.ScopeAll, - LocationIds = fromPartner + LocationIds = fromPartner, + PartnerIds = partnerIds }; } @@ -1236,15 +1293,26 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService regionInputForResolve = new List { AllScopeBindingHelper.ScopeAll }; } + var allowEmptyAll = locationHasAllSentinel && partnerIds.Count > 0; + if (allowEmptyAll) + { + await LocationScopeBindingHelper.EnsurePartnerIdsExistAsync( + _dbContext.SqlSugarClient, partnerIds); + } + var merged = await LocationScopeBindingHelper.ResolveTeamMemberLocationIdsForSaveAsync( - _dbContext.SqlSugarClient, partnerIds, regionInputForResolve, locationInputForResolve); + _dbContext.SqlSugarClient, + partnerIds, + regionInputForResolve, + locationInputForResolve, + allowEmptyAll); - if (merged.Count == 0) + if (merged.Count == 0 && !allowEmptyAll) { throw new UserFriendlyException( isCompanyAdmin - ? "Company Admin 必须选择 Company,或指定 Region / 门店" - : "成员必须至少分配一个门店(公司/区域/门店至少选一项)"); + ? "Company Admin must select a Company, or specify Region / location(s)." + : "Each member must be assigned at least one location (select company, region, and/or location)."); } await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, merged); @@ -1290,7 +1358,10 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService { AppliedRegionType = appliedRegionType, AppliedLocationType = appliedLocationType, - LocationIds = merged + LocationIds = merged, + PartnerIds = AllScopeBindingHelper.IsDeclaredAll(appliedLocationType) + ? partnerIds + : new List() }; } @@ -1306,17 +1377,22 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService return new TeamMemberScopeDimension { AppliedRegionType = row.AppliedRegionType, - AppliedLocationType = row.AppliedLocationType + AppliedLocationType = row.AppliedLocationType, + PartnerIds = LocationScopeBindingHelper.SplitPartnerIds(row.PartnerIds) }; } private async Task UpsertTeamMemberScopeAsync( Guid userId, string appliedRegionType, - string appliedLocationType) + string appliedLocationType, + IReadOnlyList? partnerIds) { var userIdString = userId.ToString(); var now = DateTime.Now; + var storedPartnerIds = AllScopeBindingHelper.IsDeclaredAll(appliedLocationType) + ? LocationScopeBindingHelper.JoinPartnerIds(partnerIds) + : null; var existing = await _dbContext.SqlSugarClient.Queryable() .FirstAsync(x => x.UserId == userIdString); if (existing is null) @@ -1326,6 +1402,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService UserId = userIdString, AppliedRegionType = appliedRegionType, AppliedLocationType = appliedLocationType, + PartnerIds = storedPartnerIds, CreationTime = now, LastModificationTime = now }).ExecuteCommandAsync(); @@ -1334,6 +1411,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService existing.AppliedRegionType = appliedRegionType; existing.AppliedLocationType = appliedLocationType; + existing.PartnerIds = storedPartnerIds; existing.LastModificationTime = now; await _dbContext.SqlSugarClient.Updateable(existing).ExecuteCommandAsync(); } @@ -1356,7 +1434,8 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService result[TeamMemberListScopeHelper.NormalizeScopeKey(row.UserId)] = new TeamMemberScopeDimension { AppliedRegionType = row.AppliedRegionType, - AppliedLocationType = row.AppliedLocationType + AppliedLocationType = row.AppliedLocationType, + PartnerIds = LocationScopeBindingHelper.SplitPartnerIds(row.PartnerIds) }; } @@ -1429,7 +1508,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService .CountAsync(); if (validCount != wanted.Count) { - throw new UserFriendlyException("存在无效门店,请刷新后重试"); + throw new UserFriendlyException("Invalid location(s). Refresh and try again."); } // 含已逻辑删除行:唯一键 UK_userlocation_user_location 覆盖全历史,不能对已删行再 INSERT @@ -1505,4 +1584,58 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService await _dbContext.SqlSugarClient.Insertable(toInsert).ExecuteCommandAsync(); } } + + /// + /// 一人多角色时优先「管理员」(admin),避免开通账号被显示成公司管理员。 + /// + private async Task LoadPreferredUserRoleAsync(Guid userId) + { + var rows = await _dbContext.SqlSugarClient.Queryable((ur, r) => ur.RoleId == r.Id) + .Where((ur, r) => ur.UserId == userId && !r.IsDeleted) + .Select((ur, r) => new UserRolePickRow + { + UserId = ur.UserId, + Id = r.Id, + RoleCode = r.RoleCode, + RoleName = r.RoleName, + OrderNum = r.OrderNum + }) + .ToListAsync(); + var preferred = PickPreferredRole(rows); + if (preferred is null) + { + return null; + } + + return new UserRoleEntity + { + UserId = userId, + RoleId = preferred.Id + }; + } + + private static UserRolePickRow? PickPreferredRole(IEnumerable rows) + { + var list = rows.ToList(); + if (list.Count == 0) + { + return null; + } + + return list + .OrderByDescending(x => + string.Equals(x.RoleCode, UserConst.AdminRolesCode, StringComparison.OrdinalIgnoreCase) + || string.Equals(x.RoleName, "管理员", StringComparison.Ordinal)) + .ThenByDescending(x => x.OrderNum) + .First(); + } + + private sealed class UserRolePickRow + { + public Guid UserId { get; set; } + public Guid Id { get; set; } + public string? RoleCode { get; set; } + public string? RoleName { get; set; } + public int OrderNum { get; set; } + } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TrainingAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TrainingAppService.cs index 2b687ff..c947506 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TrainingAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/TrainingAppService.cs @@ -254,7 +254,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("分类名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var parentId = string.IsNullOrWhiteSpace(input.ParentId) ? null : input.ParentId.Trim(); @@ -264,12 +264,12 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .FirstAsync(x => x.Id == parentId && !x.IsDeleted); if (parent is null) { - throw new UserFriendlyException("父级分类不存在"); + throw new UserFriendlyException("Parent category not found."); } if (!string.IsNullOrWhiteSpace(parent.ParentId)) { - throw new UserFriendlyException("仅支持两级分类,不能在二级分类下再建子级"); + throw new UserFriendlyException("Only two category levels are supported; cannot add children under a level-2 category."); } } @@ -277,7 +277,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .AnyAsync(x => !x.IsDeleted && x.CategoryName == name && x.ParentId == parentId); if (duplicated) { - throw new UserFriendlyException("同级分类名称已存在"); + throw new UserFriendlyException("A sibling category with this name already exists."); } var now = DateTime.Now; @@ -316,7 +316,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService /// 分类信息 /// 更新后的分类 /// 更新成功 - /// 分类不存在或名称重复 + /// Category not found.或名称重复 /// 服务器错误 public async Task UpdateCategoryAsync(string id, TrainingCategoryUpdateInputVo input) { @@ -324,14 +324,14 @@ public class TrainingAppService : ApplicationService, ITrainingAppService var name = input.CategoryName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("分类名称不能为空"); + throw new UserFriendlyException("Category name is required."); } var duplicated = await _dbContext.SqlSugarClient.Queryable() .AnyAsync(x => !x.IsDeleted && x.Id != id && x.CategoryName == name && x.ParentId == entity.ParentId); if (duplicated) { - throw new UserFriendlyException("同级分类名称已存在"); + throw new UserFriendlyException("A sibling category with this name already exists."); } entity.CategoryName = name; @@ -363,7 +363,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .AnyAsync(x => !x.IsDeleted && x.ParentId == id); if (hasChild) { - throw new UserFriendlyException("该一级分类下存在二级分类,无法删除"); + throw new UserFriendlyException("This level-1 category has level-2 children and cannot be deleted."); } } else @@ -372,7 +372,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .AnyAsync(x => !x.IsDeleted && x.CategoryId == id); if (hasFile) { - throw new UserFriendlyException("该二级分类下存在培训文件,无法删除"); + throw new UserFriendlyException("This level-2 category has training files and cannot be deleted."); } } @@ -412,30 +412,30 @@ public class TrainingAppService : ApplicationService, ITrainingAppService { if (input.File is null || input.File.Length <= 0) { - throw new UserFriendlyException("请选择要上传的文件"); + throw new UserFriendlyException("Select a file to upload."); } if (input.File.Length > MaxFileSizeBytes) { - throw new UserFriendlyException("文件大小不能超过20MB"); + throw new UserFriendlyException("File size cannot exceed 20 MB."); } var categoryId = input.CategoryId?.Trim(); if (string.IsNullOrWhiteSpace(categoryId)) { - throw new UserFriendlyException("二级分类Id不能为空"); + throw new UserFriendlyException("Level-2 category Id is required."); } var category = await GetCategoryOrThrowAsync(categoryId); if (string.IsNullOrWhiteSpace(category.ParentId)) { - throw new UserFriendlyException("文件只能上传到二级分类"); + throw new UserFriendlyException("Files can only be uploaded to level-2 categories."); } var ext = Path.GetExtension(input.File.FileName ?? string.Empty); if (string.IsNullOrWhiteSpace(ext) || !AllowedExtensions.Contains(ext)) { - throw new UserFriendlyException("不支持的文件格式"); + throw new UserFriendlyException("Unsupported file format."); } var saveRoot = ResolveTrainingRoot(); @@ -541,7 +541,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService var fileName = input.FileName?.Trim(); if (string.IsNullOrWhiteSpace(fileName)) { - throw new UserFriendlyException("文件名称不能为空"); + throw new UserFriendlyException("File name is required."); } entity.FileName = fileName; @@ -741,7 +741,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("培训文件不存在"); + throw new UserFriendlyException("Training file not found."); } return entity; @@ -753,7 +753,7 @@ public class TrainingAppService : ApplicationService, ITrainingAppService .FirstAsync(x => x.Id == id && !x.IsDeleted); if (entity is null) { - throw new UserFriendlyException("分类不存在"); + throw new UserFriendlyException("Category not found."); } return entity; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppAuthAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppAuthAppService.cs index 7bd1c08..92f73dd 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppAuthAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppAuthAppService.cs @@ -93,7 +93,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService /// 邮箱、密码;若系统开启验证码则需传 Uuid、Code /// Token、RefreshToken 与绑定门店 /// 登录成功 - /// 参数或验证码错误 + /// 参数或Verification code is incorrect. /// 服务器错误 [AllowAnonymous] public virtual async Task LoginAsync(UsAppLoginInputVo input) @@ -101,7 +101,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService // 泰额 SaaS:由 ThUsAppAuthAppService 覆盖本方法,按邮箱反查租户后登录;此处仅单库模式。 if (string.IsNullOrWhiteSpace(input.Password) || string.IsNullOrWhiteSpace(input.Email)) { - throw new UserFriendlyException("请输入合理数据!"); + throw new UserFriendlyException("Invalid input data."); } ValidationImageCaptcha(input.Uuid, input.Code); @@ -109,7 +109,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService var user = await FindActiveUserByEmailAsync(input.Email.Trim()); if (user is null) { - throw new UserFriendlyException("登录失败!邮箱不存在!"); + throw new UserFriendlyException("Sign-in failed: email does not exist."); } if (!UserPasswordHelper.VerifyPlainPassword(user, input.Password)) @@ -161,7 +161,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService { if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var list = await LoadBoundLocationsAsync(CurrentUser.Id.Value); @@ -220,7 +220,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService await UsAppAuthScopeHelper.EnsureAppScopeCallerAsync(_dbContext.SqlSugarClient, CurrentUser); if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } return await UsAppAuthScopeHelper.SelectLocationAsync( @@ -240,7 +240,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService /// 查询单个门店详情(Location 页):地址、门店电话、经营时间、店长(角色含 manager 的绑定用户) /// /// - /// 仅当当前登录用户在 userlocation 中绑定该 locationId 时可查;否则返回业务异常。 + /// 仅当当前登录用户在 userlocation 中绑定该 locationId 时可查;否则返回Business error.。 /// /// 店长:在同店绑定用户中,取 Role.RoleCode 或 Role.RoleName(忽略大小写)包含 manager 的第一条; /// 若无匹配则店长姓名与电话均为「无」。 @@ -250,20 +250,20 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService /// 门店主键(Guid 字符串) /// 与原型一致的展示字段 /// 成功 - /// 未登录、门店标识无效、未绑定或门店不存在 + /// You are not signed in.、门店标识无效、未绑定或Location not found. /// 服务器错误 [Authorize] public virtual async Task GetLocationDetailAsync(string locationId) { if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var lid = (locationId ?? string.Empty).Trim(); if (string.IsNullOrEmpty(lid) || !Guid.TryParse(lid, out var locationGuid)) { - throw new UserFriendlyException("无效的门店标识"); + throw new UserFriendlyException("Invalid location identifier."); } await UsAppPrintLogScopeHelper.EnsureUserCanAccessLocationAsync( @@ -277,7 +277,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService var loc = locRows.FirstOrDefault(); if (loc is null) { - throw new UserFriendlyException("门店不存在或已删除"); + throw new UserFriendlyException("Location not found or removed."); } var (mgrName, mgrPhone) = await TryResolveStoreManagerAsync(lid); @@ -300,14 +300,14 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService { if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var userId = CurrentUser.Id.Value; var user = await _userRepository.GetByIdAsync(userId); if (user is null || user.IsDeleted || !user.State) { - throw new UserFriendlyException("用户不存在或已停用"); + throw new UserFriendlyException("User not found or disabled."); } // 避免 SqlSugar 在该环境下对 Role 关联表达式解析异常(Select 不支持),这里改用显式 SQL 查询角色。 @@ -345,12 +345,12 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var current = input.CurrentPassword ?? string.Empty; @@ -359,17 +359,17 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService if (string.IsNullOrWhiteSpace(current) || string.IsNullOrWhiteSpace(newPwd) || string.IsNullOrWhiteSpace(confirm)) { - throw new UserFriendlyException("请填写当前密码、新密码与确认密码"); + throw new UserFriendlyException("Current password, new password, and confirmation are required."); } if (!string.Equals(newPwd, confirm, StringComparison.Ordinal)) { - throw new UserFriendlyException("新密码与确认密码不一致"); + throw new UserFriendlyException("New password and confirmation do not match."); } if (string.Equals(current, newPwd, StringComparison.Ordinal)) { - throw new UserFriendlyException("新密码不能与当前密码相同"); + throw new UserFriendlyException("New password must differ from the current password."); } ValidateAppPasswordComplexity(newPwd); @@ -378,7 +378,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService var user = await _userRepository.GetByIdAsync(userId); if (user is null || user.IsDeleted || !user.State) { - throw new UserFriendlyException("用户不存在或已停用"); + throw new UserFriendlyException("User not found or disabled."); } if (!user.JudgePassword(current)) @@ -470,27 +470,27 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService { if (password.Length < 8) { - throw new UserFriendlyException("新密码至少 8 位"); + throw new UserFriendlyException("New password must be at least 8 characters."); } if (!password.Any(char.IsUpper)) { - throw new UserFriendlyException("新密码需包含大写字母"); + throw new UserFriendlyException("New password must contain an uppercase letter."); } if (!password.Any(char.IsLower)) { - throw new UserFriendlyException("新密码需包含小写字母"); + throw new UserFriendlyException("New password must contain a lowercase letter."); } if (!password.Any(char.IsDigit)) { - throw new UserFriendlyException("新密码需包含至少一个数字"); + throw new UserFriendlyException("New password must contain at least one digit."); } if (!password.Any(c => !char.IsLetterOrDigit(c))) { - throw new UserFriendlyException("新密码需包含至少一个特殊字符"); + throw new UserFriendlyException("New password must contain at least one special character."); } } @@ -503,7 +503,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService if (!_captcha.Validate(uuid, code)) { - throw new UserFriendlyException("验证码错误"); + throw new UserFriendlyException("Verification code is incorrect."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppLabelingAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppLabelingAppService.cs index 98f8447..4855bc5 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppLabelingAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppLabelingAppService.cs @@ -63,7 +63,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (string.IsNullOrWhiteSpace(input.LocationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var locationId = input.LocationId.Trim(); @@ -348,19 +348,19 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var labelCode = input.LabelCode?.Trim(); if (string.IsNullOrWhiteSpace(labelCode)) { - throw new UserFriendlyException("labelCode不能为空"); + throw new UserFriendlyException("labelCode is required."); } var labelRow = await _dbContext.SqlSugarClient @@ -393,7 +393,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ if (labelRow is null) { - throw new UserFriendlyException("标签不存在或不可用"); + throw new UserFriendlyException("Label not found or unavailable."); } var labelForScope = new FlLabelDbEntity @@ -406,7 +406,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ if (!await LabelRegionScopeHelper.LabelAppliesToLocationAsync( _dbContext.SqlSugarClient, labelForScope, locationId, storeGroupIds)) { - throw new UserFriendlyException("该标签不属于当前门店"); + throw new UserFriendlyException("This label does not belong to the current location."); } var previewProductId = await ResolvePreviewProductIdAsync(labelRow.Id, input.ProductId); @@ -512,19 +512,19 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var labelCode = input.LabelCode?.Trim(); if (string.IsNullOrWhiteSpace(labelCode)) { - throw new UserFriendlyException("labelCode不能为空"); + throw new UserFriendlyException("labelCode is required."); } var quantity = input.PrintQuantity <= 0 ? 1 : input.PrintQuantity; @@ -576,7 +576,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ if (labelRow is null) { - throw new UserFriendlyException("标签不存在或不可用"); + throw new UserFriendlyException("Label not found or unavailable."); } await LabelRegionScopeHelper.EnsureLabelAppliesToLocationAsync( @@ -719,19 +719,19 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var taskId = input.TaskId?.Trim(); if (string.IsNullOrWhiteSpace(taskId)) { - throw new UserFriendlyException("taskId不能为空"); + throw new UserFriendlyException("taskId is required."); } var quantity = input.PrintQuantity <= 0 ? 1 : input.PrintQuantity; @@ -765,20 +765,20 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ var currentUserId = CurrentUser?.Id?.ToString(); if (string.IsNullOrWhiteSpace(currentUserId)) { - throw new UserFriendlyException("未登录"); + throw new UserFriendlyException("You are not signed in."); } var old = await _dbContext.SqlSugarClient.Queryable() .FirstAsync(x => x.Id == taskId); if (old is null) { - throw new UserFriendlyException("打印任务不存在"); + throw new UserFriendlyException("Print task not found."); } // 已绑定该门店的账号可重打门店内任意历史任务(不限 CreatedBy) if (!string.Equals(old.LocationId?.Trim(), locationId, StringComparison.OrdinalIgnoreCase)) { - throw new UserFriendlyException("该任务不属于当前门店"); + throw new UserFriendlyException("This task does not belong to the current location."); } LabelTemplatePreviewDto? resolvedTemplate = null; @@ -793,7 +793,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ if (resolvedTemplate is null) { - throw new UserFriendlyException("历史任务渲染快照解析失败,无法重打"); + throw new UserFriendlyException("Failed to parse historical task render snapshot; reprint is unavailable."); } var now = DateTime.Now; @@ -901,7 +901,7 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ /// 分页查询入参 /// 分页打印日志 /// 成功 - /// 参数错误/未登录 + /// 参数错误/You are not signed in. /// 服务器错误 [Authorize] [HttpPost] @@ -909,18 +909,18 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var currentUserIdStr = CurrentUser.Id.Value.ToString(); @@ -1050,18 +1050,18 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ { if (input is null) { - throw new UserFriendlyException("入参不能为空"); + throw new UserFriendlyException("Request body is required."); } if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } var locationId = input.LocationId?.Trim(); if (string.IsNullOrWhiteSpace(locationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } await UsAppPrintLogScopeHelper.EnsureUserCanAccessLocationAsync( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppTrainingAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppTrainingAppService.cs index 795a14b..0cad2d0 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppTrainingAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/UsAppTrainingAppService.cs @@ -53,7 +53,7 @@ public class UsAppTrainingAppService : ApplicationService, IUsAppTrainingAppServ { if (string.IsNullOrWhiteSpace(input.LocationId)) { - throw new UserFriendlyException("门店Id不能为空"); + throw new UserFriendlyException("locationId is required."); } var locationId = input.LocationId.Trim(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_alert_timer.sql b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_alert_timer.sql index c00fa72..47da0a0 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_alert_timer.sql +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_alert_timer.sql @@ -35,3 +35,70 @@ CREATE TABLE IF NOT EXISTS `fl_label_alert_timer` ( KEY `idx_fl_label_alert_timer_expires` (`ExpiresAt`), KEY `idx_fl_label_alert_timer_printed` (`PrintedAt`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='标签告警计时器'; + +-- CodeFirst 可能先建成缺列旧表,CREATE IF NOT EXISTS 不会补列,必须幂等 ALTER +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'LocationName' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `LocationName` varchar(200) NULL DEFAULT NULL COMMENT ''门店名冗余'' AFTER `LocationId`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'AlertTemplateId' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `AlertTemplateId` varchar(36) NULL DEFAULT NULL COMMENT ''告警模板Id'' AFTER `Subtitle`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'AlertTemplateName' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `AlertTemplateName` varchar(200) NULL DEFAULT NULL COMMENT ''告警模板名称'' AFTER `AlertTemplateId`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'DateTimeFormat' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `DateTimeFormat` varchar(100) NULL DEFAULT NULL COMMENT ''过期时刻展示格式'' AFTER `AlertTemplateName`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'PrintedByUserId' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `PrintedByUserId` varchar(36) NULL DEFAULT NULL COMMENT ''打印人Id'' AFTER `DateTimeFormat`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_label_alert_timer' AND COLUMN_NAME = 'PrintedByUserName' +); +SET @ddl := IF( + @c = 0, + 'ALTER TABLE `fl_label_alert_timer` ADD COLUMN `PrintedByUserName` varchar(200) NULL DEFAULT NULL COMMENT ''打印人姓名'' AFTER `PrintedByUserId`', + 'SELECT 1' +); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_team_member_scope.sql b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_team_member_scope.sql index 951f2db..e0c432c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_team_member_scope.sql +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_team_member_scope.sql @@ -7,7 +7,17 @@ CREATE TABLE IF NOT EXISTS `fl_team_member_scope` ( `UserId` varchar(36) NOT NULL COMMENT '成员 User.Id', `AppliedRegionType` varchar(20) NOT NULL DEFAULT 'SPECIFIED' COMMENT '适用Region:ALL/SPECIFIED', `AppliedLocationType` varchar(20) NOT NULL DEFAULT 'SPECIFIED' COMMENT '适用Location:ALL/SPECIFIED', + `PartnerIds` varchar(2000) NULL COMMENT 'Location=ALL 时绑定的 Company(fl_partner.Id,逗号分隔)', `CreationTime` datetime NULL, `LastModificationTime` datetime NULL, PRIMARY KEY (`UserId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Team Member 适用范围维度标记'; + +SET @c := ( + SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'fl_team_member_scope' AND COLUMN_NAME = 'PartnerIds' +); +SET @ddl := IF(@c = 0, + 'ALTER TABLE `fl_team_member_scope` ADD COLUMN `PartnerIds` varchar(2000) NULL COMMENT ''Location=ALL 时绑定的 Company(fl_partner.Id,逗号分隔)'' AFTER `AppliedLocationType`', + 'SELECT 1'); +PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/seed_platform_statistics_agents_host.sql b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/seed_platform_statistics_agents_host.sql new file mode 100644 index 0000000..9dca3cc --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/seed_platform_statistics_agents_host.sql @@ -0,0 +1,139 @@ +-- 泰额 Host:平台统计 + 代理管理菜单 / 平台代理角色 / 代理扩展表 +-- 仅在【主库 Host】执行,例如 antis-foodlabeling-test-host / antis-foodlabeling-host +-- 禁止在租户业务库执行(平台菜单不会下发给公司;新建租户不需要本脚本) +-- 可重复执行 +-- +-- 注意:文档草稿里的 f0010038 / f0010039 已占用为「支持」「API」, +-- 本脚本改用 f0010040 / f0010041。 + +SET NAMES utf8mb4; + +-- 1) 菜单:平台统计 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010040-0001-4000-8000-000000000040', + 0, NOW(), NULL, NULL, NULL, + 8, 1, '平台统计', 'FoodLabelingPlatformStatistics', 1, 'menu.platform.statistics', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:bar-chart-3', '/platform/statistics', 0, 0, 1, NULL, + '/food-labeling/platform/statistics/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010040-0001-4000-8000-000000000040' + OR `PermissionCode` = 'menu.platform.statistics' +); + +-- 2) 菜单:代理管理 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010041-0001-4000-8000-000000000041', + 0, NOW(), NULL, NULL, NULL, + 9, 1, '代理管理', 'FoodLabelingPlatformAgents', 1, 'menu.platform.agents', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:handshake', '/platform/agents', 0, 0, 1, NULL, + '/food-labeling/platform/agents/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010041-0001-4000-8000-000000000041' + OR `PermissionCode` = 'menu.platform.agents' +); + +-- 3) 角色:平台代理 +INSERT INTO `role` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `RoleName`, `RoleCode`, `Remark`, `DataScope`, `State`, + `AccessPermissionCodes`, `ConcurrencyStamp` +) +SELECT + 'f0020003-0001-4000-8000-000000000003', + 0, NOW(), NULL, NULL, NULL, + 998, '平台代理', 'platform-agent', '平台级代理:可创建公司并查看自建公司统计', 0, 1, + NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `role` WHERE `Id` = 'f0020003-0001-4000-8000-000000000003' + OR `RoleCode` = 'platform-agent' +); + +-- 4) admin 绑定新菜单(按 RoleCode,避免 Host 角色 Id 不一致) +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030043-0001-4000-8000-000000000043', r.`Id`, 'f0010040-0001-4000-8000-000000000040' +FROM `role` r +WHERE r.`RoleCode` = 'admin' AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010040-0001-4000-8000-000000000040' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030044-0001-4000-8000-000000000044', r.`Id`, 'f0010041-0001-4000-8000-000000000041' +FROM `role` r +WHERE r.`RoleCode` = 'admin' AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010041-0001-4000-8000-000000000041' + ) +LIMIT 1; + +-- 5) 代理角色:平台管理 + SAAS公司 + 平台统计(不含代理管理) +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030045-0001-4000-8000-000000000045', r.`Id`, 'f0010002-0001-4000-8000-000000000002' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010002-0001-4000-8000-000000000002' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030046-0001-4000-8000-000000000046', r.`Id`, 'f0010003-0001-4000-8000-000000000003' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010003-0001-4000-8000-000000000003' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030047-0001-4000-8000-000000000047', r.`Id`, 'f0010040-0001-4000-8000-000000000040' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010040-0001-4000-8000-000000000040' + ) +LIMIT 1; + +-- 6) 代理扩展表(Host) +CREATE TABLE IF NOT EXISTS `fl_th_platform_agent` ( + `Id` varchar(36) NOT NULL COMMENT '主键,建议与 user.Id 相同', + `UserId` varchar(36) NOT NULL COMMENT 'Host user.Id', + `CompanyQuota` int NOT NULL DEFAULT 0 COMMENT '可创建公司上限', + `Enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '1启用 0停用', + `Remark` varchar(255) NULL, + `IsDeleted` tinyint(1) NOT NULL DEFAULT 0, + `CreationTime` datetime NOT NULL, + `CreatorId` varchar(36) NULL, + `LastModificationTime` datetime NULL, + `LastModifierId` varchar(36) NULL, + `ConcurrencyStamp` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + UNIQUE KEY `UK_fl_th_platform_agent_UserId` (`UserId`), + KEY `IX_fl_th_platform_agent_Enabled` (`Enabled`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台代理扩展(配额)'; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThCompanyListItemDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThCompanyListItemDto.cs index cdafd02..e072d56 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThCompanyListItemDto.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThCompanyListItemDto.cs @@ -25,4 +25,10 @@ public class ThCompanyListItemDto /// 已分配的 SaaS 菜单权限 Key 列表 public List MenuPermissionKeys { get; set; } = new(); + + /// 公司有效期截止;空表示永久有效 + public DateTime? ExpireTime { get; set; } + + /// 当前是否已过期(超过有效期) + public bool Expired { get; set; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantInputVo.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantInputVo.cs index 79826b0..88512e8 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantInputVo.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantInputVo.cs @@ -42,6 +42,13 @@ public class ThProvisionTenantInputVo public int DbType { get; set; } /// + /// 公司有效期截止时间。空表示永久有效。 + /// 仅传日期(时间为 00:00:00)时,当天 24:00 前仍可登录。 + /// 超过后该公司主账号与子账号均无法登录、无法使用Business API。 + /// + public DateTime? ExpireTime { get; set; } + + /// /// 创建后是否触发业务库 CodeFirst 初始化(建库 + 建表 + Seed)。 /// 为 true 时在后台异步执行,HTTP 立即返回;未完成前出参 DatabaseInitializing=true、DatabaseInitialized=false。 /// 同步补跑请调用 initialize-tenant-database 或 PUT tenant/init/{id}。 diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantOutputDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantOutputDto.cs index dedf8d3..9b63899 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantOutputDto.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThProvisionTenantOutputDto.cs @@ -18,4 +18,7 @@ public class ThProvisionTenantOutputDto /// 业务库初始化是否已在后台进行中(与 DatabaseInitialized 互斥:进行中时为 true) public bool DatabaseInitializing { get; set; } + + /// 公司有效期截止;空表示永久 + public DateTime? ExpireTime { get; set; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThUpdateCompanyValidityInputVo.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThUpdateCompanyValidityInputVo.cs new file mode 100644 index 0000000..9f8d2a2 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/MultiTenancy/ThUpdateCompanyValidityInputVo.cs @@ -0,0 +1,19 @@ +using System.ComponentModel.DataAnnotations; + +namespace FoodLabeling.Th.Application.Contracts.Dtos.MultiTenancy; + +/// +/// 设置公司有效期(空 ExpireTime 表示永久有效) +/// +public class ThUpdateCompanyValidityInputVo +{ + /// 租户 Id + [Required] + public Guid TenantId { get; set; } + + /// + /// 有效期截止时间。传 null 表示永久有效。 + /// 仅日期(00:00:00)表示当天结束前有效。 + /// + public DateTime? ExpireTime { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentDto.cs new file mode 100644 index 0000000..30dd934 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentDto.cs @@ -0,0 +1,31 @@ +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 平台代理账号 +/// +public class ThPlatformAgentDto +{ + /// 用户 Id + public Guid Id { get; set; } + + /// 登录名 + public string UserName { get; set; } = string.Empty; + + /// 邮箱 + public string Email { get; set; } = string.Empty; + + /// 显示名 + public string DisplayName { get; set; } = string.Empty; + + /// 可创建公司上限 + public int CompanyQuota { get; set; } + + /// 已创建公司数 + public int CompanyUsed { get; set; } + + /// 是否启用 + public bool Enabled { get; set; } + + /// 创建时间 + public DateTime? CreationTime { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentGetListInput.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentGetListInput.cs new file mode 100644 index 0000000..14d8716 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentGetListInput.cs @@ -0,0 +1,18 @@ +using Yi.Framework.Ddd.Application.Contracts; + +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 平台代理分页查询 +/// +public class ThPlatformAgentGetListInput : PagedAllResultRequestDto +{ + /// 登录名 / 邮箱 / 显示名关键字 + public string? Keyword { get; set; } + + /// 启用状态(与前端 State 筛选兼容) + public bool? Enabled { get; set; } + + /// 启用状态(前端查询表单字段名为 State) + public bool? State { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentSaveInputVo.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentSaveInputVo.cs new file mode 100644 index 0000000..7725461 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformAgentSaveInputVo.cs @@ -0,0 +1,25 @@ +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 新建 / 更新平台代理 +/// +public class ThPlatformAgentSaveInputVo +{ + /// 登录名 + public string? UserName { get; set; } + + /// 邮箱 + public string? Email { get; set; } + + /// 显示名 + public string? DisplayName { get; set; } + + /// 可创建公司上限 + public int? CompanyQuota { get; set; } + + /// 是否启用 + public bool? Enabled { get; set; } + + /// 密码;新建必填,编辑留空表示不修改 + public string? Password { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyGetListInput.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyGetListInput.cs new file mode 100644 index 0000000..8c3b66e --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyGetListInput.cs @@ -0,0 +1,12 @@ +using Yi.Framework.Ddd.Application.Contracts; + +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 平台统计公司明细分页查询 +/// +public class ThPlatformStatisticsCompanyGetListInput : PagedAllResultRequestDto +{ + /// 公司名称关键字 + public string? Keyword { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyItemDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyItemDto.cs new file mode 100644 index 0000000..ad577d2 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsCompanyItemDto.cs @@ -0,0 +1,25 @@ +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 平台统计公司明细行 +/// +public class ThPlatformStatisticsCompanyItemDto +{ + /// 租户 Id + public Guid Id { get; set; } + + /// 公司名称 + public string CompanyName { get; set; } = string.Empty; + + /// 标签数量 + public int LabelCount { get; set; } + + /// 门店数量 + public int LocationCount { get; set; } + + /// 区域数量 + public int RegionCount { get; set; } + + /// 该公司最近使用时间 + public DateTime? LastUsedAt { get; set; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsOverviewDto.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsOverviewDto.cs new file mode 100644 index 0000000..5fcac2c --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/Dtos/Platform/ThPlatformStatisticsOverviewDto.cs @@ -0,0 +1,27 @@ +namespace FoodLabeling.Th.Application.Contracts.Dtos.Platform; + +/// +/// 平台统计概览 +/// +public class ThPlatformStatisticsOverviewDto +{ + /// 公司数量 + public int CompanyCount { get; set; } + + /// 区域数量(各租户 fl_group 合计) + public int RegionCount { get; set; } + + /// 门店数量(各租户 location 合计) + public int LocationCount { get; set; } + + /// 标签数量(各租户 fl_label 合计) + public int LabelCount { get; set; } + + /// 最近使用时间(各租户业务活跃时间的全局最大值) + public DateTime? LastUsedAt { get; set; } + + /// + /// 数据范围:all 平台管理员全部公司;agent 代理仅本人创建 + /// + public string Scope { get; set; } = "all"; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThMultiTenancyAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThMultiTenancyAppService.cs index 27cc08e..6b67276 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThMultiTenancyAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThMultiTenancyAppService.cs @@ -58,6 +58,11 @@ public interface IThMultiTenancyAppService : IApplicationService Task UpdateCompanyAdminAsync(ThUpdateCompanyAdminInputVo input); + /// + /// 平台级管理员:设置公司有效期(空表示永久) + /// + Task UpdateCompanyValidityAsync(ThUpdateCompanyValidityInputVo input); + /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformAgentAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformAgentAppService.cs new file mode 100644 index 0000000..6d41c17 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformAgentAppService.cs @@ -0,0 +1,36 @@ +using FoodLabeling.Th.Application.Contracts.Dtos.Platform; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; + +namespace FoodLabeling.Th.Application.Contracts.IServices; + +/// +/// 泰额平台代理管理(Host,仅 admin) +/// +public interface IThPlatformAgentAppService : IApplicationService +{ + /// + /// 代理分页列表 + /// + Task> GetListAsync(ThPlatformAgentGetListInput input); + + /// + /// 代理详情 + /// + Task GetAsync(Guid id); + + /// + /// 新建代理账号 + /// + Task CreateAsync(ThPlatformAgentSaveInputVo input); + + /// + /// 更新代理 + /// + Task UpdateAsync(Guid id, ThPlatformAgentSaveInputVo input); + + /// + /// 删除代理(软删用户与扩展行) + /// + Task DeleteAsync(Guid id); +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformStatisticsAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformStatisticsAppService.cs new file mode 100644 index 0000000..8c5b1e0 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application.Contracts/IServices/IThPlatformStatisticsAppService.cs @@ -0,0 +1,22 @@ +using FoodLabeling.Th.Application.Contracts.Dtos.Platform; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; + +namespace FoodLabeling.Th.Application.Contracts.IServices; + +/// +/// 泰额平台统计(Host) +/// +public interface IThPlatformStatisticsAppService : IApplicationService +{ + /// + /// 平台统计概览 KPI + /// + Task GetOverviewAsync(); + + /// + /// 平台统计公司明细分页 + /// + Task> GetCompaniesAsync( + ThPlatformStatisticsCompanyGetListInput input); +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Filters/FoodLabelingBusinessTenantActionFilter.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Filters/FoodLabelingBusinessTenantActionFilter.cs index 9eff1a1..26977f6 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Filters/FoodLabelingBusinessTenantActionFilter.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Filters/FoodLabelingBusinessTenantActionFilter.cs @@ -1,4 +1,5 @@ using FoodLabeling.Application.Helpers; +using FoodLabeling.Th.Application.MultiTenancy; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; @@ -9,35 +10,45 @@ namespace FoodLabeling.Th.Application.Filters; /// /// 泰额 SaaS:业务 AppService(fl_* / 租户 menu 等)须已解析租户上下文,禁止落到 host 主库。 -/// 平台登录误调业务接口时返回友好错误,避免 fl_label 缺表 500。 +/// 平台登录误调Business API时返回友好错误,避免 fl_label 缺表 500。 /// public class FoodLabelingBusinessTenantActionFilter : IAsyncActionFilter, ITransientDependency { private readonly ICurrentTenant _currentTenant; private readonly DbConnOptions _dbConnOptions; private readonly ISqlSugarDbContext _dbContext; + private readonly ThTenantValidityGuard _tenantValidityGuard; public FoodLabelingBusinessTenantActionFilter( ICurrentTenant currentTenant, IOptions dbConnOptions, - ISqlSugarDbContext dbContext) + ISqlSugarDbContext dbContext, + ThTenantValidityGuard tenantValidityGuard) { _currentTenant = currentTenant; _dbConnOptions = dbConnOptions.Value; _dbContext = dbContext; + _tenantValidityGuard = tenantValidityGuard; } - public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) + public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) { if (!_dbConnOptions.EnabledSaasMultiTenancy) { - return next(); + await next(); + return; + } + + if (_currentTenant.Id is { } currentTenantId && currentTenantId != Guid.Empty) + { + await _tenantValidityGuard.EnsureCompanyNotExpiredAsync(currentTenantId); } var path = context.HttpContext.Request.Path.Value ?? string.Empty; if (!RequiresBusinessTenant(path)) { - return next(); + await next(); + return; } TenantContextGuard.EnsureBusinessTenantIfSaas(_currentTenant, _dbConnOptions, ResolveOperationLabel(path)); @@ -46,7 +57,7 @@ public class FoodLabelingBusinessTenantActionFilter : IAsyncActionFilter, ITrans _dbConnOptions, ResolveOperationLabel(path)); - return next(); + await next(); } /// @@ -79,7 +90,7 @@ public class FoodLabelingBusinessTenantActionFilter : IAsyncActionFilter, ITrans private static string ResolveOperationLabel(string path) { var segment = path.Split('/', StringSplitOptions.RemoveEmptyEntries).LastOrDefault(); - return string.IsNullOrWhiteSpace(segment) ? "业务接口" : segment; + return string.IsNullOrWhiteSpace(segment) ? "Business API" : segment; } /// 平台侧路径片段(小写),命中则跳过业务租户校验。 @@ -90,9 +101,12 @@ public class FoodLabelingBusinessTenantActionFilter : IAsyncActionFilter, ITrans "/us-app-auth", "/th-multi-tenancy", "/th-tenant-provisioning", + // 平台统计 / 代理管理:读 Host yitenant + fl_th_platform_agent,不要求业务租户 + "/th-platform-statistics", + "/th-platform-agents", "/th-tenant-select", "/th-rbac", - // 平台管理员登录后拉主库菜单;__tenant 为空/全 0 时不可当业务接口拦截 + // 平台管理员登录后拉主库菜单;__tenant 为空/全 0 时不可当Business API拦截 "/auth-session", // 平台登录可进 Dashboard:服务内返回空统计 "/dashboard", diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/FoodLabelingThTenantDatabaseMigrationContributor.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/FoodLabelingThTenantDatabaseMigrationContributor.cs index a37ba2e..b661f49 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/FoodLabelingThTenantDatabaseMigrationContributor.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/FoodLabelingThTenantDatabaseMigrationContributor.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using FoodLabeling.Application.MultiTenancy; using Microsoft.Extensions.Logging; using Volo.Abp.DependencyInjection; @@ -37,6 +38,7 @@ public class FoodLabelingThTenantDatabaseMigrationContributor } var scriptAssembly = typeof(FoodLabelingTenantMigrationScriptNames).Assembly; + var errors = new List(); foreach (var resourceName in FoodLabelingTenantMigrationScriptNames.TenantInitializationOrder) { @@ -45,11 +47,29 @@ public class FoodLabelingThTenantDatabaseMigrationContributor context.TenantId, resourceName); - var sql = EmbeddedTenantSqlScripts.Read(scriptAssembly, resourceName); - await TenantSqlScriptExecutor.ExecuteMySqlScriptAsync( - context.ConnectionString, - sql, - cancellationToken); + try + { + var sql = EmbeddedTenantSqlScripts.Read(scriptAssembly, resourceName); + await TenantSqlScriptExecutor.ExecuteMySqlScriptAsync( + context.ConnectionString, + sql, + cancellationToken); + } + catch (Exception ex) + { + _logger.LogError( + ex, + "租户 {TenantId} 业务库迁移脚本失败 {Script},继续执行后续脚本", + context.TenantId, + resourceName); + errors.Add($"{resourceName}: {ex.Message}"); + } + } + + if (errors.Count > 0) + { + throw new InvalidOperationException( + "租户库补充 SQL 部分失败(后续脚本已继续执行):" + string.Join(" | ", errors)); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantAdminAccountBootstrapper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantAdminAccountBootstrapper.cs index cda43e3..e70b9e5 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantAdminAccountBootstrapper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantAdminAccountBootstrapper.cs @@ -15,7 +15,7 @@ using Yi.Framework.TenantManagement.Domain; namespace FoodLabeling.Th.Application.MultiTenancy; /// -/// 新增租户后:将业务库默认 admin 账号同步为开通时填写的登录邮箱,并确保绑定 admin 角色。 +/// 新增租户后:将业务库默认 admin 账号同步为开通时填写的登录邮箱,并确保绑定 admin(管理员)角色。 /// public class TenantAdminAccountBootstrapper : ITransientDependency { @@ -97,7 +97,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency } catch (Exception ex) { - _logger.LogWarning(ex, "租户 {TenantId} 凭据密码解密失败,仅同步账号", tenantId); + _logger.LogWarning(ex, "租户 {TenantId} 凭据Password decryption failed.,仅同步账号", tenantId); } } @@ -147,7 +147,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency tenantId, normalizedEmail); throw new UserFriendlyException( - "租户业务库默认管理员账号缺失,无法同步登录邮箱,请重新初始化业务库或联系运维"); + "Default tenant business administrator account is missing; cannot sync sign-in email. Re-initialize the business database or contact operations."); } var renamed = await tenantDb.Updateable() @@ -160,7 +160,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency if (renamed <= 0) { throw new UserFriendlyException( - "租户业务库管理员账号同步失败(UserName/Email 未更新),请重试 initialize-tenant-database 或联系运维"); + "Failed to sync tenant business administrator account (UserName/Email not updated). Retry initialize-tenant-database or contact operations."); } if (!string.IsNullOrEmpty(plainPassword)) @@ -231,7 +231,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency } /// - /// 幂等确保租户业务库管理员用户已绑定 RoleCode=admin 的角色。 + /// 幂等确保租户业务库开通账号已绑定 RoleCode=admin 的管理员角色。 /// public async Task EnsureTenantAdminRoleAsync(Guid tenantId, CancellationToken cancellationToken = default) { @@ -259,7 +259,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency } catch (UserFriendlyException ex) { - _logger.LogWarning(ex, "租户 {TenantId} 业务库未就绪,跳过 admin 角色绑定", tenantId); + _logger.LogWarning(ex, "租户 {TenantId} 业务库未就绪,跳过管理员角色绑定", tenantId); return; } @@ -277,7 +277,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency } /// - /// 查找管理员用户并绑定 admin 角色;已有绑定则跳过。 + /// 查找开通账号并绑定 admin;若仍绑着 companyAdmin 则替换为管理员。 /// private async Task EnsureAdminRoleBoundAsync( ISqlSugarClient tenantDb, @@ -287,7 +287,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency { var adminRoles = await tenantDb.Queryable() .Where(r => !r.IsDeleted) - .Where(r => r.RoleCode == UserConst.AdminRolesCode || r.RoleCode == UserConst.Admin) + .Where(r => r.RoleCode == UserConst.AdminRolesCode || r.RoleName == "管理员") .OrderBy(r => r.OrderNum, OrderByType.Desc) .Take(1) .ToListAsync(cancellationToken); @@ -330,6 +330,19 @@ public class TenantAdminAccountBootstrapper : ITransientDependency return; } + var leftoverCompanyAdminRoleIds = await tenantDb.Queryable() + .Where(r => !r.IsDeleted) + .Where(r => r.RoleCode == UserConst.CompanyAdminRolesCode) + .Where(r => r.Id != adminRole.Id) + .Select(r => r.Id) + .ToListAsync(cancellationToken); + if (leftoverCompanyAdminRoleIds.Count > 0) + { + await tenantDb.Deleteable() + .Where(ur => ur.UserId == adminUser.Id && leftoverCompanyAdminRoleIds.Contains(ur.RoleId)) + .ExecuteCommandAsync(cancellationToken); + } + var alreadyBound = await tenantDb.Queryable() .Where(ur => ur.UserId == adminUser.Id && ur.RoleId == adminRole.Id) .AnyAsync(); @@ -346,7 +359,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency await tenantDb.Insertable(entity).ExecuteCommandAsync(cancellationToken); _logger.LogInformation( - "租户 {TenantId} 已为管理员 {UserName} 绑定 admin 角色", + "租户 {TenantId} 已为开通账号 {UserName} 绑定管理员角色", tenantId, adminUser.UserName); } @@ -355,7 +368,7 @@ public class TenantAdminAccountBootstrapper : ITransientDependency { if (string.IsNullOrWhiteSpace(_dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = _dbConnOptions.DbType ?? DbType.MySql; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantBusinessDatabaseAccessor.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantBusinessDatabaseAccessor.cs index 3b43fab..54f62da 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantBusinessDatabaseAccessor.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantBusinessDatabaseAccessor.cs @@ -11,7 +11,7 @@ namespace FoodLabeling.Th.Application.MultiTenancy; public static class TenantBusinessDatabaseAccessor { private const string InitializeTenantDatabaseHintTemplate = - "请先调用 POST /api/app/th-tenant-provisioning/initialize-tenant-database/{0} 初始化业务库"; + "Call POST /api/app/th-tenant-provisioning/initialize-tenant-database/{0} to initialize the business database first"; /// /// 解析租户业务库连接串;为空时按配置回填并写回主库 YiTenant。 @@ -50,7 +50,7 @@ public static class TenantBusinessDatabaseAccessor { if (string.IsNullOrWhiteSpace(connectionString)) { - throw new UserFriendlyException("租户业务库连接串不能为空"); + throw new UserFriendlyException("Tenant business database connection string is required."); } return new SqlSugarClient(new ConnectionConfig @@ -96,7 +96,7 @@ public static class TenantBusinessDatabaseAccessor public static UserFriendlyException BuildMissingConnectionStringException(string tenantName) { return new UserFriendlyException( - $"租户「{tenantName}」未配置业务库连接串,请先在租户管理完善连接串或调用开通/初始化接口"); + $"Tenant \"{tenantName}\" has no business database connection string. Configure it in tenant management or run provisioning/initialize APIs."); } private static DbType ResolveDbType(DbType tenantDbType) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantCompanyMenuSyncService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantCompanyMenuSyncService.cs index c1a6175..57e82fe 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantCompanyMenuSyncService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantCompanyMenuSyncService.cs @@ -16,7 +16,7 @@ using Yi.Framework.TenantManagement.Domain; namespace FoodLabeling.Th.Application.MultiTenancy; /// -/// 主库 fl_th_tenant_menu_permission 同步到租户业务库 menu 与 admin 角色 rolemenu。 +/// 主库 fl_th_tenant_menu_permission 同步到租户业务库 menu,以及 admin / companyAdmin 角色 rolemenu。 /// 主库使用稳定 f001 菜单 Id;租户 Seed 为随机 Guid,须先 upsert 主库菜单副本再写 RoleMenu。 /// 主库读取使用 DbConnOptions.Url 独立 SqlSugarClient,避免后台 Init Scope 释放后仓储连接 ObjectDisposed。 /// @@ -50,7 +50,7 @@ public class TenantCompanyMenuSyncService : ITenantCompanyMenuSyncService, ITran } var tenant = await ThTenantHostDataAccessor.LoadTenantAsync(_dbConnOptions, tenantId) - ?? throw new UserFriendlyException("租户不存在"); + ?? throw new UserFriendlyException("Tenant not found."); var menuIds = await LoadNormalizedHostMenuIdsAsync(tenantId); var (connectionString, dbType) = await TenantBusinessDatabaseAccessor.ResolveConnectionAsync( @@ -69,17 +69,18 @@ public class TenantCompanyMenuSyncService : ITenantCompanyMenuSyncService, ITran return; } - var adminRole = await FindAdminRoleAsync(tenantDb, cancellationToken); - if (adminRole is null) + var targetRoles = await FindTenantMenuRolesAsync(tenantDb, cancellationToken); + if (targetRoles.Count == 0) { - _logger.LogWarning("租户 {TenantId} 未找到 admin 角色,跳过公司菜单同步", tenantId); + _logger.LogWarning("租户 {TenantId} 未找到 admin/companyAdmin 角色,跳过公司菜单同步", tenantId); return; } if (menuIds.Count == 0) { + var emptyRoleIds = targetRoles.Select(r => r.Id).ToList(); await tenantDb.Deleteable() - .Where(x => x.RoleId == adminRole.Id) + .Where(x => emptyRoleIds.Contains(x.RoleId)) .ExecuteCommandAsync(cancellationToken); return; } @@ -88,12 +89,17 @@ public class TenantCompanyMenuSyncService : ITenantCompanyMenuSyncService, ITran var menusToUpsert = CollectMenusWithAncestors(hostMenus, menuIds); await UpsertTenantMenusAsync(tenantDb, menusToUpsert, cancellationToken); await HidePlatformQrMenusAsync(tenantDb, cancellationToken); - await ReplaceAdminRoleMenusAsync(tenantDb, adminRole.Id, menusToUpsert.Select(m => m.Id).ToList(), cancellationToken); + var syncedMenuIds = menusToUpsert.Select(m => m.Id).ToList(); + foreach (var role in targetRoles) + { + await ReplaceAdminRoleMenusAsync(tenantDb, role.Id, syncedMenuIds, cancellationToken); + } _logger.LogInformation( - "租户 {TenantId} 已同步 {MenuCount} 条公司菜单到 admin 角色", + "租户 {TenantId} 已同步 {MenuCount} 条公司菜单到 {RoleCount} 个角色", tenantId, - menusToUpsert.Count); + menusToUpsert.Count, + targetRoles.Count); } private async Task> LoadNormalizedHostMenuIdsAsync(Guid tenantId) @@ -154,17 +160,21 @@ public class TenantCompanyMenuSyncService : ITenantCompanyMenuSyncService, ITran .ToList(); } - private static async Task FindAdminRoleAsync( + private static async Task> FindTenantMenuRolesAsync( ISqlSugarClient tenantDb, CancellationToken cancellationToken) { - var adminRoles = await tenantDb.Queryable() + var roles = await tenantDb.Queryable() .Where(r => !r.IsDeleted) - .Where(r => r.RoleCode == UserConst.AdminRolesCode || r.RoleCode == UserConst.Admin) - .OrderBy(r => r.OrderNum) - .Take(1) + .Where(r => r.RoleCode == UserConst.AdminRolesCode + || r.RoleCode == UserConst.Admin + || r.RoleCode == UserConst.CompanyAdminRolesCode) .ToListAsync(cancellationToken); - return adminRoles.FirstOrDefault(); + + return roles + .GroupBy(r => r.RoleCode, StringComparer.OrdinalIgnoreCase) + .Select(g => g.OrderByDescending(r => r.OrderNum).First()) + .ToList(); } private static async Task HidePlatformQrMenusAsync( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantDatabaseBootstrapper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantDatabaseBootstrapper.cs index 67628e3..87f5659 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantDatabaseBootstrapper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantDatabaseBootstrapper.cs @@ -24,13 +24,13 @@ public static class TenantDatabaseBootstrapper { if (string.IsNullOrWhiteSpace(databaseName) || !SafeDatabaseNameRegex.IsMatch(databaseName)) { - throw new UserFriendlyException("租户连接串中的数据库名无效,无法建库"); + throw new UserFriendlyException("Invalid database name in tenant connection string; cannot create database."); } var createCandidates = BuildCreateDatabaseCandidates(dbConnOptions, tenantConnectionString); if (createCandidates.Count == 0) { - throw new UserFriendlyException("未配置可用的数据库连接串,无法创建租户库"); + throw new UserFriendlyException("No usable database connection string is configured; cannot create tenant database."); } var createErrors = new List(); @@ -53,12 +53,12 @@ public static class TenantDatabaseBootstrapper { var userId = ExtractConnectionValue(tenantConnectionString, "uid") ?? "netteam"; throw new UserFriendlyException( - $"创建租户库失败(库={databaseName})。尝试结果:{string.Join(" | ", createErrors)}。" + - $"说明:MySQL 报 Access denied to database 新建库名时,通常是账号没有 CREATE 权限(与能否连上主库无关)。" + - $"请在 appsettings 的 DbConnOptions.AdminConnectionString 配置高权限账号连接串后重试;或手动执行:" + + $"Failed to create tenant database (database={databaseName}). Attempts: {string.Join(" | ", createErrors)}. " + + $"When MySQL reports Access denied for a new database name, the account usually lacks CREATE privilege (unrelated to host connectivity)." + + $"Configure a privileged connection string in appsettings DbConnOptions.AdminConnectionString and retry, or run manually: " + $"{TenantDatabaseCollation.BuildCreateDatabaseSql(databaseName)}; " + $"GRANT ALL PRIVILEGES ON `{databaseName}`.* TO '{userId}'@'%'; " + - $"再调用 initialize-tenant-database 补跑建表与 Seed"); + $"Then call initialize-tenant-database to run schema and seed."); } TryGrantTenantDatabaseAccess( diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantResolveHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantResolveHelper.cs index 18502c9..6cc1049 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantResolveHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantResolveHelper.cs @@ -52,18 +52,18 @@ public static class TenantResolveHelper if (config is null || config.Id == Guid.Empty) { - throw new UserFriendlyException("租户不存在或已停用"); + throw new UserFriendlyException("Tenant not found or disabled."); } if (string.IsNullOrWhiteSpace(config.ConnectionStrings?.Default)) { - throw new UserFriendlyException("租户未配置业务库连接串"); + throw new UserFriendlyException("Tenant business database connection string is not configured."); } return config; } - throw new UserFriendlyException("请指定租户 Id 或租户名称"); + throw new UserFriendlyException("Specify tenant Id or tenant name."); } public static async Task ResolveTenantAsync( @@ -73,7 +73,7 @@ public static class TenantResolveHelper { if (tenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } TenantConfiguration? config; @@ -84,12 +84,12 @@ public static class TenantResolveHelper if (config is null) { - throw new UserFriendlyException("租户不存在或已停用"); + throw new UserFriendlyException("Tenant not found or disabled."); } if (string.IsNullOrWhiteSpace(config.ConnectionStrings?.Default)) { - throw new UserFriendlyException("租户未配置业务库连接串"); + throw new UserFriendlyException("Tenant business database connection string is not configured."); } return config; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantSelectCredentialCipher.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantSelectCredentialCipher.cs index b0bc65a..22c58c6 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantSelectCredentialCipher.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/TenantSelectCredentialCipher.cs @@ -19,7 +19,7 @@ public class TenantSelectCredentialCipher : ITransientDependency var secretKey = options.Value.SecretKey?.Trim(); if (string.IsNullOrEmpty(secretKey)) { - throw new AbpException("未配置 FoodLabeling:TenantSelectCrypto:SecretKey"); + throw new AbpException("FoodLabeling:TenantSelectCrypto:SecretKey is not configured."); } _key = SHA256.HashData(Encoding.UTF8.GetBytes(secretKey)); @@ -56,7 +56,7 @@ public class TenantSelectCredentialCipher : ITransientDependency { if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(passwordSalt)) { - throw new UserFriendlyException("密码解密失败"); + throw new UserFriendlyException("Password decryption failed."); } try @@ -76,7 +76,7 @@ public class TenantSelectCredentialCipher : ITransientDependency } catch (Exception ex) when (ex is not UserFriendlyException) { - throw new UserFriendlyException("密码解密失败"); + throw new UserFriendlyException("Password decryption failed."); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActor.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActor.cs new file mode 100644 index 0000000..4033fd4 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActor.cs @@ -0,0 +1,19 @@ +namespace FoodLabeling.Th.Application.MultiTenancy; + +/// +/// 平台端登录身份(Host admin / 平台代理) +/// +public sealed class ThPlatformActor +{ + /// 当前用户 Id + public Guid UserId { get; init; } + + /// 是否平台超级管理员 + public bool IsAdmin { get; init; } + + /// 是否平台代理 + public bool IsAgent { get; init; } + + /// 统计范围:all / agent + public string Scope => IsAdmin ? "all" : "agent"; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActorResolver.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActorResolver.cs new file mode 100644 index 0000000..eb6472f --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformActorResolver.cs @@ -0,0 +1,89 @@ +using SqlSugar; +using Volo.Abp; +using Volo.Abp.DependencyInjection; +using Volo.Abp.MultiTenancy; +using Volo.Abp.Users; +using Yi.Framework.Rbac.Domain.Entities; +using Yi.Framework.Rbac.Domain.Shared.Consts; +using Yi.Framework.SqlSugarCore.Abstractions; + +namespace FoodLabeling.Th.Application.MultiTenancy; + +/// +/// 解析 Host 平台管理员 / 代理身份 +/// +public class ThPlatformActorResolver : ITransientDependency +{ + private readonly ICurrentUser _currentUser; + private readonly ICurrentTenant _currentTenant; + private readonly ISqlSugarRepository _userRoleRepository; + + public ThPlatformActorResolver( + ICurrentUser currentUser, + ICurrentTenant currentTenant, + ISqlSugarRepository userRoleRepository) + { + _currentUser = currentUser; + _currentTenant = currentTenant; + _userRoleRepository = userRoleRepository; + } + + /// + /// 要求当前用户为平台管理员或平台代理 + /// + public async Task EnsurePlatformActorAsync() + { + var actor = await ResolveAsync(); + if (!actor.IsAdmin && !actor.IsAgent) + { + throw new UserFriendlyException("Only platform administrators or platform agents may access this."); + } + + return actor; + } + + /// + /// 要求当前用户为平台超级管理员 + /// + public async Task EnsureAdminAsync() + { + var actor = await ResolveAsync(); + if (!actor.IsAdmin) + { + throw new UserFriendlyException("Only platform administrators may manage agents."); + } + + return actor; + } + + private async Task ResolveAsync() + { + if (_currentUser.Id is null || _currentUser.Id == Guid.Empty) + { + throw new UserFriendlyException("You are not signed in."); + } + + var userId = _currentUser.Id.Value; + List codes; + using (_currentTenant.Change(null)) + { + codes = await _userRoleRepository._DbQueryable + .InnerJoin((ur, r) => ur.RoleId == r.Id) + .Where((ur, r) => ur.UserId == userId && !r.IsDeleted && r.State) + .Select((ur, r) => r.RoleCode) + .ToListAsync(); + } + + var isAdmin = codes.Any(c => + string.Equals(c, UserConst.AdminRolesCode, StringComparison.OrdinalIgnoreCase)); + var isAgent = codes.Any(c => + string.Equals(c, UserConst.PlatformAgentRolesCode, StringComparison.OrdinalIgnoreCase)); + + return new ThPlatformActor + { + UserId = userId, + IsAdmin = isAdmin, + IsAgent = isAgent && !isAdmin + }; + } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformTenantStatsReader.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformTenantStatsReader.cs new file mode 100644 index 0000000..be3e955 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThPlatformTenantStatsReader.cs @@ -0,0 +1,161 @@ +using FoodLabeling.Th.Application.Contracts.Options; +using Microsoft.Extensions.Options; +using SqlSugar; +using Volo.Abp.DependencyInjection; +using Volo.Abp.MultiTenancy; +using Yi.Framework.SqlSugarCore.Abstractions; +using Yi.Framework.TenantManagement.Domain; + +namespace FoodLabeling.Th.Application.MultiTenancy; + +/// +/// 跨租户读取区域 / 门店 / 标签数量与最近使用时间 +/// +public class ThPlatformTenantStatsReader : ITransientDependency +{ + private const int MaxConcurrency = 4; + private static readonly Guid ProtectedDefaultTenantId = Guid.Parse("11111111-1111-1111-1111-111111111111"); + + private readonly FoodLabelingThTenantDatabaseOptions _dbOptions; + private readonly ISqlSugarRepository _tenantRepository; + private readonly ICurrentTenant _currentTenant; + + public ThPlatformTenantStatsReader( + IOptions dbOptions, + ISqlSugarRepository tenantRepository, + ICurrentTenant currentTenant) + { + _dbOptions = dbOptions.Value; + _tenantRepository = tenantRepository; + _currentTenant = currentTenant; + } + + public static bool IsProtectedDefaultTenant(TenantAggregateRoot tenant) + { + return tenant.Id == ProtectedDefaultTenantId + || string.Equals(tenant.Name, "Default", StringComparison.OrdinalIgnoreCase); + } + + /// + /// 读取单个租户业务库统计;库未初始化或表不存在时返回 0 + /// + public async Task ReadAsync(TenantAggregateRoot tenant) + { + try + { + var (connectionString, dbType) = await TenantBusinessDatabaseAccessor.ResolveConnectionAsync( + tenant, + _dbOptions, + PersistTenantAsync); + using var db = TenantBusinessDatabaseAccessor.CreateClient(connectionString, dbType); + db.Ado.ExecuteCommand("SELECT 1"); + + var tables = await db.Ado.SqlQueryAsync( + @"SELECT TABLE_NAME + FROM information_schema.TABLES + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME IN ('fl_group','location','fl_label')"); + var names = new HashSet(tables, StringComparer.OrdinalIgnoreCase); + + var region = names.Contains("fl_group") + ? await ScalarCountAsync(db, "fl_group") + : 0; + var location = names.Contains("location") + ? await ScalarCountAsync(db, "location") + : 0; + var label = names.Contains("fl_label") + ? await ScalarCountAsync(db, "fl_label") + : 0; + + DateTime? lastUsed = null; + foreach (var table in new[] { "fl_group", "location", "fl_label" }) + { + if (!names.Contains(table)) + { + continue; + } + + var ts = await db.Ado.SqlQuerySingleAsync( + $"SELECT MAX(COALESCE(`LastModificationTime`, `CreationTime`)) FROM `{table}` WHERE IFNULL(`IsDeleted`,0)=0"); + if (ts is { Year: >= 1971 } value && (lastUsed is null || value > lastUsed)) + { + lastUsed = value; + } + } + + return new ThPlatformTenantStatSnapshot + { + TenantId = tenant.Id, + CompanyName = tenant.Name, + RegionCount = region, + LocationCount = location, + LabelCount = label, + LastUsedAt = lastUsed + }; + } + catch + { + return new ThPlatformTenantStatSnapshot + { + TenantId = tenant.Id, + CompanyName = tenant.Name + }; + } + } + + /// + /// 限制并发读取多个租户统计 + /// + public async Task> ReadManyAsync(IReadOnlyList tenants) + { + var result = new ThPlatformTenantStatSnapshot[tenants.Count]; + using var gate = new SemaphoreSlim(MaxConcurrency); + var tasks = tenants.Select(async (tenant, index) => + { + await gate.WaitAsync(); + try + { + result[index] = await ReadAsync(tenant); + } + finally + { + gate.Release(); + } + }); + await Task.WhenAll(tasks); + return result.ToList(); + } + + private static async Task ScalarCountAsync(ISqlSugarClient db, string table) + { + var value = await db.Ado.GetIntAsync( + $"SELECT COUNT(1) FROM `{table}` WHERE IFNULL(`IsDeleted`,0)=0"); + return value; + } + + private async Task PersistTenantAsync(TenantAggregateRoot tenant) + { + using (_currentTenant.Change(null)) + { + await _tenantRepository.UpdateAsync(tenant); + } + } +} + +/// +/// 单个租户统计快照 +/// +public sealed class ThPlatformTenantStatSnapshot +{ + public Guid TenantId { get; init; } + + public string CompanyName { get; init; } = string.Empty; + + public int RegionCount { get; init; } + + public int LocationCount { get; init; } + + public int LabelCount { get; init; } + + public DateTime? LastUsedAt { get; init; } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantHostDataAccessor.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantHostDataAccessor.cs index b3557ba..c17b6c8 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantHostDataAccessor.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantHostDataAccessor.cs @@ -17,7 +17,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; @@ -32,7 +32,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; @@ -154,7 +154,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; @@ -170,7 +170,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; @@ -185,7 +185,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; @@ -195,7 +195,7 @@ internal static class ThTenantHostDataAccessor .ExecuteCommandAsync(); if (rows <= 0) { - throw new UserFriendlyException("主库菜单更新失败(未影响任何行)"); + throw new UserFriendlyException("Host menu update failed (no rows affected)."); } } @@ -203,7 +203,7 @@ internal static class ThTenantHostDataAccessor { if (string.IsNullOrWhiteSpace(dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = dbConnOptions.DbType ?? DbType.MySql; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantValidityGuard.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantValidityGuard.cs new file mode 100644 index 0000000..d8494b2 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThTenantValidityGuard.cs @@ -0,0 +1,98 @@ +using Microsoft.Extensions.Options; +using SqlSugar; +using Volo.Abp; +using Volo.Abp.DependencyInjection; +using Yi.Framework.SqlSugarCore.Abstractions; +using Yi.Framework.TenantManagement.Domain; + +namespace FoodLabeling.Th.Application.MultiTenancy; + +/// +/// 公司有效期:超过截止时间后,该公司主账号与子账号均不可登录、不可调Business API。 +/// +public class ThTenantValidityGuard : ITransientDependency +{ + public const string ExpiredLoginMessage = "This company authorization has expired. The primary account and all sub-accounts cannot sign in. Please contact the platform to renew."; + + public const string ExpiredApiMessage = "This company authorization has expired. You cannot continue using the system. Please contact the platform to renew."; + + private static readonly Guid ProtectedDefaultTenantId = Guid.Parse("11111111-1111-1111-1111-111111111111"); + + private readonly DbConnOptions _dbConnOptions; + + public ThTenantValidityGuard(IOptions dbConnOptions) + { + _dbConnOptions = dbConnOptions.Value; + } + + /// + /// 空有效期表示永久。仅日期(00:00:00)视为当天 24:00 截止(次日 0 点起过期)。 + /// + public static DateTime? NormalizeExpireTime(DateTime? expireTime) + { + if (expireTime is null) + { + return null; + } + + var value = expireTime.Value; + return value.TimeOfDay == TimeSpan.Zero ? value.Date.AddDays(1) : value; + } + + public static bool IsExpired(DateTime? expireTime, DateTime now) + { + var deadline = NormalizeExpireTime(expireTime); + return deadline is not null && now >= deadline; + } + + public async Task EnsureCompanyNotExpiredAsync(Guid tenantId) + { + if (tenantId == Guid.Empty || tenantId == ProtectedDefaultTenantId) + { + return; + } + + var expireTime = await GetExpireTimeAsync(tenantId); + if (IsExpired(expireTime, DateTime.Now)) + { + throw new UserFriendlyException(ExpiredApiMessage); + } + } + + public async Task EnsureCompanyCanLoginAsync(Guid tenantId) + { + if (tenantId == Guid.Empty || tenantId == ProtectedDefaultTenantId) + { + return; + } + + var expireTime = await GetExpireTimeAsync(tenantId); + if (IsExpired(expireTime, DateTime.Now)) + { + throw new UserFriendlyException(ExpiredLoginMessage); + } + } + + public async Task GetExpireTimeAsync(Guid tenantId) + { + var tenant = await ThTenantHostDataAccessor.LoadTenantAsync(_dbConnOptions, tenantId); + return tenant?.ExpireTime; + } + + public static async Task SaveExpireTimeAsync( + ISqlSugarRepository tenantRepository, + Guid tenantId, + DateTime? expireTime) + { + DateTime? stored = expireTime.HasValue && expireTime.Value.TimeOfDay == TimeSpan.Zero + ? expireTime.Value.Date + : expireTime; + await tenantRepository._Db.Ado.ExecuteCommandAsync( + "UPDATE `yitenant` SET `ExpireTime` = @ExpireTime WHERE `Id` = @Id", + new List + { + new("@ExpireTime", (object?)stored ?? DBNull.Value), + new("@Id", tenantId.ToString()) + }); + } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThWebPlatformLoginHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThWebPlatformLoginHelper.cs index 4ec3352..0711906 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThWebPlatformLoginHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/MultiTenancy/ThWebPlatformLoginHelper.cs @@ -16,7 +16,7 @@ public static class ThWebPlatformLoginHelper /// 平台邮箱账号误选业务租户时的登录拒绝提示 public const string PlatformAccountMustUseDefaultMessage = - "登录失败:平台管理员邮箱请选择 Default 选项登录,不能使用业务租户登录"; + "Sign-in failed: platform administrator accounts must sign in with the Default tenant option, not a company tenant."; /// /// 是否为业务租户登录(选了具体公司,而非 Default / 空 tenantId) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAppAuthAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAppAuthAppService.cs index f33e2f0..fe91b16 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAppAuthAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAppAuthAppService.cs @@ -2,6 +2,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text; using FoodLabeling.Application.Contracts.Dtos.UsAppAuth; +using FoodLabeling.Application.Helpers; using FoodLabeling.Application.Services.DbModels; using FoodLabeling.Domain.Entities; using FoodLabeling.Th.Application.MultiTenancy; @@ -42,6 +43,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService private readonly JwtOptions _jwtOptions; private readonly ITenantStore _tenantStore; private readonly DbConnOptions _dbConnOptions; + private readonly ThTenantValidityGuard _tenantValidityGuard; public ThAppAuthAppService( IAccountManager accountManager, @@ -52,7 +54,8 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService IOptions jwtOptions, IOptions rbacOptions, ITenantStore tenantStore, - IOptions dbConnOptions) + IOptions dbConnOptions, + ThTenantValidityGuard tenantValidityGuard) { _accountManager = accountManager; _userRepository = userRepository; @@ -63,6 +66,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService _rbacOptions = rbacOptions.Value; _tenantStore = tenantStore; _dbConnOptions = dbConnOptions.Value; + _tenantValidityGuard = tenantValidityGuard; } /// @@ -80,7 +84,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService /// 登录参数 /// Token、RefreshToken、租户信息与绑定门店 /// 登录成功 - /// 参数缺失、验证码错误或账号密码错误 + /// 参数缺失、Verification code is incorrect.或账号密码错误 /// 服务器错误 [AllowAnonymous] [HttpPost("th-app-auth/login")] @@ -89,7 +93,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService if (string.IsNullOrWhiteSpace(input.Password) || string.IsNullOrWhiteSpace(input.Email)) { - throw new UserFriendlyException("请输入邮箱与密码!"); + throw new UserFriendlyException("Email and password are required."); } ValidationImageCaptcha(input.Uuid, input.Code); @@ -97,7 +101,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService var tenantId = await ResolveTenantIdForLoginAsync(input); if (!tenantId.HasValue || tenantId.Value == Guid.Empty) { - throw new UserFriendlyException("登录失败:未找到该邮箱对应的公司,请确认邮箱或联系管理员"); + throw new UserFriendlyException("Sign-in failed: no company was found for this email. Verify the email or contact an administrator."); } if (ThWebPlatformLoginHelper.IsBusinessTenantLogin(tenantId, null)) @@ -105,6 +109,8 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService await EnsureNotHostPlatformAccountAsync(input.Email); } + await _tenantValidityGuard.EnsureCompanyCanLoginAsync(tenantId.Value); + var tenantConfig = await TenantResolveHelper.ResolveTenantAsync( _tenantStore, CurrentTenant, tenantId.Value); @@ -113,7 +119,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService // 优先直连租户库查用户,避免 CurrentTenant.Change 后仓储仍连主库导致「邮箱不存在」 var user = await FindActiveUserByEmailInTenantDbAsync(tenantId.Value, input.Email.Trim()) - ?? throw new UserFriendlyException("登录失败!邮箱不存在!"); + ?? throw new UserFriendlyException("Sign-in failed: email does not exist."); if (!UserPasswordHelper.VerifyPlainPassword(user, input.Password) && !user.JudgePassword(input.Password)) { @@ -151,12 +157,12 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService { if (!CurrentUser.Id.HasValue) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } if (!CurrentTenant.Id.HasValue) { - throw new UserFriendlyException("未识别租户,请重新登录或携带 __tenant"); + throw new UserFriendlyException("Tenant could not be resolved. Sign in again or include __tenant."); } using (CurrentTenant.Change(CurrentTenant.Id.Value, CurrentTenant.Name)) @@ -263,7 +269,7 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService if (!_captcha.Validate(uuid, code)) { - throw new UserFriendlyException("验证码错误"); + throw new UserFriendlyException("Verification code is incorrect."); } } @@ -388,21 +394,25 @@ public class ThAppAuthAppService : ApplicationService, IThAppAuthAppService private async Task> LoadBoundLocationsAsync(Guid userId) { var db = (await _dbContextProvider.GetDbContextAsync()).SqlSugarClient; - var userIdStr = userId.ToString(); - var links = await db.Queryable() - .Where(x => !x.IsDeleted && x.UserId == userIdStr) - .Select(x => x.LocationId) - .ToListAsync(); + var accessibleIds = await LocationScopeBindingHelper.ResolveAppAccessibleLocationIdsForUserAsync( + db, userId); + if (accessibleIds.Count == 0) + { + return new List(); + } - if (links.Count == 0) + var guidList = accessibleIds + .Select(x => Guid.TryParse(x, out var g) ? g : (Guid?)null) + .Where(x => x.HasValue) + .Select(x => x!.Value) + .ToList(); + if (guidList.Count == 0) { return new List(); } - var wanted = links.Distinct().ToList(); var locations = (await db.Queryable() - .Where(x => !x.IsDeleted) - .Where(x => wanted.Contains(x.Id.ToString())) + .Where(x => !x.IsDeleted && guidList.Contains(x.Id)) .ToListAsync()) .OrderBy(x => x.OrderNum) .ThenBy(x => x.LocationName) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAuthSessionAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAuthSessionAppService.cs index abb6129..23a1f58 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAuthSessionAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThAuthSessionAppService.cs @@ -3,6 +3,7 @@ using FoodLabeling.Application.Contracts.IServices; using FoodLabeling.Application.Helpers; using FoodLabeling.Application.Services; using FoodLabeling.Th.Application.Contracts.IServices; +using FoodLabeling.Th.Application.MultiTenancy; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Volo.Abp.Caching; @@ -14,13 +15,14 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace FoodLabeling.Th.Application.Services; /// -/// 泰额版:my-menus 前幂等同步主库公司菜单开通到租户 admin 角色 RoleMenu。 +/// 泰额版:my-menus 前幂等同步开通账号为管理员,并把公司菜单写到 admin / companyAdmin。 /// [Dependency(ReplaceServices = true)] [ExposeServices(typeof(IAuthSessionAppService), typeof(AuthSessionAppService))] public class ThAuthSessionAppService : AuthSessionAppService { private readonly ITenantCompanyMenuSyncService _companyMenuSyncService; + private readonly TenantAdminAccountBootstrapper _adminAccountBootstrapper; private readonly DbConnOptions _dbConnOptions; public ThAuthSessionAppService( @@ -29,10 +31,12 @@ public class ThAuthSessionAppService : AuthSessionAppService IDistributedCache userCache, IDistributedCache systemEditStampCache, IOptions dbConnOptions, - ITenantCompanyMenuSyncService companyMenuSyncService) + ITenantCompanyMenuSyncService companyMenuSyncService, + TenantAdminAccountBootstrapper adminAccountBootstrapper) : base(dbContext, userRepository, userCache, systemEditStampCache, dbConnOptions) { _companyMenuSyncService = companyMenuSyncService; + _adminAccountBootstrapper = adminAccountBootstrapper; _dbConnOptions = dbConnOptions.Value; } @@ -45,6 +49,7 @@ public class ThAuthSessionAppService : AuthSessionAppService { try { + await _adminAccountBootstrapper.EnsureTenantAdminRoleAsync(CurrentTenant.Id.Value); await _companyMenuSyncService.EnsureAdminRoleMenusSyncedAsync(CurrentTenant.Id.Value); } catch (Exception ex) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThMultiTenancyAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThMultiTenancyAppService.cs index bd7115b..b36f5af 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThMultiTenancyAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThMultiTenancyAppService.cs @@ -55,6 +55,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe private readonly DbConnOptions _dbConnOptions; private readonly IDistributedCache _tenantCache; private readonly ITenantCompanyMenuSyncService _companyMenuSyncService; + private readonly ThPlatformActorResolver _platformActorResolver; public ThMultiTenancyAppService( ITenantService tenantService, @@ -67,7 +68,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe IOptions tenantDatabaseOptions, IOptions dbConnOptions, IDistributedCache tenantCache, - ITenantCompanyMenuSyncService companyMenuSyncService) + ITenantCompanyMenuSyncService companyMenuSyncService, + ThPlatformActorResolver platformActorResolver) { _tenantService = tenantService; _tenantRepository = tenantRepository; @@ -80,6 +82,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe _dbConnOptions = dbConnOptions.Value; _tenantCache = tenantCache; _companyMenuSyncService = companyMenuSyncService; + _platformActorResolver = platformActorResolver; } /// @@ -174,7 +177,9 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// "creationTime": "2026-01-01T08:00:00", /// "loginAccount": "admin", /// "password": "Base64CipherText", - /// "passwordSalt": "Base64Iv" + /// "passwordSalt": "Base64Iv", + /// "expireTime": "2027-12-31T00:00:00", + /// "expired": false /// } /// ] /// } @@ -188,26 +193,33 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 分页与筛选条件 /// 分页公司列表 /// 成功返回分页列表 - /// 未登录 + /// You are not signed in. /// 服务器错误 [Authorize] [HttpGet("th-multi-tenancy/company-list")] public virtual async Task> GetCompanyListAsync(ThCompanyListInput input) { var nameFilter = !string.IsNullOrWhiteSpace(input.Keyword) ? input.Keyword : input.Name; + var actor = await _platformActorResolver.EnsurePlatformActorAsync(); + var skip = Math.Max(0, input.SkipCount); + var take = input.MaxResultCount <= 0 ? 10 : input.MaxResultCount; - var page = await _tenantService.GetListAsync(new TenantGetListInput + RefAsync total = 0; + List entities; + using (UseHostTenantScope()) { - Name = nameFilter, - SkipCount = input.SkipCount, - MaxResultCount = input.MaxResultCount - }); + entities = await _tenantRepository._DbQueryable + .WhereIF(actor.IsAgent, x => x.CreatorId == actor.UserId) + .WhereIF(!string.IsNullOrWhiteSpace(nameFilter), x => x.Name.Contains(nameFilter!)) + .OrderBy(x => x.CreationTime, OrderByType.Desc) + .ToPageListAsync(skip, take, total); + } - var tenantIds = page.Items.Select(x => x.Id).ToList(); + var tenantIds = entities.Select(x => x.Id).ToList(); var credentialMap = await LoadCredentialMapAsync(tenantIds); var menuPermissionMap = await LoadMenuPermissionMapAsync(tenantIds); - var items = page.Items.Select(x => + var items = entities.Select(x => { credentialMap.TryGetValue(x.Id, out var credential); var resolved = ResolveEncryptedCredential(x.Id, credential); @@ -220,11 +232,13 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe LoginAccount = resolved.LoginAccount, Password = resolved.Password, PasswordSalt = resolved.PasswordSalt, - MenuPermissionKeys = menuKeys ?? new List() + MenuPermissionKeys = menuKeys ?? new List(), + ExpireTime = x.ExpireTime, + Expired = ThTenantValidityGuard.IsExpired(x.ExpireTime, DateTime.Now) }; }).ToList(); - return new PagedResultDto(page.TotalCount, items); + return new PagedResultDto(total, items); } /// @@ -253,7 +267,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 无内容 /// 修改成功 /// 参数错误或账号重复 - /// 未登录 + /// You are not signed in. /// 租户或管理员不存在 /// 服务器错误 [Authorize] @@ -262,13 +276,13 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (input.TenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } var hasPassword = !string.IsNullOrWhiteSpace(input.Password); if (hasPassword && string.IsNullOrWhiteSpace(input.PasswordSalt)) { - throw new UserFriendlyException("修改密码时必须提供 passwordSalt"); + throw new UserFriendlyException("passwordSalt is required when changing the password."); } TenantAggregateRoot tenant; @@ -276,7 +290,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe using (UseHostTenantScope()) { tenant = await _tenantRepository.FindAsync(input.TenantId) - ?? throw new UserFriendlyException("租户不存在"); + ?? throw new UserFriendlyException("Tenant not found."); // 主键列 TenantId 映射到实体 Id,用 Queryable 按 Id 查询 var credentials = await _credentialRepository._DbQueryable .Where(c => c.Id == input.TenantId) @@ -307,7 +321,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe .Take(1) .ToListAsync(); var adminUser = adminUsers.FirstOrDefault() - ?? throw new UserFriendlyException("未找到租户管理员账号"); + ?? throw new UserFriendlyException("Tenant administrator account was not found."); if (!string.Equals(newLoginAccount, currentLoginAccount, StringComparison.OrdinalIgnoreCase)) { @@ -342,6 +356,63 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe } /// + /// 设置公司(租户)有效期 + /// + /// + /// 需平台管理员或平台代理登录。ExpireTime 为空表示永久有效; + /// 仅传日期(00:00:00)时,当天结束前仍可登录使用。 + /// 超过有效期后该公司主账号与子账号均无法登录、无法调用Business API。 + /// 代理仅能修改本人创建的公司。Default 保护租户不可改有效期。 + /// + /// 示例请求: + /// ```json + /// { + /// "tenantId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + /// "expireTime": "2027-12-31" + /// } + /// ``` + /// + /// 参数说明: + /// - tenantId: 租户 Id(必填) + /// - expireTime: 有效期截止;null 表示永久 + /// + /// 租户 Id 与有效期 + /// 无内容 + /// 设置成功 + /// 参数错误、无权限或保护租户 + /// You are not signed in. + /// Tenant not found. + /// 服务器错误 + [Authorize] + [HttpPut("th-multi-tenancy/company-validity")] + public virtual async Task UpdateCompanyValidityAsync(ThUpdateCompanyValidityInputVo input) + { + if (input.TenantId == Guid.Empty) + { + throw new UserFriendlyException("Tenant Id is required."); + } + + if (input.TenantId == ProtectedDefaultTenantId) + { + throw new UserFriendlyException("The Default tenant cannot have an expiration date."); + } + + var actor = await _platformActorResolver.EnsurePlatformActorAsync(); + TenantAggregateRoot tenant; + using (UseHostTenantScope()) + { + tenant = await _tenantRepository.FindAsync(input.TenantId) + ?? throw new UserFriendlyException("Tenant not found."); + if (actor.IsAgent && tenant.CreatorId != actor.UserId) + { + throw new UserFriendlyException("You are not allowed to change this company expiration date."); + } + + await ThTenantValidityGuard.SaveExpireTimeAsync(_tenantRepository, input.TenantId, input.ExpireTime); + } + } + + /// /// 获取可分配给公司的平台菜单树(主库 Menu,排除仅平台端菜单) /// /// @@ -391,9 +462,9 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// /// 当前租户菜单权限 /// 成功返回菜单权限 - /// 未识别租户上下文 - /// 未登录 - /// 租户不存在 + /// Tenant context could not be resolved + /// You are not signed in. + /// Tenant not found. /// 服务器错误 [Authorize] [HttpGet("th-multi-tenancy/my-company-menus")] @@ -404,7 +475,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe if (!tenantId.HasValue) { throw new UserFriendlyException( - "未识别租户上下文。请使用泰额登录接口选择具体公司登录,或请求头 __tenant 携带租户 Id。"); + "Tenant context could not be resolved. Sign in to a specific company via the Thai login APIs, or send the tenant Id in the __tenant header."); } await EnsureTenantExistsAsync(tenantId.Value); @@ -442,8 +513,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 租户菜单权限 /// 成功返回菜单权限 /// 租户 Id 无效 - /// 未登录 - /// 租户不存在 + /// You are not signed in. + /// Tenant not found. /// 服务器错误 [Authorize] [HttpGet("th-multi-tenancy/company-menus")] @@ -480,8 +551,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 无内容 /// 设置成功(含清空) /// 参数错误或存在非法 permission key - /// 未登录 - /// 租户不存在 + /// You are not signed in. + /// Tenant not found. /// 服务器错误 [Authorize] [HttpPut("th-multi-tenancy/company-menus")] @@ -490,7 +561,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (input.TenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } await EnsureTenantExistsAsync(input.TenantId); @@ -511,7 +582,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe var invalidKeys = ThSaasMenuPermissionCatalog.FindInvalidMenuIds(normalizedKeys, assignableIds); if (invalidKeys.Count > 0) { - throw new UserFriendlyException($"存在非法菜单权限 Key:{string.Join(", ", invalidKeys)}"); + throw new UserFriendlyException($"Invalid menu permission key(s): {string.Join(", ", invalidKeys)}"); } using (UseHostTenantScope()) @@ -577,8 +648,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 角色及菜单绑定列表 /// 成功返回角色列表 /// 租户 Id 无效 - /// 未登录 - /// 租户不存在 + /// You are not signed in. + /// Tenant not found. /// 服务器错误 [Authorize] [HttpGet("th-multi-tenancy/company-roles")] @@ -646,8 +717,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 无内容 /// 设置成功 /// 参数错误或菜单 Id 无效 - /// 未登录 - /// 租户或角色不存在 + /// You are not signed in. + /// 租户或Role not found. /// 服务器错误 [Authorize] [HttpPut("th-multi-tenancy/company-role-menus")] @@ -656,12 +727,12 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (input.TenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } if (input.RoleId == Guid.Empty) { - throw new UserFriendlyException("角色 Id 不能为空"); + throw new UserFriendlyException("Role Id is required."); } var tenant = await EnsureTenantExistsAsync(input.TenantId); @@ -673,7 +744,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (menuIds.Count > 0) { - throw new UserFriendlyException("该公司尚未开通任何菜单,请先在「菜单权限」中分配"); + throw new UserFriendlyException("This company has no menus enabled yet. Assign menus under Menu Permissions first."); } } else @@ -686,7 +757,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe if (outOfScope.Count > 0) { throw new UserFriendlyException( - $"角色菜单超出公司已开通范围:{string.Join(", ", outOfScope)}"); + $"Role menus exceed company-enabled scope: {string.Join(", ", outOfScope)}"); } } @@ -701,7 +772,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe var role = roles.FirstOrDefault(); if (role is null) { - throw new UserFriendlyException("角色不存在"); + throw new UserFriendlyException("Role not found."); } if (menuIds.Count == 0) @@ -722,7 +793,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe if (missingMenuIds.Count > 0) { throw new UserFriendlyException( - $"存在无效或未删除的菜单 Id:{string.Join(", ", missingMenuIds)}"); + $"Invalid or non-deleted menu Id(s): {string.Join(", ", missingMenuIds)}"); } await tenantDb.Deleteable() @@ -783,8 +854,8 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe /// 删除执行结果 /// 删除成功或部分跳过 DROP 时返回结果 /// 租户 Id 无效或受保护租户 - /// 未登录 - /// 租户不存在 + /// You are not signed in. + /// Tenant not found. /// DROP 或删除失败 [Authorize] [HttpDelete("th-multi-tenancy/company/{tenantId}")] @@ -795,7 +866,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (tenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } EnsureTenantDeletable(tenantId, null); @@ -804,7 +875,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe using (UseHostTenantScope()) { tenant = await _tenantRepository.FindAsync(tenantId) - ?? throw new UserFriendlyException("租户不存在"); + ?? throw new UserFriendlyException("Tenant not found."); } EnsureTenantDeletable(tenant.Id, tenant.Name); @@ -832,7 +903,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe } else { - result.Message = "dropDatabase=false,已跳过 DROP DATABASE"; + result.Message = "dropDatabase=false, DROP DATABASE was skipped"; } await _tenantService.DeleteAsync(new[] { tenantId }); @@ -995,13 +1066,13 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (tenantId == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } using (UseHostTenantScope()) { return await _tenantRepository.FindAsync(tenantId) - ?? throw new UserFriendlyException("租户不存在"); + ?? throw new UserFriendlyException("Tenant not found."); } } @@ -1118,7 +1189,7 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe if (invalid.Count > 0) { - throw new UserFriendlyException($"菜单 Id 格式无效:{string.Join(", ", invalid)}"); + throw new UserFriendlyException($"Invalid menu Id format: {string.Join(", ", invalid)}"); } return result; @@ -1128,12 +1199,12 @@ public class ThMultiTenancyAppService : ApplicationService, IThMultiTenancyAppSe { if (tenantId == ProtectedDefaultTenantId) { - throw new UserFriendlyException("禁止删除 Default 租户"); + throw new UserFriendlyException("Deleting the Default tenant is not allowed."); } if (string.Equals(tenantName, ProtectedDefaultTenantName, StringComparison.Ordinal)) { - throw new UserFriendlyException("禁止删除 Default 租户"); + throw new UserFriendlyException("Deleting the Default tenant is not allowed."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformAgentAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformAgentAppService.cs new file mode 100644 index 0000000..f3df2e1 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformAgentAppService.cs @@ -0,0 +1,508 @@ +using FoodLabeling.Th.Application.Contracts.Dtos.Platform; +using FoodLabeling.Th.Application.Contracts.IServices; +using FoodLabeling.Th.Application.MultiTenancy; +using FoodLabeling.Th.Domain.Entities; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Volo.Abp; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.Uow; +using Yi.Framework.Rbac.Domain.Entities; +using Yi.Framework.Rbac.Domain.Helpers; +using Yi.Framework.Rbac.Domain.Managers; +using Yi.Framework.Rbac.Domain.Shared.Consts; +using Yi.Framework.SqlSugarCore.Abstractions; +using Yi.Framework.TenantManagement.Domain; + +namespace FoodLabeling.Th.Application.Services; + +/// +/// 泰额平台代理账号管理 +/// +[Authorize] +public class ThPlatformAgentAppService : ApplicationService, IThPlatformAgentAppService +{ + private readonly ThPlatformActorResolver _actorResolver; + private readonly UserManager _userManager; + private readonly ISqlSugarRepository _userRepository; + private readonly ISqlSugarRepository _roleRepository; + private readonly ISqlSugarRepository _agentRepository; + private readonly ISqlSugarRepository _tenantRepository; + + public ThPlatformAgentAppService( + ThPlatformActorResolver actorResolver, + UserManager userManager, + ISqlSugarRepository userRepository, + ISqlSugarRepository roleRepository, + ISqlSugarRepository agentRepository, + ISqlSugarRepository tenantRepository) + { + _actorResolver = actorResolver; + _userManager = userManager; + _userRepository = userRepository; + _roleRepository = roleRepository; + _agentRepository = agentRepository; + _tenantRepository = tenantRepository; + } + + private IDisposable UseHostTenantScope() => CurrentTenant.Change(null); + + /// + /// 平台代理分页列表 + /// + /// + /// 仅平台超级管理员。关键字匹配登录名、邮箱、显示名。 + /// + /// 示例请求(GET query): + /// ```json + /// { + /// "keyword": "agent", + /// "state": true, + /// "skipCount": 0, + /// "maxResultCount": 20 + /// } + /// ``` + /// + /// 参数说明: + /// - keyword: 模糊匹配 + /// - enabled / state: 启用筛选(前端表单字段为 State) + /// - skipCount / maxResultCount: 分页 + /// + /// 分页与筛选 + /// 代理分页 + /// 成功返回列表 + /// You are not signed in. + /// 非平台管理员 + /// 服务器错误 + [HttpGet("th-platform-agents")] + public virtual async Task> GetListAsync(ThPlatformAgentGetListInput input) + { + await _actorResolver.EnsureAdminAsync(); + var keyword = input.Keyword?.Trim(); + var enabled = input.Enabled ?? input.State; + var skip = Math.Max(0, input.SkipCount); + var take = input.MaxResultCount <= 0 ? 10 : input.MaxResultCount; + + using (UseHostTenantScope()) + { + var query = _agentRepository._DbQueryable + .InnerJoin((a, u) => a.UserId == u.Id) + .Where((a, u) => !a.IsDeleted && !u.IsDeleted) + .WhereIF(enabled.HasValue, (a, u) => a.Enabled == enabled!.Value) + .WhereIF(!string.IsNullOrWhiteSpace(keyword), (a, u) => + u.UserName.Contains(keyword!) + || (u.Email != null && u.Email.Contains(keyword!)) + || (u.Nick != null && u.Nick.Contains(keyword!)) + || (u.Name != null && u.Name.Contains(keyword!))); + + RefAsync total = 0; + var rows = await query + .OrderBy((a, u) => a.CreationTime, OrderByType.Desc) + .Select((a, u) => new AgentJoinRow + { + UserId = u.Id, + UserName = u.UserName, + Email = u.Email, + Nick = u.Nick, + Name = u.Name, + CompanyQuota = a.CompanyQuota, + Enabled = a.Enabled, + CreationTime = a.CreationTime + }) + .ToPageListAsync(skip, take, total); + + var usedMap = await LoadCompanyUsedMapAsync(rows.Select(x => x.UserId).ToList()); + var items = rows.Select(x => MapDto(x, usedMap)).ToList(); + return new PagedResultDto(total, items); + } + } + + /// + /// 平台代理详情 + /// + /// + /// 示例请求:GET /api/app/th-platform-agents/{id} + /// + /// 参数说明: + /// - id: 用户 Id + /// + /// 用户 Id + /// 代理详情 + /// 成功 + /// Id 无效 + /// You are not signed in. + /// 非平台管理员 + /// Agent not found. + /// 服务器错误 + [HttpGet("th-platform-agents/{id}")] + public virtual async Task GetAsync(Guid id) + { + await _actorResolver.EnsureAdminAsync(); + if (id == Guid.Empty) + { + throw new UserFriendlyException("Agent Id is required."); + } + + using (UseHostTenantScope()) + { + var row = await LoadJoinRowAsync(id) + ?? throw new UserFriendlyException("Agent not found."); + var usedMap = await LoadCompanyUsedMapAsync(new List { row.UserId }); + return MapDto(row, usedMap); + } + } + + /// + /// 新建平台代理账号 + /// + /// + /// 在 Host user 创建用户、绑定 platform-agent 角色、写入 fl_th_platform_agent。 + /// + /// 示例请求: + /// ```json + /// { + /// "userName": "agent01", + /// "email": "agent01@example.com", + /// "displayName": "代理一", + /// "companyQuota": 10, + /// "enabled": true, + /// "password": "ChangeMe123!" + /// } + /// ``` + /// + /// 参数说明: + /// - userName / email / displayName / password: 必填 + /// - companyQuota: 可创建公司上限,默认 0 + /// - enabled: 是否启用,默认 true + /// + /// 新建参数 + /// 新建后的代理 + /// 创建成功 + /// 参数校验失败 + /// You are not signed in. + /// 非平台管理员 + /// 服务器错误 + [HttpPost("th-platform-agents")] + public virtual async Task CreateAsync([FromBody] ThPlatformAgentSaveInputVo input) + { + await _actorResolver.EnsureAdminAsync(); + var userName = RequireText(input.UserName, "Login name is required."); + var email = RequireText(input.Email, "Email is required."); + var displayName = RequireText(input.DisplayName, "Display name is required."); + var password = RequireText(input.Password, "Password is required."); + if (password.Length < 6) + { + throw new UserFriendlyException(UserConst.Create_Passworld_Error); + } + + var quota = Math.Max(0, input.CompanyQuota ?? 0); + var enabled = input.Enabled ?? true; + var role = await GetPlatformAgentRoleAsync(); + + using (UseHostTenantScope()) + using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) + { + await EnsureUserNameAndEmailUniqueAsync(userName, email, excludeUserId: null); + + var user = new UserAggregateRoot(userName, password, null, displayName) + { + Email = email, + Name = displayName, + State = enabled + }; + await _userManager.CreateAsync(user); + await _userManager.GiveUserSetRoleAsync(new List { user.Id }, new List { role.Id }); + + var now = Clock.Now; + var agent = new ThPlatformAgentEntity + { + Id = user.Id.ToString(), + UserId = user.Id, + CompanyQuota = quota, + Enabled = enabled, + IsDeleted = false, + CreationTime = now, + CreatorId = CurrentUser.Id, + ConcurrencyStamp = string.Empty + }; + await _agentRepository.InsertAsync(agent); + await uow.CompleteAsync(); + + return new ThPlatformAgentDto + { + Id = user.Id, + UserName = user.UserName, + Email = user.Email ?? string.Empty, + DisplayName = displayName, + CompanyQuota = quota, + CompanyUsed = 0, + Enabled = enabled, + CreationTime = now + }; + } + } + + /// + /// 更新平台代理(配额、启停、资料;密码可选) + /// + /// + /// 示例请求: + /// ```json + /// { + /// "displayName": "代理一", + /// "email": "agent01@example.com", + /// "companyQuota": 20, + /// "enabled": false, + /// "password": "" + /// } + /// ``` + /// + /// 参数说明: + /// - password: 留空不改密码 + /// - enabled: 同步写入 User.State + /// + /// 用户 Id + /// 更新参数 + /// 更新成功 + /// 参数校验失败 + /// You are not signed in. + /// 非平台管理员 + /// Agent not found. + /// 服务器错误 + [HttpPut("th-platform-agents/{id}")] + public virtual async Task UpdateAsync(Guid id, [FromBody] ThPlatformAgentSaveInputVo input) + { + await _actorResolver.EnsureAdminAsync(); + if (id == Guid.Empty) + { + throw new UserFriendlyException("Agent Id is required."); + } + + using (UseHostTenantScope()) + using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) + { + var user = (await _userRepository._DbQueryable + .Where(u => u.Id == id && !u.IsDeleted) + .Take(1) + .ToListAsync()) + .FirstOrDefault() + ?? throw new UserFriendlyException("Agent not found."); + var agent = (await _agentRepository._DbQueryable + .Where(a => a.UserId == id && !a.IsDeleted) + .Take(1) + .ToListAsync()) + .FirstOrDefault() + ?? throw new UserFriendlyException("Agent not found."); + + if (!string.IsNullOrWhiteSpace(input.UserName) + && !string.Equals(input.UserName.Trim(), user.UserName, StringComparison.OrdinalIgnoreCase)) + { + throw new UserFriendlyException("Login name cannot be changed after creation."); + } + + var email = string.IsNullOrWhiteSpace(input.Email) ? user.Email : input.Email.Trim(); + if (!string.IsNullOrWhiteSpace(email)) + { + await EnsureUserNameAndEmailUniqueAsync(user.UserName, email, id); + } + + var displayName = string.IsNullOrWhiteSpace(input.DisplayName) + ? (user.Nick ?? user.Name ?? user.UserName) + : input.DisplayName.Trim(); + var enabled = input.Enabled ?? agent.Enabled; + var quota = input.CompanyQuota.HasValue ? Math.Max(0, input.CompanyQuota.Value) : agent.CompanyQuota; + + user.Email = email; + user.Nick = displayName; + user.Name = displayName; + user.State = enabled; + user.LastModificationTime = Clock.Now; + user.LastModifierId = CurrentUser.Id; + if (!string.IsNullOrWhiteSpace(input.Password)) + { + if (input.Password.Trim().Length < 6) + { + throw new UserFriendlyException(UserConst.Create_Passworld_Error); + } + + UserPasswordHelper.ApplyPlainPassword(user, input.Password.Trim()); + } + + await _userRepository.UpdateAsync(user); + + agent.CompanyQuota = quota; + agent.Enabled = enabled; + agent.LastModificationTime = Clock.Now; + agent.LastModifierId = CurrentUser.Id; + await _agentRepository.UpdateAsync(agent); + await uow.CompleteAsync(); + } + } + + /// + /// 删除平台代理(软删用户与扩展行) + /// + /// + /// 示例请求:DELETE /api/app/th-platform-agents/{id} + /// + /// 用户 Id + /// 删除成功 + /// Id 无效 + /// You are not signed in. + /// 非平台管理员 + /// Agent not found. + /// 服务器错误 + [HttpDelete("th-platform-agents/{id}")] + public virtual async Task DeleteAsync(Guid id) + { + await _actorResolver.EnsureAdminAsync(); + if (id == Guid.Empty) + { + throw new UserFriendlyException("Agent Id is required."); + } + + using (UseHostTenantScope()) + using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) + { + var user = (await _userRepository._DbQueryable + .Where(u => u.Id == id) + .Take(1) + .ToListAsync()) + .FirstOrDefault() + ?? throw new UserFriendlyException("Agent not found."); + var agent = (await _agentRepository._DbQueryable + .Where(a => a.UserId == id) + .Take(1) + .ToListAsync()) + .FirstOrDefault(); + + user.IsDeleted = true; + user.LastModificationTime = Clock.Now; + user.LastModifierId = CurrentUser.Id; + await _userRepository.UpdateAsync(user); + + if (agent != null) + { + agent.IsDeleted = true; + agent.Enabled = false; + agent.LastModificationTime = Clock.Now; + agent.LastModifierId = CurrentUser.Id; + await _agentRepository.UpdateAsync(agent); + } + + await uow.CompleteAsync(); + } + } + + private async Task GetPlatformAgentRoleAsync() + { + using (UseHostTenantScope()) + { + var role = (await _roleRepository._DbQueryable + .Where(r => !r.IsDeleted && r.RoleCode == UserConst.PlatformAgentRolesCode) + .Take(1) + .ToListAsync()) + .FirstOrDefault(); + return role ?? throw new UserFriendlyException("Platform agent role platform-agent was not found. Run the host menu/role SQL first."); + } + } + + private async Task EnsureUserNameAndEmailUniqueAsync(string userName, string email, Guid? excludeUserId) + { + var nameLower = userName.Trim().ToLowerInvariant(); + var emailLower = email.Trim().ToLowerInvariant(); + var occupied = await _userRepository._DbQueryable + .AnyAsync(u => !u.IsDeleted + && (excludeUserId == null || u.Id != excludeUserId.Value) + && (SqlFunc.ToLower(u.UserName) == nameLower + || (u.Email != null && SqlFunc.ToLower(u.Email) == emailLower))); + if (occupied) + { + throw new UserFriendlyException("Login name or email is already in use."); + } + } + + private async Task LoadJoinRowAsync(Guid userId) + { + return (await _agentRepository._DbQueryable + .InnerJoin((a, u) => a.UserId == u.Id) + .Where((a, u) => a.UserId == userId && !a.IsDeleted && !u.IsDeleted) + .Select((a, u) => new AgentJoinRow + { + UserId = u.Id, + UserName = u.UserName, + Email = u.Email, + Nick = u.Nick, + Name = u.Name, + CompanyQuota = a.CompanyQuota, + Enabled = a.Enabled, + CreationTime = a.CreationTime + }) + .Take(1) + .ToListAsync()) + .FirstOrDefault(); + } + + private async Task> LoadCompanyUsedMapAsync(List userIds) + { + var map = userIds.Distinct().ToDictionary(x => x, _ => 0); + if (map.Count == 0) + { + return map; + } + + var creators = await _tenantRepository._DbQueryable + .Where(t => t.CreatorId != null && userIds.Contains(t.CreatorId.Value)) + .Where(t => t.Name != "Default") + .Select(t => t.CreatorId) + .ToListAsync(); + foreach (var group in creators.GroupBy(x => x!.Value)) + { + map[group.Key] = group.Count(); + } + + return map; + } + + private static ThPlatformAgentDto MapDto(AgentJoinRow row, IReadOnlyDictionary usedMap) + { + usedMap.TryGetValue(row.UserId, out var used); + return new ThPlatformAgentDto + { + Id = row.UserId, + UserName = row.UserName ?? string.Empty, + Email = row.Email ?? string.Empty, + DisplayName = string.IsNullOrWhiteSpace(row.Nick) + ? (row.Name ?? row.UserName ?? string.Empty) + : row.Nick, + CompanyQuota = row.CompanyQuota, + CompanyUsed = used, + Enabled = row.Enabled, + CreationTime = row.CreationTime + }; + } + + private static string RequireText(string? value, string message) + { + if (string.IsNullOrWhiteSpace(value)) + { + throw new UserFriendlyException(message); + } + + return value.Trim(); + } + + private sealed class AgentJoinRow + { + public Guid UserId { get; set; } + public string? UserName { get; set; } + public string? Email { get; set; } + public string? Nick { get; set; } + public string? Name { get; set; } + public int CompanyQuota { get; set; } + public bool Enabled { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformStatisticsAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformStatisticsAppService.cs new file mode 100644 index 0000000..9e77273 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThPlatformStatisticsAppService.cs @@ -0,0 +1,152 @@ +using FoodLabeling.Domain.Shared.MultiTenancy; +using FoodLabeling.Th.Application.Contracts.Dtos.Platform; +using FoodLabeling.Th.Application.Contracts.IServices; +using FoodLabeling.Th.Application.MultiTenancy; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.MultiTenancy; +using Yi.Framework.SqlSugarCore.Abstractions; +using Yi.Framework.TenantManagement.Domain; + +namespace FoodLabeling.Th.Application.Services; + +/// +/// 泰额平台统计:公司 / 区域 / 门店 / 标签汇总 +/// +[Authorize] +public class ThPlatformStatisticsAppService : ApplicationService, IThPlatformStatisticsAppService +{ + private readonly ThPlatformActorResolver _actorResolver; + private readonly ThPlatformTenantStatsReader _statsReader; + private readonly ISqlSugarRepository _tenantRepository; + + public ThPlatformStatisticsAppService( + ThPlatformActorResolver actorResolver, + ThPlatformTenantStatsReader statsReader, + ISqlSugarRepository tenantRepository) + { + _actorResolver = actorResolver; + _statsReader = statsReader; + _tenantRepository = tenantRepository; + } + + private IDisposable UseHostTenantScope() => CurrentTenant.Change(null); + + /// + /// 平台统计概览 KPI + /// + /// + /// 平台管理员汇总全部未删除、非 Default 保护租户;平台代理仅汇总本人创建的公司。 + /// 各租户切业务库 COUNT 区域(fl_group)、门店(location)、标签(fl_label)。 + /// + /// 示例请求:无参数 GET + /// + /// 示例响应: + /// ```json + /// { + /// "companyCount": 2, + /// "regionCount": 5, + /// "locationCount": 12, + /// "labelCount": 40, + /// "lastUsedAt": "2026-10-20T12:00:00", + /// "scope": "all" + /// } + /// ``` + /// + /// 概览 KPI + /// 成功返回概览 + /// You are not signed in. + /// 非平台管理员或代理 + /// 服务器错误 + [HttpGet("th-platform-statistics/overview")] + public virtual async Task GetOverviewAsync() + { + var actor = await _actorResolver.EnsurePlatformActorAsync(); + var tenants = await LoadScopedTenantsAsync(actor, keyword: null); + var stats = await _statsReader.ReadManyAsync(tenants); + + return new ThPlatformStatisticsOverviewDto + { + CompanyCount = tenants.Count, + RegionCount = stats.Sum(x => x.RegionCount), + LocationCount = stats.Sum(x => x.LocationCount), + LabelCount = stats.Sum(x => x.LabelCount), + LastUsedAt = stats.Count == 0 ? null : stats.Max(x => x.LastUsedAt), + Scope = actor.Scope + }; + } + + /// + /// 平台统计公司明细分页 + /// + /// + /// 过滤范围与概览相同。关键字匹配公司名称。 + /// + /// 示例请求(GET query): + /// ```json + /// { + /// "keyword": "麦当劳", + /// "skipCount": 0, + /// "maxResultCount": 20 + /// } + /// ``` + /// + /// 参数说明: + /// - keyword: 公司名称模糊匹配 + /// - skipCount: 跳过条数 + /// - maxResultCount: 每页条数 + /// + /// 分页与关键字 + /// 公司明细分页 + /// 成功返回分页列表 + /// You are not signed in. + /// 非平台管理员或代理 + /// 服务器错误 + [HttpGet("th-platform-statistics/companies")] + public virtual async Task> GetCompaniesAsync( + ThPlatformStatisticsCompanyGetListInput input) + { + var actor = await _actorResolver.EnsurePlatformActorAsync(); + var tenants = await LoadScopedTenantsAsync(actor, input.Keyword); + var total = tenants.Count; + var skip = Math.Max(0, input.SkipCount); + var take = input.MaxResultCount <= 0 ? 10 : input.MaxResultCount; + var page = tenants + .OrderByDescending(x => x.CreationTime) + .Skip(skip) + .Take(take) + .ToList(); + + var stats = await _statsReader.ReadManyAsync(page); + var items = stats.Select(x => new ThPlatformStatisticsCompanyItemDto + { + Id = x.TenantId, + CompanyName = x.CompanyName, + LabelCount = x.LabelCount, + LocationCount = x.LocationCount, + RegionCount = x.RegionCount, + LastUsedAt = x.LastUsedAt + }).ToList(); + + return new PagedResultDto(total, items); + } + + private async Task> LoadScopedTenantsAsync(ThPlatformActor actor, string? keyword) + { + using (UseHostTenantScope()) + { + // SqlSugar 不能把 private 字段写进表达式,必须先落到局部变量 + var defaultTenantId = FoodLabelingMultiTenancyConsts.LegacyBootstrapTenantId; + var defaultTenantName = FoodLabelingMultiTenancyConsts.LegacyBootstrapTenantName; + return await _tenantRepository._DbQueryable + .Where(t => t.Id != defaultTenantId && t.Name != defaultTenantName) + .WhereIF(actor.IsAgent, t => t.CreatorId == actor.UserId) + .WhereIF(!string.IsNullOrWhiteSpace(keyword), t => t.Name.Contains(keyword!.Trim())) + .OrderBy(t => t.CreationTime, OrderByType.Desc) + .ToListAsync(); + } + } +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThRbacMenuAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThRbacMenuAppService.cs index a2e41ea..db60002 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThRbacMenuAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThRbacMenuAppService.cs @@ -65,7 +65,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// 分页与筛选条件 /// 分页菜单列表 /// 成功返回分页列表 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpGet("th-rbac-menu/list")] public virtual async Task> GetListAsync([FromQuery] ThRbacMenuGetListInputVo input) @@ -90,8 +90,8 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// 菜单 Id(字符串) /// 菜单详情 /// 成功返回菜单 - /// 菜单不存在 - /// 未登录 + /// Menu not found. + /// You are not signed in. /// 服务器错误 [HttpGet("th-rbac-menu/{id}")] public virtual async Task GetAsync(string id) @@ -129,7 +129,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// 新建菜单详情 /// 创建成功 /// 参数校验失败 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpPost("th-rbac-menu")] public virtual async Task CreateAsync([FromBody] ThRbacMenuCreateInputVo input) @@ -137,7 +137,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService var name = input.MenuName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("菜单名称不能为空"); + throw new UserFriendlyException("Menu name is required."); } var parentId = NormalizeParentId(input.ParentId); @@ -191,8 +191,8 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// 编辑入参 /// 更新后的菜单详情 /// 更新成功 - /// 参数错误或菜单不存在 - /// 未登录 + /// 参数错误或Menu not found. + /// You are not signed in. /// 服务器错误 [HttpPut("th-rbac-menu/{id}")] public virtual async Task UpdateAsync(string id, [FromBody] ThRbacMenuUpdateInputVo input) @@ -202,13 +202,13 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService var name = input.MenuName?.Trim(); if (string.IsNullOrWhiteSpace(name)) { - throw new UserFriendlyException("菜单名称不能为空"); + throw new UserFriendlyException("Menu name is required."); } var parentId = NormalizeParentId(input.ParentId); if (string.Equals(parentId, id, StringComparison.Ordinal)) { - throw new UserFriendlyException("父级菜单不能为自身"); + throw new UserFriendlyException("Parent menu cannot be the menu itself."); } await EnsureParentExistsAsync(parentId, id); @@ -256,7 +256,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService if (rows <= 0) { - throw new UserFriendlyException("菜单更新失败(未影响任何行)"); + throw new UserFriendlyException("Menu update failed (no rows affected)."); } // 主库种子/系统菜单:镜像到主库,避免租户编辑后被同步冲掉 @@ -306,7 +306,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService catch (Exception ex) { // 主库镜像失败不阻断当前库已成功的更新,但抛友好错误便于排查 - throw new UserFriendlyException($"当前库已更新,但同步主库失败:{ex.Message}"); + throw new UserFriendlyException($"Tenant database updated, but host sync failed: {ex.Message}"); } } @@ -340,7 +340,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// 菜单 Id 列表 /// 无内容 /// 删除成功 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpDelete("th-rbac-menu")] public virtual async Task DeleteAsync([FromBody] List ids) @@ -372,7 +372,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService /// /// 根节点菜单树 /// 成功返回菜单树 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpGet("th-rbac-menu/tree")] public virtual async Task> GetTreeAsync() @@ -412,7 +412,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService { if (string.IsNullOrWhiteSpace(id)) { - throw new UserFriendlyException("菜单 Id 不能为空"); + throw new UserFriendlyException("Menu Id is required."); } var entity = await _dbContext.SqlSugarClient.Queryable() @@ -421,7 +421,7 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService if (entity is null) { - throw new UserFriendlyException("菜单不存在"); + throw new UserFriendlyException("Menu not found."); } return entity; @@ -440,12 +440,12 @@ public class ThRbacMenuAppService : ApplicationService, IThRbacMenuAppService if (parent is null) { - throw new UserFriendlyException("父级菜单不存在"); + throw new UserFriendlyException("Parent menu not found."); } if (currentId is not null && string.Equals(parent.ParentId, currentId, StringComparison.Ordinal)) { - throw new UserFriendlyException("不能将菜单移动到其子节点下"); + throw new UserFriendlyException("Cannot move a menu under its own descendant."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantProvisioningAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantProvisioningAppService.cs index ba4c73a..3a91d9d 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantProvisioningAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantProvisioningAppService.cs @@ -17,6 +17,7 @@ using Yi.Framework.Rbac.Domain.Shared.Options; using Yi.Framework.SqlSugarCore.Abstractions; using Yi.Framework.TenantManagement.Application.Contracts; using Yi.Framework.TenantManagement.Application.Contracts.Dtos; +using Yi.Framework.TenantManagement.Domain; namespace FoodLabeling.Th.Application.Services; @@ -39,6 +40,9 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi private readonly FoodLabelingThTenantDatabaseOptions _dbOptions; private readonly DbConnOptions _dbConnOptions; private readonly RbacOptions _rbacOptions; + private readonly ThPlatformActorResolver _platformActorResolver; + private readonly ISqlSugarRepository _agentRepository; + private readonly ISqlSugarRepository _tenantRepository; public ThTenantProvisioningAppService( ITenantService tenantService, @@ -50,7 +54,10 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi ITenantCompanyMenuSyncService companyMenuSyncService, IOptions dbOptions, IOptions dbConnOptions, - IOptions rbacOptions) + IOptions rbacOptions, + ThPlatformActorResolver platformActorResolver, + ISqlSugarRepository agentRepository, + ISqlSugarRepository tenantRepository) { _tenantService = tenantService; _backgroundInitializer = backgroundInitializer; @@ -62,6 +69,9 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi _dbOptions = dbOptions.Value; _dbConnOptions = dbConnOptions.Value; _rbacOptions = rbacOptions.Value; + _platformActorResolver = platformActorResolver; + _agentRepository = agentRepository; + _tenantRepository = tenantRepository; } /// @@ -81,6 +91,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi /// "name": "中国麦当劳公司", /// "email": "mcdonalds.admin@example.com", /// "adminPassword": "ChangeMe123!", + /// "expireTime": "2027-12-31", /// "initializeDatabase": true /// } /// ``` @@ -89,13 +100,14 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi /// - name: 租户/公司名称(必填) /// - email / adminUserName: 管理员登录邮箱(必填,唯一) /// - adminPassword: 可选初始密码;为空用系统默认 AdminPassword + /// - expireTime: 可选有效期截止;空表示永久。仅日期视为当天结束前有效 /// - tenantConnectionString / databaseKey / dbType / initializeDatabase: 库相关可选参数 /// /// 开通参数 /// 租户 Id、邮箱、库信息与初始化状态 /// 创建成功(业务库可能仍在后台初始化) /// 名称/邮箱缺失、邮箱格式错误或邮箱已被占用 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpPost("th-tenant-provisioning/provision")] [HttpPost("th-tenant-provisioning")] @@ -103,7 +115,13 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi { if (string.IsNullOrWhiteSpace(input.Name)) { - throw new UserFriendlyException("租户名称不能为空"); + throw new UserFriendlyException("Tenant name is required."); + } + + var actor = await _platformActorResolver.EnsurePlatformActorAsync(); + if (actor.IsAgent) + { + await EnsureAgentCanCreateCompanyAsync(actor.UserId); } var email = NormalizeAndValidateEmail( @@ -115,7 +133,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi : input.AdminPassword.Trim(); if (string.IsNullOrEmpty(plainPassword)) { - throw new UserFriendlyException("管理员初始密码不能为空(请传 adminPassword 或配置 RbacOptions.AdminPassword)"); + throw new UserFriendlyException("Initial administrator password is required (pass adminPassword or configure RbacOptions.AdminPassword)."); } // 未显式指定 DatabaseKey / 连接串时,名称 hash 后追加短 Guid,避免同名公司复用同一业务库 @@ -153,6 +171,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi }); await InsertAdminCredentialAsync(created.Id, email, plainPassword); + await ApplyProvisionHostColumnsAsync(created.Id, input.ExpireTime); await uow.CompleteAsync(); } @@ -173,7 +192,8 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi DatabaseName = databaseName, TenantConnectionString = connectionString, DatabaseInitialized = false, - DatabaseInitializing = initializing + DatabaseInitializing = initializing, + ExpireTime = input.ExpireTime }; } @@ -187,7 +207,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi /// 租户 Id /// 初始化成功 /// 租户无效或业务库不可用 - /// 未登录 + /// You are not signed in. /// 服务器错误 [HttpPost("th-tenant-provisioning/initialize-tenant-database/{tenantId}")] [HttpPost("th-tenant-provisioning/initialize-tenant-database")] @@ -197,7 +217,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi var id = tenantId != Guid.Empty ? tenantId : (tenantIdQuery ?? Guid.Empty); if (id == Guid.Empty) { - throw new UserFriendlyException("租户 Id 不能为空"); + throw new UserFriendlyException("Tenant Id is required."); } await _tenantService.InitAsync(id); @@ -206,17 +226,42 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi await _companyMenuSyncService.EnsureAdminRoleMenusSyncedAsync(id); } + private async Task EnsureAgentCanCreateCompanyAsync(Guid userId) + { + using (CurrentTenant.Change(null)) + { + var agents = await _agentRepository._DbQueryable + .Where(a => a.UserId == userId && !a.IsDeleted) + .Take(1) + .ToListAsync(); + var agent = agents.FirstOrDefault() + ?? throw new UserFriendlyException("This account has no agent company quota configured; cannot create a company."); + if (!agent.Enabled) + { + throw new UserFriendlyException("Agent is disabled; cannot create a company."); + } + + var used = await _tenantRepository._DbQueryable + .Where(t => t.CreatorId == userId) + .CountAsync(); + if (used >= agent.CompanyQuota) + { + throw new UserFriendlyException("Maximum number of companies that can be created has been reached."); + } + } + } + private static string NormalizeAndValidateEmail(string? email) { if (string.IsNullOrWhiteSpace(email)) { - throw new UserFriendlyException("登录邮箱不能为空"); + throw new UserFriendlyException("Sign-in email is required."); } var normalized = email.Trim(); if (!ThWebPlatformLoginHelper.IsPlausiblePlatformEmail(normalized)) { - throw new UserFriendlyException("登录邮箱格式不正确"); + throw new UserFriendlyException("Sign-in email format is invalid."); } return normalized; @@ -237,7 +282,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi || SqlFunc.ToLower(u.UserName) == normalized)); if (hostOccupied) { - throw new UserFriendlyException($"登录邮箱「{email}」已被平台账号占用,请更换"); + throw new UserFriendlyException($"Sign-in email \"{email}\" is already used by a platform account. Use another email."); } var companyOccupied = await _credentialRepository._DbQueryable @@ -245,7 +290,7 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi && SqlFunc.ToLower(c.LoginAccount) == normalized); if (companyOccupied) { - throw new UserFriendlyException($"登录邮箱「{email}」已被其他公司管理员占用,请更换"); + throw new UserFriendlyException($"Sign-in email \"{email}\" is already used by another company administrator. Use another email."); } } } @@ -268,6 +313,42 @@ public class ThTenantProvisioningAppService : ApplicationService, IThTenantProvi }); } + private async Task ApplyProvisionHostColumnsAsync(Guid tenantId, DateTime? expireTime) + { + var expireDate = expireTime.HasValue && expireTime.Value.TimeOfDay == TimeSpan.Zero + ? expireTime.Value.Date + : expireTime; + var creatorId = CurrentUser.Id is { } id && id != Guid.Empty ? id : (Guid?)null; + if (!creatorId.HasValue && !expireDate.HasValue) + { + return; + } + + using (CurrentTenant.Change(null)) + { + if (creatorId.HasValue && expireDate.HasValue) + { + await _tenantRepository._Db.Updateable() + .SetColumns(t => t.CreatorId == creatorId.Value) + .SetColumns(t => t.ExpireTime == expireDate.Value) + .Where(t => t.Id == tenantId) + .ExecuteCommandAsync(); + return; + } + + if (creatorId.HasValue) + { + await _tenantRepository._Db.Updateable() + .SetColumns(t => t.CreatorId == creatorId.Value) + .Where(t => t.Id == tenantId) + .ExecuteCommandAsync(); + return; + } + + await ThTenantValidityGuard.SaveExpireTimeAsync(_tenantRepository, tenantId, expireDate); + } + } + private static string? ExtractDatabaseName(string connectionString) { const string key = "database="; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantScopedRbacRoleAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantScopedRbacRoleAppService.cs index 01c1b79..ccf23c9 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantScopedRbacRoleAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThTenantScopedRbacRoleAppService.cs @@ -69,7 +69,7 @@ public class ThTenantScopedRbacRoleAppService : RbacRoleAppService tenantId); if (allowedMenuIds.Count == 0) { - throw new UserFriendlyException("该公司尚未开通任何菜单,请先在「菜单权限」中分配"); + throw new UserFriendlyException("This company has no menus enabled yet. Assign menus under Menu Permissions first."); } var outOfScope = menuIds @@ -80,7 +80,7 @@ public class ThTenantScopedRbacRoleAppService : RbacRoleAppService if (outOfScope.Count > 0) { throw new UserFriendlyException( - $"角色菜单超出公司已开通范围:{string.Join(", ", outOfScope)}"); + $"Role menus exceed company-enabled scope: {string.Join(", ", outOfScope)}"); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThWebAuthAppService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThWebAuthAppService.cs index 5bd5537..831fd26 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThWebAuthAppService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Application/Services/ThWebAuthAppService.cs @@ -32,6 +32,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService private readonly RbacOptions _rbacOptions; private readonly DbConnOptions _dbConnOptions; private readonly ITenantStore _tenantStore; + private readonly ThTenantValidityGuard _tenantValidityGuard; public ThWebAuthAppService( IAccountManager accountManager, @@ -42,7 +43,8 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService ICaptcha captcha, IOptions rbacOptions, IOptions dbConnOptions, - ITenantStore tenantStore) + ITenantStore tenantStore, + ThTenantValidityGuard tenantValidityGuard) { _accountManager = accountManager; _userRepository = userRepository; @@ -53,6 +55,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService _rbacOptions = rbacOptions.Value; _dbConnOptions = dbConnOptions.Value; _tenantStore = tenantStore; + _tenantValidityGuard = tenantValidityGuard; } /// @@ -84,7 +87,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService /// 登录参数 /// Token 与租户信息 /// 登录成功 - /// 参数缺失、验证码错误或账号密码错误 + /// 参数缺失、Verification code is incorrect.或账号密码错误 /// 服务器错误 [AllowAnonymous] [HttpPost("th-web-auth/login")] @@ -93,7 +96,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService if (string.IsNullOrWhiteSpace(input.Password) || string.IsNullOrWhiteSpace(input.UserName)) { - throw new UserFriendlyException("请输入账号与密码"); + throw new UserFriendlyException("Username and password are required."); } ValidationImageCaptcha(input.Uuid, input.Code); @@ -148,10 +151,11 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService catch (Exception ex) { Logger.LogWarning(ex, "解析租户失败"); - throw new UserFriendlyException($"租户解析失败:{ex.GetBaseException().Message}"); + throw new UserFriendlyException($"Tenant resolution failed: {ex.GetBaseException().Message}"); } var tenantId = tenantConfig.Id; + await _tenantValidityGuard.EnsureCompanyCanLoginAsync(tenantId); try { @@ -166,12 +170,12 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService { var initMessage = await ResolveTenantNotReadyLoginMessageAsync(tenantId); throw new UserFriendlyException( - initMessage ?? "登录失败:账号不存在或已禁用"); + initMessage ?? "Sign-in failed: account does not exist or is disabled."); } if (!user.JudgePassword(input.Password)) { - throw new UserFriendlyException("登录失败:账号或密码错误"); + throw new UserFriendlyException("Sign-in failed: incorrect username or password."); } var accessToken = await _accountManager.GetTokenByUserIdAsync(user.Id); @@ -197,11 +201,11 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService { throw new UserFriendlyException( await ResolveTenantNotReadyLoginMessageAsync(tenantId) - ?? "登录失败:租户业务库尚未初始化完成,请稍候再试"); + ?? "Sign-in failed: the tenant business database is not fully initialized yet. Please try again shortly."); } throw new UserFriendlyException( - "登录失败:租户业务库初始化异常,请联系管理员处理"); + "Sign-in failed: tenant business database initialization failed. Contact an administrator."); } } @@ -253,7 +257,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService if (!user.JudgePassword(input.Password)) { - throw new UserFriendlyException("登录失败:账号或密码错误"); + throw new UserFriendlyException("Sign-in failed: incorrect username or password."); } var accessToken = await _accountManager.GetTokenByUserIdAsync(user.Id); @@ -278,7 +282,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService if (!_captcha.Validate(uuid, code)) { - throw new UserFriendlyException("验证码错误或已过期"); + throw new UserFriendlyException("Verification code is incorrect or expired."); } } @@ -301,7 +305,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService { if (_backgroundInitializer.IsRunning(tenantId)) { - throw new UserFriendlyException("登录失败:租户业务库正在初始化,请稍候再试"); + throw new UserFriendlyException("Sign-in failed: the tenant business database is initializing. Please try again shortly."); } Logger.LogWarning(ex, "租户 {TenantId} 业务库未就绪,登录前同步初始化", tenantId); @@ -369,7 +373,7 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService { if (_backgroundInitializer.IsRunning(tenantId)) { - return "登录失败:租户业务库正在初始化,请稍候再试"; + return "Sign-in failed: the tenant business database is initializing. Please try again shortly."; } try @@ -380,13 +384,13 @@ public class ThWebAuthAppService : ApplicationService, IThWebAuthAppService .CountAsync(u => !u.IsDeleted); if (activeUserCount == 0) { - return "登录失败:租户业务库尚未初始化完成,请稍候再试"; + return "Sign-in failed: the tenant business database is not fully initialized yet. Please try again shortly."; } } } catch (Exception ex) when (IsTenantDatabaseNotReady(ex)) { - return "登录失败:租户业务库尚未初始化完成,请稍候再试"; + return "Sign-in failed: the tenant business database is not fully initialized yet. Please try again shortly."; } return null; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Domain/Entities/ThPlatformAgentEntity.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Domain/Entities/ThPlatformAgentEntity.cs new file mode 100644 index 0000000..1bee0c0 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/FoodLabeling.Th.Domain/Entities/ThPlatformAgentEntity.cs @@ -0,0 +1,77 @@ +using SqlSugar; +using Volo.Abp.Domain.Entities; +using Yi.Framework.SqlSugarCore.Abstractions; + +namespace FoodLabeling.Th.Domain.Entities; + +/// +/// 平台主库:代理账号配额扩展(与 Host User.Id 一一对应) +/// +[SugarTable("fl_th_platform_agent")] +[DefaultTenantTable] +[SugarIndex("UK_fl_th_platform_agent_UserId", nameof(UserId), OrderByType.Asc, IsUnique = true)] +public class ThPlatformAgentEntity : IEntity +{ + /// + /// 主键,与 相同 + /// + [SugarColumn(IsPrimaryKey = true, Length = 36)] + public string Id { get; set; } = string.Empty; + + /// + /// Host 用户 Id + /// + public Guid UserId { get; set; } + + /// + /// 可创建公司上限 + /// + public int CompanyQuota { get; set; } + + /// + /// 是否启用 + /// + public bool Enabled { get; set; } = true; + + /// + /// 备注 + /// + [SugarColumn(Length = 255, IsNullable = true)] + public string? Remark { get; set; } + + /// + /// 逻辑删除 + /// + public bool IsDeleted { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreationTime { get; set; } = DateTime.Now; + + /// + /// 创建者 + /// + [SugarColumn(Length = 36, IsNullable = true)] + public Guid? CreatorId { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? LastModificationTime { get; set; } + + /// + /// 最后修改者 + /// + [SugarColumn(Length = 36, IsNullable = true)] + public Guid? LastModifierId { get; set; } + + /// + /// 并发戳 + /// + [SugarColumn(Length = 255)] + public string ConcurrencyStamp { get; set; } = string.Empty; + + /// + public object[] GetKeys() => new object[] { Id }; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/alter_yitenant_expire_time.sql b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/alter_yitenant_expire_time.sql new file mode 100644 index 0000000..a999196 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/alter_yitenant_expire_time.sql @@ -0,0 +1,7 @@ +-- Host 库 antis-foodlabeling-host:公司有效期 +-- 空 = 永久有效。仅日期(00:00:00)表示当天结束前有效。 + +ALTER TABLE `yitenant` + ADD COLUMN `ExpireTime` datetime NULL + COMMENT '公司有效期截止;空=永久' + AFTER `CreatorId`; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/seed_platform_statistics_agents_host.sql b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/seed_platform_statistics_agents_host.sql new file mode 100644 index 0000000..9dca3cc --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling/scripts/seed_platform_statistics_agents_host.sql @@ -0,0 +1,139 @@ +-- 泰额 Host:平台统计 + 代理管理菜单 / 平台代理角色 / 代理扩展表 +-- 仅在【主库 Host】执行,例如 antis-foodlabeling-test-host / antis-foodlabeling-host +-- 禁止在租户业务库执行(平台菜单不会下发给公司;新建租户不需要本脚本) +-- 可重复执行 +-- +-- 注意:文档草稿里的 f0010038 / f0010039 已占用为「支持」「API」, +-- 本脚本改用 f0010040 / f0010041。 + +SET NAMES utf8mb4; + +-- 1) 菜单:平台统计 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010040-0001-4000-8000-000000000040', + 0, NOW(), NULL, NULL, NULL, + 8, 1, '平台统计', 'FoodLabelingPlatformStatistics', 1, 'menu.platform.statistics', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:bar-chart-3', '/platform/statistics', 0, 0, 1, NULL, + '/food-labeling/platform/statistics/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010040-0001-4000-8000-000000000040' + OR `PermissionCode` = 'menu.platform.statistics' +); + +-- 2) 菜单:代理管理 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010041-0001-4000-8000-000000000041', + 0, NOW(), NULL, NULL, NULL, + 9, 1, '代理管理', 'FoodLabelingPlatformAgents', 1, 'menu.platform.agents', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:handshake', '/platform/agents', 0, 0, 1, NULL, + '/food-labeling/platform/agents/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010041-0001-4000-8000-000000000041' + OR `PermissionCode` = 'menu.platform.agents' +); + +-- 3) 角色:平台代理 +INSERT INTO `role` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `RoleName`, `RoleCode`, `Remark`, `DataScope`, `State`, + `AccessPermissionCodes`, `ConcurrencyStamp` +) +SELECT + 'f0020003-0001-4000-8000-000000000003', + 0, NOW(), NULL, NULL, NULL, + 998, '平台代理', 'platform-agent', '平台级代理:可创建公司并查看自建公司统计', 0, 1, + NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `role` WHERE `Id` = 'f0020003-0001-4000-8000-000000000003' + OR `RoleCode` = 'platform-agent' +); + +-- 4) admin 绑定新菜单(按 RoleCode,避免 Host 角色 Id 不一致) +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030043-0001-4000-8000-000000000043', r.`Id`, 'f0010040-0001-4000-8000-000000000040' +FROM `role` r +WHERE r.`RoleCode` = 'admin' AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010040-0001-4000-8000-000000000040' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030044-0001-4000-8000-000000000044', r.`Id`, 'f0010041-0001-4000-8000-000000000041' +FROM `role` r +WHERE r.`RoleCode` = 'admin' AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010041-0001-4000-8000-000000000041' + ) +LIMIT 1; + +-- 5) 代理角色:平台管理 + SAAS公司 + 平台统计(不含代理管理) +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030045-0001-4000-8000-000000000045', r.`Id`, 'f0010002-0001-4000-8000-000000000002' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010002-0001-4000-8000-000000000002' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030046-0001-4000-8000-000000000046', r.`Id`, 'f0010003-0001-4000-8000-000000000003' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010003-0001-4000-8000-000000000003' + ) +LIMIT 1; + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030047-0001-4000-8000-000000000047', r.`Id`, 'f0010040-0001-4000-8000-000000000040' +FROM `role` r +WHERE (r.`Id` = 'f0020003-0001-4000-8000-000000000003' OR r.`RoleCode` = 'platform-agent') + AND r.`IsDeleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `rolemenu` rm + WHERE rm.`RoleId` = r.`Id` AND rm.`MenuId` = 'f0010040-0001-4000-8000-000000000040' + ) +LIMIT 1; + +-- 6) 代理扩展表(Host) +CREATE TABLE IF NOT EXISTS `fl_th_platform_agent` ( + `Id` varchar(36) NOT NULL COMMENT '主键,建议与 user.Id 相同', + `UserId` varchar(36) NOT NULL COMMENT 'Host user.Id', + `CompanyQuota` int NOT NULL DEFAULT 0 COMMENT '可创建公司上限', + `Enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '1启用 0停用', + `Remark` varchar(255) NULL, + `IsDeleted` tinyint(1) NOT NULL DEFAULT 0, + `CreationTime` datetime NOT NULL, + `CreatorId` varchar(36) NULL, + `LastModificationTime` datetime NULL, + `LastModifierId` varchar(36) NULL, + `ConcurrencyStamp` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + UNIQUE KEY `UK_fl_th_platform_agent_UserId` (`UserId`), + KEY `IX_fl_th_platform_agent_Enabled` (`Enabled`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台代理扩展(配额)'; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IAccountService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IAccountService.cs index e51810e..ac29957 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IAccountService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IAccountService.cs @@ -14,7 +14,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.IServices Task RestPasswordAsync(Guid userId, RestPasswordDto input); /// - /// 根据信息查询用户,可能为空,代表该用户不存在或禁用 + /// 根据信息查询用户,可能为空,代表该User not found.或禁用 /// /// /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs index 37e7d2b..5b994be 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs @@ -209,7 +209,7 @@ namespace Yi.Framework.Rbac.Application.Services var res = Regex.IsMatch(phone, @"^\d{11}$"); if (res == false) { - throw new UserFriendlyException("手机号码格式错误!请检查"); + throw new UserFriendlyException("Invalid phone number format."); } } @@ -265,7 +265,7 @@ namespace Yi.Framework.Rbac.Application.Services if (validationPhoneType == ValidationPhoneTypeEnum.Register && await _userRepository.IsAnyAsync(x => x.Phone.ToString() == input.Phone)) { - throw new UserFriendlyException("该手机号已被注册!"); + throw new UserFriendlyException("This phone number is already registered."); } var value = await _phoneCache.GetAsync(new CaptchaPhoneCacheKey(validationPhoneType, input.Phone)); @@ -273,7 +273,7 @@ namespace Yi.Framework.Rbac.Application.Services //防止暴刷 if (value is not null) { - throw new UserFriendlyException($"{input.Phone}已发送过验证码,10分钟后可重试"); + throw new UserFriendlyException($"{input.Phone} — a verification code was already sent; retry in about 10 minutes."); } //生成一个4位数的验证码 @@ -306,7 +306,7 @@ namespace Yi.Framework.Rbac.Application.Services return; } - throw new UserFriendlyException("验证码错误"); + throw new UserFriendlyException("Verification code is incorrect."); } /// @@ -323,7 +323,7 @@ namespace Yi.Framework.Rbac.Application.Services var entity = await _userRepository.GetFirstAsync(x => x.Phone == input.Phone); if (entity is null) { - throw new UserFriendlyException("该手机号码未注册"); + throw new UserFriendlyException("This phone number is not registered."); } await _accountManager.RestPasswordAsync(entity.Id, input.Password); @@ -395,17 +395,17 @@ namespace Yi.Framework.Rbac.Application.Services { if (_rbacOptions.EnableRegister == false) { - throw new UserFriendlyException("该系统暂未开放注册功能"); + throw new UserFriendlyException("Registration is not enabled on this system."); } if (input.Phone is null) { - throw new UserFriendlyException("手机号不能为空"); + throw new UserFriendlyException("Phone number is required."); } //临时账号 if (input.UserName.StartsWith("ls_")) { - throw new UserFriendlyException("注册账号不能以ls_字符开头"); + throw new UserFriendlyException("Registration username cannot start with ls_."); } if (_rbacOptions.EnableCaptcha) @@ -442,7 +442,7 @@ namespace Yi.Framework.Rbac.Application.Services var userId = _currentUser.Id; if (userId is null) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } //此处优先从缓存中获取 @@ -459,7 +459,7 @@ namespace Yi.Framework.Rbac.Application.Services .Where(x => x.State == true) .FirstAsync(); - //该用户不存在 + //该User not found. if (user is null) { return null; @@ -468,7 +468,7 @@ namespace Yi.Framework.Rbac.Application.Services //注意用户名大小写数据库不敏感问题 if (userName is not null && !user.UserName.Equals(userName)) { - throw new UserFriendlyException($"该用户名不存在或已禁用-{userName}"); + throw new UserFriendlyException($"Username does not exist or is disabled: {userName}"); } var output = await _userManager.GetInfoAsync(user.Id); @@ -487,7 +487,7 @@ namespace Yi.Framework.Rbac.Application.Services var userId = _currentUser.Id; if (_currentUser.Id is null) { - throw new AbpAuthorizationException("用户未登录"); + throw new AbpAuthorizationException("You are not signed in."); } var data = await _userManager.GetInfoAsync(userId!.Value); @@ -557,12 +557,12 @@ namespace Yi.Framework.Rbac.Application.Services { if (input.OldPassword.Equals(input.NewPassword)) { - throw new UserFriendlyException("无效更新!输入的数据,新密码不能与老密码相同"); + throw new UserFriendlyException("Update failed: new password must differ from the old password."); } if (_currentUser.Id is null) { - throw new UserFriendlyException("用户未登录"); + throw new UserFriendlyException("You are not signed in."); } await _accountManager.UpdatePasswordAsync(_currentUser.Id ?? Guid.Empty, input.NewPassword, @@ -581,7 +581,7 @@ namespace Yi.Framework.Rbac.Application.Services { if (string.IsNullOrEmpty(input.Password)) { - throw new UserFriendlyException("重置密码不能为空!"); + throw new UserFriendlyException("Reset password cannot be empty."); } await _accountManager.RestPasswordAsync(userId, input.Password); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs index 3386af7..292b95b 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs @@ -54,7 +54,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication if (authEntity is null) { - throw new UserFriendlyException("第三方登录失败,请先注册后,在个人中心进行绑定该第三方后使用"); + throw new UserFriendlyException("Third-party sign-in failed. Register first, then bind the provider in your profile."); } var accessToken = await _accountManager.GetTokenByUserIdAsync(authEntity.UserId); @@ -77,7 +77,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication var authEntityAny = await _repository.IsAnyAsync(x => x.OpenId == openId && x.AuthType == scheme); if (authEntityAny) { - throw new UserFriendlyException("绑定失败,该第三方账号已被注册"); + throw new UserFriendlyException("Bind failed: this third-party account is already registered."); } var authAggregateRoot = new AuthAggregateRoot(scheme, userId ?? Guid.Empty, openId, name); @@ -90,7 +90,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication { if (HttpContext is null) { - throw new AggregateException("HttpContext 参数为空"); + throw new AggregateException("HttpContext is null."); } var authenticateResult = await HttpContext.AuthenticateAsync(scheme); if (!authenticateResult.Succeeded) @@ -178,7 +178,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication if (isAny) { - throw new UserFriendlyException("该用户已有此应用授权"); + throw new UserFriendlyException("This user already has authorization for this application."); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs index 2eb1024..2f651f2 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs @@ -76,7 +76,7 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor { if (!EnableRedisCache) { - throw new UserFriendlyException("后端程序未使用Redis缓存,无法对Redis进行监控,可切换使用Redis"); + throw new UserFriendlyException("Redis cache is not enabled; Redis monitoring is unavailable. Switch to Redis to monitor."); } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs index b46d007..a0db068 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs @@ -68,7 +68,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var entity = await _repository.GetByIdAsync(id); if (entity is null) { - throw new ApplicationException("岗位未存在"); + throw new ApplicationException("Post not found."); } entity.State = state; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs index 0c28e33..9f26a5c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs @@ -99,7 +99,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var count = await query.CountAsync(); if (count > exportPdfMaxRows) { - throw new UserFriendlyException($"导出数据超过上限 {exportPdfMaxRows} 条,请缩小筛选范围"); + throw new UserFriendlyException($"Export exceeds the maximum of {exportPdfMaxRows} rows. Narrow your filters and try again."); } var rows = await query.OrderBy(x => x.OrderNum, OrderByType.Desc).Take(exportPdfMaxRows).ToListAsync(); @@ -216,7 +216,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var entity = await _repository.GetByIdAsync(id); if (entity is null) { - throw new ApplicationException("角色未存在"); + throw new ApplicationException("Role not found."); } entity.State = state; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs index d6c4072..017518a 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs @@ -214,7 +214,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var entity = await _repository.GetByIdAsync(id); if (entity is null) { - throw new ApplicationException("用户未存在"); + throw new ApplicationException("User not found."); } entity.State = state; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/ConfigConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/ConfigConst.cs index 5cdec63..dc43885 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/ConfigConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/ConfigConst.cs @@ -2,5 +2,5 @@ public class ConfigConst { - public const string Exist = "该配置已经存在"; + public const string Exist = "This configuration already exists."; } \ No newline at end of file diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DeptConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DeptConst.cs index 830f1b5..7bb434f 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DeptConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DeptConst.cs @@ -12,6 +12,6 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public class DeptConst { - public const string Exist = "该部门已经存在"; + public const string Exist = "This department already exists."; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DictionaryConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DictionaryConst.cs index 90831f4..5721b67 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DictionaryConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/DictionaryConst.cs @@ -2,5 +2,5 @@ public class DictionaryConst { - public const string Exist = "该字典已经存在"; + public const string Exist = "This dictionary already exists."; } \ No newline at end of file diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/MenuConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/MenuConst.cs index 82eb6f7..7ebd875 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/MenuConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/MenuConst.cs @@ -12,6 +12,6 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public class MenuConst { - public const string Exist = "该菜单已经存在"; + public const string Exist = "This menu already exists."; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/PostConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/PostConst.cs index 5c88d8d..2388a90 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/PostConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/PostConst.cs @@ -12,6 +12,6 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public class PostConst { - public const string Exist = "该岗位已经存在"; + public const string Exist = "This post already exists."; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/RoleConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/RoleConst.cs index 8cc4405..d4bfa4c 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/RoleConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/RoleConst.cs @@ -12,6 +12,6 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public class RoleConst { - public const string Exist = "该角色已经存在"; + public const string Exist = "This role already exists."; } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs index ba78c09..0bd5f50 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs @@ -12,22 +12,32 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public class UserConst { - public const string Login_Error = "登录失败!用户名或密码错误!"; - public const string Login_User_No_Exist = "登录失败!用户名不存在!"; - public const string Login_Passworld_Error = "密码为空,添加失败!"; - public const string Create_Passworld_Error = "密码格式错误,长度需大于等于6位"; - public const string Exist = "用户已经存在,创建失败!"; - public const string State_Is_State = "该用户已被禁用,请联系管理员进行恢复"; - public const string No_Permission = "登录禁用!该用户分配无任何权限,无意义登录!"; - public const string No_Role = "登录禁用!该用户分配无任何角色,无意义登录!"; - public const string Name_Not_Allowed = "用户名被禁止"; - public const string Phone_Repeat = "手机号已重复"; + public const string Login_Error = "Sign-in failed: incorrect username or password."; + public const string Login_User_No_Exist = "Sign-in failed: username does not exist."; + public const string Login_Passworld_Error = "Password is empty; create failed."; + public const string Create_Passworld_Error = "Invalid password format; length must be at least 6 characters."; + public const string Exist = "User already exists; create failed."; + public const string State_Is_State = "This user is disabled. Contact an administrator to restore access."; + public const string No_Permission = "Sign-in blocked: this user has no permissions assigned."; + public const string No_Role = "Sign-in blocked: this user has no roles assigned."; + public const string Name_Not_Allowed = "Username is not allowed."; + public const string Phone_Repeat = "Phone number is already in use."; //子租户管理员 public const string Admin = "admin"; public const string AdminRolesCode = "admin"; public const string AdminPermissionCode = "*:*:*"; + /// + /// 租户业务库「公司管理员」角色(可选分配;开通账号默认绑 admin)。 + /// + public const string CompanyAdminRolesCode = "companyAdmin"; + + /// + /// 平台代理角色(Host):可创建公司并查看自建公司统计。 + /// + public const string PlatformAgentRolesCode = "platform-agent"; + //租户管理员 public const string TenantAdmin = "ccadmin"; public const string TenantAdminPermissionCode = "*"; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/PermissionGlobalAttribute.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/PermissionGlobalAttribute.cs index 3d5644c..40189a0 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/PermissionGlobalAttribute.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/PermissionGlobalAttribute.cs @@ -44,8 +44,8 @@ namespace Yi.Framework.Rbac.Domain.Authorization var model = new RemoteServiceErrorInfo() { Code = "403", - Message = $"您无权限访问,请联系管理员申请", - Details = $"您无权限访问该接口-{context.HttpContext.Request.Path.Value}", + Message = "You do not have permission to access this resource. Contact an administrator.", + Details = $"You do not have permission to access this API: {context.HttpContext.Request.Path.Value}", }; var content = new ObjectResult(new { error = model }) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs index fb8d291..274e204 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs @@ -18,7 +18,7 @@ public static class UserPasswordHelper { if (string.IsNullOrWhiteSpace(plainPassword)) { - throw new UserFriendlyException("密码不能为空"); + throw new UserFriendlyException("Password is required."); } user.EncryPassword ??= new EncryPasswordValueObject(); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs index ccdd77c..fd10721 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs @@ -255,7 +255,7 @@ namespace Yi.Framework.Rbac.Domain.Managers if (!user.JudgePassword(oldPassword)) { - throw new UserFriendlyException("无效更新!原密码错误!"); + throw new UserFriendlyException("Update failed: current password is incorrect."); } UserPasswordHelper.ApplyPlainPassword(user, newPassword); await _repository.UpdateAsync(user); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AliyunManger.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AliyunManger.cs index 7036b24..d6c56bf 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AliyunManger.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AliyunManger.cs @@ -57,8 +57,8 @@ namespace Yi.Framework.Rbac.Domain.Managers catch (Exception _error) { - _logger.LogError(_error, "阿里云短信发送错误:" + _error.Message); - throw new UserFriendlyException("阿里云短信发送错误:" + _error.Message); + _logger.LogError(_error, "Aliyun SMS send error:" + _error.Message); + throw new UserFriendlyException("Aliyun SMS send error:" + _error.Message); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/FileManager.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/FileManager.cs index d82112d..55c8036 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/FileManager.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/FileManager.cs @@ -34,7 +34,7 @@ public class FileManager : DomainService, IFileManager { if (files.Count() == 0) { - throw new ArgumentException("文件上传为空!"); + throw new ArgumentException("Uploaded file is empty."); } //批量插入 @@ -87,11 +87,11 @@ public class FileManager : DomainService, IFileManager } else if (compressResult.State == ImageProcessState.Canceled) { - throw new NotSupportedException($"当前图片无法再进行压缩,文件id:{file.Id}"); + throw new NotSupportedException($"This image cannot be compressed further. File id: {file.Id}"); } else { - throw new NotSupportedException($"当前图片不支持压缩,文件id:{file.Id}"); + throw new NotSupportedException($"This image format does not support compression. File id: {file.Id}"); } } catch (Exception exception) when (exception is NotSupportedException) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs index d826efa..ca64349 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs @@ -144,12 +144,12 @@ namespace Yi.Framework.Rbac.Domain.Managers { if (input.UserName == UserConst.Admin || input.UserName == UserConst.TenantAdmin) { - throw new UserFriendlyException("用户名无效注册!"); + throw new UserFriendlyException("Invalid username for registration."); } if (input.UserName.Length < 2) { - throw new UserFriendlyException("账号名需大于等于2位!"); + throw new UserFriendlyException("Account name must be at least 2 characters."); } // 正则表达式,匹配只包含数字和字母的字符串 @@ -158,7 +158,7 @@ namespace Yi.Framework.Rbac.Domain.Managers bool isMatch = Regex.IsMatch(input.UserName, pattern); if (!isMatch) { - throw new UserFriendlyException("用户名不能包含除【字母】与【数字】与【_】的其他字符"); + throw new UserFriendlyException("Username may only contain letters, digits, and underscore (_)."); } } @@ -235,7 +235,7 @@ namespace Yi.Framework.Rbac.Domain.Managers if (user is null) { //为了解决token前端缓存,后端数据库重新dbseed - throw new UserFriendlyException($"数据错误,查询用户不存在,请重新登录"); + throw new UserFriendlyException($"Data error: user not found. Please sign in again."); } user.EncryPassword.Password = string.Empty; user.EncryPassword.Salt = string.Empty; diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs index f7d27d8..8a20c0a 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Data; +using SqlSugar; +using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Yi.Framework.Rbac.Domain.Entities; using Yi.Framework.Rbac.Domain.Shared.Enums; @@ -7,7 +8,8 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { /// - /// 初始化角色。Host 主库保留调试角色;租户业务库仅产出 admin / companyAdmin / staff。 + /// 初始化角色。Host 主库保留调试角色;租户业务库产出 admin / companyAdmin / staff。 + /// 开通租户后默认登录账号绑定 admin(管理员)。 /// public class RoleDataSeed : IDataSeedContributor, ITransientDependency { @@ -76,7 +78,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds } /// - /// 租户业务库种子:仅 admin(配菜单)、companyAdmin、staff(无初始菜单)。 + /// 租户业务库种子:admin(开通账号默认角色)、companyAdmin、staff。 /// public List GetTenantSeedData() { @@ -114,12 +116,22 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds public async Task SeedAsync(DataSeedContext context) { - if (!await _repository.IsAnyAsync(x => true)) + var seedData = context.TenantId.HasValue + ? GetTenantSeedData() + : GetHostSeedData(); + var existingCodes = await _repository._DbQueryable + .Where(x => !x.IsDeleted) + .Select(x => x.RoleCode) + .ToListAsync(); + var existing = new HashSet( + existingCodes.Where(x => !string.IsNullOrWhiteSpace(x))!, + StringComparer.OrdinalIgnoreCase); + var missing = seedData + .Where(x => !existing.Contains(x.RoleCode)) + .ToList(); + if (missing.Count > 0) { - var seedData = context.TenantId.HasValue - ? GetTenantSeedData() - : GetHostSeedData(); - await _repository.InsertManyAsync(seedData); + await _repository.InsertManyAsync(missing); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserRoleDataSeed.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserRoleDataSeed.cs index 624eb3f..f8cf8be 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserRoleDataSeed.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserRoleDataSeed.cs @@ -1,5 +1,7 @@ +using SqlSugar; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; +using Yi.Framework.Rbac.Domain.Authorization; using Yi.Framework.Rbac.Domain.Entities; using Yi.Framework.Rbac.Domain.Shared.Consts; using Yi.Framework.SqlSugarCore.Abstractions; @@ -7,37 +9,112 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds; /// -/// 初始化用户与角色的默认绑定(admin/test/guest)。 +/// 初始化用户与角色的默认绑定(租户开通账号必须绑 admin;Host 绑 admin/test/guest)。 /// public class UserRoleDataSeed : IDataSeedContributor, ITransientDependency { private readonly ISqlSugarRepository _userRoleRepository; private readonly ISqlSugarRepository _userRepository; private readonly ISqlSugarRepository _roleRepository; + private readonly IDataFilter _dataFilter; public UserRoleDataSeed( ISqlSugarRepository userRoleRepository, ISqlSugarRepository userRepository, - ISqlSugarRepository roleRepository) + ISqlSugarRepository roleRepository, + IDataFilter dataFilter) { _userRoleRepository = userRoleRepository; _userRepository = userRepository; _roleRepository = roleRepository; + _dataFilter = dataFilter; } public async Task SeedAsync(DataSeedContext context) { - if (await _userRoleRepository.IsAnyAsync(x => true)) + using (_dataFilter.DisablePermissionHandler()) + { + if (context.TenantId.HasValue) + { + await EnsureTenantAdminBoundAsync(); + return; + } + + if (await _userRoleRepository.IsAnyAsync(x => true)) + { + return; + } + + await SeedHostBindingsAsync(); + } + } + + /// + /// 租户业务库:开通默认账号必须是「管理员」(RoleCode=admin),不能停在公司管理员。 + /// 即使 userrole 已有其它行也要纠正。 + /// + private async Task EnsureTenantAdminBoundAsync() + { + var adminRoles = await _roleRepository._DbQueryable + .Where(r => !r.IsDeleted) + .Where(r => r.RoleCode == UserConst.AdminRolesCode || r.RoleName == "管理员") + .OrderBy(r => r.OrderNum, OrderByType.Desc) + .Take(1) + .ToListAsync(); + var adminRole = adminRoles.FirstOrDefault(); + if (adminRole is null) + { + return; + } + + var adminUsers = await _userRepository._DbQueryable + .Where(u => !u.IsDeleted) + .Where(u => u.UserName == UserConst.Admin + || (u.Email != null && SqlFunc.ToLower(u.Email) == "admin@example.com") + || u.Nick == "超级管理员") + .OrderBy(u => u.OrderNum, OrderByType.Desc) + .Take(1) + .ToListAsync(); + var adminUser = adminUsers.FirstOrDefault(); + if (adminUser is null) + { + return; + } + + var leftoverCompanyAdminRoleIds = await _roleRepository._DbQueryable + .Where(r => !r.IsDeleted) + .Where(r => r.RoleCode == UserConst.CompanyAdminRolesCode) + .Where(r => r.Id != adminRole.Id) + .Select(r => r.Id) + .ToListAsync(); + if (leftoverCompanyAdminRoleIds.Count > 0) + { + await _userRoleRepository._Db.Deleteable() + .Where(ur => ur.UserId == adminUser.Id && leftoverCompanyAdminRoleIds.Contains(ur.RoleId)) + .ExecuteCommandAsync(); + } + + var alreadyBound = await _userRoleRepository._DbQueryable + .AnyAsync(ur => ur.UserId == adminUser.Id && ur.RoleId == adminRole.Id); + if (alreadyBound) { return; } - var isTenantDb = context.TenantId.HasValue; + await _userRoleRepository.InsertAsync(new UserRoleEntity + { + UserId = adminUser.Id, + RoleId = adminRole.Id + }); + } + private async Task SeedHostBindingsAsync() + { var users = await _userRepository._DbQueryable .Where(u => !u.IsDeleted) .Where(u => u.UserName == UserConst.Admin - || (!isTenantDb && (u.UserName == "test" || u.UserName == "guest"))) + || u.UserName == "test" + || u.UserName == "guest") .ToListAsync(); if (users.Count == 0) { @@ -47,7 +124,8 @@ public class UserRoleDataSeed : IDataSeedContributor, ITransientDependency var roles = await _roleRepository._DbQueryable .Where(r => !r.IsDeleted) .Where(r => r.RoleCode == UserConst.AdminRolesCode - || (!isTenantDb && (r.RoleCode == "test" || r.RoleCode == UserConst.DefaultRoleCode))) + || r.RoleCode == "test" + || r.RoleCode == UserConst.DefaultRoleCode) .ToListAsync(); if (roles.Count == 0) { @@ -58,17 +136,12 @@ public class UserRoleDataSeed : IDataSeedContributor, ITransientDependency .GroupBy(r => r.RoleCode, StringComparer.OrdinalIgnoreCase) .ToDictionary(g => g.Key, g => g.First(), StringComparer.OrdinalIgnoreCase); - var bindings = isTenantDb - ? new (string UserName, string RoleCode)[] - { - (UserConst.Admin, UserConst.AdminRolesCode) - } - : new (string UserName, string RoleCode)[] - { - (UserConst.Admin, UserConst.AdminRolesCode), - ("test", "test"), - ("guest", UserConst.DefaultRoleCode) - }; + var bindings = new (string UserName, string RoleCode)[] + { + (UserConst.Admin, UserConst.AdminRolesCode), + ("test", "test"), + ("guest", UserConst.DefaultRoleCode) + }; var entities = new List(); foreach (var (userName, roleCode) in bindings) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application/TenantService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application/TenantService.cs index de90ec4..6c538ae 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application/TenantService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application/TenantService.cs @@ -54,7 +54,7 @@ namespace Yi.Framework.TenantManagement.Application { if (string.IsNullOrWhiteSpace(_dbConnOptions.Url)) { - throw new UserFriendlyException("未配置主库连接字符串 DbConnOptions.Url"); + throw new UserFriendlyException("Host database connection string DbConnOptions.Url is not configured."); } var dbType = _dbConnOptions.DbType ?? DbType.MySql; @@ -128,7 +128,7 @@ namespace Yi.Framework.TenantManagement.Application { if (await _repository.IsAnyAsync(x => x.Name == input.Name)) { - throw new UserFriendlyException("创建失败,当前租户已存在"); + throw new UserFriendlyException("Create failed: tenant already exists."); } return await base.CreateAsync(input); @@ -147,7 +147,7 @@ namespace Yi.Framework.TenantManagement.Application { if (await _repository.IsAnyAsync(x => x.Name == input.Name && x.Id != id)) { - throw new UserFriendlyException("更新后租户名已经存在"); + throw new UserFriendlyException("Tenant name already exists after update."); } return await base.UpdateAsync(id, input); @@ -185,7 +185,7 @@ namespace Yi.Framework.TenantManagement.Application tenant = await LoadTenantFromHostAsync(id); if (tenant == null) { - throw new UserFriendlyException("未找到租户信息"); + throw new UserFriendlyException("Tenant information not found."); } } @@ -219,7 +219,7 @@ namespace Yi.Framework.TenantManagement.Application var databaseName = ExtractDatabaseName(tenant.TenantConnectionString); if (string.IsNullOrWhiteSpace(databaseName) || !SafeDatabaseNameRegex.IsMatch(databaseName)) { - throw new UserFriendlyException("租户连接串中的数据库名无效,无法建库"); + throw new UserFriendlyException("Invalid database name in tenant connection string; cannot create database."); } // 建库连接候选(按优先级,互不相同才尝试下一条): @@ -254,7 +254,7 @@ namespace Yi.Framework.TenantManagement.Application if (createCandidates.Count == 0) { - throw new UserFriendlyException("未配置可用的数据库连接串,无法创建租户库"); + throw new UserFriendlyException("No usable database connection string is configured; cannot create tenant database."); } var externalServices = new ConfigureExternalServices @@ -304,12 +304,12 @@ namespace Yi.Framework.TenantManagement.Application { var userId = ExtractConnectionValue(tenant.TenantConnectionString, "uid") ?? "netteam"; throw new UserFriendlyException( - $"创建租户库失败(库={databaseName})。尝试结果:{string.Join(" | ", createErrors)}。" + - $"说明:MySQL 报 Access denied to database 新建库名时,通常是账号没有 CREATE 权限(与能否连上主库无关)。" + - $"请在 appsettings 的 DbConnOptions.AdminConnectionString 配置高权限账号连接串后重试;或手动执行:" + + $"Failed to create tenant database (database={databaseName}). Attempts: {string.Join(" | ", createErrors)}. " + + $"When MySQL reports Access denied for a new database name, the account usually lacks CREATE privilege (unrelated to host connectivity). " + + $"Configure a privileged connection string in appsettings DbConnOptions.AdminConnectionString and retry, or run manually: " + $"CREATE DATABASE IF NOT EXISTS `{databaseName}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; " + $"GRANT ALL PRIVILEGES ON `{databaseName}`.* TO '{userId}'@'%'; " + - $"再 PUT /api/app/tenant/init/{tenant.Id}"); + $"then PUT /api/app/tenant/init/{tenant.Id}"); } // 2) 把业务账号(TenantConnectionString 的 uid,如 netteam)授权到新库 @@ -349,11 +349,11 @@ namespace Yi.Framework.TenantManagement.Application { var userId = ExtractConnectionValue(tenant.TenantConnectionString, "uid") ?? "netteam"; throw new UserFriendlyException( - $"租户库 `{databaseName}` 已存在,但建表失败。" + - $"业务账号建表:{GetRootMessage(tenantConnEx)};" + - $"高权限建表:{GetRootMessage(adminConnEx)}。" + - (string.IsNullOrEmpty(grantWarnings) ? "" : $"授权提示:{grantWarnings}。") + - $"请手动执行 GRANT ALL PRIVILEGES ON `{databaseName}`.* TO '{userId}'@'%'; 后 " + + $"Tenant database `{databaseName}` already exists but schema creation failed. " + + $"Business account: {GetRootMessage(tenantConnEx)}; " + + $"Privileged account: {GetRootMessage(adminConnEx)}. " + + (string.IsNullOrEmpty(grantWarnings) ? "" : $"Grant note: {grantWarnings}. ") + + $"Run GRANT ALL PRIVILEGES ON `{databaseName}`.* TO '{userId}'@'%'; then " + $"PUT /api/app/tenant/init/{tenant.Id}"); } } @@ -396,7 +396,7 @@ namespace Yi.Framework.TenantManagement.Application catch (Exception ex) { throw new UserFriendlyException( - $"租户库 CodeFirst 后的补充迁移失败({contributor.GetType().Name}):{GetRootMessage(ex)}"); + $"Post–CodeFirst tenant migration failed ({contributor.GetType().Name}): {GetRootMessage(ex)}"); } } } diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/SqlSugarAndConfigurationTenantStore.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/SqlSugarAndConfigurationTenantStore.cs index d29fe31..24783b5 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/SqlSugarAndConfigurationTenantStore.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/SqlSugarAndConfigurationTenantStore.cs @@ -29,12 +29,12 @@ namespace Yi.Framework.TenantManagement.Domain public new TenantConfiguration? Find(string name) { - throw new NotImplementedException("请使用异步方法"); + throw new NotImplementedException("Use the async method instead."); } public new TenantConfiguration? Find(Guid id) { - throw new NotImplementedException("请使用异步方法"); + throw new NotImplementedException("Use the async method instead."); } public new async Task FindAsync(string name) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/TenantAggregateRoot.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/TenantAggregateRoot.cs index 7f0424c..58a35f8 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/TenantAggregateRoot.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/TenantAggregateRoot.cs @@ -32,6 +32,12 @@ namespace Yi.Framework.TenantManagement.Domain public DbType DbType { get; protected set; } + /// + /// 公司有效期截止时间;空表示永久有效。仅日期(00:00:00)表示当天结束前有效。 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ExpireTime { get; set; } + [SugarColumn(IsIgnore = true)] public override ExtraPropertyDictionary ExtraProperties { get => base.ExtraProperties; protected set => base.ExtraProperties = value; } public virtual void SetConnectionString(DbType dbType, string connectionString) diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs index b21fab3..976b104 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs @@ -48,8 +48,8 @@ namespace Yi.Abp.Application.Services [HttpGet("error")] public string GetError() { - throw new UserFriendlyException("业务异常"); - throw new Exception("系统异常"); + throw new UserFriendlyException("Business error."); + throw new Exception("System error"); } /// diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index c9b4f63..1db3320 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -47,7 +47,9 @@ using Yi.Framework.Rbac.Domain.Shared.Options; using Yi.Framework.TenantManagement.Application; using Antis.Erp.Application; using FoodLabeling.Application; +using FoodLabeling.Application.Helpers; using FoodLabeling.Application.MultiTenancy; +using FoodLabeling.Application.Options; using FoodLabeling.Th.Application; namespace Yi.Abp.Web @@ -407,17 +409,15 @@ namespace Yi.Abp.Web }); app.UseDirectoryBrowser("/api/app/wwwroot"); - // 类别图片静态资源(物理目录 /www/wwwroot/FoodLabelingManagementUs/picture) - // - Linux:通常可直接写入与访问 - // - Windows:如该目录不存在,则使用项目 wwwroot/FoodLabelingManagementUs/picture 作为落盘目录 - var linuxPictureRoot = "/www/wwwroot/FoodLabelingManagementUs/picture"; - var webRootPicture = Path.Combine(env.WebRootPath ?? string.Empty, "FoodLabelingManagementUs", "picture"); - var pictureRoot = Directory.Exists(linuxPictureRoot) ? linuxPictureRoot : webRootPicture; - Directory.CreateDirectory(pictureRoot); + // 图片静态资源:Linux 统一 /www/wwwroot/picture/{版本},与发布目录分离 + var pictureRoot = FoodLabelingPictureRoot.Resolve( + context.GetConfiguration()[$"{FoodLabelingPictureOptions.SectionName}:RootPath"], + env.ContentRootPath, + env.WebRootPath); app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider(pictureRoot), - RequestPath = "/picture" + RequestPath = FoodLabelingPictureRoot.RequestPath }); app.Properties.Add("_AbpExceptionHandlingMiddleware_Added", false); diff --git a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json index d1db9f3..f0ba90f 100644 --- a/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json +++ b/泰额版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json @@ -20,7 +20,7 @@ }, //应用启动:SelfUrl 供 Program.cs UseUrls 绑定;用 0.0.0.0 避免写成固定局域网 IP 在本机无该网卡时启动失败(WinError 10049) "App": { - "SelfUrl": "http://192.168.31.88:19002", + "SelfUrl": "http://192.168.31.89:19002", "CorsOrigins": "http://localhost:19002;http://localhost:18000;http://localhost:5666;http://localhost:5173;http://localhost:5174;http://localhost:3000;http://127.0.0.1:19002;http://flus-tetest.3flabeling.com;https://flus-tetest.3flabeling.com;http://flusapi-tetest.3flabeling.com;https://flusapi-tetest.3flabeling.com" }, //配置 @@ -146,6 +146,12 @@ "CacheExpirationMinutes": 10 }, + "FoodLabeling": { + "Picture": { + "RootPath": "/www/wwwroot/picture/tetest" + } + }, + "SemanticKernel": { "ModelIds": [ "gpt-4o" ], "Endpoint": "https://xxx.com/v1", diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts index 8b939a8..608ce06 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts @@ -1,4 +1,6 @@ export * from './th-app-auth'; export * from './th-multi-tenancy'; +export * from './th-platform-agents'; +export * from './th-platform-statistics'; export * from './th-tenant-provisioning'; export * from './th-web-auth'; diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-agents.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-agents.ts new file mode 100644 index 0000000..ca39a4b --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-agents.ts @@ -0,0 +1,99 @@ +import { requestClient } from '#/api/request'; + +const PATH = '/th-platform-agents'; + +export interface PlatformAgentDto { + id: string; + userName: string; + email: string; + displayName: string; + companyQuota: number; + companyUsed: number; + enabled: boolean; + creationTime: null | string; +} + +export interface PlatformAgentListDto { + items: PlatformAgentDto[]; + totalCount: number; +} + +export interface PlatformAgentQuery { + Enabled?: boolean; + Keyword?: string; + MaxResultCount?: number; + SkipCount?: number; +} + +export interface PlatformAgentSaveInput { + companyQuota?: number; + displayName?: string; + email?: string; + enabled?: boolean; + password?: string; + userName?: string; +} + +function asRecord(raw: unknown): Record { + return raw && typeof raw === 'object' ? (raw as Record) : {}; +} + +function toNumber(v: unknown): number { + const n = Number(v); + return Number.isFinite(n) ? n : 0; +} + +function toText(v: unknown): string { + return String(v ?? '').trim(); +} + +function normalizeAgent(raw: unknown): PlatformAgentDto { + const o = asRecord(raw); + return { + id: String(o.id ?? o.Id ?? ''), + userName: toText(o.userName ?? o.UserName), + email: toText(o.email ?? o.Email), + displayName: toText(o.displayName ?? o.DisplayName), + companyQuota: toNumber(o.companyQuota ?? o.CompanyQuota), + companyUsed: toNumber(o.companyUsed ?? o.CompanyUsed), + enabled: o.enabled === false || o.Enabled === false ? false : true, + creationTime: toText(o.creationTime ?? o.CreationTime) || null, + }; +} + +export async function thPlatformAgentList( + query: PlatformAgentQuery = {}, +): Promise { + const raw = await requestClient.get(PATH, { + params: query, + successMessageMode: 'none', + errorMessageMode: 'none', + }); + const o = asRecord(raw); + const itemsRaw = o.items ?? o.Items; + const items = Array.isArray(itemsRaw) ? itemsRaw.map(normalizeAgent) : []; + return { + items, + totalCount: toNumber(o.totalCount ?? o.TotalCount ?? items.length), + }; +} + +export async function thPlatformAgentGet(id: string): Promise { + const raw = await requestClient.get(`${PATH}/${encodeURIComponent(id)}`, { + successMessageMode: 'none', + errorMessageMode: 'none', + }); + return normalizeAgent(raw); +} + +export function thPlatformAgentCreate(input: PlatformAgentSaveInput) { + return requestClient.postWithMsg(PATH, input); +} + +export function thPlatformAgentUpdate(id: string, input: PlatformAgentSaveInput) { + return requestClient.putWithMsg(`${PATH}/${encodeURIComponent(id)}`, input); +} + +export function thPlatformAgentRemove(id: string) { + return requestClient.deleteWithMsg(`${PATH}/${encodeURIComponent(id)}`); +} diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-statistics.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-statistics.ts new file mode 100644 index 0000000..5e60a9c --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-platform-statistics.ts @@ -0,0 +1,94 @@ +import { requestClient } from '#/api/request'; + +const PATH = '/th-platform-statistics'; + +export interface ThPlatformStatisticsOverviewDto { + companyCount: number; + regionCount: number; + locationCount: number; + labelCount: number; + lastUsedAt: null | string; + scope: 'agent' | 'all' | string; +} + +export interface ThPlatformStatisticsCompanyItemDto { + id: string; + companyName: string; + labelCount: number; + locationCount: number; + regionCount: number; + lastUsedAt: null | string; +} + +export interface ThPlatformStatisticsCompanyListDto { + items: ThPlatformStatisticsCompanyItemDto[]; + totalCount: number; +} + +export interface ThPlatformStatisticsCompanyQuery { + Keyword?: string; + MaxResultCount?: number; + SkipCount?: number; +} + +function asRecord(raw: unknown): Record { + return raw && typeof raw === 'object' ? (raw as Record) : {}; +} + +function toNumber(v: unknown): number { + const n = Number(v); + return Number.isFinite(n) ? n : 0; +} + +function toText(v: unknown): null | string { + if (v == null) { + return null; + } + const s = String(v).trim(); + return s || null; +} + +export async function thPlatformStatisticsOverview(): Promise { + const raw = await requestClient.get(`${PATH}/overview`, { + successMessageMode: 'none', + errorMessageMode: 'none', + }); + const o = asRecord(raw); + return { + companyCount: toNumber(o.companyCount ?? o.CompanyCount), + regionCount: toNumber(o.regionCount ?? o.RegionCount), + locationCount: toNumber(o.locationCount ?? o.LocationCount), + labelCount: toNumber(o.labelCount ?? o.LabelCount), + lastUsedAt: toText(o.lastUsedAt ?? o.LastUsedAt), + scope: String(o.scope ?? o.Scope ?? 'all'), + }; +} + +export async function thPlatformStatisticsCompanies( + query: ThPlatformStatisticsCompanyQuery = {}, +): Promise { + const raw = await requestClient.get(`${PATH}/companies`, { + params: query, + successMessageMode: 'none', + errorMessageMode: 'none', + }); + const o = asRecord(raw); + const itemsRaw = o.items ?? o.Items; + const items = Array.isArray(itemsRaw) + ? itemsRaw.map((row) => { + const r = asRecord(row); + return { + id: String(r.id ?? r.Id ?? ''), + companyName: String(r.companyName ?? r.CompanyName ?? ''), + labelCount: toNumber(r.labelCount ?? r.LabelCount), + locationCount: toNumber(r.locationCount ?? r.LocationCount), + regionCount: toNumber(r.regionCount ?? r.RegionCount), + lastUsedAt: toText(r.lastUsedAt ?? r.LastUsedAt), + }; + }) + : []; + return { + items, + totalCount: toNumber(o.totalCount ?? o.TotalCount ?? items.length), + }; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/management/account-management/team-members/team-member-modal.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/management/account-management/team-members/team-member-modal.vue index 1fde392..7b36b61 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/management/account-management/team-members/team-member-modal.vue +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/management/account-management/team-members/team-member-modal.vue @@ -286,10 +286,16 @@ const [BasicModal, modalApi] = useVbenModal({ selectedRoleId.value = ''; currentPartnerId.value = ''; refreshFormSchema(); + const adminRole = roleOptions.value.find((option) => { + const label = String(option.label ?? '').trim(); + const code = String((option as { roleCode?: string }).roleCode ?? '').trim(); + return label === '管理员' || code.toLowerCase() === 'admin'; + }); await formApi.setValues({ state: true, regionIds: [], locationIds: [], + roleId: adminRole?.value, }); } modalApi.modalLoading(false); diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/agent-modal.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/agent-modal.vue new file mode 100644 index 0000000..8b9bd9b --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/agent-modal.vue @@ -0,0 +1,169 @@ + + + diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/data.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/data.ts new file mode 100644 index 0000000..344fb0d --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/data.ts @@ -0,0 +1,55 @@ +import type { FormSchemaGetter } from '#/adapter/form'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { $t } from '@vben/locales'; + +import { foodLabelingActionColumn } from '../../management/shared/management-grid'; +import { keywordFilterSchema, stateFilterSchema } from '../../shared/form-schema'; + +export const querySchema: FormSchemaGetter = () => [ + ...keywordFilterSchema(), + ...stateFilterSchema(), +]; + +export function agentColumns(): VxeGridProps['columns'] { + return [ + { + field: 'displayName', + minWidth: 140, + title: $t('foodLabeling.platform.agents.displayName'), + }, + { + field: 'userName', + minWidth: 140, + title: $t('foodLabeling.platform.agents.userName'), + }, + { + field: 'email', + minWidth: 180, + title: $t('foodLabeling.platform.agents.email'), + }, + { + field: 'companyQuota', + minWidth: 110, + title: $t('foodLabeling.platform.agents.companyQuota'), + }, + { + field: 'companyUsed', + minWidth: 110, + title: $t('foodLabeling.platform.agents.companyUsed'), + }, + { + field: 'enabled', + minWidth: 90, + slots: { default: 'enabled' }, + title: $t('foodLabeling.common.status'), + }, + { + field: 'creationTime', + minWidth: 170, + slots: { default: 'creationTime' }, + title: $t('foodLabeling.platform.creationTime'), + }, + foodLabelingActionColumn({ minWidth: 160 }), + ]; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/index.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/index.vue new file mode 100644 index 0000000..df0739d --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/agents/index.vue @@ -0,0 +1,140 @@ + + + diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/data.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/data.ts new file mode 100644 index 0000000..de4ba83 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/data.ts @@ -0,0 +1,39 @@ +import type { FormSchemaGetter } from '#/adapter/form'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { $t } from '@vben/locales'; + +import { keywordFilterSchema } from '../../shared/form-schema'; + +export const querySchema: FormSchemaGetter = () => [...keywordFilterSchema()]; + +export function companyColumns(): VxeGridProps['columns'] { + return [ + { + field: 'companyName', + minWidth: 220, + title: $t('foodLabeling.platform.companyName'), + }, + { + field: 'regionCount', + minWidth: 100, + title: $t('foodLabeling.platform.statistics.regionCount'), + }, + { + field: 'locationCount', + minWidth: 100, + title: $t('foodLabeling.platform.statistics.locationCount'), + }, + { + field: 'labelCount', + minWidth: 100, + title: $t('foodLabeling.platform.statistics.labelCount'), + }, + { + field: 'lastUsedAt', + minWidth: 180, + slots: { default: 'lastUsedAt' }, + title: $t('foodLabeling.platform.statistics.lastUsedAt'), + }, + ]; +} diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/index.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/index.vue new file mode 100644 index 0000000..5718d92 --- /dev/null +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/statistics/index.vue @@ -0,0 +1,161 @@ + + + diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/shared/use-account-lookups.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/shared/use-account-lookups.ts index 5712d07..5e07358 100644 --- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/shared/use-account-lookups.ts +++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/shared/use-account-lookups.ts @@ -49,6 +49,7 @@ export function useAccountLookups() { roleOptions.value = roleDefinitions.value.map((r) => ({ label: (r.roleName ?? r.roleCode ?? r.id).trim() || r.id, value: r.id, + roleCode: r.roleCode, })); } diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs index 679bc51..8ae93bb 100644 --- a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/FoodLabelingApplicationModule.cs @@ -25,6 +25,8 @@ public class FoodLabelingApplicationModule : AbpModule context.Services.GetConfiguration().GetSection(FoodLabelingBatchImportOptions.SectionName)); Configure( context.Services.GetConfiguration().GetSection(FoodLabelingAppUpdateOptions.SectionName)); + Configure( + context.Services.GetConfiguration().GetSection(FoodLabelingPictureOptions.SectionName)); // 任意业务写接口成功后刷新系统编辑时间戳,供 my-menus.lastUpdated 使用 Configure(options => diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs new file mode 100644 index 0000000..3de3d74 --- /dev/null +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Helpers/FoodLabelingPictureRoot.cs @@ -0,0 +1,48 @@ +using System.Runtime.InteropServices; + +namespace FoodLabeling.Application.Helpers; + +/// 解析图片物理根目录:优先配置,Linux 用 /www/wwwroot/picture/...,Windows 回落到 wwwroot/picture。 +public static class FoodLabelingPictureRoot +{ + public const string LinuxSharedRoot = "/www/wwwroot/picture"; + public const string RequestPath = "/picture"; + + public static string Resolve(string? configuredRoot, string contentRootPath, string? webRootPath) + { + var configured = (configuredRoot ?? string.Empty).Trim(); + if (!string.IsNullOrWhiteSpace(configured) && CanUseConfiguredPath(configured)) + { + Directory.CreateDirectory(configured); + return configured; + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || Directory.Exists("/www/wwwroot")) + { + var linux = string.IsNullOrWhiteSpace(configured) + ? Path.Combine(LinuxSharedRoot, "local") + : configured; + Directory.CreateDirectory(linux); + return linux; + } + + var localBase = !string.IsNullOrWhiteSpace(webRootPath) + ? webRootPath + : Path.Combine(contentRootPath, "wwwroot"); + var local = Path.Combine(localBase, "picture"); + Directory.CreateDirectory(local); + return local; + } + + private static bool CanUseConfiguredPath(string path) + { + var unix = path.Replace('\\', '/'); + var isLinuxWww = unix.StartsWith("/www/wwwroot/", StringComparison.OrdinalIgnoreCase); + if (isLinuxWww && !RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && !Directory.Exists("/www/wwwroot")) + { + return false; + } + + return true; + } +} diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs new file mode 100644 index 0000000..aa16a14 --- /dev/null +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Options/FoodLabelingPictureOptions.cs @@ -0,0 +1,12 @@ +namespace FoodLabeling.Application.Options; + +/// +/// 产品/类别图片落盘目录。Linux 统一在 /www/wwwroot/picture/{版本},与 API 发布目录分离,避免部署清空图片。 +/// +public class FoodLabelingPictureOptions +{ + public const string SectionName = "FoodLabeling:Picture"; + + /// 物理根目录,例如 /www/wwwroot/picture/teustest。 + public string RootPath { get; set; } = string.Empty; +} diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs index da530bd..414d75a 100644 --- a/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/PictureAppService.cs @@ -1,8 +1,11 @@ using FoodLabeling.Application.Contracts.Dtos.Picture; using FoodLabeling.Application.Contracts.IServices; +using FoodLabeling.Application.Helpers; +using FoodLabeling.Application.Options; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Options; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.Guids; @@ -23,17 +26,33 @@ public class PictureAppService : ApplicationService, IPictureAppService private readonly IGuidGenerator _guidGenerator; private readonly IHostEnvironment _hostEnvironment; + private readonly FoodLabelingPictureOptions _pictureOptions; - public PictureAppService(IGuidGenerator guidGenerator, IHostEnvironment hostEnvironment) + public PictureAppService( + IGuidGenerator guidGenerator, + IHostEnvironment hostEnvironment, + IOptions pictureOptions) { _guidGenerator = guidGenerator; _hostEnvironment = hostEnvironment; + _pictureOptions = pictureOptions.Value; } /// - /// 上传类别图片(保存到 /www/wwwroot/FoodLabelingManagementUs/picture) + /// 上传类别/产品图片(Linux 保存到 /www/wwwroot/picture/{版本}) /// - /// 返回的 Url 可直接保存到 CategoryPhotoUrl。 + /// + /// 与 API 发布目录分离,部署不会删除已上传图片。返回的 Url 可直接保存到 CategoryPhotoUrl / ProductImageUrl。 + /// + /// 参数说明: + /// - file: 图片文件 + /// - subDir: 可选子目录,产品图为 product + /// + /// 上传表单 + /// 相对路径 Url,如 /picture/product/xxx.png + /// 上传成功 + /// 文件为空、过大或扩展名不支持 + /// 服务器写入失败 [HttpPost] [Consumes("multipart/form-data")] [Route("/api/app/picture/category/upload")] @@ -77,12 +96,11 @@ public class PictureAppService : ApplicationService, IPictureAppService }; } - private string ResolvePictureRoot() - { - var linuxPictureRoot = "/www/wwwroot/FoodLabelingManagementUs/picture"; - var webRootPicture = Path.Combine(_hostEnvironment.ContentRootPath, "wwwroot", "FoodLabelingManagementUs", "picture"); - return Directory.Exists(linuxPictureRoot) ? linuxPictureRoot : webRootPicture; - } + private string ResolvePictureRoot() => + FoodLabelingPictureRoot.Resolve( + _pictureOptions.RootPath, + _hostEnvironment.ContentRootPath, + Path.Combine(_hostEnvironment.ContentRootPath, "wwwroot")); private static string NormalizeSubDir(string? subDir) { diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index d23327c..e81bd40 100644 --- a/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -46,6 +46,8 @@ using Yi.Framework.Rbac.Domain.Shared.Options; using Yi.Framework.TenantManagement.Application; using Antis.Erp.Application; using FoodLabeling.Application; +using FoodLabeling.Application.Helpers; +using FoodLabeling.Application.Options; using FoodLabeling.Th.Application; namespace Yi.Abp.Web @@ -398,17 +400,15 @@ namespace Yi.Abp.Web }); app.UseDirectoryBrowser("/api/app/wwwroot"); - // 类别图片静态资源(物理目录 /www/wwwroot/FoodLabelingManagementUs/picture) - // - Linux:通常可直接写入与访问 - // - Windows:如该目录不存在,则使用项目 wwwroot/FoodLabelingManagementUs/picture 作为落盘目录 - var linuxPictureRoot = "/www/wwwroot/FoodLabelingManagementUs/picture"; - var webRootPicture = Path.Combine(env.WebRootPath ?? string.Empty, "FoodLabelingManagementUs", "picture"); - var pictureRoot = Directory.Exists(linuxPictureRoot) ? linuxPictureRoot : webRootPicture; - Directory.CreateDirectory(pictureRoot); + // 图片静态资源:Linux 统一 /www/wwwroot/picture/{版本},与发布目录分离 + var pictureRoot = FoodLabelingPictureRoot.Resolve( + context.GetConfiguration()[$"{FoodLabelingPictureOptions.SectionName}:RootPath"], + env.ContentRootPath, + env.WebRootPath); app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider(pictureRoot), - RequestPath = "/picture" + RequestPath = FoodLabelingPictureRoot.RequestPath }); app.Properties.Add("_AbpExceptionHandlingMiddleware_Added", false); diff --git a/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json b/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json index 4a06755..1da4946 100644 --- a/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json +++ b/美国版/Food Labeling Management Code/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json @@ -137,6 +137,9 @@ "Changelog": "", "ApkPath": "/www/wwwroot/FoodLabelingManagementTeUsTest/wwwroot/app-update/app-release.apk" }, + "Picture": { + "RootPath": "/www/wwwroot/picture/teustest" + }, "BatchImport": { "TemplateDirectory": "/www/wwwroot/FoodLabelingManagementUs/batchImportOfFiles", "LocationTemplateFileName": "Location-Manager-批量导入模板.xlsx", diff --git a/美国版/scripts/泰鄂测试版部署.ps1 b/美国版/scripts/泰鄂测试版部署.ps1 index e46520d..94a5bef 100644 --- a/美国版/scripts/泰鄂测试版部署.ps1 +++ b/美国版/scripts/泰鄂测试版部署.ps1 @@ -74,18 +74,17 @@ if (-not (Test-Path (Join-Path $PublishDir "Yi.Abp.Web.dll"))) { } Write-Host "== stop remote process ==" -ForegroundColor Cyan -$stopRemote = @" +Invoke-Remote @' set -e PIDFILE=/var/tmp/net_project/食品标签泰鄂测试版.pid -if test -f "`$PIDFILE"; then - pid=`$(cat "`$PIDFILE" || true) - if test -n "`$pid"; then kill `$pid 2>/dev/null || true; fi +if test -f "$PIDFILE"; then + pid=$(cat "$PIDFILE" || true) + if test -n "$pid"; then kill $pid 2>/dev/null || true; fi fi pkill -f "/www/wwwroot/FoodLabelingManagementTeTest/Yi.Abp.Web.dll" 2>/dev/null || true sleep 1 echo stopped -"@ -Invoke-Remote $stopRemote +'@ Write-Host "== upload publish package ==" -ForegroundColor Cyan $tar = Join-Path $env:TEMP "flus-tetest-publish.tgz" @@ -101,37 +100,56 @@ try { & scp @SshOpts $tar "${UserName}@${HostName}:/tmp/flus-tetest-publish.tgz" if ($LASTEXITCODE -ne 0) { throw "scp failed" } -$uploadRemote = @" +$uploadRemote = @' set -e -mkdir -p '$RemoteDir' -cd '$RemoteDir' +mkdir -p '__REMOTE_DIR__' +cd '__REMOTE_DIR__' for x in *; do - case "`$x" in + case "$x" in logs|*.log) ;; - *) rm -rf "`$x" ;; + *) rm -rf "$x" ;; esac done -tar --overwrite -xzf /tmp/flus-tetest-publish.tgz -C '$RemoteDir' +tar --overwrite -xzf /tmp/flus-tetest-publish.tgz -C '__REMOTE_DIR__' rm -f /tmp/flus-tetest-publish.tgz -chmod -R a+rX '$RemoteDir' -ls -l '$RemoteDir/Yi.Abp.Web.dll' -echo uploaded_to=$RemoteDir -"@ +chmod -R a+rX '__REMOTE_DIR__' +ls -l '__REMOTE_DIR__/Yi.Abp.Web.dll' +echo uploaded_to=__REMOTE_DIR__ +'@.Replace('__REMOTE_DIR__', $RemoteDir) Invoke-Remote $uploadRemote Write-Host "== register BT net project ==" -ForegroundColor Cyan $btPyLocal = Join-Path $ScriptDir "bt-register-net-project.py" & scp @SshOpts $btPyLocal "${UserName}@${HostName}:/tmp/bt-register-net-project.py" if ($LASTEXITCODE -ne 0) { throw "upload bt python failed" } -$btRemote = @" +$btRemote = @' set -e -sed -i 's/\r`$//' /tmp/bt-register-net-project.py -python3 /tmp/bt-register-net-project.py name='$BtName' path='$RemoteDir' port='19002' ps='$BtName' domain='$BtDomain' cmd='$BtCmd' run_user='root' dotnet_version='8.0.100' -"@ +sed -i 's/\r$//' /tmp/bt-register-net-project.py +python3 /tmp/bt-register-net-project.py name='__BT_NAME__' path='__REMOTE_DIR__' port='19002' ps='__BT_NAME__' domain='__BT_DOMAIN__' cmd='__BT_CMD__' run_user='root' dotnet_version='8.0.100' +'@.Replace('__BT_NAME__', $BtName).Replace('__REMOTE_DIR__', $RemoteDir).Replace('__BT_DOMAIN__', $BtDomain).Replace('__BT_CMD__', $BtCmd) Invoke-Remote $btRemote Write-Host "== start API ==" -ForegroundColor Cyan -$startRemote = @" +$startRemote = @' +if ss -lntp 2>/dev/null | grep ':443' | grep -q '/usr/sbin/nginx'; then + echo 'switch distro nginx to baota nginx' + mkdir -p /etc/systemd/system/nginx.service.d + cat > /etc/systemd/system/nginx.service.d/bt-nginx.conf <<'NGX' +[Service] +PIDFile=/www/server/nginx/logs/nginx.pid +ExecStartPre= +ExecStartPre=/www/server/nginx/sbin/nginx -t -c /www/server/nginx/conf/nginx.conf +ExecStart= +ExecStart=/www/server/nginx/sbin/nginx -c /www/server/nginx/conf/nginx.conf +ExecReload= +ExecReload=/www/server/nginx/sbin/nginx -s reload +NGX + systemctl daemon-reload || true + systemctl stop nginx || true + pkill -f '/usr/sbin/nginx' || true + sleep 1 + /etc/init.d/nginx start || /www/server/nginx/sbin/nginx -c /www/server/nginx/conf/nginx.conf || true +fi mkdir -p /www/wwwlogs/net /var/tmp/net_project test -f /swapfile || fallocate -l 2G /swapfile || dd if=/dev/zero of=/swapfile bs=1M count=2048 if test -f /swapfile; then @@ -141,14 +159,14 @@ if test -f /swapfile; then grep -q '^/swapfile ' /etc/fstab || echo '/swapfile none swap sw 0 0' >> /etc/fstab fi swapon -a || true -cd '$RemoteDir' -setsid nohup $Dotnet '$AppDll' --urls=$ListenUrl >> /www/wwwlogs/net/食品标签泰鄂测试版.log 2>&1 < /dev/null & -echo `$! > /var/tmp/net_project/食品标签泰鄂测试版.pid +cd '__REMOTE_DIR__' +setsid nohup __DOTNET__ '__APP_DLL__' --urls=__LISTEN_URL__ >> /www/wwwlogs/net/食品标签泰鄂测试版.log 2>&1 < /dev/null & +echo $! > /var/tmp/net_project/食品标签泰鄂测试版.pid sleep 15 ss -lntp | grep 19002 || true curl -s -o /dev/null -w 'local=%{http_code}\n' --max-time 15 http://127.0.0.1:19002/swagger/index.html || true tail -n 30 /www/wwwlogs/net/食品标签泰鄂测试版.log || true -"@ +'@.Replace('__REMOTE_DIR__', $RemoteDir).Replace('__DOTNET__', $Dotnet).Replace('__APP_DLL__', $AppDll).Replace('__LISTEN_URL__', $ListenUrl) Invoke-Remote -AllowFail $startRemote Write-Host "== health check ==" -ForegroundColor Cyan diff --git a/项目相关文档/2026-10-20接口文档.md b/项目相关文档/2026-10-20接口文档.md new file mode 100644 index 0000000..e1efbd1 --- /dev/null +++ b/项目相关文档/2026-10-20接口文档.md @@ -0,0 +1,464 @@ +# 2026-10-20 泰额平台统计 / 代理管理接口文档 + +范围:泰额 Host 平台端(`th-platform-statistics`、`th-platform-agents`)。 +统一包装:成功时业务数据在 `data`(camelCase)。 +鉴权:请求头 `Authorization` 使用泰额登录返回的 token(已含 `Bearer ` 则原样带上)。 +**不要**带业务公司 `__tenant`。这两个接口读主库,平台登录即可。 + +| 角色 | 平台统计 | 代理管理 | 创建公司 | +|------|----------|----------|----------| +| 平台超级管理员 `admin` | 全部公司 | 可 CRUD 代理、配额 | 不限配额 | +| 平台代理 `platform-agent` | 仅本人创建的公司 | 无权限 | 受配额、须启用 | + +--- + +## 0. 登录(拿 Token) + +**POST** `/api/app/th-web-auth/login` + +平台管理员选 Default / 平台租户登录(与「SAAS 公司」进入某公司不是同一上下文)。 + +```json +{ + "userName": "admin@example.com", + "password": "your-password", + "tenantName": "Default" +} +``` + +后续请求: + +```http +Authorization: <登录返回的 token> +``` + +--- + +## 1. 平台统计概览 + +**GET** `/api/app/th-platform-statistics/overview` + +无 Query。admin / platform-agent 可调。 + +### data + +| 字段 | 类型 | 说明 | +|------|------|------| +| companyCount | int | 公司数(不含 Default 保护租户) | +| regionCount | int | 各租户 `fl_group` 合计 | +| locationCount | int | 各租户 `location` 合计 | +| labelCount | int | 各租户 `fl_label` 合计 | +| lastUsedAt | string / null | 各租户业务活跃时间全局 Max(ISO) | +| scope | string | `all`(admin)或 `agent`(代理) | + +`data` 示例: + +```json +{ + "companyCount": 2, + "regionCount": 5, + "locationCount": 12, + "labelCount": 40, + "lastUsedAt": "2026-10-20T12:00:00", + "scope": "all" +} +``` + +--- + +## 2. 平台统计公司明细 + +**GET** `/api/app/th-platform-statistics/companies` + +过滤范围与概览相同。代理只能看到 `YiTenant.CreatorId = 当前用户` 的公司。 + +| Query | 类型 | 必填 | 说明 | +|-------|------|------|------| +| Keyword | string | 否 | 公司名称模糊匹配 | +| SkipCount | int | 否 | 跳过条数,默认 0 | +| MaxResultCount | int | 否 | 每页条数,≤0 时按 10 | + +示例:`/api/app/th-platform-statistics/companies?MaxResultCount=10&SkipCount=0` + +### data + +| 字段 | 类型 | 说明 | +|------|------|------| +| totalCount | long | 总条数 | +| items | array | 当前页 | + +### items[] + +| 字段 | 类型 | 说明 | +|------|------|------| +| id | guid | 租户 Id | +| companyName | string | 公司名称 | +| labelCount | int | 标签数 | +| locationCount | int | 门店数 | +| regionCount | int | 区域数 | +| lastUsedAt | string / null | 该公司最近使用时间 | + +--- + +## 3. 代理列表 + +**GET** `/api/app/th-platform-agents` + +仅 `admin`。 + +| Query | 类型 | 必填 | 说明 | +|-------|------|------|------| +| Keyword | string | 否 | 登录名 / 邮箱 / 显示名 | +| Enabled | bool | 否 | 启用筛选 | +| State | bool | 否 | 与前端表单字段 `State` 兼容,等同 Enabled | +| SkipCount | int | 否 | 跳过条数 | +| MaxResultCount | int | 否 | 每页条数 | + +示例:`/api/app/th-platform-agents?MaxResultCount=10&SkipCount=0` + +### data.items[](PlatformAgentDto) + +| 字段 | 类型 | 说明 | +|------|------|------| +| id | guid | 用户 Id | +| userName | string | 登录名 | +| email | string | 邮箱 | +| displayName | string | 显示名 | +| companyQuota | int | 可创建公司上限 | +| companyUsed | int | 已创建公司数(`YiTenant.CreatorId`) | +| enabled | bool | 是否启用 | +| creationTime | string / null | 创建时间 | + +--- + +## 4. 代理详情 + +**GET** `/api/app/th-platform-agents/{id}` + +仅 `admin`。`id` 为用户 Id。出参同列表单项。 + +--- + +## 5. 新建代理 + +**POST** `/api/app/th-platform-agents` + +仅 `admin`。Host `user` 建账号,绑角色 `platform-agent`,写 `fl_th_platform_agent`。 + +```json +{ + "userName": "agent01", + "email": "agent01@example.com", + "displayName": "代理一", + "companyQuota": 10, + "enabled": true, + "password": "ChangeMe123!" +} +``` + +| 字段 | 必填 | 说明 | +|------|------|------| +| userName | 是 | 登录名,创建后不可改 | +| email | 是 | 邮箱,全局不可与平台账号重复 | +| displayName | 是 | 显示名 | +| password | 是 | 不少于 6 位 | +| companyQuota | 否 | 默认 0 | +| enabled | 否 | 默认 true | + +成功 `data` 为新建后的 PlatformAgentDto。 + +--- + +## 6. 更新代理 + +**PUT** `/api/app/th-platform-agents/{id}` + +仅 `admin`。`password` 留空表示不改密码。`enabled` 同步 `User.State`。 + +```json +{ + "displayName": "代理一", + "email": "agent01@example.com", + "companyQuota": 20, + "enabled": false, + "password": "" +} +``` + +--- + +## 7. 删除代理 + +**DELETE** `/api/app/th-platform-agents/{id}` + +仅 `admin`。软删 Host 用户与 `fl_th_platform_agent`。 + +--- + +## 8. 创建公司时的配额(已有开户接口) + +**POST** `/api/app/th-tenant-provisioning/provision`(或 `POST /api/app/th-tenant-provisioning`) + +- 创建成功后 `YiTenant.CreatorId = 当前用户` +- 代理:`Enabled=false` 禁止开户;`companyUsed >= companyQuota` 返回「已达可创建公司数量上限」 +- 公司列表 **GET** `/api/app/th-multi-tenancy/company-list`:代理只看自己创建的公司;admin 不过滤 + +--- + +## 9. 错误码说明 + +| HTTP | 场景 | +|------|------| +| 200 | 成功 | +| 400 | 参数校验失败、配额用尽、代理停用、登录名/邮箱占用 | +| 401 | 未登录 | +| 403 | 代理调代理管理等无权限(友好文案) | +| 404 | 代理不存在 | +| 500 | 服务器错误 | + +历史上平台登录调这两个接口会出现「未识别租户上下文」。已把路径加入平台豁免,**不要**再为这两个接口传业务 `__tenant`。 + +--- + +## 10. curl 示例 + +把 `` 换成登录返回的完整 token。 + +```bash +curl -s "https://flusapi-tetest.3flabeling.com/api/app/th-platform-statistics/overview" \ + -H "Authorization: " + +curl -s "https://flusapi-tetest.3flabeling.com/api/app/th-platform-statistics/companies?MaxResultCount=10&SkipCount=0" \ + -H "Authorization: " + +curl -s "https://flusapi-tetest.3flabeling.com/api/app/th-platform-agents?MaxResultCount=10&SkipCount=0" \ + -H "Authorization: " +``` + +--- + +## 11. 公司有效期 + +范围:泰额 Host 平台端。字段落在主库 `yitenant.ExpireTime`。 +统一包装:成功时业务数据在 `data`(camelCase)。 +鉴权:`Authorization` 使用 **平台账号** 登录返回的 token。**不要**带业务公司 `__tenant`。 + +| 角色 | 开通公司写有效期 | 改有效期 | 列表看到有效期 | +|------|------------------|----------|----------------| +| 平台超级管理员 `admin` | 可 | 可改全部公司 | 全部公司 | +| 平台代理 `platform-agent` | 可(受配额) | 仅本人创建的公司 | 仅本人创建的公司 | +| 公司主账号 / 子账号 | 否 | 否 | 否 | + +### 规则 + +- `expireTime` 为空 / `null`:**永久有效** +- 只传日期(时间为 `00:00:00`,如 `"2027-12-31"`):**当天结束前仍可用**,次日 0 点起过期 +- 带具体时分秒:到达该时刻起过期 +- 超过有效期后:该公司主账号、子账号 Web / App **无法登录**;已登录 Token 调业务接口也会被拦截 +- 平台账号不受影响,可续期 +- `Default` 保护租户(`11111111-1111-1111-1111-111111111111`)不校验、不可改有效期 + +现有前端不传 `expireTime` 时,开通结果仍是永久,行为与改前一致。 + +### Host 库变更(先执行再发版) + +```sql +ALTER TABLE `yitenant` + ADD COLUMN `ExpireTime` datetime NULL + COMMENT '公司有效期截止;空=永久' + AFTER `CreatorId`; +``` + +--- + +### 11.1 开通公司(写入有效期) + +**POST** `/api/app/th-tenant-provisioning/provision` +同义:**POST** `/api/app/th-tenant-provisioning` + +在原开通参数上增加可选 `expireTime`。 + +#### 请求体 + +| 字段 | 类型 | 必填 | 说明 | +|------|------|------|------| +| name | string | 是 | 公司 / 租户名称 | +| email | string | 是(与 adminUserName 二选一,优先 email) | 公司主账号登录邮箱,全局唯一 | +| adminUserName | string | 否 | 兼容旧字段,当作登录邮箱 | +| adminPassword | string | 否 | 初始明文密码;空则用系统默认 AdminPassword | +| expireTime | string / null | 否 | 有效期截止;不传或 null = 永久 | +| initializeDatabase | bool | 否 | 是否后台初始化业务库,默认 true | +| tenantConnectionString | string | 否 | 自定义连接串 | +| databaseKey | string | 否 | 库名片段 | +| dbType | int | 否 | SqlSugar DbType,默认 0=MySql | + +#### 请求示例 + +```json +{ + "name": "测试公司", + "email": "company.admin@example.com", + "adminPassword": "ChangeMe123!", + "expireTime": "2027-12-31", + "initializeDatabase": true +} +``` + +#### 响应 data + +| 字段 | 类型 | 说明 | +|------|------|------| +| tenantId | guid | 租户 Id | +| name | string | 公司名称 | +| email | string | 主账号邮箱 | +| databaseName | string | 业务库名 | +| tenantConnectionString | string | 业务库连接串 | +| databaseInitialized | bool | 业务库是否已初始化完成 | +| databaseInitializing | bool | 是否后台初始化中 | +| expireTime | string / null | 写入的有效期;null 表示永久 | + +```json +{ + "tenantId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "name": "测试公司", + "email": "company.admin@example.com", + "databaseName": "antis-foodlabeling-xxx", + "tenantConnectionString": "...", + "databaseInitialized": false, + "databaseInitializing": true, + "expireTime": "2027-12-31T00:00:00" +} +``` + +```bash +curl -s -X POST "https://flusapi-tetest.3flabeling.com/api/app/th-tenant-provisioning/provision" \ + -H "Authorization: " \ + -H "Content-Type: application/json" \ + -d "{\"name\":\"测试公司\",\"email\":\"company.admin@example.com\",\"adminPassword\":\"ChangeMe123!\",\"expireTime\":\"2027-12-31\",\"initializeDatabase\":true}" +``` + +--- + +### 11.2 编辑公司有效期 + +**PUT** `/api/app/th-multi-tenancy/company-validity` + +仅平台 `admin` / `platform-agent`。代理只能改 `YiTenant.CreatorId = 当前用户` 的公司。 +`expireTime` 传 `null` 表示改为永久。 + +#### 请求体 + +| 字段 | 类型 | 必填 | 说明 | +|------|------|------|------| +| tenantId | guid | 是 | 公司租户 Id | +| expireTime | string / null | 否 | 有效期截止;null = 永久 | + +设为指定日期: + +```json +{ + "tenantId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "expireTime": "2027-12-31" +} +``` + +改为永久: + +```json +{ + "tenantId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "expireTime": null +} +``` + +成功时无业务体(HTTP 200)。 + +```bash +curl -s -X PUT "https://flusapi-tetest.3flabeling.com/api/app/th-multi-tenancy/company-validity" \ + -H "Authorization: " \ + -H "Content-Type: application/json" \ + -d "{\"tenantId\":\"3fa85f64-5717-4562-b3fc-2c963f66afa6\",\"expireTime\":\"2027-12-31\"}" +``` + +--- + +### 11.3 公司列表(回显有效期) + +**GET** `/api/app/th-multi-tenancy/company-list` + +| Query | 类型 | 必填 | 说明 | +|------|------|------|------| +| Keyword / Name | string | 否 | 公司名称模糊匹配(keyword 优先) | +| SkipCount | int | 否 | 跳过条数,默认 0 | +| MaxResultCount | int | 否 | 每页条数,≤0 时按 10 | + +示例:`/api/app/th-multi-tenancy/company-list?MaxResultCount=20&SkipCount=0` + +#### data.items[] 新增字段 + +| 字段 | 类型 | 说明 | +|------|------|------| +| expireTime | string / null | 有效期截止;null = 永久 | +| expired | bool | 当前是否已过期 | + +其余字段与原来一致:`id`、`name`、`creationTime`、`loginAccount`、`password`、`passwordSalt`、`menuPermissionKeys`。 + +```json +{ + "totalCount": 1, + "items": [ + { + "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "name": "测试公司", + "creationTime": "2026-10-20T08:00:00", + "loginAccount": "company.admin@example.com", + "password": "Base64CipherText", + "passwordSalt": "Base64Iv", + "menuPermissionKeys": [], + "expireTime": "2027-12-31T00:00:00", + "expired": false + } + ] +} +``` + +```bash +curl -s "https://flusapi-tetest.3flabeling.com/api/app/th-multi-tenancy/company-list?MaxResultCount=20&SkipCount=0" \ + -H "Authorization: " +``` + +--- + +### 11.4 过期拦截(无需前端改调用) + +| 接口 | 过期行为 | +|------|----------| +| POST `/api/app/th-web-auth/login` | 400,该公司主账号 / 子账号均不可登录 | +| POST `/api/app/th-app-auth/login` | 同上 | +| POST `/api/app/us-app-auth/login`(走泰额登录时) | 同上 | +| 该公司业务接口(带公司 TenantId 的已登录请求) | 400,不可继续使用系统 | + +登录错误文案: + +```text +This company authorization has expired. The primary account and all sub-accounts cannot sign in. Please contact the platform to renew. +``` + +业务接口错误文案: + +```text +This company authorization has expired. You cannot continue using the system. Please contact the platform to renew. +``` + +--- + +### 11.5 错误码 + +| HTTP | 场景 | +|------|------| +| 200 | 成功 | +| 400 | tenantId 为空、Default 不可改、代理改别人的公司、公司已过期登录/使用 | +| 401 | 未登录 | +| 404 | 租户不存在 | +| 500 | 服务器错误(常见于 Host 未执行 ALTER,查询 `ExpireTime` 列失败) | + diff --git a/项目相关文档/seed_platform_statistics_agents_menus.sql b/项目相关文档/seed_platform_statistics_agents_menus.sql new file mode 100644 index 0000000..e1131a6 --- /dev/null +++ b/项目相关文档/seed_platform_statistics_agents_menus.sql @@ -0,0 +1,133 @@ +-- 泰额 Host:平台统计 + 代理管理菜单 / 平台代理角色 / 代理扩展表 +-- 目标库:antis-foodlabeling-test-host(或正式 Host) +-- 可重复执行 + +-- 1) 菜单:平台统计 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010038-0001-4000-8000-000000000038', + 0, NOW(), NULL, NULL, NULL, + 8, 1, '平台统计', 'FoodLabelingPlatformStatistics', 1, 'menu.platform.statistics', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:bar-chart-3', '/platform/statistics', 0, 0, 1, NULL, + '/food-labeling/platform/statistics/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010038-0001-4000-8000-000000000038' +); + +-- 2) 菜单:代理管理 +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010039-0001-4000-8000-000000000039', + 0, NOW(), NULL, NULL, NULL, + 9, 1, '代理管理', 'FoodLabelingPlatformAgents', 1, 'menu.platform.agents', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:handshake', '/platform/agents', 0, 0, 1, NULL, + '/food-labeling/platform/agents/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010039-0001-4000-8000-000000000039' +); + +-- 3) 角色:平台代理 +INSERT INTO `role` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `RoleName`, `RoleCode`, `Remark`, `DataScope`, `State`, + `AccessPermissionCodes`, `ConcurrencyStamp` +) +SELECT + 'f0020003-0001-4000-8000-000000000003', + 0, NOW(), NULL, NULL, NULL, + 998, '平台代理', 'platform-agent', '平台级代理:可创建公司并查看自建公司统计', 0, 1, + NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `role` WHERE `Id` = 'f0020003-0001-4000-8000-000000000003' + OR `RoleCode` = 'platform-agent' +); + +-- 4) admin 绑定新菜单 +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030038-0001-4000-8000-000000000038', + 'f0020002-0001-4000-8000-000000000002', + 'f0010038-0001-4000-8000-000000000038' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020002-0001-4000-8000-000000000002' + AND `MenuId` = 'f0010038-0001-4000-8000-000000000038' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030039-0001-4000-8000-000000000039', + 'f0020002-0001-4000-8000-000000000002', + 'f0010039-0001-4000-8000-000000000039' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020002-0001-4000-8000-000000000002' + AND `MenuId` = 'f0010039-0001-4000-8000-000000000039' +); + +-- 5) 代理角色:平台管理 + SAAS公司 + 平台统计(不含代理管理) +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030040-0001-4000-8000-000000000040', + 'f0020003-0001-4000-8000-000000000003', + 'f0010002-0001-4000-8000-000000000002' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010002-0001-4000-8000-000000000002' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030041-0001-4000-8000-000000000041', + 'f0020003-0001-4000-8000-000000000003', + 'f0010003-0001-4000-8000-000000000003' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010003-0001-4000-8000-000000000003' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030042-0001-4000-8000-000000000042', + 'f0020003-0001-4000-8000-000000000003', + 'f0010038-0001-4000-8000-000000000038' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010038-0001-4000-8000-000000000038' +); + +-- 6) 代理扩展表 +CREATE TABLE IF NOT EXISTS `fl_th_platform_agent` ( + `Id` varchar(36) NOT NULL, + `UserId` varchar(36) NOT NULL, + `CompanyQuota` int NOT NULL DEFAULT 0, + `Enabled` tinyint(1) NOT NULL DEFAULT 1, + `Remark` varchar(255) NULL, + `IsDeleted` tinyint(1) NOT NULL DEFAULT 0, + `CreationTime` datetime NOT NULL, + `CreatorId` varchar(36) NULL, + `LastModificationTime` datetime NULL, + `LastModifierId` varchar(36) NULL, + `ConcurrencyStamp` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + UNIQUE KEY `UK_fl_th_platform_agent_UserId` (`UserId`), + KEY `IX_fl_th_platform_agent_Enabled` (`Enabled`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台代理扩展(配额)'; diff --git a/项目相关文档/平台统计与代理角色-后端改造方案.md b/项目相关文档/平台统计与代理角色-后端改造方案.md new file mode 100644 index 0000000..949cb30 --- /dev/null +++ b/项目相关文档/平台统计与代理角色-后端改造方案.md @@ -0,0 +1,340 @@ +# 平台统计与代理角色 — 后端改造方案 + +> 日期:2026-10-20 +> 范围:泰额版平台端(Host) +> 前端:已先落地页面(本文件仅描述后端 / 库表 / 菜单 SQL,**暂不改后端代码**) + +## 1. 目标 + +| 角色 | 平台统计 | 代理管理 | 创建公司 | +|------|----------|----------|--------| +| 平台超级管理员 `admin` | **全部**公司汇总 | 可创建/编辑代理、分配可创建公司配额 | 可创建任意公司 | +| 平台代理 `platform-agent` | **仅本人创建**的公司汇总 | 无此菜单 | 可创建公司,受配额限制 | + +统计维度(概览 + 公司明细): + +- 公司数量 +- 区域数量(各租户库 `fl_group`) +- 门店数量(各租户库 `location`) +- 标签数量(各租户库 `fl_label` 或实际标签主表) +- 最近使用日期(建议:各租户内业务活跃时间的全局 Max,如标签/打印/登录 `LastModificationTime` 的最大值) + +## 2. 前端已对齐的 API(需实现) + +### 2.1 平台统计 `ThPlatformStatisticsAppService` + +路由前缀:`/api/app/th-platform-statistics` + +| 方法 | 路径 | 说明 | +|------|------|------| +| GET | `/overview` | 概览 KPI | +| GET | `/companies` | 公司明细分页(Keyword / SkipCount / MaxResultCount) | + +**Overview 出参(camelCase):** + +```json +{ + "companyCount": 0, + "regionCount": 0, + "locationCount": 0, + "labelCount": 0, + "lastUsedAt": "2026-10-20T12:00:00Z", + "scope": "all" +} +``` + +- `scope`: `"all"`(admin) / `"agent"`(代理) +- 数据范围: + - admin:`yitenant` 中全部未删除、非 Default 保护租户 + - agent:`yitenant.CreatorId = 当前用户 Id` + +**Companies 出参:** + +```json +{ + "items": [ + { + "id": "tenant-guid", + "companyName": "中国麦当劳公司", + "labelCount": 10, + "locationCount": 5, + "regionCount": 2, + "lastUsedAt": "2026-10-19T08:00:00Z" + } + ], + "totalCount": 1 +} +``` + +**实现要点:** + +1. Host 库读取 `yitenant`(已有 `CreatorId`,代理范围直接用)。 +2. 对每个租户用其 `TenantConnectionString` 切库,分别 `COUNT` 区域/门店/标签,再汇总。 +3. 注意超时与 N+1:可批量并行(限制并发)、或落缓存表(见 3.2 可选)。 +4. 权限:仅平台会话;代理不可看非本人创建的公司明细。 + +### 2.2 代理管理 `ThPlatformAgentAppService` + +路由前缀:`/api/app/th-platform-agents` + +| 方法 | 路径 | 说明 | +|------|------|------| +| GET | `/` | 分页列表 Keyword / Enabled / SkipCount / MaxResultCount | +| GET | `/{id}` | 详情 | +| POST | `/` | 新建代理账号 | +| PUT | `/{id}` | 更新(配额、启停、资料;密码可选) | +| DELETE | `/{id}` | 删除(建议软删用户 + 代理扩展行) | + +**DTO 字段(与前端 `PlatformAgentDto` 对齐):** + +| 字段 | 说明 | +|------|------| +| id | 用户 Id | +| userName | 登录名 | +| email | 邮箱 | +| displayName | 显示名 | +| companyQuota | 可创建公司上限 | +| companyUsed | 已创建公司数(`COUNT(yitenant WHERE CreatorId=id AND IsDeleted=0)`) | +| enabled | 是否启用 | +| creationTime | 创建时间 | + +**新建逻辑:** + +1. 仅 `admin` 角色可调用。 +2. 在 Host `user` 表创建用户(密码哈希与现有平台用户一致)。 +3. 绑定平台角色 `platform-agent`(见菜单 SQL 中的角色种子)。 +4. 写入 `fl_th_platform_agent`(配额、启用状态)。 +5. 为该角色分配菜单:平台统计 + SAAS 公司(**不含**代理管理、建议不含仅 admin 的运维菜单)。 + +### 2.3 创建公司时的配额与归属(改造现有开户流程) + +现有平台「SAAS 公司」创建走 Yi `ITenantService` / 租户开通流程。需补充: + +1. **写入归属**:创建成功后确保 `yitenant.CreatorId = CurrentUser.Id`(代理与 admin 均写入;admin 自建也计入 CreatorId,统计「全部」时不按 Creator 过滤)。 +2. **配额校验**(仅代理): + - 读 `fl_th_platform_agent.CompanyQuota` + - `companyUsed >= quota` → `UserFriendlyException("已达可创建公司数量上限")` +3. **停用代理**:`Enabled=false` 时禁止再创建公司;已创建公司可只读统计。 +4. 公司列表接口(`GetCompanyListAsync`):代理登录时过滤 `CreatorId = 当前用户`;admin 不过滤。 + +## 3. 数据库 + +### 3.1 新建表 `fl_th_platform_agent`(Host 库) + +```sql +CREATE TABLE IF NOT EXISTS `fl_th_platform_agent` ( + `Id` varchar(36) NOT NULL COMMENT '主键,建议与 user.Id 相同', + `UserId` varchar(36) NOT NULL COMMENT 'Host user.Id', + `CompanyQuota` int NOT NULL DEFAULT 0 COMMENT '可创建公司上限', + `Enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '1启用 0停用', + `Remark` varchar(255) NULL, + `IsDeleted` tinyint(1) NOT NULL DEFAULT 0, + `CreationTime` datetime NOT NULL, + `CreatorId` varchar(36) NULL, + `LastModificationTime` datetime NULL, + `LastModifierId` varchar(36) NULL, + `ConcurrencyStamp` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + UNIQUE KEY `UK_fl_th_platform_agent_UserId` (`UserId`), + KEY `IX_fl_th_platform_agent_Enabled` (`Enabled`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台代理扩展(配额)'; +``` + +> ID 生成:实体 Id 使用 `YitIdHelper.NextId().ToString()`;若与 UserId 共用,则 Id=UserId 亦可,二选一写清即可。 + +### 3.2 可选缓存表 `fl_th_platform_tenant_stat`(性能) + +若跨库实时 COUNT 过慢,可增加定时任务刷新: + +- TenantId, CompanyName, RegionCount, LocationCount, LabelCount, LastUsedAt, RefreshedAt + +统计接口优先读缓存,创建/删除公司时失效对应行。 + +### 3.3 已有字段复用 + +- `yitenant.CreatorId`:代理创建公司归属(**无需新列**,实现时务必赋值)。 + +## 4. 角色与权限 + +| RoleCode | RoleName | 说明 | +|----------|----------|------| +| `admin` | 平台超级管理员 | 已有;增加新菜单绑定 | +| `platform-agent` | 平台代理 | 新建;绑定「平台统计」「SAAS 公司」 | + +权限码(菜单,`menu.platform*` 已是平台-only,不会下发给公司): + +| PermissionCode | 路由 | 谁可见 | +|----------------|------|--------| +| `menu.platform.statistics` | `/platform/statistics` | admin + 代理 | +| `menu.platform.agents` | `/platform/agents` | **仅 admin** | + +接口授权建议: + +- Statistics:平台登录且(admin **或** platform-agent) +- Agents CRUD:仅 admin +- 创建公司:admin 或(platform-agent 且 Enabled 且未超配额) + +## 5. Host 菜单 SQL(测试库 / 正式 Host 执行) + +> 库名示例:`antis-foodlabeling-test-host`(正式以实际 Host 为准) +> 父级:平台管理 `f0010002-0001-4000-8000-000000000002` +> 可重复执行(先按 Id 判断)。 + +```sql +-- ========== 1) 菜单:平台统计 ========== +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010038-0001-4000-8000-000000000038', + 0, NOW(), NULL, NULL, NULL, + 8, 1, '平台统计', 'FoodLabelingPlatformStatistics', 1, 'menu.platform.statistics', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:bar-chart-3', '/platform/statistics', 0, 0, 1, NULL, + '/food-labeling/platform/statistics/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010038-0001-4000-8000-000000000038' +); + +-- ========== 2) 菜单:代理管理 ========== +INSERT INTO `menu` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `State`, `MenuName`, `RouterName`, `MenuType`, `PermissionCode`, `ParentId`, + `MenuIcon`, `Router`, `IsLink`, `IsCache`, `IsShow`, `Remark`, `Component`, `MenuSource`, + `Query`, `ConcurrencyStamp` +) +SELECT + 'f0010039-0001-4000-8000-000000000039', + 0, NOW(), NULL, NULL, NULL, + 9, 1, '代理管理', 'FoodLabelingPlatformAgents', 1, 'menu.platform.agents', + 'f0010002-0001-4000-8000-000000000002', + 'lucide:handshake', '/platform/agents', 0, 0, 1, NULL, + '/food-labeling/platform/agents/index', 0, NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `menu` WHERE `Id` = 'f0010039-0001-4000-8000-000000000039' +); + +-- ========== 3) 角色:平台代理 ========== +INSERT INTO `role` ( + `Id`, `IsDeleted`, `CreationTime`, `CreatorId`, `LastModifierId`, `LastModificationTime`, + `OrderNum`, `RoleName`, `RoleCode`, `Remark`, `DataScope`, `State`, + `AccessPermissionCodes`, `ConcurrencyStamp` +) +SELECT + 'f0020003-0001-4000-8000-000000000003', + 0, NOW(), NULL, NULL, NULL, + 998, '平台代理', 'platform-agent', '平台级代理:可创建公司并查看自建公司统计', 0, 1, + NULL, '' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `role` WHERE `Id` = 'f0020003-0001-4000-8000-000000000003' + OR `RoleCode` = 'platform-agent' +); + +-- ========== 4) admin 绑定新菜单 ========== +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030038-0001-4000-8000-000000000038', + 'f0020002-0001-4000-8000-000000000002', + 'f0010038-0001-4000-8000-000000000038' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020002-0001-4000-8000-000000000002' + AND `MenuId` = 'f0010038-0001-4000-8000-000000000038' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030039-0001-4000-8000-000000000039', + 'f0020002-0001-4000-8000-000000000002', + 'f0010039-0001-4000-8000-000000000039' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020002-0001-4000-8000-000000000002' + AND `MenuId` = 'f0010039-0001-4000-8000-000000000039' +); + +-- ========== 5) 代理角色绑定:平台管理目录 + SAAS公司 + 平台统计(不含代理管理) ========== +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030040-0001-4000-8000-000000000040', + 'f0020003-0001-4000-8000-000000000003', + 'f0010002-0001-4000-8000-000000000002' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010002-0001-4000-8000-000000000002' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030041-0001-4000-8000-000000000041', + 'f0020003-0001-4000-8000-000000000003', + 'f0010003-0001-4000-8000-000000000003' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010003-0001-4000-8000-000000000003' +); + +INSERT INTO `rolemenu` (`Id`, `RoleId`, `MenuId`) +SELECT 'f0030042-0001-4000-8000-000000000042', + 'f0020003-0001-4000-8000-000000000003', + 'f0010038-0001-4000-8000-000000000038' +FROM DUAL +WHERE NOT EXISTS ( + SELECT 1 FROM `rolemenu` + WHERE `RoleId` = 'f0020003-0001-4000-8000-000000000003' + AND `MenuId` = 'f0010038-0001-4000-8000-000000000038' +); + +-- ========== 6) 代理扩展表 ========== +CREATE TABLE IF NOT EXISTS `fl_th_platform_agent` ( + `Id` varchar(36) NOT NULL, + `UserId` varchar(36) NOT NULL, + `CompanyQuota` int NOT NULL DEFAULT 0, + `Enabled` tinyint(1) NOT NULL DEFAULT 1, + `Remark` varchar(255) NULL, + `IsDeleted` tinyint(1) NOT NULL DEFAULT 0, + `CreationTime` datetime NOT NULL, + `CreatorId` varchar(36) NULL, + `LastModificationTime` datetime NULL, + `LastModifierId` varchar(36) NULL, + `ConcurrencyStamp` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + UNIQUE KEY `UK_fl_th_platform_agent_UserId` (`UserId`), + KEY `IX_fl_th_platform_agent_Enabled` (`Enabled`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台代理扩展(配额)'; +``` + +执行后:admin 重新登录(或清菜单缓存)→ 侧栏「平台管理」下出现「平台统计」「代理管理」。 + +## 6. 后端落地清单(后续开发用) + +1. `[Contracts]` DTO + `IThPlatformStatisticsAppService` / `IThPlatformAgentAppService` +2. `[Application]` 实现服务;XML 注释按项目规范 +3. 改造开户:CreatorId + 代理配额校验 + 公司列表按角色过滤 +4. `my-menus`:代理用户返回其 rolemenu(已有 RBAC 则只需绑好角色) +5. 接口测试 + Host 库验证 `fl_th_platform_agent` / `yitenant.CreatorId` +6. 同步 `数据库说明.md`(表结构) + +## 7. 前端对照(已完成,勿重复) + +| 路径 | 目录 | +|------|------| +| `/platform/statistics` | `views/food-labeling/platform/statistics/` | +| `/platform/agents` | `views/food-labeling/platform/agents/` | + +API 封装:`api.ts` 已指向上述路径;后端未就绪时页面会 Warning + 空表。 + +## 8. 验证建议 + +1. Host 执行第 5 节 SQL。 +2. admin 登录 → 见「平台统计」「代理管理」。 +3. 后端未上线前:页面可打开,接口 404/失败有提示。 +4. 后端上线后:admin 概览 `scope=all`;创建代理并赋配额 → 代理登录仅见统计+公司,概览 `scope=agent`,公司数 ≤ 配额。 -- libgit2 0.21.4