From 13ba536df2ba50a97e5c9436d5f77a1c2acfa218 Mon Sep 17 00:00:00 2001 From: nsnail Date: Mon, 4 Nov 2024 12:06:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=E6=A1=86?= =?UTF-8?q?=E6=9E=B6&=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E5=88=86?= =?UTF-8?q?=E7=A6=BB=20(#185)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tk --- .github/workflows/README.md | 1 + .gitignore | 1 + .gitmodules | 6 +- Directory.Build.props | 1 + NetAdmin.sln | 45 +- NetAdmin.sln.DotSettings | 250 ++ assets/res/CountryCodes.ln | 249 ++ assets/res/NetAdmin.AdmServer.Fields.ln | 0 assets/res/NetAdmin.AdmServer.Statements.ln | 0 assets/res/NetAdmin.Fields.ln | 70 + assets/res/NetAdmin.Statements.ln | 21 + ...lds.ln => NetAdmin.SysComponent.Fields.ln} | 66 - ...ln => NetAdmin.SysComponent.Statements.ln} | 38 +- build/prebuild.targets | 18 - docker/README.md | 1 + refs/Furion | 1 - scripts/2.git.release.ps1 | 6 +- ...e.tags.ps1 => 4.git.del.obsolete.tags.ps1} | 0 scripts/gen.resx.tt | 6 +- ...tcher.furion.json => switcher.gurion.json} | 6 +- scripts/sync.sln.files.csx | 14 + src/backend/GlobalUsings.cs | 20 +- .../NetAdmin.AdmServer.Application.csproj | 7 +- ...n.AdmServer.Application.csproj.DotSettings | 2 - .../NetAdmin.AdmServer.Cache.csproj | 2 +- .../NetAdmin.AdmServer.Domain.csproj | 10 + .../Extensions/ServiceCollectionExtensions.cs | 6 +- .../NetAdmin.AdmServer.Host.csproj | 8 +- .../NetAdmin.AdmServer.Host/Startup.cs | 3 +- .../settings.Development.json | 1 - .../settings.Test.json | 1 - .../NetAdmin.AdmServer.Host/settings.json | 45 - .../AdmSettings.Development.json | 10 + .../AdmSettings.Remote.json | 10 + .../AdmSettings.Test.json | 10 + .../AdmSettings.json | 99 + .../NetAdmin.AdmServer.Infrastructure.csproj | 19 + .../Modules/Tpl/IExampleModule.cs | 3 +- .../NetAdmin.Application.csproj | 3 - .../Tpl/Dependency/IExampleService.cs | 8 + .../Services/Tpl/ExampleService.cs | 18 +- .../Tpl/Dependency/IExampleCache.cs | 9 + .../Tpl/ExampleCache.cs | 7 +- .../Contexts/ContextUserToken.cs | 6 +- .../Dependency/Fields/IFieldModifiedUser.cs | 2 +- .../DbMaps/Dependency/Fields/IFieldSummary.cs | 4 +- .../DbMaps/Dependency/ImmutableEntity.cs | 16 +- .../DbMaps/Dependency/LiteImmutableEntity.cs | 12 +- .../DbMaps/Dependency/LiteMutableEntity.cs | 12 +- .../DbMaps/Dependency/LiteVersionEntity.cs | 12 +- .../DbMaps/Dependency/MutableEntity.cs | 24 +- .../DbMaps/Dependency/SimpleEntity.cs | 4 +- .../DbMaps/Dependency/VersionEntity.cs | 24 +- .../NetAdmin.Domain/Dto/RestfulInfo.cs | 4 +- .../NetAdmin.Domain/NetAdmin.Domain.csproj | 6 - src/backend/NetAdmin.Domain/ProjectUsings.cs | 12 +- .../Controllers/Tpl/ExampleController.cs | 10 +- .../Extensions/ServiceCollectionExtensions.cs | 52 +- .../NetAdmin.Host/Filters/ApiResultHandler.cs | 2 +- .../Filters/DefaultApiResultHandler.cs | 2 +- .../Filters/GlobalExceptionHandler.cs | 4 +- .../Attributes/CountryAttribute.cs | 56 + .../Attributes/DomainAttribute.cs | 13 + .../Dependency/ApiClientOptions.cs | 17 + .../OptionAbstraction.cs | 2 +- .../Configuration/Options/CaptchaOptions.cs | 2 + .../Configuration/Options/DatabaseOptions.cs | 1 + .../Configuration/Options/RedisOptions.cs | 2 + .../Configuration/Options/UploadOptions.cs | 2 + .../NetAdmin.Infrastructure/Constant/Chars.cs | 12 +- .../Constant/Numbers.cs | 32 +- .../Enums/Countries.cs | 2581 +++++++++++++++++ .../NetAdmin.Infrastructure/Enums/Nations.cs | 1 + .../NetAdmin.Infrastructure/GlobalStatic.cs | 5 - .../NetAdmin.Infrastructure.csproj | 26 +- ...json => NetAdminSettings.Development.json} | 8 - ...ment.json => NetAdminSettings.Remote.json} | 10 +- .../NetAdminSettings.Test.json | 7 + .../NetAdminSettings.json | 143 + .../NetAdmin.Infrastructure/ProjectUsings.cs | 2 +- .../Utils/FreeSqlBuilder.cs | 17 +- .../Utils/XmlCommentReader.cs | 2 +- .../commonSettings.json | 332 --- .../Modules/Sys/IApiModule.cs | 2 +- .../Modules/Sys/ICacheModule.cs | 2 +- .../Modules/Sys/ICaptchaModule.cs | 2 +- .../Modules/Sys/IConfigModule.cs | 2 +- .../Modules/Sys/IDeptModule.cs | 2 +- .../Modules/Sys/IDevModule.cs | 2 +- .../Modules/Sys/IDicCatalogModule.cs | 2 +- .../Modules/Sys/IDicContentModule.cs | 2 +- .../Modules/Sys/IDicModule.cs | 4 +- .../Modules/Sys/IJobModule.cs | 5 +- .../Modules/Sys/IJobRecordModule.cs | 2 +- .../Modules/Sys/ILoginLogModule.cs | 2 +- .../Modules/Sys/IMenuModule.cs | 2 +- .../Modules/Sys/IRequestLogDetailModule.cs | 2 +- .../Modules/Sys/IRequestLogModule.cs | 3 +- .../Modules/Sys/IRoleModule.cs | 2 +- .../Modules/Sys/ISiteMsgDeptModule.cs | 2 +- .../Modules/Sys/ISiteMsgFlagModule.cs | 2 +- .../Modules/Sys/ISiteMsgModule.cs | 4 +- .../Modules/Sys/ISiteMsgRoleModule.cs | 2 +- .../Modules/Sys/ISiteMsgUserModule.cs | 2 +- .../Modules/Sys/IToolsModule.cs | 2 +- .../Modules/Sys/IUserModule.cs | 4 +- .../Modules/Sys/IUserProfileModule.cs | 2 +- .../Modules/Sys/IVerifyCodeModule.cs | 2 +- .../Modules/Sys/Session/IUserModule.cs | 2 +- .../NetAdmin.SysComponent.Application.csproj | 4 +- .../ProjectUsings.cs | 6 +- .../Services/Sys/ApiService.cs | 2 +- .../Services/Sys/CacheService.cs | 2 +- .../Services/Sys/CaptchaService.cs | 2 +- .../Services/Sys/ConfigService.cs | 2 +- .../Services/Sys/Dependency/IApiService.cs | 2 +- .../Sys/Dependency/IDicCatalogService.cs | 2 +- .../Sys/Dependency/IDicContentService.cs | 2 +- .../Sys/Dependency/IJobRecordService.cs | 3 +- .../Services/Sys/Dependency/IJobService.cs | 2 +- .../Sys/Dependency/ISiteMsgFlagService.cs | 2 +- .../Sys/Dependency/IUserProfileService.cs | 2 +- .../Services/Sys/Dependency/IUserService.cs | 2 +- .../Sys/Dependency/IVerifyCodeService.cs | 2 +- .../Services/Sys/DeptService.cs | 2 +- .../Services/Sys/DevService.cs | 70 +- .../Services/Sys/DicCatalogService.cs | 2 +- .../Services/Sys/DicContentService.cs | 2 +- .../Services/Sys/DicService.cs | 4 +- .../Services/Sys/JobRecordService.cs | 3 +- .../Services/Sys/JobService.cs | 13 +- .../Services/Sys/LoginLogService.cs | 2 +- .../Services/Sys/MenuService.cs | 2 +- .../Services/Sys/RequestLogDetailService.cs | 2 +- .../Services/Sys/RequestLogService.cs | 8 +- .../Services/Sys/RoleService.cs | 2 +- .../Services/Sys/SiteMsgDeptService.cs | 2 +- .../Services/Sys/SiteMsgFlagService.cs | 2 +- .../Services/Sys/SiteMsgRoleService.cs | 2 +- .../Services/Sys/SiteMsgService.cs | 11 +- .../Services/Sys/SiteMsgUserService.cs | 2 +- .../Services/Sys/ToolsService.cs | 2 +- .../Services/Sys/UserProfileService.cs | 16 +- .../Services/Sys/UserService.cs | 8 +- .../Services/Sys/VerifyCodeService.cs | 5 +- .../Tpl/Dependency/IExampleService.cs | 8 - .../ProjectUsings.cs | 5 +- .../Sys/ApiCache.cs | 2 +- .../Sys/CacheCache.cs | 4 +- .../Sys/CaptchaCache.cs | 5 +- .../Sys/ConfigCache.cs | 2 +- .../Sys/Dependency/ICaptchaCache.cs | 2 +- .../Sys/Dependency/IDicContentCache.cs | 2 +- .../Sys/Dependency/IUserCache.cs | 2 +- .../Sys/DeptCache.cs | 2 +- .../Sys/DevCache.cs | 2 +- .../Sys/DicCache.cs | 6 +- .../Sys/DicCatalogCache.cs | 2 +- .../Sys/DicContentCache.cs | 5 +- .../Sys/JobCache.cs | 13 +- .../Sys/JobRecordCache.cs | 2 +- .../Sys/LoginLogCache.cs | 2 +- .../Sys/MenuCache.cs | 2 +- .../Sys/RequestLogCache.cs | 13 +- .../Sys/RequestLogDetailCache.cs | 2 +- .../Sys/RoleCache.cs | 2 +- .../Sys/SiteMsgCache.cs | 4 +- .../Sys/SiteMsgDeptCache.cs | 2 +- .../Sys/SiteMsgFlagCache.cs | 2 +- .../Sys/SiteMsgRoleCache.cs | 2 +- .../Sys/SiteMsgUserCache.cs | 2 +- .../Sys/ToolsCache.cs | 2 +- .../Sys/UserCache.cs | 10 +- .../Sys/UserProfileCache.cs | 2 +- .../Sys/VerifyCodeCache.cs | 2 +- .../Tpl/Dependency/IExampleCache.cs | 9 - .../DataValidation/ApiIdAttribute.cs | 4 +- .../DataValidation/SpecificDeptAttribute.cs | 4 +- .../DataValidation/UserIdAttribute.cs | 4 +- .../Contexts/ContextUserInfo.cs | 4 +- .../DbMaps/Sys/Sys_Api.cs | 6 +- .../DbMaps/Sys/Sys_Config.cs | 2 +- .../DbMaps/Sys/Sys_Dept.cs | 4 +- .../DbMaps/Sys/Sys_DicCatalog.cs | 2 +- .../DbMaps/Sys/Sys_DicContent.cs | 8 +- .../DbMaps/Sys/Sys_Job.cs | 2 +- .../DbMaps/Sys/Sys_JobRecord.cs | 2 +- .../DbMaps/Sys/Sys_LoginLog.cs | 22 +- .../DbMaps/Sys/Sys_Menu.cs | 2 +- .../DbMaps/Sys/Sys_RequestLog.cs | 2 +- .../DbMaps/Sys/Sys_RequestLogDetail.cs | 10 +- .../DbMaps/Sys/Sys_Role.cs | 4 +- .../DbMaps/Sys/Sys_RoleApi.cs | 2 +- .../DbMaps/Sys/Sys_RoleDept.cs | 2 +- .../DbMaps/Sys/Sys_RoleMenu.cs | 2 +- .../DbMaps/Sys/Sys_SiteMsg.cs | 4 +- .../DbMaps/Sys/Sys_SiteMsgDept.cs | 2 +- .../DbMaps/Sys/Sys_SiteMsgFlag.cs | 2 +- .../DbMaps/Sys/Sys_SiteMsgRole.cs | 2 +- .../DbMaps/Sys/Sys_SiteMsgUser.cs | 2 +- .../DbMaps/Sys/Sys_User.cs | 6 +- .../DbMaps/Sys/Sys_UserProfile.cs | 4 +- .../DbMaps/Sys/Sys_UserRole.cs | 2 +- .../DbMaps/Sys/Sys_VerifyCode.cs | 2 +- .../Dto/Sys/Api/CreateApiReq.cs | 2 +- .../Dto/Sys/Api/ExportApiRsp.cs | 2 +- .../Dto/Sys/Api/QueryApiReq.cs | 2 +- .../Dto/Sys/Api/QueryApiRsp.cs | 2 +- .../Dto/Sys/Cache/CacheStatisticsRsp.cs | 2 +- .../Dto/Sys/Cache/DelEntryReq.cs | 2 +- .../Dto/Sys/Cache/GetAllEntriesReq.cs | 2 +- .../Dto/Sys/Cache/GetEntriesReq.cs | 2 +- .../Dto/Sys/Cache/GetEntryRsp.cs | 2 +- .../Dto/Sys/Captcha/GetCaptchaRsp.cs | 2 +- .../Dto/Sys/Captcha/VerifyCaptchaReq.cs | 2 +- .../Dto/Sys/Config/CreateConfigReq.cs | 2 +- .../Dto/Sys/Config/EditConfigReq.cs | 2 +- .../Dto/Sys/Config/ExportConfigRsp.cs | 6 +- .../Dto/Sys/Config/QueryConfigReq.cs | 2 +- .../Dto/Sys/Config/QueryConfigRsp.cs | 6 +- .../Dto/Sys/Config/SetConfigEnabledReq.cs | 2 +- .../Dto/Sys/Dept/CreateDeptReq.cs | 6 +- .../Dto/Sys/Dept/EditDeptReq.cs | 2 +- .../Dto/Sys/Dept/ExportDeptRsp.cs | 2 +- .../Dto/Sys/Dept/QueryDeptReq.cs | 2 +- .../Dto/Sys/Dept/QueryDeptRsp.cs | 6 +- .../Dto/Sys/Dept/SetDeptEnabledReq.cs | 2 +- .../Dto/Sys/Dev/GenerateCsCodeReq.cs | 5 +- .../Dto/Sys/Dev/GenerateIconCodeReq.cs | 2 +- .../Dto/Sys/Dev/IconExportJsInfo.cs | 2 +- .../Sys/Dic/Catalog/CreateDicCatalogReq.cs | 2 +- .../Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs | 2 +- .../Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs | 2 +- .../Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs | 2 +- .../Sys/Dic/Content/CreateDicContentReq.cs | 2 +- .../Dto/Sys/Dic/Content/EditDicContentReq.cs | 2 +- .../Sys/Dic/Content/ExportDicContentRsp.cs | 2 +- .../Dto/Sys/Dic/Content/GetDicValueReq.cs | 2 +- .../Dto/Sys/Dic/Content/QueryDicContentReq.cs | 2 +- .../Dto/Sys/Dic/Content/QueryDicContentRsp.cs | 2 +- .../Dic/Content/SetDicContentEnabledReq.cs | 2 +- .../Dto/Sys/GetBarChartRsp.cs | 2 +- .../Dto/Sys/GetPieChartRsp.cs | 2 +- .../Dto/Sys/Job/CreateJobReq.cs | 4 +- .../Dto/Sys/Job/EditJobReq.cs | 2 +- .../Dto/Sys/Job/ExportJobRsp.cs | 4 +- .../Dto/Sys/Job/FinishJobReq.cs | 2 +- .../Dto/Sys/Job/QueryJobReq.cs | 2 +- .../Dto/Sys/Job/QueryJobRsp.cs | 4 +- .../Dto/Sys/Job/SetJobEnabledReq.cs | 2 +- .../Dto/Sys/JobRecord/CreateJobRecordReq.cs | 2 +- .../Dto/Sys/JobRecord/ExportJobRecordRsp.cs | 4 +- .../Dto/Sys/JobRecord/QueryJobRecordReq.cs | 2 +- .../Dto/Sys/JobRecord/QueryJobRecordRsp.cs | 4 +- .../Dto/Sys/LoginLog/CreateLoginLogReq.cs | 7 +- .../Dto/Sys/LoginLog/ExportLoginLogRsp.cs | 4 +- .../Dto/Sys/LoginLog/QueryLoginLogReq.cs | 2 +- .../Dto/Sys/LoginLog/QueryLoginLogRsp.cs | 4 +- .../Dto/Sys/Menu/CreateMenuReq.cs | 6 +- .../Dto/Sys/Menu/EditMenuReq.cs | 2 +- .../Dto/Sys/Menu/MetaInfo.cs | 2 +- .../Dto/Sys/Menu/QueryMenuReq.cs | 2 +- .../Dto/Sys/Menu/QueryMenuRsp.cs | 2 +- .../Dto/Sys/RequestLog/CreateRequestLogReq.cs | 4 +- .../Dto/Sys/RequestLog/ExportRequestLogRsp.cs | 8 +- .../Dto/Sys/RequestLog/QueryRequestLogReq.cs | 2 +- .../Dto/Sys/RequestLog/QueryRequestLogRsp.cs | 8 +- .../CreateRequestLogDetailReq.cs | 2 +- .../QueryRequestLogDetailReq.cs | 2 +- .../QueryRequestLogDetailRsp.cs | 4 +- .../Dto/Sys/Role/CreateRoleReq.cs | 7 +- .../Dto/Sys/Role/EditRoleReq.cs | 2 +- .../Dto/Sys/Role/ExportRoleRsp.cs | 2 +- .../Dto/Sys/Role/GetMenusRsp.cs | 2 +- .../Dto/Sys/Role/MapMenusReq.cs | 2 +- .../Dto/Sys/Role/QueryRoleReq.cs | 2 +- .../Dto/Sys/Role/QueryRoleRsp.cs | 6 +- .../Dto/Sys/Role/SetDisplayDashboardReq.cs | 2 +- .../Sys/Role/SetIgnorePermissionControlReq.cs | 2 +- .../Dto/Sys/Role/SetRoleEnabledReq.cs | 2 +- .../Dto/Sys/SiteMsg/CreateSiteMsgReq.cs | 2 +- .../Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs | 8 +- .../Dto/Sys/SiteMsg/QuerySiteMsgReq.cs | 2 +- .../Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs | 10 +- .../Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs | 2 +- .../Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs | 2 +- .../Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs | 2 +- .../Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs | 2 +- .../Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs | 4 +- .../Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs | 2 +- .../Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs | 2 +- .../SiteMsgFlag/SetUserSiteMsgStatusReq.cs | 2 +- .../Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs | 2 +- .../Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs | 2 +- .../Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs | 2 +- .../Sys/SiteMsgUser/CreateSiteMsgUserReq.cs | 2 +- .../Sys/SiteMsgUser/QuerySiteMsgUserReq.cs | 2 +- .../Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs | 2 +- .../Dto/Sys/Tool/AesDecodeReq.cs | 2 +- .../Dto/Sys/Tool/ExecuteSqlReq.cs | 2 +- .../Dto/Sys/Tool/GetModulesRsp.cs | 2 +- .../Dto/Sys/User/CheckMobileAvailableReq.cs | 2 +- .../Dto/Sys/User/CheckUserNameAvailableReq.cs | 2 +- .../Dto/Sys/User/CreateEditUserReq.cs | 2 +- .../Dto/Sys/User/CreateUserReq.cs | 4 +- .../Dto/Sys/User/EditUserReq.cs | 4 +- .../Dto/Sys/User/ExportUserRsp.cs | 6 +- .../Dto/Sys/User/LoginByPwdReq.cs | 2 +- .../Dto/Sys/User/LoginBySmsReq.cs | 4 +- .../Dto/Sys/User/LoginRsp.cs | 2 +- .../Dto/Sys/User/QueryUserReq.cs | 2 +- .../Dto/Sys/User/QueryUserRsp.cs | 6 +- .../Dto/Sys/User/RegisterUserReq.cs | 4 +- .../Dto/Sys/User/ResetPasswordReq.cs | 4 +- .../Dto/Sys/User/SetAvatarReq.cs | 2 +- .../Dto/Sys/User/SetEmailReq.cs | 4 +- .../Dto/Sys/User/SetMobileReq.cs | 6 +- .../Dto/Sys/User/SetPasswordReq.cs | 2 +- .../Dto/Sys/User/SetUserEnabledReq.cs | 2 +- .../Dto/Sys/User/UserInfoRsp.cs | 6 +- .../Sys/UserProfile/CreateUserProfileReq.cs | 4 +- .../Dto/Sys/UserProfile/EditUserProfileReq.cs | 2 +- .../UserProfile/GetSessionUserAppConfigRsp.cs | 2 +- .../Sys/UserProfile/QueryUserProfileReq.cs | 2 +- .../Sys/UserProfile/QueryUserProfileRsp.cs | 4 +- .../UserProfile/SetSessionUserAppConfigReq.cs | 2 +- .../Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs | 2 +- .../Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs | 2 +- .../Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs | 2 +- .../Dto/Sys/VerifyCode/SendVerifyCodeReq.cs | 4 +- .../Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs | 2 +- .../Sys/VerifyCode/SetVerifyCodeStatusReq.cs | 2 +- .../Dto/Sys/VerifyCode/VerifyCodeReq.cs | 2 +- .../Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs | 2 +- .../Dto/Sys/VerifyCode/VerifySmsCodeReq.cs | 2 +- .../Enums/Sys/DataScopes.cs | 2 +- .../Enums/Sys/JobStatues.cs | 2 +- .../Enums/Sys/MenuTypes.cs | 2 +- .../Enums/Sys/SiteMsgTypes.cs | 2 +- .../Enums/Sys/UserSiteMsgStatues.cs | 2 +- .../Enums/Sys/VerifyCodeDeviceTypes.cs | 2 +- .../Enums/Sys/VerifyCodeStatues.cs | 2 +- .../Enums/Sys/VerifyCodeTypes.cs | 2 +- .../Events/Sys/RequestLogEvent.cs | 5 +- .../Events/Sys/UserCreatedEvent.cs | 5 +- .../Events/Sys/UserUpdatedEvent.cs | 5 +- .../Events/Sys/VerifyCodeCreatedEvent.cs | 5 +- .../NetAdmin.SysComponent.Domain.csproj | 10 + .../ProjectUsings.cs | 13 + .../Controllers/Sys/ApiController.cs | 2 +- .../Controllers/Sys/CacheController.cs | 2 +- .../Controllers/Sys/CaptchaController.cs | 2 +- .../Controllers/Sys/ConfigController.cs | 2 +- .../Controllers/Sys/DeptController.cs | 2 +- .../Controllers/Sys/DevController.cs | 2 +- .../Controllers/Sys/DicController.cs | 4 +- .../Controllers/Sys/JobController.cs | 6 +- .../Controllers/Sys/LoginLogController.cs | 2 +- .../Controllers/Sys/MenuController.cs | 2 +- .../Controllers/Sys/RequestLogController.cs | 4 +- .../Controllers/Sys/RoleController.cs | 2 +- .../Controllers/Sys/SiteMsgController.cs | 4 +- .../Controllers/Sys/ToolsController.cs | 2 +- .../Controllers/Sys/UserController.cs | 4 +- .../Controllers/Sys/VerifyCodeController.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 61 +- .../Jobs/FreeScheduledJob.cs | 2 +- .../Jobs/ScheduledJob.cs | 17 +- .../Middlewares/RequestAuditMiddleware.cs | 4 +- .../NetAdmin.SysComponent.Host.csproj | 6 +- .../ProjectUsings.cs | 2 +- .../Subscribers/CacheCleaner.cs | 5 +- .../Subscribers/EmailCodeSender.cs | 6 +- .../Subscribers/OperationLogger.cs | 14 +- .../Subscribers/SmsCodeSender.cs | 6 +- .../Utils/RequestLogger.cs | 13 +- .../Utils/SqlAuditor.cs | 4 +- .../Constant/SysChars.cs | 14 + .../Constant/SysNumbers.cs | 22 + ...etAdmin.SysComponent.Infrastructure.csproj | 14 + .../NetAdmin.SysComponent.Tests.csproj | 8 - .../ProjectUsings.cs | 0 .../Sys/ApiTests.cs | 4 +- .../Sys/CacheTests.cs | 4 +- .../Sys/CaptchaTests.cs | 4 +- .../Sys/ConfigTests.cs | 4 +- .../Sys/ConstantTests.cs | 2 +- .../Sys/DeptTests.cs | 4 +- .../Sys/DevTests.cs | 4 +- .../Sys/DicTests.cs | 6 +- .../Sys/FileTests.cs | 2 +- .../Sys/JobTests.cs | 8 +- .../Sys/LoginLogTests.cs | 4 +- .../Sys/MenuTests.cs | 4 +- .../Sys/RequestLogTests.cs | 6 +- .../Sys/RoleTests.cs | 4 +- .../Sys/SiteMsgTests.cs | 6 +- .../Sys/ToolsTests.cs | 4 +- .../Sys/UserTests.cs | 6 +- .../Sys/VerifyCodeTests.cs | 4 +- .../UnitTests.csproj} | 2 +- .../WebApiTestBase.cs | 9 +- src/frontend/admin/package.json | 8 +- .../admin/src/views/sys/job/all/save.vue | 4 +- 404 files changed, 4579 insertions(+), 1283 deletions(-) create mode 100644 .github/workflows/README.md create mode 100644 assets/res/CountryCodes.ln create mode 100644 assets/res/NetAdmin.AdmServer.Fields.ln create mode 100644 assets/res/NetAdmin.AdmServer.Statements.ln create mode 100644 assets/res/NetAdmin.Fields.ln create mode 100644 assets/res/NetAdmin.Statements.ln rename assets/res/{Fields.ln => NetAdmin.SysComponent.Fields.ln} (59%) rename assets/res/{Statements.ln => NetAdmin.SysComponent.Statements.ln} (82%) create mode 100644 docker/README.md delete mode 160000 refs/Furion rename scripts/{git.del.obsolete.tags.ps1 => 4.git.del.obsolete.tags.ps1} (100%) rename scripts/{switcher.furion.json => switcher.gurion.json} (52%) delete mode 100644 src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj.DotSettings create mode 100644 src/backend/NetAdmin.AdmServer.Domain/NetAdmin.AdmServer.Domain.csproj delete mode 100644 src/backend/NetAdmin.AdmServer.Host/settings.Development.json delete mode 100644 src/backend/NetAdmin.AdmServer.Host/settings.Test.json delete mode 100644 src/backend/NetAdmin.AdmServer.Host/settings.json create mode 100644 src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Development.json create mode 100644 src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Remote.json create mode 100644 src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Test.json create mode 100644 src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json create mode 100644 src/backend/NetAdmin.AdmServer.Infrastructure/NetAdmin.AdmServer.Infrastructure.csproj rename src/backend/{NetAdmin.SysComponent.Application => NetAdmin.Application}/Modules/Tpl/IExampleModule.cs (82%) create mode 100644 src/backend/NetAdmin.Application/Services/Tpl/Dependency/IExampleService.cs rename src/backend/{NetAdmin.SysComponent.Application => NetAdmin.Application}/Services/Tpl/ExampleService.cs (92%) create mode 100644 src/backend/NetAdmin.Cache/Tpl/Dependency/IExampleCache.cs rename src/backend/{NetAdmin.SysComponent.Cache => NetAdmin.Cache}/Tpl/ExampleCache.cs (90%) rename src/backend/{NetAdmin.SysComponent.Host => NetAdmin.Host}/Controllers/Tpl/ExampleController.cs (89%) create mode 100644 src/backend/NetAdmin.Infrastructure/Attributes/CountryAttribute.cs create mode 100644 src/backend/NetAdmin.Infrastructure/Attributes/DomainAttribute.cs create mode 100644 src/backend/NetAdmin.Infrastructure/Configuration/Dependency/ApiClientOptions.cs rename src/backend/NetAdmin.Infrastructure/Configuration/{Options => Dependency}/OptionAbstraction.cs (66%) create mode 100644 src/backend/NetAdmin.Infrastructure/Enums/Countries.cs rename src/backend/NetAdmin.Infrastructure/{commonSettings.Test.json => NetAdminSettings.Development.json} (61%) rename src/backend/NetAdmin.Infrastructure/{commonSettings.Development.json => NetAdminSettings.Remote.json} (59%) create mode 100644 src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json create mode 100644 src/backend/NetAdmin.Infrastructure/NetAdminSettings.json delete mode 100644 src/backend/NetAdmin.Infrastructure/commonSettings.json delete mode 100644 src/backend/NetAdmin.SysComponent.Application/Services/Tpl/Dependency/IExampleService.cs delete mode 100644 src/backend/NetAdmin.SysComponent.Cache/Tpl/Dependency/IExampleCache.cs rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Attributes/DataValidation/ApiIdAttribute.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Attributes/DataValidation/SpecificDeptAttribute.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Attributes/DataValidation/UserIdAttribute.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Contexts/ContextUserInfo.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Api.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Config.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Dept.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_DicCatalog.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_DicContent.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Job.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_JobRecord.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_LoginLog.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Menu.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_RequestLog.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_RequestLogDetail.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_Role.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_RoleApi.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_RoleDept.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_RoleMenu.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_SiteMsg.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_SiteMsgDept.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_SiteMsgFlag.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_SiteMsgRole.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_SiteMsgUser.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_User.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_UserProfile.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_UserRole.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/DbMaps/Sys/Sys_VerifyCode.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Api/CreateApiReq.cs (66%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Api/ExportApiRsp.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Api/QueryApiReq.cs (66%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Api/QueryApiRsp.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Cache/CacheStatisticsRsp.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Cache/DelEntryReq.cs (85%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Cache/GetAllEntriesReq.cs (80%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Cache/GetEntriesReq.cs (79%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Cache/GetEntryRsp.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Captcha/GetCaptchaRsp.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Captcha/VerifyCaptchaReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/CreateConfigReq.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/EditConfigReq.cs (83%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/ExportConfigRsp.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/QueryConfigReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/QueryConfigRsp.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Config/SetConfigEnabledReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/CreateDeptReq.cs (84%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/EditDeptReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/ExportDeptRsp.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/QueryDeptReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/QueryDeptRsp.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dept/SetDeptEnabledReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dev/GenerateCsCodeReq.cs (75%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dev/GenerateIconCodeReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dev/IconExportJsInfo.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs (67%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/CreateDicContentReq.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/EditDicContentReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/ExportDicContentRsp.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/GetDicValueReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/QueryDicContentReq.cs (67%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/QueryDicContentRsp.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/GetBarChartRsp.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/GetPieChartRsp.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/CreateJobReq.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/EditJobReq.cs (83%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/ExportJobRsp.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/FinishJobReq.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/QueryJobReq.cs (83%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/QueryJobRsp.cs (98%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Job/SetJobEnabledReq.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/JobRecord/CreateJobRecordReq.cs (69%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/JobRecord/ExportJobRecordRsp.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/JobRecord/QueryJobRecordReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/JobRecord/QueryJobRecordRsp.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/LoginLog/CreateLoginLogReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/LoginLog/ExportLoginLogRsp.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/LoginLog/QueryLoginLogReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/LoginLog/QueryLoginLogRsp.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Menu/CreateMenuReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Menu/EditMenuReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Menu/MetaInfo.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Menu/QueryMenuReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Menu/QueryMenuRsp.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLog/CreateRequestLogReq.cs (66%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLog/ExportRequestLogRsp.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLog/QueryRequestLogReq.cs (83%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLog/QueryRequestLogRsp.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs (68%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs (81%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/CreateRoleReq.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/EditRoleReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/ExportRoleRsp.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/GetMenusRsp.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/MapMenusReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/QueryRoleReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/QueryRoleRsp.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/SetDisplayDashboardReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/SetIgnorePermissionControlReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Role/SetRoleEnabledReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs (96%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs (69%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs (71%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs (70%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs (69%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs (69%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Tool/AesDecodeReq.cs (79%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Tool/ExecuteSqlReq.cs (85%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/Tool/GetModulesRsp.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/CheckMobileAvailableReq.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/CheckUserNameAvailableReq.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/CreateEditUserReq.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/CreateUserReq.cs (86%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/EditUserReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/ExportUserRsp.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/LoginByPwdReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/LoginBySmsReq.cs (51%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/LoginRsp.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/QueryUserReq.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/QueryUserRsp.cs (93%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/RegisterUserReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/ResetPasswordReq.cs (84%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/SetAvatarReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/SetEmailReq.cs (69%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/SetMobileReq.cs (77%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/SetPasswordReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/SetUserEnabledReq.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/User/UserInfoRsp.cs (81%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/CreateUserProfileReq.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/EditUserProfileReq.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs (91%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/QueryUserProfileReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/QueryUserProfileRsp.cs (97%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs (84%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs (65%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs (82%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs (95%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs (84%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs (83%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/VerifyCodeReq.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/DataScopes.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/JobStatues.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/MenuTypes.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/SiteMsgTypes.cs (87%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/UserSiteMsgStatues.cs (90%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/VerifyCodeDeviceTypes.cs (88%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/VerifyCodeStatues.cs (92%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Enums/Sys/VerifyCodeTypes.cs (94%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Events/Sys/RequestLogEvent.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Events/Sys/UserCreatedEvent.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Events/Sys/UserUpdatedEvent.cs (89%) rename src/backend/{NetAdmin.Domain => NetAdmin.SysComponent.Domain}/Events/Sys/VerifyCodeCreatedEvent.cs (89%) create mode 100644 src/backend/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj create mode 100644 src/backend/NetAdmin.SysComponent.Domain/ProjectUsings.cs rename src/backend/{NetAdmin.Host => NetAdmin.SysComponent.Host}/Middlewares/RequestAuditMiddleware.cs (96%) rename src/backend/{NetAdmin.Host => NetAdmin.SysComponent.Host}/Utils/RequestLogger.cs (90%) rename src/backend/{NetAdmin.Host => NetAdmin.SysComponent.Host}/Utils/SqlAuditor.cs (98%) create mode 100644 src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs create mode 100644 src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs create mode 100644 src/backend/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj delete mode 100644 src/backend/NetAdmin.SysComponent.Tests/NetAdmin.SysComponent.Tests.csproj rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/ProjectUsings.cs (100%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/ApiTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/CacheTests.cs (95%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/CaptchaTests.cs (91%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/ConfigTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/ConstantTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/DeptTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/DevTests.cs (93%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/DicTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/FileTests.cs (93%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/JobTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/LoginLogTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/MenuTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/RequestLogTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/RoleTests.cs (98%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/SiteMsgTests.cs (97%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/ToolsTests.cs (96%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/UserTests.cs (98%) rename src/backend/{NetAdmin.SysComponent.Tests => UnitTests}/Sys/VerifyCodeTests.cs (97%) rename src/backend/{NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj => UnitTests/UnitTests.csproj} (100%) rename src/backend/{NetAdmin.Tests => UnitTests}/WebApiTestBase.cs (92%) diff --git a/.github/workflows/README.md b/.github/workflows/README.md new file mode 100644 index 00000000..febad1fd --- /dev/null +++ b/.github/workflows/README.md @@ -0,0 +1 @@ +github workflows \ No newline at end of file diff --git a/.gitignore b/.gitignore index cb911a49..cd8e2d0e 100644 --- a/.gitignore +++ b/.gitignore @@ -397,6 +397,7 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml .idea/ +!src/backend/CloudCode.DataGrip/.idea # User Define dist/ diff --git a/.gitmodules b/.gitmodules index 5d673544..e811f5f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "refs/Furion"] - path = refs/Furion - url = https://github.com/nsnail/Furion.git +[submodule "refs/Gurion"] + path = refs/Gurion + url = https://github.com/nsnail/Gurion.git [submodule "refs/ns-ext"] path = refs/ns-ext url = https://github.com/nsnail/ns-ext.git diff --git a/Directory.Build.props b/Directory.Build.props index ac75abf8..100ffc56 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + DBTYPE_SQLITE $(MSBuildThisFileDirectory) diff --git a/NetAdmin.sln b/NetAdmin.sln index da3755ac..3114e75b 100644 --- a/NetAdmin.sln +++ b/NetAdmin.sln @@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B 1.git.pull.request.ps1 = scripts/1.git.pull.request.ps1 2.git.release.ps1 = scripts/2.git.release.ps1 3.git.recreate.branch.ps1 = scripts/3.git.recreate.branch.ps1 + 4.git.del.obsolete.tags.ps1 = scripts/4.git.del.obsolete.tags.ps1 clean.ln.csx = scripts/clean.ln.csx code.clean.csx = scripts/code.clean.csx code.clean.ps1 = scripts/code.clean.ps1 @@ -39,13 +40,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B gen.id.linq = scripts/gen.id.linq gen.ln.cmd = scripts/gen.ln.cmd gen.resx.tt = scripts/gen.resx.tt - git.del.obsolete.tags.ps1 = scripts/git.del.obsolete.tags.ps1 image.optimize.csx = scripts/image.optimize.csx install.as.tpl.ps1 = scripts/install.as.tpl.ps1 rename.csx = scripts/rename.csx resharper.full.ps1 = scripts/resharper.full.ps1 switcher.freesql.json = scripts/switcher.freesql.json - switcher.furion.json = scripts/switcher.furion.json + switcher.gurion.json = scripts/switcher.gurion.json switcher.nsext.json = scripts/switcher.nsext.json switcher.ps1 = scripts/switcher.ps1 sync.sln.files.csx = scripts/sync.sln.files.csx @@ -57,6 +57,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3C6F049E-3EE8-4D66-9AFF-E8A369032487}" ProjectSection(SolutionItems) = preProject nightly-build.yml = .github/workflows/nightly-build.yml + README.md = .github/workflows/README.md release.yml = .github/workflows/release.yml EndProjectSection EndProject @@ -99,10 +100,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01.frameworks", "01.framewo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04.tests", "04.tests", "{89260294-80FC-49F1-8D73-AECD39AFF2B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Tests", "src\backend\NetAdmin.AdmServer.Tests\NetAdmin.AdmServer.Tests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05.tools", "05.tools", "{79409163-5006-405D-AC96-406FA0AD77B7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\backend\UnitTests\UnitTests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}" + ProjectSection(SolutionItems) = preProject + README.md = docker/README.md + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Domain", "src\backend\NetAdmin.SysComponent.Domain\NetAdmin.SysComponent.Domain.csproj", "{51D6E603-0749-4A11-A78C-9E5BB127E03A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Domain", "src\backend\NetAdmin.AdmServer.Domain\NetAdmin.AdmServer.Domain.csproj", "{932520DF-D312-415A-A128-1117F8221D68}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Infrastructure", "src\backend\NetAdmin.AdmServer.Infrastructure\NetAdmin.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Infrastructure", "src\backend\NetAdmin.SysComponent.Infrastructure\NetAdmin.SysComponent.Infrastructure.csproj", "{48EE6FC4-B64A-40D3-B889-36837E067880}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -164,6 +180,22 @@ Global {00604162-C444-478B-B773-3AB23C856CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.Build.0 = Release|Any CPU + {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.Build.0 = Release|Any CPU + {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.Build.0 = Release|Any CPU + {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.Build.0 = Release|Any CPU + {48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {4DAF9366-855F-46BB-AE4C-660C92FA0697} = {C84EB5A0-37AD-4B17-A51E-E36888C4441E} @@ -180,10 +212,15 @@ Global {CE895E44-EEC3-4ECE-A56A-8A82E7D863E3} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86} {89260294-80FC-49F1-8D73-AECD39AFF2B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697} {C7F27698-DA05-4ACD-B0D7-4791B3972002} = {89260294-80FC-49F1-8D73-AECD39AFF2B7} - {3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1} {00604162-C444-478B-B773-3AB23C856CA7} = {D9C3EF66-2757-473D-A26B-54FD08DA203F} {34650E82-D257-46DA-BD6B-DE307113347B} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {19872A4C-3C9A-4C62-A33B-74F5B8D6F77C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {C2CC1596-3BEE-43EA-A9BE-4EDE5716296C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} + {79409163-5006-405D-AC96-406FA0AD77B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697} + {51D6E603-0749-4A11-A78C-9E5BB127E03A} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} + {932520DF-D312-415A-A128-1117F8221D68} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86} + {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86} + {48EE6FC4-B64A-40D3-B889-36837E067880} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} + {3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1} EndGlobalSection EndGlobal \ No newline at end of file diff --git a/NetAdmin.sln.DotSettings b/NetAdmin.sln.DotSettings index c1226460..bde2d8b2 100644 --- a/NetAdmin.sln.DotSettings +++ b/NetAdmin.sln.DotSettings @@ -27,6 +27,256 @@ NEVER NEVER NEVER + AD + AE + AF + AG + AI + AL + AM + AO + AQ + AR + AS + AT + AU + AW + AX + AZ + BA + BB + BD + BE + BF + BG + BH + BI + BJ + BL + BM + BN + BO + BQ + BR + BS + BT + BV + BW + BY + BZ + CA + CC + CD + CF + CG + CH + CI + CK + CL + CM + CN + CO + CR + CU + CV + CW + CX + CY + CZ + DE + DJ + DK + DM + DO + DZ + EC + EE + EG + EH + ER + ES + ET + FI + FJ + FK + FM + FO + FR + GA + GB + GD + GE + GF + GG + GH + GI + GL + GM + GN + GP + GQ + GR + GS + GT + GU + GW + GY + HK + HM + HN + HR + HT + HU + ID + IE + IL + IM + IN + IO + IQ + IR + IS + IT + JE + JM + JO + JP + KE + KG + KH + KI + KM + KN + KP + KR + KW + KY + KZ + LA + LB + LC + LI + LK + LR + LS + LT + LU + LV + LY + MA + MC + MD + ME + MF + MG + MH + MK + ML + MM + MN + MO + MP + MQ + MR + MS + MT + MU + MV + MW + MX + MY + MZ + NA + NC + NE + NF + NG + NI + NL + NO + NP + NR + NU + NZ + OM + OTP + PA + PE + PF + PG + PH + PK + PL + PM + PN + PR + PS + PT + PW + PY + QA + RE + RO + RS + RU + RW + SA + SB + SC + SD + SE + SG + SH + SI + SJ + SK + SL + SM + SN + SO + SR + SS + ST + SV + SX + SY + SZ + TC + TD + TF + TG + TH + TJ + TK + TL + TM + TN + TO + TR + TT + TV + TW + TZ + UA + UG + UM + US + UY + UZ + VA + VC + VE + VG + VI + VN + VU + WF + WS + YE + YT + ZA + ZM + ZW <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy> <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="AA_BB" /></Policy> <Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy> diff --git a/assets/res/CountryCodes.ln b/assets/res/CountryCodes.ln new file mode 100644 index 00000000..e2937ce9 --- /dev/null +++ b/assets/res/CountryCodes.ln @@ -0,0 +1,249 @@ +不丹 +东帝汶 +中国 +中非 +丹麦 +乌克兰 +乌兹别克斯坦 +乌干达 +乌拉圭 +乍得 +也门 +亚美尼亚 +以色列 +伊拉克 +伊朗 +伯利兹 +佛得角 +俄罗斯 +保加利亚 +克罗地亚 +关岛 +冈比亚 +冰岛 +几内亚 +几内亚比绍 +列支敦士登 +刚果共和国 +刚果民主共和国 +利比亚 +利比里亚 +加拿大 +加纳 +加蓬 +匈牙利 +北马其顿 +北马里亚纳群岛 +南乔治亚和南桑威奇群岛 +南极洲 +南苏丹 +南非 +博茨瓦纳 +卡塔尔 +卢旺达 +卢森堡 +印度 +印度尼西亚 +危地马拉 +厄瓜多尔 +厄立特里亚 +叙利亚 +古巴 +台湾 +吉尔吉斯斯坦 +吉布提 +哈萨克斯坦 +哥伦比亚 +哥斯达黎加 +喀麦隆 +图瓦卢 +土库曼斯坦 +土耳其 +圣卢西亚 +圣基茨和尼维斯 +圣多美和普林西比 +圣巴泰勒米 +圣文森特和格林纳丁斯 +圣皮埃尔和密克隆 +圣诞岛 +圣赫勒拿 +圣马力诺 +圭亚那 +坦桑尼亚 +埃及 +埃塞俄比亚 +基里巴斯 +塔吉克斯坦 +塞内加尔 +塞尔维亚 +塞拉利昂 +塞浦路斯 +塞舌尔 +墨西哥 +多哥 +多米尼克 +多米尼加 +奥兰 +奥地利 +委内瑞拉 +孟加拉国 +安哥拉 +安圭拉 +安提瓜和巴布达 +安道尔 +密克罗尼西亚联邦 +尼加拉瓜 +尼日利亚 +尼日尔 +尼泊尔 +巴勒斯坦 +巴哈马 +巴基斯坦 +巴巴多斯 +巴布亚新几内亚 +巴拉圭 +巴拿马 +巴林 +巴西 +布基纳法索 +布隆迪 +布韦岛 +希腊 +帕劳 +库克群岛 +库拉索 +开曼群岛 +德国 +意大利 +所罗门群岛 +托克劳 +拉脱维亚 +挪威 +捷克 +摩尔多瓦 +摩洛哥 +摩纳哥 +文莱 +斐济 +斯威士兰 +斯洛伐克 +斯洛文尼亚 +斯瓦尔巴和扬马延 +斯里兰卡 +新加坡 +新喀里多尼亚 +新西兰 +日本 +智利 +朝鲜 +柬埔寨 +根西 +格林纳达 +格陵兰 +格鲁吉亚 +梵蒂冈 +比利时 +毛里塔尼亚 +毛里求斯 +汤加 +沙特阿拉伯 +法国 +法属南部和南极领地 +法属圣马丁 +法属圭亚那 +法属波利尼西亚 +法罗群岛 +波兰 +波多黎各 +波黑 +泰国 +泽西 +津巴布韦 +洪都拉斯 +海地 +澳大利亚 +澳门 +爱尔兰 +爱沙尼亚 +牙买加 +特克斯和凯科斯群岛 +特立尼达和多巴哥 +玻利维亚 +瑙鲁 +瑞典 +瑞士 +瓜德罗普 +瓦利斯和富图纳 +瓦努阿图 +留尼汪 +白俄罗斯 +百慕大 +皮特凯恩群岛 +直布罗陀 +福克兰群岛 +科威特 +科摩罗 +科特迪瓦 +科科斯基林群岛 +秘鲁 +突尼斯 +立陶宛 +索马里 +约旦 +纳米比亚 +纽埃 +缅甸 +罗马尼亚 +美国 +美国本土外小岛屿 +美属维尔京群岛 +美属萨摩亚 +老挝 +肯尼亚 +芬兰 +苏丹 +苏里南 +英国 +英属印度洋领地 +英属维尔京群岛 +荷兰 +荷兰加勒比区 +荷属圣马丁 +莫桑比克 +莱索托 +菲律宾 +萨尔瓦多 +萨摩亚 +葡萄牙 +蒙古 +蒙特塞拉特 +西撒哈拉 +西班牙 +诺福克岛 +贝宁 +赞比亚 +赤道几内亚 +赫德岛和麦克唐纳群岛 +越南 +阿塞拜疆 +阿富汗 +阿尔及利亚 +阿尔巴尼亚 +阿曼 +阿根廷 +阿联酋 +阿鲁巴 +韩国 +香港 +马尔代夫 +马恩岛 +马拉维 +马提尼克 +马来西亚 +马约特 +马绍尔群岛 +马耳他 +马达加斯加 +马里 +黎巴嫩 +黑山 \ No newline at end of file diff --git a/assets/res/NetAdmin.AdmServer.Fields.ln b/assets/res/NetAdmin.AdmServer.Fields.ln new file mode 100644 index 00000000..e69de29b diff --git a/assets/res/NetAdmin.AdmServer.Statements.ln b/assets/res/NetAdmin.AdmServer.Statements.ln new file mode 100644 index 00000000..e69de29b diff --git a/assets/res/NetAdmin.Fields.ln b/assets/res/NetAdmin.Fields.ln new file mode 100644 index 00000000..ce1e80c2 --- /dev/null +++ b/assets/res/NetAdmin.Fields.ln @@ -0,0 +1,70 @@ +不为其中之一 +不以什么开始 +不以什么结束 +不包含 +不排序 +不等于 +丧偶 +中专 +中共党员 +为其中之一 +以什么开始 +以什么结束 +保密 +保密 +信息 +倒序排序 +共青团员 +出生证 +初中 +包含 +博士 +博士后 +同步数据库结构 +外国人居留证 +外部错误 +大专 +大于 +大于等于 +女 +女 +宕机 +小于 +小于等于 +小学 +已婚 +并且 +成功 +或者 +护照 +插入种子数据 +无效操作 +无效输入 +日期范围 +未处理异常 +未婚 +本科 +比较数据库结构 +港澳台通行证 +男 +男 +硕士 +示例导出 +离异 +等于 +等于 +等于 +管理模块 +系统模块 +结果非预期 +群众 +自定义 +范围 +警告 +调试 +跟踪 +身份证 +错误 +随机排序 +顺序排序 +高中 \ No newline at end of file diff --git a/assets/res/NetAdmin.Statements.ln b/assets/res/NetAdmin.Statements.ln new file mode 100644 index 00000000..6aafb9b4 --- /dev/null +++ b/assets/res/NetAdmin.Statements.ln @@ -0,0 +1,21 @@ +6位数字 +8位以上数字字母组合 +XML注释文件不存在 +中文姓名 +事务已回滚 +事务已提交 +区号电话号码分机号 +参数格式不正确 +开始事务 +支付宝账号 +数据库同步开始 +数据库结构同步完成 +无效端口号 +无效证件号码 +时间表达式 +用户名不能是手机号码 +用户名长度4位以上 +请求对象不能为空 +邀请码不正确 +配置文件初始化完毕 +非JSON字符串 \ No newline at end of file diff --git a/assets/res/Fields.ln b/assets/res/NetAdmin.SysComponent.Fields.ln similarity index 59% rename from assets/res/Fields.ln rename to assets/res/NetAdmin.SysComponent.Fields.ln index 95b42809..c95fefe1 100644 --- a/assets/res/Fields.ln +++ b/assets/res/NetAdmin.SysComponent.Fields.ln @@ -2,66 +2,29 @@ 上次执行状态 上次执行耗时 下次执行时间 -不为其中之一 -不以什么开始 -不以什么结束 -不包含 -不排序 -不等于 -丧偶 -中专 -中共党员 -为其中之一 人工审核 -以什么开始 -以什么结束 作业名称 作业状态 -保密 -信息 -倒序排序 全部数据 公告 -共青团员 -出生证 创建时间 -初中 删除 -包含 -博士 -博士后 发送失败 -同步数据库结构 响应体 响应状态码 唯一编码 备注 -外国人居留证 -外部错误 -大专 -大于 -大于等于 -女 字典内容导出 -宕机 客户端IP -小于 -小于等于 -小学 已发送 -已婚 已校验 已读 -并且 -成功 -或者 所属角色 所属部门 手机 手机号 执行耗时 执行计划 -护照 指定部门数据 按钮 排序 @@ -69,66 +32,41 @@ 接口导出 接口描述 接口路径 -插入种子数据 操作系统 数据范围 -无效操作 -无效输入 无限权限 -日期范围 是否启用 显示仪表板 最后登录时间 -未处理异常 -未婚 未读 本人数据 -本科 本部门和下级部门数据 本部门数据 框架 -比较数据库结构 注册 消息主题 消息摘要 消息类型 -港澳台通行证 用户代理 用户名 用户导出 电子邮箱 -男 登录 登录名 登录日志导出 -硕士 -示例导出 -离异 空闲 站内信导出 -等于 等待发送 -管理模块 -系统模块 绑定手机号码 -结果非预期 -群众 -自定义 -范围 菜单 角色名称 角色导出 解绑手机号码 -警告 计划作业导出 计划作业执行记录导出 请求方式 请求日志导出 -调试 -跟踪 跟踪标识 -跟踪编号 -身份证 运行 通知 邮箱号 @@ -137,11 +75,7 @@ 配置导出 重设密码 链接 -错误 -随机排序 项值 项名 -顺序排序 -高中 默认角色 默认部门 \ No newline at end of file diff --git a/assets/res/Statements.ln b/assets/res/NetAdmin.SysComponent.Statements.ln similarity index 82% rename from assets/res/Statements.ln rename to assets/res/NetAdmin.SysComponent.Statements.ln index 02bc1d2f..d65c5763 100644 --- a/assets/res/Statements.ln +++ b/assets/res/NetAdmin.SysComponent.Statements.ln @@ -1,17 +1,9 @@ 1分钟内只能发送1次 -6位数字 -8位以上数字字母组合 -XML注释文件不存在 -中文姓名 -事务已回滚 -事务已提交 人机校验请求不能为空 人机验证未通过 作业名称不能为空 允许的文件大小 允许的文件格式 -区号电话号码分机号 -参数格式不正确 唯一编码不能为空 图标代码不能为空 图标名称不能为空 @@ -19,55 +11,61 @@ XML注释文件不存在 字典名称不能为空 字典目录不存在 字典目录编号不能为空 +字典目录编号不能为空 字典编码不能为空 学历不正确 密码不能为空 +密码不能为空 +密码不能为空 +密码不能为空 +已处理完毕 +已处理完毕 已处理完毕 并发冲突_请稍后重试 -开始事务 性别不正确 手机号码不正确 手机号码不能为空 接口编码不存在 -支付宝账号 政治面貌不正确 -数据库同步开始 数据库服务器时钟偏移 -数据库结构同步完成 文件不能为空 新密码不能为空 新手机号码验证码不正确 -无效端口号 -无效证件号码 旧密码不正确 旧密码不能为空 旧手机号码不正确 旧手机号码验证码不正确 -时间表达式 时间计划不能为空 未指定部门 未获取到待执行任务 模块名称不能为空 +模块类型不能为空 模块说明不能为空 此节点已下线 +此节点已下线 民族不正确 消息主题不能为空 消息内容不能为空 父节点不存在 用户不存在 用户名不能为空 -用户名不能是手机号码 +用户名不能为空 +用户名不能为空 用户名或密码错误 -用户名长度4位以上 用户头像不能为空 用户编号不存在 目标设备不能为空 +目标设备不能为空 +短信验证请求不能为空 +短信验证请求不能为空 短信验证请求不能为空 站内信不存在 站内信状态不正确 站内信类型不正确 缓存键不能为空 网络地址不正确 +网络地址不正确 +网络地址不正确 菜单名称不能为空 菜单标题不能为空 菜单类型不正确 @@ -83,21 +81,19 @@ XML注释文件不存在 该部门下存在子部门 该部门下存在用户 请求地址不能为空 -请求对象不能为空 请求方法不正确 +请稍后重试 请联系管理员激活账号 读取用户令牌出错 账号不能为空 -邀请码不正确 邮箱验证码不正确 部门不存在 部门名称不能为空 -配置文件初始化完毕 键值不能为空 键名称不能为空 +键名称不能为空 随机延时结束时间不正确 随机延时起始时间不正确 -非JSON字符串 验证数据不能为空 验证码不正确 验证码不能为空 diff --git a/build/prebuild.targets b/build/prebuild.targets index ffa1687e..85f82d72 100644 --- a/build/prebuild.targets +++ b/build/prebuild.targets @@ -9,22 +9,4 @@ Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs" StdOutEncoding="utf-8" /> - - - Languages/Statements.ln - - - Languages/Nations.ln - - - Languages/Fields.ln - - - Languages/Ln.resx - PublicResXFileCodeGenerator - - - Languages/Ln.Designer.cs - - \ No newline at end of file diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 00000000..6d0eac4b --- /dev/null +++ b/docker/README.md @@ -0,0 +1 @@ +docker \ No newline at end of file diff --git a/refs/Furion b/refs/Furion deleted file mode 160000 index d23c7cca..00000000 --- a/refs/Furion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d23c7cca552e9b1b1365349741139a012e2bc955 diff --git a/scripts/2.git.release.ps1 b/scripts/2.git.release.ps1 index b354d715..09ff4de9 100644 --- a/scripts/2.git.release.ps1 +++ b/scripts/2.git.release.ps1 @@ -20,8 +20,10 @@ git tag -d $tag git tag $tag git push --tags origin release Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...release" -Write-Host "按『Enter』回到主分支，『Ctrl+C』退出" +Write-Host "按『Enter』回到tk分支，『Ctrl+C』退出" Pause git checkout main git pull -git branch -D release \ No newline at end of file +git branch -D release +git branch -D tk +git checkout -b tk \ No newline at end of file diff --git a/scripts/git.del.obsolete.tags.ps1 b/scripts/4.git.del.obsolete.tags.ps1 similarity index 100% rename from scripts/git.del.obsolete.tags.ps1 rename to scripts/4.git.del.obsolete.tags.ps1 diff --git a/scripts/gen.resx.tt b/scripts/gen.resx.tt index ba5cf23f..29f8b5cd 100644 --- a/scripts/gen.resx.tt +++ b/scripts/gen.resx.tt @@ -1,6 +1,7 @@ <#@ template language="C#" #> <#@ output encoding="utf-8" extension="resx" #> <#@ import namespace="System.IO" #> +<#@ import namespace="System.Linq" #> <#@ import namespace="System.Text.RegularExpressions" #> @@ -28,14 +29,11 @@ <# var regex = new Regex(@"^\d", RegexOptions.Compiled); - foreach (var file in Directory.GetFiles("../assets/res/", "*.ln")) + foreach (var line in Directory.GetFiles("../assets/res/", "*.ln").SelectMany(x => File.ReadLines(x)).Distinct()) { - foreach (var line in File.ReadLines(file)) - { #> <#= line #>" xml:space="preserve"><#= line #> <# - } } #> \ No newline at end of file diff --git a/scripts/switcher.furion.json b/scripts/switcher.gurion.json similarity index 52% rename from scripts/switcher.furion.json rename to scripts/switcher.gurion.json index edc4de27..3ec2b573 100644 --- a/scripts/switcher.furion.json +++ b/scripts/switcher.gurion.json @@ -1,15 +1,15 @@ { "solution": "NetAdmin.sln", "mappings": { - "Furion.Pure.NS": "../refs/Furion/framework/Furion.Pure/Furion.Pure.csproj" + "Gurion": "../refs/Gurion/src/Gurion.csproj" }, "restore": [ { "name": "NetAdmin.Infrastructure", "packages": [ { - "packageName": "Furion.Pure.NS", - "version": "4.9.5.8-ns1" + "packageName": "Gurion", + "version": "1.1.0" } ] } diff --git a/scripts/sync.sln.files.csx b/scripts/sync.sln.files.csx index b197fa69..f0e256f2 100644 --- a/scripts/sync.sln.files.csx +++ b/scripts/sync.sln.files.csx @@ -17,6 +17,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0 """ ); +content = Regex.Replace( + content, + "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"docker\", \"docker\", \"{E80A1018-C354-4A26-9029-8847BB9DA864}\"(?:.|\n)*?EndProject", + $$""" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}" + ProjectSection(SolutionItems) = preProject +{{string.Join('\n', + Directory.GetFiles(@"../docker", "*") + .Select(x=>$" {Path.GetFileName(x)} = docker/{Path.GetFileName(x)}") + )}} + EndProject +""" +); + content = Regex.Replace( content, "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"workflows\", \"workflows\", \"{3C6F049E-3EE8-4D66-9AFF-E8A369032487}\"(?:.|\n)*?EndProject", diff --git a/src/backend/GlobalUsings.cs b/src/backend/GlobalUsings.cs index 587d8489..f89552ee 100644 --- a/src/backend/GlobalUsings.cs +++ b/src/backend/GlobalUsings.cs @@ -25,16 +25,16 @@ global using FreeSql; global using FreeSql.Aop; global using FreeSql.DataAnnotations; global using FreeSql.Internal.Model; -global using Furion; -global using Furion.Authorization; -global using Furion.ConfigurableOptions; -global using Furion.DataEncryption; -global using Furion.DataValidation; -global using Furion.DependencyInjection; -global using Furion.DynamicApiController; -global using Furion.EventBus; -global using Furion.SpecificationDocument; -global using Furion.UnifyResult; +global using Gurion; +global using Gurion.Authorization; +global using Gurion.ConfigurableOptions; +global using Gurion.DataEncryption; +global using Gurion.DataValidation; +global using Gurion.DependencyInjection; +global using Gurion.DynamicApiController; +global using Gurion.EventBus; +global using Gurion.SpecificationDocument; +global using Gurion.UnifyResult; global using Mapster; global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Builder; diff --git a/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj b/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj index b00e0fa0..3c99a87b 100644 --- a/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj +++ b/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj @@ -1,9 +1,10 @@ - - DBTYPE_SQLITE - + + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj.DotSettings b/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj.DotSettings deleted file mode 100644 index b8097e57..00000000 --- a/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - True \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj b/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj index ceb4baae..03e702c7 100644 --- a/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj +++ b/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Domain/NetAdmin.AdmServer.Domain.csproj b/src/backend/NetAdmin.AdmServer.Domain/NetAdmin.AdmServer.Domain.csproj new file mode 100644 index 00000000..c014e087 --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Domain/NetAdmin.AdmServer.Domain.csproj @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs index 22f4cd96..6e01a2b5 100644 --- a/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs @@ -1,8 +1,8 @@ using NetAdmin.AdmServer.Host.Filters; -using NetAdmin.Domain.Contexts; using NetAdmin.Domain.DbMaps.Dependency.Fields; -using NetAdmin.Domain.Enums.Sys; -using NetAdmin.Host.Extensions; +using NetAdmin.SysComponent.Domain.Contexts; +using NetAdmin.SysComponent.Domain.Enums.Sys; +using NetAdmin.SysComponent.Host.Extensions; namespace NetAdmin.AdmServer.Host.Extensions; diff --git a/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj b/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj index 58eb7b2c..6d799c87 100644 --- a/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj +++ b/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj @@ -1,17 +1,11 @@ - - - - - - PreserveNewest - + diff --git a/src/backend/NetAdmin.AdmServer.Host/Startup.cs b/src/backend/NetAdmin.AdmServer.Host/Startup.cs index e671dc20..f9186b2f 100644 --- a/src/backend/NetAdmin.AdmServer.Host/Startup.cs +++ b/src/backend/NetAdmin.AdmServer.Host/Startup.cs @@ -91,7 +91,8 @@ namespace NetAdmin.AdmServer.Host .AddFreeSqlWithArgs() // 添加 freeSql .AddRemoteRequest() // 添加远程请求 .AddCorsAccessor() // 添加支持跨域访问 - .AddContextUser() // 添加上下文用户 + .AddContextUserToken() // 添加上下文用户令牌 + .AddContextUserInfo() // 添加上下文用户信息 .AddRedisCache() // 添加 Redis 缓存 .AddSchedules() // 添加计划任务 diff --git a/src/backend/NetAdmin.AdmServer.Host/settings.Development.json b/src/backend/NetAdmin.AdmServer.Host/settings.Development.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/backend/NetAdmin.AdmServer.Host/settings.Development.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Host/settings.Test.json b/src/backend/NetAdmin.AdmServer.Host/settings.Test.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/backend/NetAdmin.AdmServer.Host/settings.Test.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Host/settings.json b/src/backend/NetAdmin.AdmServer.Host/settings.json deleted file mode 100644 index 44762fdf..00000000 --- a/src/backend/NetAdmin.AdmServer.Host/settings.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", - "SpecificationDocumentSettings": { - "GroupOpenApiInfos": [ - { - "Group": "Sys", - "Title": "系统组件", - "Description": "NetAdmin - 系统组件", - }, - { - "Group": "Adm", - "Title": "管理服务", - "Description": "NetAdmin - 管理服务", - }, - { - "Group": "Tpl", - "Visible": false, - }, - { - "Group": "Probe", - "Visible": false, - } - ], - "SecurityDefinitions": [ - { - "Id": "Bearer", - "Type": "ApiKey", - "Name": "Authorization", - "Description": "JWT Authorization header using the Bearer scheme.", - "BearerFormat": "JWT", - "Scheme": "bearer", - "In": "Header", - "Requirement": { - "Scheme": { - "Reference": { - "Id": "Bearer", - "Type": "SecurityScheme" - }, - "Accesses": [] - } - } - } - ] - } -} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Development.json b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Development.json new file mode 100644 index 00000000..6fc2bc4b --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Development.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + "Logging": { + "LogLevel": { + "Default": "Debug", + "Microsoft.AspNetCore": "Debug", + "System.Logging.EventBusService": "Debug" + }, + } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Remote.json b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Remote.json new file mode 100644 index 00000000..6fc2bc4b --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Remote.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + "Logging": { + "LogLevel": { + "Default": "Debug", + "Microsoft.AspNetCore": "Debug", + "System.Logging.EventBusService": "Debug" + }, + } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Test.json b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Test.json new file mode 100644 index 00000000..6fc2bc4b --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.Test.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + "Logging": { + "LogLevel": { + "Default": "Debug", + "Microsoft.AspNetCore": "Debug", + "System.Logging.EventBusService": "Debug" + }, + } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json new file mode 100644 index 00000000..a4bd517e --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/AdmSettings.json @@ -0,0 +1,99 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + // Swagger文档配置 ------------------------------------------------------------------------------ + "SpecificationDocumentSettings": { + "GroupOpenApiInfos": [ + { + "Group": "Sys", + "Title": "系统组件", + "Description": "NetAdmin - 系统组件" + }, + { + "Group": "Adm", + "Title": "管理服务", + "Description": "NetAdmin - 管理服务" + }, + { + "Group": "Tpl", + "Visible": false + }, + { + "Group": "Probe", + "Visible": false + } + ], + "XmlComments": [ + "NetAdmin.AdmServer.Application.xml", + "NetAdmin.AdmServer.Cache.xml", + "NetAdmin.AdmServer.Domain.xml", + "NetAdmin.AdmServer.Host.xml", + "NetAdmin.AdmServer.Infrastructure.xml", + "FreeSql.xml", + "NetAdmin.Application.xml", + "NetAdmin.Cache.xml", + "NetAdmin.Domain.xml", + "NetAdmin.Host.xml", + "NetAdmin.Infrastructure.xml", + "NetAdmin.SysComponent.Application.xml", + "NetAdmin.SysComponent.Cache.xml", + "NetAdmin.SysComponent.Domain.xml", + "NetAdmin.SysComponent.Host.xml", + "NetAdmin.SysComponent.Infrastructure.xml" + ] + }, + // 数据库配置 -------------------------------------------------------------------------------------------------------- + "Database": { + "DbType": "Sqlite", + "ConnStr": "data source=NetAdmin.db", + "SeedDataRelativePath": "SeedData" + }, + // JWT鉴权配置 ------------------------------------------------------------------------------------------------------- + "JWTSettings": { + "ValidateIssuerSigningKey": true, + "IssuerSigningKey": "bO0BCAGxpxYnm6AE4XpgO25T27NayFzjGgfDqBuzUzD6ROpFiZUi3KjVg93bdGek", + "ValidateIssuer": true, + "ValidIssuer": "签发方", + "ValidateAudience": true, + "ValidAudience": "签收方", + "ValidateLifetime": true, + "ExpiredTime": 5256000, + "ClockSkew": 5, + "Algorithm": "HS256" + }, + // 日志配置 ---------------------------------------------------------------------------------------------------------- + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "System.Logging.EventBusService": "Error" + } + }, + // Redis配置 -------------------------------------------------------------------------------------------------------- + "Redis": { + "Instances": [ + { + "Name": "DataCache", + "ConnStr": "localhost:6379,abortConnect=false", + "DataBase": 0 + } + ] + }, + // 文件上传配置 ------------------------------------------------------------------------------------------------------- + "Upload": { + "ContentTypes": [ + "image/jpg", + "image/png", + "image/jpeg", + "image/gif" + ], + "MaxSize": 1073741824, + "Minio": { + "ServerAddress": "vm-ubt-1:9000", + "AccessKey": "nVMM0gSqwyIjM8iZ", + "SecretKey": "F8OZngGrNsZSYn4MP9swwMSf5rfm61EC", + "BucketName": "cloud-code", + "AccessUrl": "http://vm-ubt-1:9000", + "Secure": false + } + }, +} \ No newline at end of file diff --git a/src/backend/NetAdmin.AdmServer.Infrastructure/NetAdmin.AdmServer.Infrastructure.csproj b/src/backend/NetAdmin.AdmServer.Infrastructure/NetAdmin.AdmServer.Infrastructure.csproj new file mode 100644 index 00000000..13a8758f --- /dev/null +++ b/src/backend/NetAdmin.AdmServer.Infrastructure/NetAdmin.AdmServer.Infrastructure.csproj @@ -0,0 +1,19 @@ + + + + + + + + Languages/NetAdmin.AdmServer.Statements.ln + + + Languages/NetAdmin.AdmServer.Fields.ln + + + + + PreserveNewest + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Tpl/IExampleModule.cs b/src/backend/NetAdmin.Application/Modules/Tpl/IExampleModule.cs similarity index 82% rename from src/backend/NetAdmin.SysComponent.Application/Modules/Tpl/IExampleModule.cs rename to src/backend/NetAdmin.Application/Modules/Tpl/IExampleModule.cs index 897f0334..fd653293 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Tpl/IExampleModule.cs +++ b/src/backend/NetAdmin.Application/Modules/Tpl/IExampleModule.cs @@ -1,6 +1,7 @@ +using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Tpl.Example; -namespace NetAdmin.SysComponent.Application.Modules.Tpl; +namespace NetAdmin.Application.Modules.Tpl; /// /// 示例模块 diff --git a/src/backend/NetAdmin.Application/NetAdmin.Application.csproj b/src/backend/NetAdmin.Application/NetAdmin.Application.csproj index ce1aa961..c21da26e 100644 --- a/src/backend/NetAdmin.Application/NetAdmin.Application.csproj +++ b/src/backend/NetAdmin.Application/NetAdmin.Application.csproj @@ -1,7 +1,4 @@ - - DBTYPE_SQLITE - diff --git a/src/backend/NetAdmin.Application/Services/Tpl/Dependency/IExampleService.cs b/src/backend/NetAdmin.Application/Services/Tpl/Dependency/IExampleService.cs new file mode 100644 index 00000000..670d0f04 --- /dev/null +++ b/src/backend/NetAdmin.Application/Services/Tpl/Dependency/IExampleService.cs @@ -0,0 +1,8 @@ +using NetAdmin.Application.Modules.Tpl; + +namespace NetAdmin.Application.Services.Tpl.Dependency; + +/// +/// 示例服务 +/// +public interface IExampleService : IService, IExampleModule; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Tpl/ExampleService.cs b/src/backend/NetAdmin.Application/Services/Tpl/ExampleService.cs similarity index 92% rename from src/backend/NetAdmin.SysComponent.Application/Services/Tpl/ExampleService.cs rename to src/backend/NetAdmin.Application/Services/Tpl/ExampleService.cs index 994ad1b9..bf23ecea 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Tpl/ExampleService.cs +++ b/src/backend/NetAdmin.Application/Services/Tpl/ExampleService.cs @@ -1,8 +1,10 @@ +using NetAdmin.Application.Repositories; +using NetAdmin.Application.Services.Tpl.Dependency; using NetAdmin.Domain.DbMaps.Tpl; +using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Tpl.Example; -using NetAdmin.SysComponent.Application.Services.Tpl.Dependency; -namespace NetAdmin.SysComponent.Application.Services.Tpl; +namespace NetAdmin.Application.Services.Tpl; /// public sealed class ExampleService(BasicRepository rpo) // @@ -27,10 +29,10 @@ public sealed class ExampleService(BasicRepository rpo) // { req.ThrowIfInvalid(); return QueryInternal(req) - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) - #endif - .CountAsync(); + #endif + .CountAsync(); } /// @@ -53,10 +55,10 @@ public sealed class ExampleService(BasicRepository rpo) // { req.ThrowIfInvalid(); return QueryInternal(req) - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) - #endif - .AnyAsync(); + #endif + .AnyAsync(); } /// diff --git a/src/backend/NetAdmin.Cache/Tpl/Dependency/IExampleCache.cs b/src/backend/NetAdmin.Cache/Tpl/Dependency/IExampleCache.cs new file mode 100644 index 00000000..d887f95a --- /dev/null +++ b/src/backend/NetAdmin.Cache/Tpl/Dependency/IExampleCache.cs @@ -0,0 +1,9 @@ +using NetAdmin.Application.Modules.Tpl; +using NetAdmin.Application.Services.Tpl.Dependency; + +namespace NetAdmin.Cache.Tpl.Dependency; + +/// +/// 示例缓存 +/// +public interface IExampleCache : ICache, IExampleModule; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs b/src/backend/NetAdmin.Cache/Tpl/ExampleCache.cs similarity index 90% rename from src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs rename to src/backend/NetAdmin.Cache/Tpl/ExampleCache.cs index 9be9ba1e..d2a7b472 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Tpl/ExampleCache.cs +++ b/src/backend/NetAdmin.Cache/Tpl/ExampleCache.cs @@ -1,8 +1,9 @@ +using NetAdmin.Application.Services.Tpl.Dependency; +using NetAdmin.Cache.Tpl.Dependency; +using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Tpl.Example; -using NetAdmin.SysComponent.Application.Services.Tpl.Dependency; -using NetAdmin.SysComponent.Cache.Tpl.Dependency; -namespace NetAdmin.SysComponent.Cache.Tpl; +namespace NetAdmin.Cache.Tpl; /// public sealed class ExampleCache(IDistributedCache cache, IExampleService service) diff --git a/src/backend/NetAdmin.Domain/Contexts/ContextUserToken.cs b/src/backend/NetAdmin.Domain/Contexts/ContextUserToken.cs index a76db8e9..6ec5e9cb 100644 --- a/src/backend/NetAdmin.Domain/Contexts/ContextUserToken.cs +++ b/src/backend/NetAdmin.Domain/Contexts/ContextUserToken.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.Dto.Sys.User; - namespace NetAdmin.Domain.Contexts; /// @@ -43,9 +41,9 @@ public sealed record ContextUserToken : DataAbstraction /// /// 从 QueryUserRsp 创建上下文用户 /// - public static ContextUserToken Create(QueryUserRsp user) + public static ContextUserToken Create(long id, Guid token, string userName, long deptId) { - return new ContextUserToken { Id = user.Id, Token = user.Token, UserName = user.UserName, DeptId = user.DeptId }; + return new ContextUserToken { Id = id, Token = token, UserName = userName, DeptId = deptId }; } /// diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedUser.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedUser.cs index b5fce03d..92df41a6 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedUser.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldModifiedUser.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Domain.DbMaps.Dependency.Fields; /// -/// 更新用户字段接口 +/// 修改用户字段接口 /// public interface IFieldModifiedUser { diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldSummary.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldSummary.cs index bd93c673..48353a24 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldSummary.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldSummary.cs @@ -1,12 +1,12 @@ namespace NetAdmin.Domain.DbMaps.Dependency.Fields; /// -/// 描述字段接口 +/// 备注字段接口 /// public interface IFieldSummary { /// - /// 描述 + /// 备注 /// string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs index 805ca178..09d5ed74 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record ImmutableEntity : ImmutableEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -17,19 +19,25 @@ public abstract record ImmutableEntity : ImmutableEntity public abstract record ImmutableEntity : LiteImmutableEntity, IFieldCreatedUser where T : IEquatable { - /// + /// + /// 创建者编号 + /// [Column(CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public long? CreatedUserId { get; init; } - /// + /// + /// 创建者用户名 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual string CreatedUserName { get; init; } - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] public override T Id { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs index e46d9cb9..7d22adc6 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record LiteImmutableEntity : LiteImmutableEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -17,13 +19,17 @@ public abstract record LiteImmutableEntity : LiteImmutableEntity public abstract record LiteImmutableEntity : EntityBase, IFieldCreatedTime where T : IEquatable { - /// + /// + /// 创建时间 + /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs index a343e85a..06824910 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record LiteMutableEntity : LiteMutableEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -16,12 +18,16 @@ public abstract record LiteMutableEntity : LiteMutableEntity public abstract record LiteMutableEntity : LiteImmutableEntity, IFieldModifiedTime where T : IEquatable { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] public override T Id { get; init; } - /// + /// + /// 修改时间 + /// [Column(ServerTime = DateTimeKind.Local, CanInsert = false, Position = -1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs index fa388a64..53e7f209 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record LiteVersionEntity : LiteVersionEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -16,13 +18,17 @@ public abstract record LiteVersionEntity : LiteVersionEntity public abstract record LiteVersionEntity : LiteMutableEntity, IFieldVersion where T : IEquatable { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] public override T Id { get; init; } - /// + /// + /// 数据版本 + /// [Column(IsVersion = true, Position = -1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs index 82f862bc..81120cc3 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record MutableEntity : MutableEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -16,30 +18,40 @@ public abstract record MutableEntity : MutableEntity public abstract record MutableEntity : LiteMutableEntity, IFieldCreatedUser, IFieldModifiedUser where T : IEquatable { - /// + /// + /// 创建者编号 + /// [Column(CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual long? CreatedUserId { get; init; } - /// + /// + /// 创建者用户名 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual string CreatedUserName { get; init; } - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] public override T Id { get; init; } - /// + /// + /// 修改者编号 + /// [Column(CanInsert = false, Position = -1)] [CsvIgnore] [JsonIgnore] public long? ModifiedUserId { get; init; } - /// + /// + /// 修改者用户名 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs index 2704d9c7..12698287 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record SimpleEntity : SimpleEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs index b0bbf267..939b8093 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs @@ -3,7 +3,9 @@ namespace NetAdmin.Domain.DbMaps.Dependency; /// public abstract record VersionEntity : VersionEntity { - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [Snowflake] @@ -16,30 +18,40 @@ public abstract record VersionEntity : VersionEntity public abstract record VersionEntity : LiteVersionEntity, IFieldModifiedUser, IFieldCreatedUser where T : IEquatable { - /// + /// + /// 创建者编号 + /// [Column(CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual long? CreatedUserId { get; init; } - /// + /// + /// 创建者用户名 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual string CreatedUserName { get; init; } - /// + /// + /// 唯一编码 + /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] public override T Id { get; init; } - /// + /// + /// 修改者编号 + /// [Column(CanInsert = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual long? ModifiedUserId { get; init; } - /// + /// + /// 修改者用户名 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs b/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs index 08856711..3286b5e6 100644 --- a/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs +++ b/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs @@ -8,6 +8,7 @@ public record RestfulInfo : DataAbstraction /// /// 代码 /// + /// succeed [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public ErrorCodes Code { get; init; } @@ -17,7 +18,8 @@ public record RestfulInfo : DataAbstraction public T Data { get; init; } /// - /// 消息 + /// 字符串："消息内容"，或数组：[{"参数名1":"消息内容1"},{"参数名2":"消息内容2"}] /// + /// 请求成功 public object Msg { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj index d0d678da..681c72f9 100644 --- a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj +++ b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj @@ -1,11 +1,5 @@ - - DBTYPE_SQLITE - - - - diff --git a/src/backend/NetAdmin.Domain/ProjectUsings.cs b/src/backend/NetAdmin.Domain/ProjectUsings.cs index 89735778..4f775145 100644 --- a/src/backend/NetAdmin.Domain/ProjectUsings.cs +++ b/src/backend/NetAdmin.Domain/ProjectUsings.cs @@ -1,13 +1,5 @@ -global using NetAdmin.Domain.Attributes; -global using NetAdmin.Domain.Attributes.DataValidation; +global using NetAdmin.Domain.Attributes; global using NetAdmin.Domain.DbMaps.Dependency; global using NetAdmin.Domain.DbMaps.Dependency.Fields; -global using NetAdmin.Domain.DbMaps.Sys; -global using NetAdmin.Domain.Dto.Dependency; -global using NetAdmin.Domain.Enums.Sys; global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; -global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; -global using CsvName = CsvHelper.Configuration.Attributes.NameAttribute; -global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; -global using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; -global using SqlIndex = FreeSql.DataAnnotations.IndexAttribute; \ No newline at end of file +global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Tpl/ExampleController.cs b/src/backend/NetAdmin.Host/Controllers/Tpl/ExampleController.cs similarity index 89% rename from src/backend/NetAdmin.SysComponent.Host/Controllers/Tpl/ExampleController.cs rename to src/backend/NetAdmin.Host/Controllers/Tpl/ExampleController.cs index dd0eb0a6..15606d46 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Tpl/ExampleController.cs +++ b/src/backend/NetAdmin.Host/Controllers/Tpl/ExampleController.cs @@ -1,9 +1,11 @@ +using NetAdmin.Application.Modules.Tpl; +using NetAdmin.Application.Services.Tpl.Dependency; +using NetAdmin.Cache.Tpl.Dependency; +using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Tpl.Example; -using NetAdmin.SysComponent.Application.Modules.Tpl; -using NetAdmin.SysComponent.Application.Services.Tpl.Dependency; -using NetAdmin.SysComponent.Cache.Tpl.Dependency; +using NetAdmin.Host.Attributes; -namespace NetAdmin.SysComponent.Host.Controllers.Tpl; +namespace NetAdmin.Host.Controllers.Tpl; /// /// 示例服务 diff --git a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs index c4d347db..ed9a3264 100644 --- a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs @@ -1,12 +1,7 @@ -using Furion.Logging; +using Gurion.Logging; using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Events; -using NetAdmin.Host.Filters; -using NetAdmin.Host.Utils; using StackExchange.Redis; using Yitter.IdGenerator; -using FreeSqlBuilder = NetAdmin.Infrastructure.Utils.FreeSqlBuilder; - #if DEBUG using Spectre.Console; #endif @@ -83,7 +78,7 @@ public static class ServiceCollectionExtensions this IServiceCollection me) { var optionsTypes - = from type in App.EffectiveTypes.Where(x => !x.IsAbstract && !x.FullName!.Contains(nameof(Furion)) && + = from type in App.EffectiveTypes.Where(x => !x.IsAbstract && !x.FullName!.Contains(nameof(Gurion)) && x.GetInterfaces().Contains(typeof(IConfigurableOptions))) select type; @@ -126,12 +121,11 @@ public static class ServiceCollectionExtensions } /// - /// 添加上下文用户 + /// 添加上下文用户令牌 /// - public static IServiceCollection AddContextUser(this IServiceCollection me) + public static IServiceCollection AddContextUserToken(this IServiceCollection me) { - return me.AddScoped(typeof(ContextUserToken), _ => ContextUserToken.Create()) - .AddScoped(typeof(ContextUserInfo), _ => ContextUserInfo.Create()); + return me.AddScoped(typeof(ContextUserToken), _ => ContextUserToken.Create()); } /// @@ -142,42 +136,6 @@ public static class ServiceCollectionExtensions return me.AddEventBus(builder => builder.AddSubscribers(App.Assemblies.ToArray())); } - /// - /// 添加 freeSql orm工具 - /// - public static IServiceCollection AddFreeSql( // - this IServiceCollection me, FreeSqlInitMethods initMethods = FreeSqlInitMethods.None, Action freeSqlConfig = null) - { - // // 非调试模式下禁止同步数据库 - // #if !DEBUG - // initOptions = FreeSqlInitOptions.None; - // #endif - var dbOptions = App.GetOptions(); - var fSql = new FreeSqlBuilder(dbOptions).Build(initMethods); - _ = me.AddSingleton(fSql); - - fSql.Aop.AuditValue += SqlAuditor.DataAuditHandler; // Insert/Update自动值处理 - var eventPublisher = App.GetService(); - - #pragma warning disable VSTHRD110 - - // AOP事件发布（异步） - fSql.Aop.CommandBefore += (_, e) => eventPublisher.PublishAsync(new SqlCommandBeforeEvent(e)); // 增删查改，执行命令之前触发 - fSql.Aop.CommandAfter += (_, e) => eventPublisher.PublishAsync(new SqlCommandAfterEvent(e)); // 增删查改，执行命令完成后触发 - - fSql.Aop.SyncStructureBefore += (_, e) => eventPublisher.PublishAsync(new SyncStructureBeforeEvent(e)); // CodeFirst迁移，执行之前触发 - - fSql.Aop.SyncStructureAfter += (_, e) => eventPublisher.PublishAsync(new SyncStructureAfterEvent(e)); // CodeFirst迁移，执行完成触发 - #pragma warning restore VSTHRD110 - - // 全局过滤器设置 - freeSqlConfig?.Invoke(fSql); - - return me.AddScoped() // 注入工作单元管理器 - .AddFreeRepository(null, App.Assemblies.ToArray()) // 批量注入 Repository - .AddMvcFilter(); // 注入事务拦截器 - } - /// /// 添加内存缓存 /// diff --git a/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs b/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs index 66e92381..cc242292 100644 --- a/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs +++ b/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs @@ -1,4 +1,4 @@ -using Furion.FriendlyException; +using Gurion.FriendlyException; using NetAdmin.Domain.Dto; namespace NetAdmin.Host.Filters; diff --git a/src/backend/NetAdmin.Host/Filters/DefaultApiResultHandler.cs b/src/backend/NetAdmin.Host/Filters/DefaultApiResultHandler.cs index 8224ac10..d6777752 100644 --- a/src/backend/NetAdmin.Host/Filters/DefaultApiResultHandler.cs +++ b/src/backend/NetAdmin.Host/Filters/DefaultApiResultHandler.cs @@ -1,4 +1,4 @@ -using Furion.FriendlyException; +using Gurion.FriendlyException; using NetAdmin.Domain.Dto; namespace NetAdmin.Host.Filters; diff --git a/src/backend/NetAdmin.Host/Filters/GlobalExceptionHandler.cs b/src/backend/NetAdmin.Host/Filters/GlobalExceptionHandler.cs index 88e211bc..2d0a7e95 100644 --- a/src/backend/NetAdmin.Host/Filters/GlobalExceptionHandler.cs +++ b/src/backend/NetAdmin.Host/Filters/GlobalExceptionHandler.cs @@ -1,8 +1,8 @@ -using Furion.FriendlyException; +using Gurion.FriendlyException; namespace NetAdmin.Host.Filters; -/// +/// public sealed class GlobalExceptionHandler(ILogger logger) : IGlobalExceptionHandler, ISingleton { /// diff --git a/src/backend/NetAdmin.Infrastructure/Attributes/CountryAttribute.cs b/src/backend/NetAdmin.Infrastructure/Attributes/CountryAttribute.cs new file mode 100644 index 00000000..7a2b8ad1 --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/Attributes/CountryAttribute.cs @@ -0,0 +1,56 @@ +namespace NetAdmin.Infrastructure.Attributes; + +/// +/// 国家信息特性 +/// +/// +/// https://github.com/countries/countries +/// +[AttributeUsage(AttributeTargets.Field | AttributeTargets.Enum)] +public sealed class CountryAttribute : Attribute +{ + /// + /// 三个字母的国家代码 + /// + public string Alpha3 { get; set; } + + /// + /// 国际电话呼号 + /// + public int CallingCode { get; set; } + + /// + /// 国际电话子呼号（区分同一呼号不同国家） + /// + public string CallingSubCode { get; set; } + + /// + /// 货币代码 + /// + public string CurrencyCode { get; set; } + + /// + /// 当命中多个国家时的首选国家 + /// + public bool IsPreferred { get; set; } + + /// + /// 官方语言代码 + /// + public string Languages { get; set; } + + /// + /// 国家全称 + /// + public string LongName { get; set; } + + /// + /// 国家简称 + /// + public string ShortName { get; set; } + + /// + /// 非正式名称 + /// + public string UnofficialNames { get; set; } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Attributes/DomainAttribute.cs b/src/backend/NetAdmin.Infrastructure/Attributes/DomainAttribute.cs new file mode 100644 index 00000000..5ce02505 --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/Attributes/DomainAttribute.cs @@ -0,0 +1,13 @@ +namespace NetAdmin.Infrastructure.Attributes; + +/// +/// 域名特性 +/// +[AttributeUsage(AttributeTargets.Field | AttributeTargets.Enum)] +public sealed class DomainAttribute : Attribute +{ + /// + /// 主机名称 + /// + public string HostName { get; init; } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Dependency/ApiClientOptions.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Dependency/ApiClientOptions.cs new file mode 100644 index 00000000..e2294468 --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Dependency/ApiClientOptions.cs @@ -0,0 +1,17 @@ +namespace NetAdmin.Infrastructure.Configuration.Dependency; + +/// +/// API客户端基础选项 +/// +public abstract record ApiClientOptions : OptionAbstraction +{ + /// + /// 网关地址 + /// + public string Gateway { get; set; } + + /// + /// 密钥 + /// + public string Token { get; set; } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/OptionAbstraction.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Dependency/OptionAbstraction.cs similarity index 66% rename from src/backend/NetAdmin.Infrastructure/Configuration/Options/OptionAbstraction.cs rename to src/backend/NetAdmin.Infrastructure/Configuration/Dependency/OptionAbstraction.cs index bf9cca15..880bdad4 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/OptionAbstraction.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Dependency/OptionAbstraction.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Infrastructure.Configuration.Options; +namespace NetAdmin.Infrastructure.Configuration.Dependency; /// /// 选项抽象基类 diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/CaptchaOptions.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Options/CaptchaOptions.cs index 5f7257db..7e362cf9 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/CaptchaOptions.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Options/CaptchaOptions.cs @@ -1,3 +1,5 @@ +using NetAdmin.Infrastructure.Configuration.Dependency; + namespace NetAdmin.Infrastructure.Configuration.Options; /// diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/DatabaseOptions.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Options/DatabaseOptions.cs index 469449f6..ea46cecf 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/DatabaseOptions.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Options/DatabaseOptions.cs @@ -1,3 +1,4 @@ +using NetAdmin.Infrastructure.Configuration.Dependency; using DataType = FreeSql.DataType; namespace NetAdmin.Infrastructure.Configuration.Options; diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/RedisOptions.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Options/RedisOptions.cs index dc92a1d5..dfafd920 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/RedisOptions.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Options/RedisOptions.cs @@ -1,3 +1,5 @@ +using NetAdmin.Infrastructure.Configuration.Dependency; + namespace NetAdmin.Infrastructure.Configuration.Options; /// diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/UploadOptions.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Options/UploadOptions.cs index 2d4256b0..7dba5c74 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/UploadOptions.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Options/UploadOptions.cs @@ -1,3 +1,5 @@ +using NetAdmin.Infrastructure.Configuration.Dependency; + namespace NetAdmin.Infrastructure.Configuration.Options; /// diff --git a/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs b/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs index bbca647f..824894cb 100644 --- a/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs +++ b/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs @@ -74,14 +74,10 @@ public static class Chars public const string FLG_HTTP_METHOD_PUT = "PUT"; public const string FLG_HTTP_METHOD_TRACE = "TRACE"; public const string FLG_PATH_API_METRICS = "metrics"; - - public const string FLG_PATH_API_RPOBE = "api/probe"; - public const string FLG_PATH_API_SYS_USER_LOGIN_BY_PWD = "api/sys/user/login.by.pwd"; - public const string FLG_PATH_WEBSOCKET_PREFIX = "ws"; - public const string FLG_RANDOM_UNAME_PWD = "VcXlp7WY"; - public const string FLG_REDIS_INSTANCE_DATA_CACHE = "DataCache"; - public const string FLG_SNOWFLAKE_WORK_ID = "SNOWFLAKE_WORK_ID"; - public const string FLG_SYSTEM_PREFIX = "sc_"; + public const string FLG_PATH_API_RPOBE = "api/probe"; + public const string FLG_PATH_WEBSOCKET_PREFIX = "ws"; + public const string FLG_REDIS_INSTANCE_DATA_CACHE = "DataCache"; + public const string FLG_SNOWFLAKE_WORK_ID = "SNOWFLAKE_WORK_ID"; public const string FLGL_HTTP_HEADER_VALUE_UA_MOBILE = "Mozilla/5.0 (Linux; Android 9; Redmi Note 8 Pro Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.96 Mobile Safari/537.36"; diff --git a/src/backend/NetAdmin.Infrastructure/Constant/Numbers.cs b/src/backend/NetAdmin.Infrastructure/Constant/Numbers.cs index 56f1f153..b2360c87 100644 --- a/src/backend/NetAdmin.Infrastructure/Constant/Numbers.cs +++ b/src/backend/NetAdmin.Infrastructure/Constant/Numbers.cs @@ -10,26 +10,14 @@ namespace NetAdmin.Infrastructure.Constant; /// public static class Numbers { - public const int DEF_PAGE_SIZE_QUERY = 20; // 分页查询默认的页容量 - public const long DEF_SORT_VAL = 100; // 排序默认值 - - public const int HTTP_STATUS_BIZ_FAIL = 900; // Http状态码-业务异常 - public const long ID_DIC_CATALOG_GEO_AREA = 379794295185413; // 唯一编号：字典目录-行政区划字典 - - public const int MAX_LIMIT_BULK_REQ = 100; // 最大限制：批量请求数 - public const int MAX_LIMIT_EXPORT = 10000; // 最大限制：导出为CSV文件的条数 - public const int MAX_LIMIT_QUERY = 1000; // 最大限制：非分页查询条数 - public const int MAX_LIMIT_QUERY_PAGE_NO = 10000; // 最大限制：分页查询页码 - public const int MAX_LIMIT_QUERY_PAGE_SIZE = 100; // 最大限制：分页查询页容量 - public const int MAX_LIMIT_RETRY_CNT_REDIS_LOCK = 10; // 最大限制：Redis锁重试次数 - public const int REQUEST_LOG_BUFF_SIZE = 10; // 请求日志缓冲区大小 - public const int SCHEDULED_JOB_PARALLEL_NUM = 5; // 计划作业并发数 - public const int SECS_CACHE_CHART = 300; // 秒：缓存时间-仪表 - public const int SECS_CACHE_DEFAULT = 60; // 秒：缓存时间-默认 - public const int SECS_CACHE_DIC_CATALOG_CODE = 300; // 秒：缓存时间-字典配置-目录代码 - public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 秒：缓存时间-通过用户编号登录的用户信息 - public const int SECS_REDIS_LOCK_EXPIRY = 60; // 秒：Redis锁过期时间 - public const int SECS_REDIS_LOCK_RETRY_DELAY = 1; // 秒：Redis锁重试间隔 - public const int SECS_TIMEOUT_HTTP_CLIENT = 15; // 秒：超时时间-默认HTTP客户端 - public const int SECS_TIMEOUT_JOB = 600; // 秒：超时时间-作业 + public const int DEF_PAGE_SIZE_QUERY = 20; // 默认值：分页查询页容量 + public const int HTTP_STATUS_BIZ_FAIL = 900; // HTTP状态码：业务异常 + public const int MAX_LIMIT_BULK_REQ = 100; // 最大限制：批量请求数 + public const int MAX_LIMIT_EXPORT = 50000; // 最大限制：导出为CSV文件的条数 + public const int MAX_LIMIT_QUERY = 1000; // 最大限制：非分页查询条数 + public const int MAX_LIMIT_QUERY_PAGE_NO = 10000; // 最大限制：分页查询页码 + public const int MAX_LIMIT_QUERY_PAGE_SIZE = 100; // 最大限制：分页查询页容量 + public const int MAX_LIMIT_RETRY_CNT_REDIS_LOCK = 10; // 最大限制：Redis锁重试次数 + public const int SECS_REDIS_LOCK_EXPIRY = 60; // 秒：Redis锁过期时间 + public const int SECS_REDIS_LOCK_RETRY_DELAY = 1; // 秒：Redis锁重试间隔 } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Enums/Countries.cs b/src/backend/NetAdmin.Infrastructure/Enums/Countries.cs new file mode 100644 index 00000000..9074ed34 --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/Enums/Countries.cs @@ -0,0 +1,2581 @@ +// ReSharper disable UnusedMember.Global + +#pragma warning disable RCS1154 + +namespace NetAdmin.Infrastructure.Enums; + +/// +/// 世界各国 +/// +/// +/// ISO3166-1 +/// +[Export] +public enum Countries +{ + /// + /// 多米尼加 + /// + [Country(CallingCode = 1, CallingSubCode = "809,829,849", Alpha3 = "DOM", ShortName = "Dominican Republic", LongName = "The Dominican Republic" + , CurrencyCode = "DOP", Languages = "es" + , UnofficialNames + = "Dominican Republic|Dominikanische Republik|République Dominicaine|República Dominicana|ドミニカ共和国|Dominicaanse Republiek|多米尼加")] + [ResourceDescription(nameof(Ln.多米尼加))] + DO = 214 + + , + + /// + /// 波多黎各 + /// + [Country(CallingCode = 1, CallingSubCode = "787,939", Alpha3 = "PRI", ShortName = "Puerto Rico", LongName = "The Commonwealth of Puerto Rico" + , CurrencyCode = "USD", Languages = "es|en", UnofficialNames = "Puerto Rico|プエルトリコ|波多黎各")] + [ResourceDescription(nameof(Ln.波多黎各))] + PR = 630 + + , + + /// + /// 牙买加 + /// + [Country(CallingCode = 1, CallingSubCode = "658,876", Alpha3 = "JAM", ShortName = "Jamaica", LongName = "Jamaica", CurrencyCode = "JMD" + , Languages = "en", UnofficialNames = "Jamaica|Jamaika|Jamaïque|ジャマイカ|牙买加")] + [ResourceDescription(nameof(Ln.牙买加))] + JM = 388 + + , + + /// + /// 圣基茨和尼维斯 + /// + [Country(CallingCode = 1, CallingSubCode = "869", Alpha3 = "KNA", ShortName = "Saint Kitts and Nevis", LongName = "Saint Kitts and Nevis" + , CurrencyCode = "XCD", Languages = "en" + , UnofficialNames + = "Saint Kitts and Nevis|Föderation St. Kitts und Nevis|Saint Kitts et Nevis|Saint Kitts y Nevis|セントクリストファー・ネイビス|Saint Kitts en Nevis|St. Kitts and Nevis|St Kitts and Nevis|圣基茨和尼维斯")] + [ResourceDescription(nameof(Ln.圣基茨和尼维斯))] + KN = 659 + + , + + /// + /// 特立尼达和多巴哥 + /// + [Country(CallingCode = 1, CallingSubCode = "868", Alpha3 = "TTO", ShortName = "Trinidad and Tobago" + , LongName = "The Republic of Trinidad and Tobago", CurrencyCode = "TTD", Languages = "en" + , UnofficialNames = "Trinidad and Tobago|Trinidad und Tobago|Trinité et Tobago|Trinidad y Tobago|トリニダード・トバゴ|Trinidad en Tobago|特立尼达和多巴哥")] + [ResourceDescription(nameof(Ln.特立尼达和多巴哥))] + TT = 780 + + , + + /// + /// 圣文森特和格林纳丁斯 + /// + [Country(CallingCode = 1, CallingSubCode = "784", Alpha3 = "VCT", ShortName = "Saint Vincent and the Grenadines" + , LongName = "Saint Vincent and the Grenadines", CurrencyCode = "XCD", Languages = "en" + , UnofficialNames + = "Saint Vincent and the Grenadines|Saint Vincent und die Grenadinen|Saint-Vincent et les Grenadines|San Vicente y Granadinas|セントビンセントおよびグレナディーン諸島|Saint Vincent en de Grenadines|St. Vincent Grenadines|St Vincent Grenadines|圣文森特和格林纳丁斯")] + [ResourceDescription(nameof(Ln.圣文森特和格林纳丁斯))] + VC = 670 + + , + + /// + /// 多米尼克 + /// + [Country(CallingCode = 1, CallingSubCode = "767", Alpha3 = "DMA", ShortName = "Dominica", LongName = "The Commonwealth of Dominica" + , CurrencyCode = "XCD", Languages = "en", UnofficialNames = "Dominica|ドミニカ国|多米尼克")] + [ResourceDescription(nameof(Ln.多米尼克))] + DM = 212 + + , + + /// + /// 圣卢西亚 + /// + [Country(CallingCode = 1, CallingSubCode = "758", Alpha3 = "LCA", ShortName = "Saint Lucia", LongName = "Saint Lucia", CurrencyCode = "XCD" + , Languages = "en", UnofficialNames = "Saint Lucia|Saint-Lucie|Santa Lucía|セントルシア|St. Lucia|St Lucia|圣卢西亚")] + [ResourceDescription(nameof(Ln.圣卢西亚))] + LC = 662 + + , + + /// + /// 荷属圣马丁 + /// + [Country(CallingCode = 1, CallingSubCode = "721", Alpha3 = "SXM", ShortName = "Sint Maarten (Dutch part)", LongName = "Sint Maarten" + , CurrencyCode = "ANG", Languages = "nl|en", UnofficialNames = "Sint Maarten|セント・マーチン島|荷属圣马丁")] + [ResourceDescription(nameof(Ln.荷属圣马丁))] + SX = 534 + + , + + /// + /// 美属萨摩亚 + /// + [Country(CallingCode = 1, CallingSubCode = "684", Alpha3 = "ASM", ShortName = "American Samoa", LongName = "The Territory of American Samoa" + , CurrencyCode = "USD", Languages = "en|sm" + , UnofficialNames = "American Samoa|Amerikanisch-Samoa|Samoa américaines|Samoa Americana|アメリカ領サモア|Amerikaans Samoa|美属萨摩亚")] + [ResourceDescription(nameof(Ln.美属萨摩亚))] + AS = 016 + + , + + /// + /// 关岛 + /// + [Country(CallingCode = 1, CallingSubCode = "671", Alpha3 = "GUM", ShortName = "Guam", LongName = "The Territory of Guam", CurrencyCode = "USD" + , Languages = "en|ch|es", UnofficialNames = "Guam|グアム|关岛")] + [ResourceDescription(nameof(Ln.关岛))] + GU = 316 + + , + + /// + /// 北马里亚纳群岛 + /// + [Country(CallingCode = 1, CallingSubCode = "670", Alpha3 = "MNP", ShortName = "Northern Mariana Islands" + , LongName = "The Commonwealth of the Northern Mariana Islands", CurrencyCode = "USD", Languages = "en|ch" + , UnofficialNames + = "Northern Mariana Islands|Nördliche Marianen|Mariannes du Nord|Islas Marianas del Norte|北マリアナ諸島|Noordelijke Marianeneilanden|北马里亚纳群岛")] + [ResourceDescription(nameof(Ln.北马里亚纳群岛))] + MP = 580 + + , + + /// + /// 蒙特塞拉特 + /// + [Country(CallingCode = 1, CallingSubCode = "664", Alpha3 = "MSR", ShortName = "Montserrat", LongName = "Montserrat", CurrencyCode = "XCD" + , Languages = "en", UnofficialNames = "Montserrat|モントセラト|蒙特塞拉特")] + [ResourceDescription(nameof(Ln.蒙特塞拉特))] + MS = 500 + + , + + /// + /// 特克斯和凯科斯群岛 + /// + [Country(CallingCode = 1, CallingSubCode = "649", Alpha3 = "TCA", ShortName = "Turks and Caicos Islands" + , LongName = "The Turks and Caicos Islands", CurrencyCode = "USD", Languages = "en" + , UnofficialNames + = "Turks and Caicos Islands|Turks- und Caicosinseln|Îles Turks et Caïcos|Islas Turks y Caicos|タークス・カイコス諸島|Turks- en Caicoseilanden|Turks and Caicos|特克斯和凯科斯群岛")] + [ResourceDescription(nameof(Ln.特克斯和凯科斯群岛))] + TC = 796 + + , + + /// + /// 格林纳达 + /// + [Country(CallingCode = 1, CallingSubCode = "473", Alpha3 = "GRD", ShortName = "Grenada", LongName = "Grenada", CurrencyCode = "XCD" + , Languages = "en", UnofficialNames = "Grenada|グレナダ|格林纳达")] + [ResourceDescription(nameof(Ln.格林纳达))] + GD = 308 + + , + + /// + /// 百慕大 + /// + [Country(CallingCode = 1, CallingSubCode = "441", Alpha3 = "BMU", ShortName = "Bermuda", LongName = "Bermuda", CurrencyCode = "BMD" + , Languages = "en", UnofficialNames = "Bermuda|Bermudes|Bermudas|バミューダ|百慕大")] + [ResourceDescription(nameof(Ln.百慕大))] + BM = 060 + + , + + /// + /// 开曼群岛 + /// + [Country(CallingCode = 1, CallingSubCode = "345", Alpha3 = "CYM", ShortName = "Cayman Islands", LongName = "The Cayman Islands" + , CurrencyCode = "KYD", Languages = "en" + , UnofficialNames = "Cayman Islands|Kaimaninseln|Îles Caïmans|Islas Caimán|ケイマン諸島|Caymaneilanden|开曼群岛")] + [ResourceDescription(nameof(Ln.开曼群岛))] + KY = 136 + + , + + /// + /// 美属维尔京群岛 + /// + [Country(CallingCode = 1, CallingSubCode = "340", Alpha3 = "VIR", ShortName = "Virgin Islands (U.S.)" + , LongName = "The Virgin Islands of the United States", CurrencyCode = "USD", Languages = "en" + , UnofficialNames + = "Virgin Islands of the United States|Amerikanische Jungferninseln|Îles Vierges américaines|Islas Vírgenes de los Estados Unidos|アメリカ領ヴァージン諸島|Amerikaanse Maagdeneilanden|Virgin Islands (U.S.)|United States Virgin Islands|U.S. Virgin Islands|美属维尔京群岛")] + [ResourceDescription(nameof(Ln.美属维尔京群岛))] + VI = 850 + + , + + /// + /// 英属维尔京群岛 + /// + [Country(CallingCode = 1, CallingSubCode = "284", Alpha3 = "VGB", ShortName = "Virgin Islands (British)", LongName = "The Virgin Islands" + , CurrencyCode = "USD", Languages = "en" + , UnofficialNames + = "British Virgin Islands|Britische Jungferninseln|Îles Vierges britanniques|Islas Vírgenes del Reino Unido|イギリス領ヴァージン諸島|Britse Maagdeneilanden|Virgin Islands (British)|英属维尔京群岛")] + [ResourceDescription(nameof(Ln.英属维尔京群岛))] + VG = 092 + + , + + /// + /// 安提瓜和巴布达 + /// + [Country(CallingCode = 1, CallingSubCode = "268", Alpha3 = "ATG", ShortName = "Antigua and Barbuda", LongName = "Antigua and Barbuda" + , CurrencyCode = "XCD", Languages = "en" + , UnofficialNames + = "Antigua and Barbuda|Antigua und Barbuda|Antigua et Barbuda|Antigua y Barbuda|アンティグア・バーブーダ|Antigua en Barbuda|安提瓜和巴布达")] + [ResourceDescription(nameof(Ln.安提瓜和巴布达))] + AG = 028 + + , + + /// + /// 安圭拉 + /// + [Country(CallingCode = 1, CallingSubCode = "264", Alpha3 = "AIA", ShortName = "Anguilla", LongName = "Anguilla", CurrencyCode = "XCD" + , Languages = "en", UnofficialNames = "Anguilla|アンギラ|安圭拉")] + [ResourceDescription(nameof(Ln.安圭拉))] + AI = 660 + + , + + /// + /// 巴巴多斯 + /// + [Country(CallingCode = 1, CallingSubCode = "246", Alpha3 = "BRB", ShortName = "Barbados", LongName = "Barbados", CurrencyCode = "BBD" + , Languages = "en", UnofficialNames = "Barbade|Barbados|バルバドス|巴巴多斯")] + [ResourceDescription(nameof(Ln.巴巴多斯))] + BB = 052 + + , + + /// + /// 巴哈马 + /// + [Country(CallingCode = 1, CallingSubCode = "242", Alpha3 = "BHS", ShortName = "Bahamas", LongName = "The Commonwealth of The Bahamas" + , CurrencyCode = "BSD", Languages = "en", UnofficialNames = "The Bahamas|バハマ|巴哈马")] + [ResourceDescription(nameof(Ln.巴哈马))] + BS = 044 + + , + + /// + /// 加拿大 + /// + [Country(CallingCode = 1, Alpha3 = "CAN", ShortName = "Canada", LongName = "Canada", CurrencyCode = "CAD", Languages = "en|fr" + , UnofficialNames = "Canada|Kanada|Canadá|カナダ|加拿大")] + [ResourceDescription(nameof(Ln.加拿大))] + CA = 124 + + , + + /// + /// 美国本土外小岛屿 + /// + [Country(CallingCode = 1, Alpha3 = "UMI", ShortName = "United States Minor Outlying Islands", LongName = "United States Minor Outlying Islands" + , CurrencyCode = "USD", Languages = "en" + , UnofficialNames + = "United States Minor Outlying Islands|US-Amerikanische Hoheitsgebiete|Dépendances américaines|Islas menores de Estados Unidos|合衆国領有小離島|Kleine afgelegen eilanden van de Verenigde Staten|美国本土外小岛屿")] + [ResourceDescription(nameof(Ln.美国本土外小岛屿))] + UM = 581 + + , + + /// + /// 美国 + /// + [Country(CallingCode = 1, Alpha3 = "USA", ShortName = "United States of America", LongName = "The United States of America", CurrencyCode = "USD" + , Languages = "en" + , UnofficialNames + = "United States|USA|Vereinigte Staaten von Amerika|États-Unis|Estados Unidos|アメリカ合衆国|Verenigde Staten|Соединенные Штаты Америки|美国" + , IsPreferred = true)] + [ResourceDescription(nameof(Ln.美国))] + US = 840 + + , + + /// + /// 哈萨克斯坦 + /// + [Country(CallingCode = 7, CallingSubCode = "6,7", Alpha3 = "KAZ", ShortName = "Kazakhstan", LongName = "The Republic of Kazakhstan" + , CurrencyCode = "KZT", Languages = "kk|ru", UnofficialNames = "Kazakhstan|Kasachstan|Kazajistán|カザフスタン|Kazachstan|哈萨克斯坦")] + [ResourceDescription(nameof(Ln.哈萨克斯坦))] + KZ = 398 + + , + + /// + /// 俄罗斯 + /// + [Country(CallingCode = 7, Alpha3 = "RUS", ShortName = "Russian Federation", LongName = "The Russian Federation", CurrencyCode = "RUB" + , Languages = "ru", UnofficialNames = "Russia|Russland|Russie|Rusia|ロシア連邦|Rusland|Россия|Расія|俄罗斯", IsPreferred = true)] + [ResourceDescription(nameof(Ln.俄罗斯))] + RU = 643 + + , + + /// + /// 埃及 + /// + [Country(CallingCode = 20, Alpha3 = "EGY", ShortName = "Egypt", LongName = "The Arab Republic of Egypt", CurrencyCode = "EGP", Languages = "ar" + , UnofficialNames = "Egypt|مصر|Ägypten|Égypte|Egipto|エジプト|Egypte|埃及")] + [ResourceDescription(nameof(Ln.埃及))] + EG = 818 + + , + + /// + /// 南非 + /// + [Country(CallingCode = 27, Alpha3 = "ZAF", ShortName = "South Africa", LongName = "The Republic of South Africa", CurrencyCode = "ZAR" + , Languages = "af|en|nr|st|ss|tn|ts|ve|xh|zu" + , UnofficialNames = "South Africa|Republik Südafrika|Afrique du Sud|República de Sudáfrica|南アフリカ|Zuid-Afrika|南非")] + [ResourceDescription(nameof(Ln.南非))] + ZA = 710 + + , + + /// + /// 希腊 + /// + [Country(CallingCode = 30, Alpha3 = "GRC", ShortName = "Greece", LongName = "The Hellenic Republic", CurrencyCode = "EUR", Languages = "el" + , UnofficialNames = "Greece|Griechenland|Grèce|Grecia|ギリシャ|Griekenland|希腊")] + [ResourceDescription(nameof(Ln.希腊))] + GR = 300 + + , + + /// + /// 荷兰 + /// + [Country(CallingCode = 31, Alpha3 = "NLD", ShortName = "Netherlands", LongName = "The Kingdom of the Netherlands", CurrencyCode = "EUR" + , Languages = "nl|fy", UnofficialNames = "Netherlands|The Netherlands|Niederlande|Pays-Bas|Países Bajos|オランダ|Nederland|Нидерландия|荷兰")] + [ResourceDescription(nameof(Ln.荷兰))] + NL = 528 + + , + + /// + /// 比利时 + /// + [Country(CallingCode = 32, Alpha3 = "BEL", ShortName = "Belgium", LongName = "The Kingdom of Belgium", CurrencyCode = "EUR" + , Languages = "nl|fr|de", UnofficialNames = "Belgium|Belgien|Belgique|Bélgica|ベルギー|België|比利时")] + [ResourceDescription(nameof(Ln.比利时))] + BE = 056 + + , + + /// + /// 法国 + /// + [Country(CallingCode = 33, Alpha3 = "FRA", ShortName = "France", LongName = "The French Republic", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "France|Frankreich|the French Republic|フランス|Frankrijk|Francia|法国")] + [ResourceDescription(nameof(Ln.法国))] + FR = 250 + + , + + /// + /// 西班牙 + /// + [Country(CallingCode = 34, Alpha3 = "ESP", ShortName = "Spain", LongName = "The Kingdom of Spain", CurrencyCode = "EUR", Languages = "es" + , UnofficialNames = "Spain|Spanien|Espagne|España|スペイン|Spanje|西班牙")] + [ResourceDescription(nameof(Ln.西班牙))] + ES = 724 + + , + + /// + /// 匈牙利 + /// + [Country(CallingCode = 36, Alpha3 = "HUN", ShortName = "Hungary", LongName = "Hungary", CurrencyCode = "HUF", Languages = "hu" + , UnofficialNames = "Hungary|Ungarn|Hongrie|Hungría|ハンガリー|Hongarije|匈牙利")] + [ResourceDescription(nameof(Ln.匈牙利))] + HU = 348 + + , + + /// + /// 意大利 + /// + [Country(CallingCode = 39, Alpha3 = "ITA", ShortName = "Italy", LongName = "The Italian Republic", CurrencyCode = "EUR", Languages = "it" + , UnofficialNames = "Italy|Italien|Italie|Italia|イタリア|Italië|意大利", IsPreferred = true)] + [ResourceDescription(nameof(Ln.意大利))] + IT = 380 + + , + + /// + /// 罗马尼亚 + /// + [Country(CallingCode = 40, Alpha3 = "ROU", ShortName = "Romania", LongName = "Romania", CurrencyCode = "RON", Languages = "ro" + , UnofficialNames = "Romania|Rumänien|Roumanie|Rumania|ルーマニア|Roemenië|罗马尼亚")] + [ResourceDescription(nameof(Ln.罗马尼亚))] + RO = 642 + + , + + /// + /// 瑞士 + /// + [Country(CallingCode = 41, Alpha3 = "CHE", ShortName = "Switzerland", LongName = "The Swiss Confederation", CurrencyCode = "CHF" + , Languages = "de|fr|it", UnofficialNames = "Switzerland|Schweiz|Suisse|Suiza|スイス|Zwitserland|瑞士")] + [ResourceDescription(nameof(Ln.瑞士))] + CH = 756 + + , + + /// + /// 奥地利 + /// + [Country(CallingCode = 43, Alpha3 = "AUT", ShortName = "Austria", LongName = "The Republic of Austria", CurrencyCode = "EUR", Languages = "de" + , UnofficialNames = "Austria|Österreich|Autriche|オーストリア|Oostenrijk|奥地利")] + [ResourceDescription(nameof(Ln.奥地利))] + AT = 040 + + , + + /// + /// 英国 + /// + [Country(CallingCode = 44, Alpha3 = "GBR", ShortName = "United Kingdom of Great Britain and Northern Ireland" + , LongName = "The United Kingdom of Great Britain and Northern Ireland", CurrencyCode = "GBP", Languages = "en" + , UnofficialNames + = "United Kingdom|The United Kingdom|England|Großbritannien|Vereinigtes Königreich|Royaume-Uni|Reino Unido|イギリス|Verenigd Koninkrijk|Great Britain (UK)|UK|Великобритания|Velká Británie|İngiltere|Великобританія|英国" + , IsPreferred = true)] + [ResourceDescription(nameof(Ln.英国))] + GB = 826 + + , + + /// + /// 根西 + /// + [Country(CallingCode = 44, CallingSubCode = "1481", Alpha3 = "GGY", ShortName = "Guernsey", LongName = "The Bailiwick of Guernsey" + , CurrencyCode = "GBP", Languages = "en|fr" + , UnofficialNames = "Guernsey and Alderney|Guernsey und Alderney|Guernsey et Alderney|Guernsey y Alderney|ガーンジー|Guernsey|根西")] + [ResourceDescription(nameof(Ln.根西))] + GG = 831 + + , + + /// + /// 马恩岛 + /// + [Country(CallingCode = 44, CallingSubCode = "1624", Alpha3 = "IMN", ShortName = "Isle of Man", LongName = "The Isle of Man", CurrencyCode = "GBP" + , Languages = "en|gv", UnofficialNames = "Isle of Man|Insel Man|Île de Man|Isla de Man|マン島|马恩岛")] + [ResourceDescription(nameof(Ln.马恩岛))] + IM = 833 + + , + + /// + /// 泽西 + /// + [Country(CallingCode = 44, CallingSubCode = "1534", Alpha3 = "JEY", ShortName = "Jersey", LongName = "The Bailiwick of Jersey" + , CurrencyCode = "GBP", Languages = "en|fr", UnofficialNames = "Jersey|ジャージー|泽西")] + [ResourceDescription(nameof(Ln.泽西))] + JE = 832 + + , + + /// + /// 丹麦 + /// + [Country(CallingCode = 45, Alpha3 = "DNK", ShortName = "Denmark", LongName = "The Kingdom of Denmark", CurrencyCode = "DKK", Languages = "da" + , UnofficialNames = "Denmark|Dänemark|Danemark|Dinamarca|デンマーク|Denemarken|丹麦")] + [ResourceDescription(nameof(Ln.丹麦))] + DK = 208 + + , + + /// + /// 瑞典 + /// + [Country(CallingCode = 46, Alpha3 = "SWE", ShortName = "Sweden", LongName = "The Kingdom of Sweden", CurrencyCode = "SEK", Languages = "sv" + , UnofficialNames = "Sweden|Schweden|Suède|Suecia|スウェーデン|Zweden|瑞典")] + [ResourceDescription(nameof(Ln.瑞典))] + SE = 752 + + , + + /// + /// 斯瓦尔巴和扬马延 + /// + [Country(CallingCode = 47, CallingSubCode = "79", Alpha3 = "SJM", ShortName = "Svalbard and Jan Mayen", LongName = "Svalbard and Jan Mayen" + , CurrencyCode = "NOK", Languages = "no" + , UnofficialNames + = "Svalbard and Jan Mayen|Svalbard und Jan Mayen|Îles Svalbard et Jan Mayen|Islas Svalbard y Jan Mayen|スヴァールバル諸島およびヤンマイエン島|Svalbard en Jan Mayen|斯瓦尔巴和扬马延")] + [ResourceDescription(nameof(Ln.斯瓦尔巴和扬马延))] + SJ = 744 + + , + + /// + /// 布韦岛 + /// + [Country(CallingCode = 47, Alpha3 = "BVT", ShortName = "Bouvet Island", LongName = "Bouvet Island", CurrencyCode = "NOK", Languages = "" + , UnofficialNames = "Bouvet Island|Bouvetinsel|ブーベ島|Bouveteiland|布韦岛")] + [ResourceDescription(nameof(Ln.布韦岛))] + BV = 074 + + , + + /// + /// 挪威 + /// + [Country(CallingCode = 47, Alpha3 = "NOR", ShortName = "Norway", LongName = "The Kingdom of Norway", CurrencyCode = "NOK", Languages = "nb|nn" + , UnofficialNames = "Norway|Norwegen|Norvège|Noruega|ノルウェー|Noorwegen|挪威", IsPreferred = true)] + [ResourceDescription(nameof(Ln.挪威))] + NO = 578 + + , + + /// + /// 波兰 + /// + [Country(CallingCode = 48, Alpha3 = "POL", ShortName = "Poland", LongName = "The Republic of Poland", CurrencyCode = "PLN", Languages = "pl" + , UnofficialNames = "Poland|Polen|Pologne|Polonia|ポーランド|波兰")] + [ResourceDescription(nameof(Ln.波兰))] + PL = 616 + + , + + /// + /// 德国 + /// + [Country(CallingCode = 49, Alpha3 = "DEU", ShortName = "Germany", LongName = "The Federal Republic of Germany", CurrencyCode = "EUR" + , Languages = "de", UnofficialNames = "Germany|Deutschland|Allemagne|Alemania|ドイツ|Duitsland|德国")] + [ResourceDescription(nameof(Ln.德国))] + DE = 276 + + , + + /// + /// 秘鲁 + /// + [Country(CallingCode = 51, Alpha3 = "PER", ShortName = "Peru", LongName = "The Republic of Perú", CurrencyCode = "PEN", Languages = "es" + , UnofficialNames = "Peru|Pérou|Perú|ペルー|秘鲁")] + [ResourceDescription(nameof(Ln.秘鲁))] + PE = 604 + + , + + /// + /// 墨西哥 + /// + [Country(CallingCode = 52, Alpha3 = "MEX", ShortName = "Mexico", LongName = "The United Mexican States", CurrencyCode = "MXN", Languages = "es" + , UnofficialNames = "Mexico|Mexiko|Mexique|México|メキシコ|墨西哥")] + [ResourceDescription(nameof(Ln.墨西哥))] + MX = 484 + + , + + /// + /// 古巴 + /// + [Country(CallingCode = 53, Alpha3 = "CUB", ShortName = "Cuba", LongName = "The Republic of Cuba", CurrencyCode = "CUP", Languages = "es" + , UnofficialNames = "Cuba|Kuba|キューバ|古巴")] + [ResourceDescription(nameof(Ln.古巴))] + CU = 192 + + , + + /// + /// 阿根廷 + /// + [Country(CallingCode = 54, Alpha3 = "ARG", ShortName = "Argentina", LongName = "The Argentine Republic", CurrencyCode = "ARS", Languages = "es|gn" + , UnofficialNames = "Argentina|Argentinien|Argentine|アルゼンチン|Argentinië|阿根廷")] + [ResourceDescription(nameof(Ln.阿根廷))] + AR = 032 + + , + + /// + /// 巴西 + /// + [Country(CallingCode = 55, Alpha3 = "BRA", ShortName = "Brazil", LongName = "The Federative Republic of Brazil", CurrencyCode = "BRL" + , Languages = "pt", UnofficialNames = "Brazil|Brasilien|Brésil|Brasil|ブラジル|Brazilië|巴西")] + [ResourceDescription(nameof(Ln.巴西))] + BR = 076 + + , + + /// + /// 智利 + /// + [Country(CallingCode = 56, Alpha3 = "CHL", ShortName = "Chile", LongName = "The Republic of Chile", CurrencyCode = "CLP", Languages = "es" + , UnofficialNames = "Chile|チリ|Chili|智利")] + [ResourceDescription(nameof(Ln.智利))] + CL = 152 + + , + + /// + /// 哥伦比亚 + /// + [Country(CallingCode = 57, Alpha3 = "COL", ShortName = "Colombia", LongName = "The Republic of Colombia", CurrencyCode = "COP", Languages = "es" + , UnofficialNames = "Colombia|Kolumbien|Colombie|コロンビア|哥伦比亚")] + [ResourceDescription(nameof(Ln.哥伦比亚))] + CO = 170 + + , + + /// + /// 委内瑞拉 + /// + [Country(CallingCode = 58, Alpha3 = "VEN", ShortName = "Venezuela (Bolivarian Republic of)", LongName = "The Bolivarian Republic of Venezuela" + , CurrencyCode = "VES", Languages = "es", UnofficialNames = "Venezuela|ベネズエラ・ボリバル共和国|委内瑞拉")] + [ResourceDescription(nameof(Ln.委内瑞拉))] + VE = 862 + + , + + /// + /// 马来西亚 + /// + [Country(CallingCode = 60, Alpha3 = "MYS", ShortName = "Malaysia", LongName = "Malaysia", CurrencyCode = "MYR", Languages = "ms|en" + , UnofficialNames = "Malaysia|Malaisie|Malasia|マレーシア|Maleisië|马来西亚")] + [ResourceDescription(nameof(Ln.马来西亚))] + MY = 458 + + , + + /// + /// 澳大利亚 + /// + [Country(CallingCode = 61, Alpha3 = "AUS", ShortName = "Australia", LongName = "The Commonwealth of Australia", CurrencyCode = "AUD" + , Languages = "en", UnofficialNames = "Australia|Australien|Australie|オーストラリア|Australië|澳洲|澳大利亚", IsPreferred = true)] + [ResourceDescription(nameof(Ln.澳大利亚))] + AU = 036 + + , + + /// + /// 科科斯基林群岛 + /// + [Country(CallingCode = 61, CallingSubCode = "89162", Alpha3 = "CCK", ShortName = "Cocos (Keeling) Islands" + , LongName = "The Territory of Cocos (Keeling) Islands", CurrencyCode = "AUD", Languages = "en" + , UnofficialNames = "Cocos (Keeling) Islands|Kokosinseln|ココス（キーリング）諸島|Cocoseilanden|科科斯基林群岛")] + [ResourceDescription(nameof(Ln.科科斯基林群岛))] + CC = 166 + + , + + /// + /// 圣诞岛 + /// + [Country(CallingCode = 61, CallingSubCode = "89164", Alpha3 = "CXR", ShortName = "Christmas Island" + , LongName = "The Territory of Christmas Island", CurrencyCode = "AUD", Languages = "en|zh|ms" + , UnofficialNames = "Christmas Island|Weihnachtsinsel|クリスマス島|Christmaseiland|圣诞岛")] + [ResourceDescription(nameof(Ln.圣诞岛))] + CX = 162 + + , + + /// + /// 赫德岛和麦克唐纳群岛 + /// + [Country(CallingCode = 672, CallingSubCode = "1", Alpha3 = "HMD", ShortName = "Heard Island and McDonald Islands" + , LongName = "The Territory of Heard Island and McDonald Islands", CurrencyCode = "AUD", Languages = "en" + , UnofficialNames + = "Heard and McDonald Islands|Heard und die McDonaldinseln|ハード島とマクドナルド諸島|Heard- en McDonaldeilanden|Heard Island and McDonald Islands|赫德岛和麦克唐纳群岛")] + [ResourceDescription(nameof(Ln.赫德岛和麦克唐纳群岛))] + HM = 334 + + , + + /// + /// 印度尼西亚 + /// + [Country(CallingCode = 62, Alpha3 = "IDN", ShortName = "Indonesia", LongName = "The Republic of Indonesia", CurrencyCode = "IDR", Languages = "id" + , UnofficialNames = "Indonesia|Indonesien|Indonésie|インドネシア|Indonesië|印度尼西亚")] + [ResourceDescription(nameof(Ln.印度尼西亚))] + ID = 360 + + , + + /// + /// 菲律宾 + /// + [Country(CallingCode = 63, Alpha3 = "PHL", ShortName = "Philippines", LongName = "The Republic of the Philippines", CurrencyCode = "PHP" + , Languages = "tl|en", UnofficialNames = "Philippines|Philippinen|Filipinas|フィリピン|Filipijnen|菲律宾")] + [ResourceDescription(nameof(Ln.菲律宾))] + PH = 608 + + , + + /// + /// 新西兰 + /// + [Country(CallingCode = 64, Alpha3 = "NZL", ShortName = "New Zealand", LongName = "New Zealand", CurrencyCode = "NZD", Languages = "en" + , UnofficialNames = "New Zealand|Neuseeland|Nouvelle Zélande|Nueva Zelanda|ニュージーランド|Nieuw-Zeeland|新西兰", IsPreferred = true)] + [ResourceDescription(nameof(Ln.新西兰))] + NZ = 554 + + , + + /// + /// 皮特凯恩群岛 + /// + [Country(CallingCode = 64, Alpha3 = "PCN", ShortName = "Pitcairn", LongName = "The Pitcairn, Henderson, Ducie and Oeno Islands" + , CurrencyCode = "NZD", Languages = "en", UnofficialNames = "Pitcairn|ピトケアン|Pitcairneilanden|Pitcairn Islands|皮特凯恩群岛")] + [ResourceDescription(nameof(Ln.皮特凯恩群岛))] + PN = 612 + + , + + /// + /// 新加坡 + /// + [Country(CallingCode = 65, Alpha3 = "SGP", ShortName = "Singapore", LongName = "The Republic of Singapore", CurrencyCode = "SGD" + , Languages = "en|ms|ta", UnofficialNames = "Singapore|Singapur|Singapour|シンガポール|新加坡")] + [ResourceDescription(nameof(Ln.新加坡))] + SG = 702 + + , + + /// + /// 泰国 + /// + [Country(CallingCode = 66, Alpha3 = "THA", ShortName = "Thailand", LongName = "The Kingdom of Thailand", CurrencyCode = "THB", Languages = "th" + , UnofficialNames = "Thailand|Thaïlande|Tailandia|タイ|ประเทศไทย|泰国")] + [ResourceDescription(nameof(Ln.泰国))] + TH = 764 + + , + + /// + /// 日本 + /// + [Country(CallingCode = 81, Alpha3 = "JPN", ShortName = "Japan", LongName = "Japan", CurrencyCode = "JPY", Languages = "ja" + , UnofficialNames = "Japan|Japon|Japón|日本")] + [ResourceDescription(nameof(Ln.日本))] + JP = 392 + + , + + /// + /// 韩国 + /// + [Country(CallingCode = 82, Alpha3 = "KOR", ShortName = "Korea (Republic of)", LongName = "The Republic of Korea", CurrencyCode = "KRW" + , Languages = "ko" + , UnofficialNames = "South Korea|Korea (South)|Südkorea|Corée du Sud|Corea del Sur|大韓民国|Zuid-Korea|Korea (Republic of)|韩国")] + [ResourceDescription(nameof(Ln.韩国))] + KR = 410 + + , + + /// + /// 越南 + /// + [Country(CallingCode = 84, Alpha3 = "VNM", ShortName = "Viet Nam", LongName = "The Socialist Republic of Viet Nam", CurrencyCode = "VND" + , Languages = "vi", UnofficialNames = "Vietnam|ベトナム|Viet Nam|越南")] + [ResourceDescription(nameof(Ln.越南))] + VN = 704 + + , + + /// + /// 中国 + /// + [Country(CallingCode = 86, Alpha3 = "CHN", ShortName = "China", LongName = "The People's Republic of China", CurrencyCode = "CNY" + , Languages = "zh", UnofficialNames = "China|Chine|中国")] + [ResourceDescription(nameof(Ln.中国))] + CN = 156 + + , + + /// + /// 土耳其 + /// + [Country(CallingCode = 90, Alpha3 = "TUR", ShortName = "Türkiye", LongName = "The Republic of Türkiye", CurrencyCode = "TRY", Languages = "tr" + , UnofficialNames = "Turkey|Türkei|Turquie|Turquía|トルコ|Turkije|土耳其")] + [ResourceDescription(nameof(Ln.土耳其))] + TR = 792 + + , + + /// + /// 印度 + /// + [Country(CallingCode = 91, Alpha3 = "IND", ShortName = "India", LongName = "The Republic of India", CurrencyCode = "INR", Languages = "hi|en" + , UnofficialNames = "India|Indien|Inde|インド|印度")] + [ResourceDescription(nameof(Ln.印度))] + IN = 356 + + , + + /// + /// 巴基斯坦 + /// + [Country(CallingCode = 92, Alpha3 = "PAK", ShortName = "Pakistan", LongName = "The Islamic Republic of Pakistan", CurrencyCode = "PKR" + , Languages = "en|ur", UnofficialNames = "Pakistan|Paquistán|パキスタン|巴基斯坦")] + [ResourceDescription(nameof(Ln.巴基斯坦))] + PK = 586 + + , + + /// + /// 阿富汗 + /// + [Country(CallingCode = 93, Alpha3 = "AFG", ShortName = "Afghanistan", LongName = "The Islamic Republic of Afghanistan", CurrencyCode = "AFN" + , Languages = "ps|uz|tk", UnofficialNames = "Afghanistan|Afganistán|アフガニスタン|阿富汗")] + [ResourceDescription(nameof(Ln.阿富汗))] + AF = 004 + + , + + /// + /// 斯里兰卡 + /// + [Country(CallingCode = 94, Alpha3 = "LKA", ShortName = "Sri Lanka", LongName = "The Democratic Socialist Republic of Sri Lanka" + , CurrencyCode = "LKR", Languages = "si|ta", UnofficialNames = "Sri Lanka|スリランカ|斯里兰卡")] + [ResourceDescription(nameof(Ln.斯里兰卡))] + LK = 144 + + , + + /// + /// 缅甸 + /// + [Country(CallingCode = 95, Alpha3 = "MMR", ShortName = "Myanmar", LongName = "The Republic of the Union of Myanmar", CurrencyCode = "MMK" + , Languages = "my", UnofficialNames = "Myanmar (Burma)|ミャンマー|缅甸")] + [ResourceDescription(nameof(Ln.缅甸))] + MM = 104 + + , + + /// + /// 伊朗 + /// + [Country(CallingCode = 98, Alpha3 = "IRN", ShortName = "Iran (Islamic Republic of)", LongName = "The Islamic Republic of Iran" + , CurrencyCode = "IRR", Languages = "fa" + , UnofficialNames = "Iran|Irán|Iran (Islamic Republic Of)|イラン・イスラム共和国|Islamic Republic of Iran|伊朗")] + [ResourceDescription(nameof(Ln.伊朗))] + IR = 364 + + , + + /// + /// 南苏丹 + /// + [Country(CallingCode = 211, Alpha3 = "SSD", ShortName = "South Sudan", LongName = "The Republic of South Sudan", CurrencyCode = "SSP" + , Languages = "ar|en", UnofficialNames = "South Sudan|Südsudan|南スーダン|Zuid-Soedan|南苏丹")] + [ResourceDescription(nameof(Ln.南苏丹))] + SS = 728 + + , + + /// + /// 西撒哈拉 + /// + [Country(CallingCode = 212, Alpha3 = "ESH", ShortName = "Western Sahara", LongName = "The Sahrawi Arab Democratic Republic", CurrencyCode = "MAD" + , Languages = "es|fr", UnofficialNames = "Western Sahara|الصحراء الغربية|Westsahara|Sahara Occidental|西サハラ|Westelijke Sahara|西撒哈拉")] + [ResourceDescription(nameof(Ln.西撒哈拉))] + EH = 732 + + , + + /// + /// 摩洛哥 + /// + [Country(CallingCode = 212, Alpha3 = "MAR", ShortName = "Morocco", LongName = "The Kingdom of Morocco", CurrencyCode = "MAD", Languages = "ar" + , UnofficialNames = "Morocco|المغرب|Marokko|Maroc|Marruecos|モロッコ|摩洛哥", IsPreferred = true)] + [ResourceDescription(nameof(Ln.摩洛哥))] + MA = 504 + + , + + /// + /// 阿尔及利亚 + /// + [Country(CallingCode = 213, Alpha3 = "DZA", ShortName = "Algeria", LongName = "The People's Democratic Republic of Algeria", CurrencyCode = "DZD" + , Languages = "ar", UnofficialNames = "Algeria|الجزائر|Algerien|Algérie|Argelia|アルジェリア|Algerije|阿尔及利亚")] + [ResourceDescription(nameof(Ln.阿尔及利亚))] + DZ = 012 + + , + + /// + /// 突尼斯 + /// + [Country(CallingCode = 216, Alpha3 = "TUN", ShortName = "Tunisia", LongName = "The Republic of Tunisia", CurrencyCode = "TND", Languages = "ar|fr" + , UnofficialNames = "Tunisia|تونس|Tunesien|Tunisie|Túnez|チュニジア|Tunesië|突尼斯")] + [ResourceDescription(nameof(Ln.突尼斯))] + TN = 788 + + , + + /// + /// 利比亚 + /// + [Country(CallingCode = 218, Alpha3 = "LBY", ShortName = "Libya", LongName = "The State of Libya", CurrencyCode = "LYD", Languages = "ar" + , UnofficialNames = "Libya|ليبيا|Libyen|Libye|Libia|リビア|Libië|Libyan Arab Jamahiriya|利比亚")] + [ResourceDescription(nameof(Ln.利比亚))] + LY = 434 + + , + + /// + /// 冈比亚 + /// + [Country(CallingCode = 220, Alpha3 = "GMB", ShortName = "Gambia", LongName = "The Republic of The Gambia", CurrencyCode = "GMD", Languages = "en" + , UnofficialNames = "The Gambia|ガンビア|冈比亚")] + [ResourceDescription(nameof(Ln.冈比亚))] + GM = 270 + + , + + /// + /// 塞内加尔 + /// + [Country(CallingCode = 221, Alpha3 = "SEN", ShortName = "Senegal", LongName = "The Republic of Senegal", CurrencyCode = "XOF", Languages = "fr" + , UnofficialNames = "Senegal|Sénégal|セネガル|塞内加尔")] + [ResourceDescription(nameof(Ln.塞内加尔))] + SN = 686 + + , + + /// + /// 毛里塔尼亚 + /// + [Country(CallingCode = 222, Alpha3 = "MRT", ShortName = "Mauritania", LongName = "The Islamic Republic of Mauritania", CurrencyCode = "MRU" + , Languages = "ar|fr", UnofficialNames = "Mauritania|موريتانيا|Mauretanien|Mauritanie|モーリタニア|Mauritanië|毛里塔尼亚")] + [ResourceDescription(nameof(Ln.毛里塔尼亚))] + MR = 478 + + , + + /// + /// 马里 + /// + [Country(CallingCode = 223, Alpha3 = "MLI", ShortName = "Mali", LongName = "The Republic of Mali", CurrencyCode = "XOF", Languages = "fr" + , UnofficialNames = "Mali|マリ|马里")] + [ResourceDescription(nameof(Ln.马里))] + ML = 466 + + , + + /// + /// 几内亚 + /// + [Country(CallingCode = 224, Alpha3 = "GIN", ShortName = "Guinea", LongName = "The Republic of Guinea", CurrencyCode = "GNF", Languages = "fr|ff" + , UnofficialNames = "Guinea|Guinée|ギニア|Guinee|几内亚")] + [ResourceDescription(nameof(Ln.几内亚))] + GN = 324 + + , + + /// + /// 科特迪瓦 + /// + [Country(CallingCode = 225, Alpha3 = "CIV", ShortName = "Côte d'Ivoire", LongName = "The Republic of Côte d'Ivoire", CurrencyCode = "XOF" + , Languages = "fr" + , UnofficialNames + = "Côte D'Ivoire|Elfenbeinküste|コートジボワール|Ivoorkust|Cote D'Ivoire (Ivory Coast)|Cote d Ivoire (Ivory Coast)|Ivory Coast|科特迪瓦")] + [ResourceDescription(nameof(Ln.科特迪瓦))] + CI = 384 + + , + + /// + /// 布基纳法索 + /// + [Country(CallingCode = 226, Alpha3 = "BFA", ShortName = "Burkina Faso", LongName = "Burkina Faso", CurrencyCode = "XOF", Languages = "fr|ff" + , UnofficialNames = "Burkina Faso|ブルキナファソ|布基纳法索")] + [ResourceDescription(nameof(Ln.布基纳法索))] + BF = 854 + + , + + /// + /// 尼日尔 + /// + [Country(CallingCode = 227, Alpha3 = "NER", ShortName = "Niger", LongName = "The Republic of the Niger", CurrencyCode = "XOF", Languages = "fr" + , UnofficialNames = "Niger|Níger|ニジェール|尼日尔")] + [ResourceDescription(nameof(Ln.尼日尔))] + NE = 562 + + , + + /// + /// 多哥 + /// + [Country(CallingCode = 228, Alpha3 = "TGO", ShortName = "Togo", LongName = "The Togolese Republic", CurrencyCode = "XOF", Languages = "fr" + , UnofficialNames = "Togo|トーゴ|多哥")] + [ResourceDescription(nameof(Ln.多哥))] + TG = 768 + + , + + /// + /// 贝宁 + /// + [Country(CallingCode = 229, Alpha3 = "BEN", ShortName = "Benin", LongName = "The Republic of Benin", CurrencyCode = "XOF", Languages = "fr" + , UnofficialNames = "Benin|Bénin|ベナン|贝宁")] + [ResourceDescription(nameof(Ln.贝宁))] + BJ = 204 + + , + + /// + /// 毛里求斯 + /// + [Country(CallingCode = 230, Alpha3 = "MUS", ShortName = "Mauritius", LongName = "The Republic of Mauritius", CurrencyCode = "MUR" + , Languages = "en", UnofficialNames = "Mauritius|Île Maurice|Mauricio|モーリシャス|毛里求斯")] + [ResourceDescription(nameof(Ln.毛里求斯))] + MU = 480 + + , + + /// + /// 利比里亚 + /// + [Country(CallingCode = 231, Alpha3 = "LBR", ShortName = "Liberia", LongName = "The Republic of Liberia", CurrencyCode = "LRD", Languages = "en" + , UnofficialNames = "Liberia|リベリア|利比里亚")] + [ResourceDescription(nameof(Ln.利比里亚))] + LR = 430 + + , + + /// + /// 塞拉利昂 + /// + [Country(CallingCode = 232, Alpha3 = "SLE", ShortName = "Sierra Leone", LongName = "The Republic of Sierra Leone", CurrencyCode = "SLL" + , Languages = "en", UnofficialNames = "Sierra Leone|シエラレオネ|塞拉利昂")] + [ResourceDescription(nameof(Ln.塞拉利昂))] + SL = 694 + + , + + /// + /// 加纳 + /// + [Country(CallingCode = 233, Alpha3 = "GHA", ShortName = "Ghana", LongName = "The Republic of Ghana", CurrencyCode = "GHS", Languages = "en" + , UnofficialNames = "Ghana|ガーナ|加纳")] + [ResourceDescription(nameof(Ln.加纳))] + GH = 288 + + , + + /// + /// 尼日利亚 + /// + [Country(CallingCode = 234, Alpha3 = "NGA", ShortName = "Nigeria", LongName = "The Federal Republic of Nigeria", CurrencyCode = "NGN" + , Languages = "en", UnofficialNames = "Nigeria|Nigéria|the Federal Republic of Nigeria|ナイジェリア|尼日利亚")] + [ResourceDescription(nameof(Ln.尼日利亚))] + NG = 566 + + , + + /// + /// 乍得 + /// + [Country(CallingCode = 235, Alpha3 = "TCD", ShortName = "Chad", LongName = "The Republic of Chad", CurrencyCode = "XAF", Languages = "ar|fr" + , UnofficialNames = "Chad|تشاد|Tschad|Tchad|チャド|Tsjaad|乍得")] + [ResourceDescription(nameof(Ln.乍得))] + TD = 148 + + , + + /// + /// 中非 + /// + [Country(CallingCode = 236, Alpha3 = "CAF", ShortName = "Central African Republic", LongName = "The Central African Republic" + , CurrencyCode = "XAF", Languages = "fr|sg" + , UnofficialNames + = "Central African Republic|Zentralafrikanische Republik|République Centrafricaine|República Centroafricana|中央アフリカ共和国|Centraal-Afrikaanse Republiek|中非")] + [ResourceDescription(nameof(Ln.中非))] + CF = 140 + + , + + /// + /// 喀麦隆 + /// + [Country(CallingCode = 237, Alpha3 = "CMR", ShortName = "Cameroon", LongName = "The Republic of Cameroon", CurrencyCode = "XAF" + , Languages = "en|fr", UnofficialNames = "Cameroon|Kamerun|Cameroun|Camerún|カメルーン|Kameroen|喀麦隆")] + [ResourceDescription(nameof(Ln.喀麦隆))] + CM = 120 + + , + + /// + /// 佛得角 + /// + [Country(CallingCode = 238, Alpha3 = "CPV", ShortName = "Cabo Verde", LongName = "The Republic of Cabo Verde", CurrencyCode = "CVE" + , Languages = "pt", UnofficialNames = "Cape Verde|Kap Verde|Cap Vert|Cabo Verde|カーボベルデ|Kaapverdië|佛得角")] + [ResourceDescription(nameof(Ln.佛得角))] + CV = 132 + + , + + /// + /// 圣多美和普林西比 + /// + [Country(CallingCode = 239, Alpha3 = "STP", ShortName = "Sao Tome and Principe", LongName = "The Democratic Republic of São Tomé and Príncipe" + , CurrencyCode = "STD", Languages = "pt" + , UnofficialNames + = "São Tomé and Príncipe|São Tomé und Príncipe|São Tomé et Príncipe|Santo Tomé y Príncipe|サントメ・プリンシペ|Sao Tomé en Principe|圣多美和普林西比")] + [ResourceDescription(nameof(Ln.圣多美和普林西比))] + ST = 678 + + , + + /// + /// 赤道几内亚 + /// + [Country(CallingCode = 240, Alpha3 = "GNQ", ShortName = "Equatorial Guinea", LongName = "The Republic of Equatorial Guinea", CurrencyCode = "XAF" + , Languages = "es|fr" + , UnofficialNames = "Equatorial Guinea|Äquatorial-Guinea|Guinée Équatoriale|Guinea Ecuatorial|赤道ギニア|Equatoriaal-Guinea|赤道几内亚")] + [ResourceDescription(nameof(Ln.赤道几内亚))] + GQ = 226 + + , + + /// + /// 加蓬 + /// + [Country(CallingCode = 241, Alpha3 = "GAB", ShortName = "Gabon", LongName = "The Gabonese Republic", CurrencyCode = "XAF", Languages = "fr" + , UnofficialNames = "Gabon|Gabun|Gabón|ガボン|加蓬")] + [ResourceDescription(nameof(Ln.加蓬))] + GA = 266 + + , + + /// + /// 刚果共和国 + /// + [Country(CallingCode = 242, Alpha3 = "COG", ShortName = "Congo", LongName = "The Republic of the Congo", CurrencyCode = "XAF", Languages = "fr|ln" + , UnofficialNames = "Congo|Kongo|コンゴ共和国|Congo [Republiek]|Congo, Republic of|刚果共和国")] + [ResourceDescription(nameof(Ln.刚果共和国))] + CG = 178 + + , + + /// + /// 刚果民主共和国 + /// + [Country(CallingCode = 243, Alpha3 = "COD", ShortName = "Congo (Democratic Republic of the)", LongName = "The Democratic Republic of the Congo" + , CurrencyCode = "CDF", Languages = "fr|ln|kg|sw|lu" + , UnofficialNames + = "Congo (Dem. Rep.)|Kongo (Dem. Rep.)|Congo (Rep. Dem.)|コンゴ民主共和国|Congo [DRC]|Congo (The Democratic Republic Of The)|Democratic Republic of the Congo|Congo, Democratic Republic of|刚果民主共和国")] + [ResourceDescription(nameof(Ln.刚果民主共和国))] + CD = 180 + + , + + /// + /// 安哥拉 + /// + [Country(CallingCode = 244, Alpha3 = "AGO", ShortName = "Angola", LongName = "The Republic of Angola", CurrencyCode = "AOA", Languages = "pt" + , UnofficialNames = "Angola|アンゴラ|安哥拉")] + [ResourceDescription(nameof(Ln.安哥拉))] + AO = 024 + + , + + /// + /// 几内亚比绍 + /// + [Country(CallingCode = 245, Alpha3 = "GNB", ShortName = "Guinea-Bissau", LongName = "The Republic of Guinea-Bissau", CurrencyCode = "XOF" + , Languages = "pt", UnofficialNames = "Guinea-Bissau|Guinée-Bissau|ギニアビサウ|Guinee-Bissau|Guinea Bissau|几内亚比绍")] + [ResourceDescription(nameof(Ln.几内亚比绍))] + GW = 624 + + , + + /// + /// 英属印度洋领地 + /// + [Country(CallingCode = 246, Alpha3 = "IOT", ShortName = "British Indian Ocean Territory", LongName = "The British Indian Ocean Territory" + , CurrencyCode = "USD", Languages = "en" + , UnofficialNames + = "British Indian Ocean Territory|Britisches Territorium im Indischen Ozean|イギリス領インド洋地域|Britse Gebieden in de Indische Oceaan|英属印度洋领地")] + [ResourceDescription(nameof(Ln.英属印度洋领地))] + IO = 086 + + , + + /// + /// 塞舌尔 + /// + [Country(CallingCode = 248, Alpha3 = "SYC", ShortName = "Seychelles", LongName = "The Republic of Seychelles", CurrencyCode = "SCR" + , Languages = "fr|en", UnofficialNames = "Seychelles|Seychellen|セーシェル|塞舌尔")] + [ResourceDescription(nameof(Ln.塞舌尔))] + SC = 690 + + , + + /// + /// 苏丹 + /// + [Country(CallingCode = 249, Alpha3 = "SDN", ShortName = "Sudan", LongName = "The Republic of the Sudan", CurrencyCode = "SDG", Languages = "ar|en" + , UnofficialNames = "Sudan|السودان|Soudan|Sudán|スーダン|Soedan|苏丹")] + [ResourceDescription(nameof(Ln.苏丹))] + SD = 729 + + , + + /// + /// 卢旺达 + /// + [Country(CallingCode = 250, Alpha3 = "RWA", ShortName = "Rwanda", LongName = "The Republic of Rwanda", CurrencyCode = "RWF" + , Languages = "rw|en|fr", UnofficialNames = "Rwanda|Ruanda|ルワンダ|卢旺达")] + [ResourceDescription(nameof(Ln.卢旺达))] + RW = 646 + + , + + /// + /// 埃塞俄比亚 + /// + [Country(CallingCode = 251, Alpha3 = "ETH", ShortName = "Ethiopia", LongName = "The Federal Democratic Republic of Ethiopia", CurrencyCode = "ETB" + , Languages = "am", UnofficialNames = "Ethiopia|Äthiopien|Éthiopie|Etiopía|エチオピア|Ethiopië|埃塞俄比亚")] + [ResourceDescription(nameof(Ln.埃塞俄比亚))] + ET = 231 + + , + + /// + /// 索马里 + /// + [Country(CallingCode = 252, Alpha3 = "SOM", ShortName = "Somalia", LongName = "The Federal Republic of Somalia", CurrencyCode = "SOS" + , Languages = "so|ar", UnofficialNames = "Somalia|الصومال|ソマリア|Somalië|索马里")] + [ResourceDescription(nameof(Ln.索马里))] + SO = 706 + + , + + /// + /// 吉布提 + /// + [Country(CallingCode = 253, Alpha3 = "DJI", ShortName = "Djibouti", LongName = "The Republic of Djibouti", CurrencyCode = "DJF" + , Languages = "ar|fr", UnofficialNames = "Djibouti|جيبوتي|Dschibuti|ジブチ|吉布提")] + [ResourceDescription(nameof(Ln.吉布提))] + DJ = 262 + + , + + /// + /// 肯尼亚 + /// + [Country(CallingCode = 254, Alpha3 = "KEN", ShortName = "Kenya", LongName = "The Republic of Kenya", CurrencyCode = "KES", Languages = "en|sw" + , UnofficialNames = "Kenya|Kenia|ケニア|肯尼亚")] + [ResourceDescription(nameof(Ln.肯尼亚))] + KE = 404 + + , + + /// + /// 坦桑尼亚 + /// + [Country(CallingCode = 255, Alpha3 = "TZA", ShortName = "Tanzania, United Republic of", LongName = "The United Republic of Tanzania" + , CurrencyCode = "TZS", Languages = "sw|en", UnofficialNames = "Tanzania|Tansania|Tanzanie|タンザニア|Tanzania United Republic|坦桑尼亚")] + [ResourceDescription(nameof(Ln.坦桑尼亚))] + TZ = 834 + + , + + /// + /// 乌干达 + /// + [Country(CallingCode = 256, Alpha3 = "UGA", ShortName = "Uganda", LongName = "The Republic of Uganda", CurrencyCode = "UGX", Languages = "en|sw" + , UnofficialNames = "Uganda|ウガンダ|Oeganda|乌干达")] + [ResourceDescription(nameof(Ln.乌干达))] + UG = 800 + + , + + /// + /// 布隆迪 + /// + [Country(CallingCode = 257, Alpha3 = "BDI", ShortName = "Burundi", LongName = "The Republic of Burundi", CurrencyCode = "BIF", Languages = "fr|rn" + , UnofficialNames = "Burundi|ブルンジ|布隆迪")] + [ResourceDescription(nameof(Ln.布隆迪))] + BI = 108 + + , + + /// + /// 莫桑比克 + /// + [Country(CallingCode = 258, Alpha3 = "MOZ", ShortName = "Mozambique", LongName = "The Republic of Mozambique", CurrencyCode = "MZN" + , Languages = "pt", UnofficialNames = "Mozambique|Mosambik|モザンビーク|莫桑比克")] + [ResourceDescription(nameof(Ln.莫桑比克))] + MZ = 508 + + , + + /// + /// 赞比亚 + /// + [Country(CallingCode = 260, Alpha3 = "ZMB", ShortName = "Zambia", LongName = "The Republic of Zambia", CurrencyCode = "ZMW", Languages = "en" + , UnofficialNames = "Zambia|Sambia|Zambie|ザンビア|赞比亚")] + [ResourceDescription(nameof(Ln.赞比亚))] + ZM = 894 + + , + + /// + /// 马达加斯加 + /// + [Country(CallingCode = 261, Alpha3 = "MDG", ShortName = "Madagascar", LongName = "The Republic of Madagascar", CurrencyCode = "MGA" + , Languages = "fr|mg", UnofficialNames = "Madagascar|Madagaskar|the Republic of Madagascar|マダガスカル|马达加斯加")] + [ResourceDescription(nameof(Ln.马达加斯加))] + MG = 450 + + , + + /// + /// 留尼汪 + /// + [Country(CallingCode = 262, Alpha3 = "REU", ShortName = "Réunion", LongName = "Réunion", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "Réunion|Reunión|Reunion|レユニオン|留尼汪", IsPreferred = true)] + [ResourceDescription(nameof(Ln.留尼汪))] + RE = 638 + + , + + /// + /// 法属南部和南极领地 + /// + [Country(CallingCode = 262, Alpha3 = "ATF", ShortName = "French Southern Territories", LongName = "The French Southern and Antarctic Lands" + , CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames + = "French Southern Territories|Französische Süd- und Antarktisgebiete|Terres Australes Françaises|Territorios Franceses del Sur|フランス領南方・南極地域|Franse Gebieden in de zuidelijke Indische Oceaan|French Southern and Antarctic Lands|法属南部和南极领地")] + [ResourceDescription(nameof(Ln.法属南部和南极领地))] + TF = 260 + + , + + /// + /// 马约特 + /// + [Country(CallingCode = 262, CallingSubCode = "269,639", Alpha3 = "MYT", ShortName = "Mayotte", LongName = "The Department of Mayotte" + , CurrencyCode = "EUR", Languages = "fr", UnofficialNames = "Mayotte|マヨット|马约特")] + [ResourceDescription(nameof(Ln.马约特))] + YT = 175 + + , + + /// + /// 津巴布韦 + /// + [Country(CallingCode = 263, Alpha3 = "ZWE", ShortName = "Zimbabwe", LongName = "The Republic of Zimbabwe", CurrencyCode = "USD" + , Languages = "en|sn|nd", UnofficialNames = "Zimbabwe|Simbabwe|Zimbabue|ジンバブエ|津巴布韦")] + [ResourceDescription(nameof(Ln.津巴布韦))] + ZW = 716 + + , + + /// + /// 纳米比亚 + /// + [Country(CallingCode = 264, Alpha3 = "NAM", ShortName = "Namibia", LongName = "The Republic of Namibia", CurrencyCode = "NAD", Languages = "en|af" + , UnofficialNames = "Namibia|Namibie|ナミビア|Namibië|纳米比亚")] + [ResourceDescription(nameof(Ln.纳米比亚))] + NA = 516 + + , + + /// + /// 马拉维 + /// + [Country(CallingCode = 265, Alpha3 = "MWI", ShortName = "Malawi", LongName = "The Republic of Malawi", CurrencyCode = "MWK", Languages = "en|ny" + , UnofficialNames = "Malawi|マラウイ|马拉维")] + [ResourceDescription(nameof(Ln.马拉维))] + MW = 454 + + , + + /// + /// 莱索托 + /// + [Country(CallingCode = 266, Alpha3 = "LSO", ShortName = "Lesotho", LongName = "The Kingdom of Lesotho", CurrencyCode = "LSL", Languages = "en|st" + , UnofficialNames = "Lesotho|レソト|莱索托")] + [ResourceDescription(nameof(Ln.莱索托))] + LS = 426 + + , + + /// + /// 博茨瓦纳 + /// + [Country(CallingCode = 267, Alpha3 = "BWA", ShortName = "Botswana", LongName = "The Republic of Botswana", CurrencyCode = "BWP" + , Languages = "en|tn", UnofficialNames = "Botswana|ボツワナ|博茨瓦纳")] + [ResourceDescription(nameof(Ln.博茨瓦纳))] + BW = 072 + + , + + /// + /// 斯威士兰 + /// + [Country(CallingCode = 268, Alpha3 = "SWZ", ShortName = "Eswatini", LongName = "The Kingdom of Eswatini", CurrencyCode = "SZL" + , Languages = "en|ss", UnofficialNames = "Swaziland|Swasiland|Suazilandia|スワジランド|斯威士兰")] + [ResourceDescription(nameof(Ln.斯威士兰))] + SZ = 748 + + , + + /// + /// 科摩罗 + /// + [Country(CallingCode = 269, Alpha3 = "COM", ShortName = "Comoros", LongName = "The Union of the Comoros", CurrencyCode = "KMF" + , Languages = "ar|fr", UnofficialNames = "Comoros|Union der Komoren|Comores|コモロ|Comoren|科摩罗")] + [ResourceDescription(nameof(Ln.科摩罗))] + KM = 174 + + , + + /// + /// 圣赫勒拿 + /// + [Country(CallingCode = 290, Alpha3 = "SHN", ShortName = "Saint Helena, Ascension and Tristan da Cunha" + , LongName = "Saint Helena, Ascension and Tristan da Cunha", CurrencyCode = "SHP", Languages = "en" + , UnofficialNames + = "Saint Helena|Sankt Helena|Sainte Hélène|Santa Helena|セントヘレナ・アセンションおよびトリスタンダクーニャ|Sint-Helena|Saint Helena, Ascension and Tristan da Cunha|圣赫勒拿")] + [ResourceDescription(nameof(Ln.圣赫勒拿))] + SH = 654 + + , + + /// + /// 厄立特里亚 + /// + [Country(CallingCode = 291, Alpha3 = "ERI", ShortName = "Eritrea", LongName = "The State of Eritrea", CurrencyCode = "ETB", Languages = "en|ar|ti" + , UnofficialNames = "Eritrea|إريتريا|Érythrée|エリトリア|厄立特里亚")] + [ResourceDescription(nameof(Ln.厄立特里亚))] + ER = 232 + + , + + /// + /// 阿鲁巴 + /// + [Country(CallingCode = 297, Alpha3 = "ABW", ShortName = "Aruba", LongName = "Aruba", CurrencyCode = "AWG", Languages = "nl" + , UnofficialNames = "Aruba|アルバ|阿鲁巴")] + [ResourceDescription(nameof(Ln.阿鲁巴))] + AW = 533 + + , + + /// + /// 法罗群岛 + /// + [Country(CallingCode = 298, Alpha3 = "FRO", ShortName = "Faroe Islands", LongName = "The Faroe Islands", CurrencyCode = "DKK", Languages = "fo" + , UnofficialNames = "Faroe Islands|Färöer-Inseln|Îles Féroé|Islas Faroe|フェロー諸島|Faeröer|法罗群岛")] + [ResourceDescription(nameof(Ln.法罗群岛))] + FO = 234 + + , + + /// + /// 格陵兰 + /// + [Country(CallingCode = 299, Alpha3 = "GRL", ShortName = "Greenland", LongName = "Kalaallit Nunaat", CurrencyCode = "DKK", Languages = "kl" + , UnofficialNames = "Greenland|Grönland|Groenland|Groenlandia|グリーンランド|格陵兰")] + [ResourceDescription(nameof(Ln.格陵兰))] + GL = 304 + + , + + /// + /// 直布罗陀 + /// + [Country(CallingCode = 350, Alpha3 = "GIB", ShortName = "Gibraltar", LongName = "Gibraltar", CurrencyCode = "GIP", Languages = "en" + , UnofficialNames = "Gibraltar|ジブラルタル|直布罗陀")] + [ResourceDescription(nameof(Ln.直布罗陀))] + GI = 292 + + , + + /// + /// 葡萄牙 + /// + [Country(CallingCode = 351, Alpha3 = "PRT", ShortName = "Portugal", LongName = "The Portuguese Republic", CurrencyCode = "EUR", Languages = "pt" + , UnofficialNames = "Portugal|ポルトガル|葡萄牙")] + [ResourceDescription(nameof(Ln.葡萄牙))] + PT = 620 + + , + + /// + /// 卢森堡 + /// + [Country(CallingCode = 352, Alpha3 = "LUX", ShortName = "Luxembourg", LongName = "The Grand Duchy of Luxembourg", CurrencyCode = "EUR" + , Languages = "fr|de|lb", UnofficialNames = "Luxembourg|Luxemburg|Luxemburgo|ルクセンブルク|卢森堡")] + [ResourceDescription(nameof(Ln.卢森堡))] + LU = 442 + + , + + /// + /// 爱尔兰 + /// + [Country(CallingCode = 353, Alpha3 = "IRL", ShortName = "Ireland", LongName = "Ireland", CurrencyCode = "EUR", Languages = "en|ga" + , UnofficialNames = "Ireland|Irland|Irlande|Irlanda|アイルランド|Ierland|爱尔兰")] + [ResourceDescription(nameof(Ln.爱尔兰))] + IE = 372 + + , + + /// + /// 冰岛 + /// + [Country(CallingCode = 354, Alpha3 = "ISL", ShortName = "Iceland", LongName = "Iceland", CurrencyCode = "ISK", Languages = "is" + , UnofficialNames = "Iceland|Island|Islande|Islandia|アイスランド|IJsland|冰岛")] + [ResourceDescription(nameof(Ln.冰岛))] + IS = 352 + + , + + /// + /// 阿尔巴尼亚 + /// + [Country(CallingCode = 355, Alpha3 = "ALB", ShortName = "Albania", LongName = "The Republic of Albania", CurrencyCode = "ALL", Languages = "sq" + , UnofficialNames = "Albania|Albanien|Albanie|アルバニア|Albanië|阿尔巴尼亚")] + [ResourceDescription(nameof(Ln.阿尔巴尼亚))] + AL = 008 + + , + + /// + /// 马耳他 + /// + [Country(CallingCode = 356, Alpha3 = "MLT", ShortName = "Malta", LongName = "The Republic of Malta", CurrencyCode = "EUR", Languages = "mt|en" + , UnofficialNames = "Malta|Malte|マルタ|马耳他")] + [ResourceDescription(nameof(Ln.马耳他))] + MT = 470 + + , + + /// + /// 塞浦路斯 + /// + [Country(CallingCode = 357, Alpha3 = "CYP", ShortName = "Cyprus", LongName = "The Republic of Cyprus", CurrencyCode = "EUR" + , Languages = "el|tr|hy", UnofficialNames = "Cyprus|Zypern|Chypre|Chipre|キプロス|塞浦路斯")] + [ResourceDescription(nameof(Ln.塞浦路斯))] + CY = 196 + + , + + /// + /// 奥兰 + /// + [Country(CallingCode = 358, CallingSubCode = "18", Alpha3 = "ALA", ShortName = "Åland Islands", LongName = "Åland", CurrencyCode = "EUR" + , Languages = "sv", UnofficialNames = "Åland Islands|Åland|オーランド諸島|Ålandeilanden|奥兰")] + [ResourceDescription(nameof(Ln.奥兰))] + AX = 248 + + , + + /// + /// 芬兰 + /// + [Country(CallingCode = 358, Alpha3 = "FIN", ShortName = "Finland", LongName = "The Republic of Finland", CurrencyCode = "EUR", Languages = "fi|sv" + , UnofficialNames = "Finland|Finnland|Finlande|Finlandia|フィンランド|芬兰", IsPreferred = true)] + [ResourceDescription(nameof(Ln.芬兰))] + FI = 246 + + , + + /// + /// 保加利亚 + /// + [Country(CallingCode = 359, Alpha3 = "BGR", ShortName = "Bulgaria", LongName = "The Republic of Bulgaria", CurrencyCode = "BGN", Languages = "bg" + , UnofficialNames = "Bulgaria|България|Bulgarien|Bulgarie|ブルガリア|Bulgarije|保加利亚")] + [ResourceDescription(nameof(Ln.保加利亚))] + BG = 100 + + , + + /// + /// 立陶宛 + /// + [Country(CallingCode = 370, Alpha3 = "LTU", ShortName = "Lithuania", LongName = "The Republic of Lithuania", CurrencyCode = "EUR" + , Languages = "lt", UnofficialNames = "Lithuania|Litauen|Lituanie|Lituania|リトアニア|Litouwen|Літва|Lietuva|立陶宛")] + [ResourceDescription(nameof(Ln.立陶宛))] + LT = 440 + + , + + /// + /// 拉脱维亚 + /// + [Country(CallingCode = 371, Alpha3 = "LVA", ShortName = "Latvia", LongName = "The Republic of Latvia", CurrencyCode = "EUR", Languages = "lv" + , UnofficialNames = "Latvia|Lettland|Lettonie|Letonia|ラトビア|Letland|拉脱维亚")] + [ResourceDescription(nameof(Ln.拉脱维亚))] + LV = 428 + + , + + /// + /// 爱沙尼亚 + /// + [Country(CallingCode = 372, Alpha3 = "EST", ShortName = "Estonia", LongName = "The Republic of Estonia", CurrencyCode = "EUR", Languages = "et" + , UnofficialNames = "Estonia|Estland|Estonie|エストニア|爱沙尼亚")] + [ResourceDescription(nameof(Ln.爱沙尼亚))] + EE = 233 + + , + + /// + /// 摩尔多瓦 + /// + [Country(CallingCode = 373, Alpha3 = "MDA", ShortName = "Moldova (Republic of)", LongName = "The Republic of Moldova", CurrencyCode = "MDL" + , Languages = "ro", UnofficialNames = "Moldova|Moldawien|Moldavie|Moldavia|the Republic of Moldova|モルドバ共和国|Moldavië|摩尔多瓦")] + [ResourceDescription(nameof(Ln.摩尔多瓦))] + MD = 498 + + , + + /// + /// 亚美尼亚 + /// + [Country(CallingCode = 374, Alpha3 = "ARM", ShortName = "Armenia", LongName = "The Republic of Armenia", CurrencyCode = "AMD", Languages = "hy|ru" + , UnofficialNames = "Armenia|Armenien|Arménie|アルメニア|Armenië|亚美尼亚")] + [ResourceDescription(nameof(Ln.亚美尼亚))] + AM = 051 + + , + + /// + /// 白俄罗斯 + /// + [Country(CallingCode = 375, Alpha3 = "BLR", ShortName = "Belarus", LongName = "The Republic of Belarus", CurrencyCode = "BYN", Languages = "be|ru" + , UnofficialNames = "Belarus|Weißrussland|Biélorussie|Bielorrusia|ベラルーシ|Wit-Rusland|Беларусь|白俄罗斯")] + [ResourceDescription(nameof(Ln.白俄罗斯))] + BY = 112 + + , + + /// + /// 安道尔 + /// + [Country(CallingCode = 376, Alpha3 = "AND", ShortName = "Andorra", LongName = "The Principality of Andorra", CurrencyCode = "EUR" + , Languages = "ca", UnofficialNames = "Andorre|Andorra|アンドラ|安道尔")] + [ResourceDescription(nameof(Ln.安道尔))] + AD = 020 + + , + + /// + /// 摩纳哥 + /// + [Country(CallingCode = 377, Alpha3 = "MCO", ShortName = "Monaco", LongName = "The Principality of Monaco", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "Monaco|Mónaco|モナコ|摩纳哥")] + [ResourceDescription(nameof(Ln.摩纳哥))] + MC = 492 + + , + + /// + /// 圣马力诺 + /// + [Country(CallingCode = 378, Alpha3 = "SMR", ShortName = "San Marino", LongName = "The Republic of San Marino", CurrencyCode = "EUR" + , Languages = "it", UnofficialNames = "San Marino|Saint-Marin|サンマリノ|圣马力诺")] + [ResourceDescription(nameof(Ln.圣马力诺))] + SM = 674 + + , + + /// + /// 梵蒂冈 + /// + [Country(CallingCode = 39, CallingSubCode = "06698", Alpha3 = "VAT", ShortName = "Holy See", LongName = "The Holy See", CurrencyCode = "EUR" + , Languages = "it|la" + , UnofficialNames = "Vatican City|Vatikan|Cité du Vatican|Ciudad del Vaticano|バチカン市国|Vaticaanstad|Vatican City State (Holy See)|梵蒂冈")] + [ResourceDescription(nameof(Ln.梵蒂冈))] + VA = 336 + + , + + /// + /// 乌克兰 + /// + [Country(CallingCode = 380, Alpha3 = "UKR", ShortName = "Ukraine", LongName = "Ukraine", CurrencyCode = "UAH", Languages = "uk" + , UnofficialNames = "Ukraine|Ucrania|ウクライナ|Oekraïne|Украина|Україна|Украіна|乌克兰")] + [ResourceDescription(nameof(Ln.乌克兰))] + UA = 804 + + , + + /// + /// 塞尔维亚 + /// + [Country(CallingCode = 381, Alpha3 = "SRB", ShortName = "Serbia", LongName = "The Republic of Serbia", CurrencyCode = "RSD", Languages = "sr" + , UnofficialNames = "Serbia|Serbien|Serbie|セルビア|Servië|塞尔维亚")] + [ResourceDescription(nameof(Ln.塞尔维亚))] + RS = 688 + + , + + /// + /// 黑山 + /// + [Country(CallingCode = 382, Alpha3 = "MNE", ShortName = "Montenegro", LongName = "Montenegro", CurrencyCode = "EUR", Languages = "sr|bs|sq|hr" + , UnofficialNames = "Crna Gora|Montenegro|モンテネグロ|黑山")] + [ResourceDescription(nameof(Ln.黑山))] + ME = 499 + + , + + /// + /// 克罗地亚 + /// + [Country(CallingCode = 385, Alpha3 = "HRV", ShortName = "Croatia", LongName = "The Republic of Croatia", CurrencyCode = "EUR", Languages = "hr" + , UnofficialNames = "Croatia|Kroatien|Croatie|Croacia|クロアチア|Kroatië|Croatia (Hrvatska)|克罗地亚")] + [ResourceDescription(nameof(Ln.克罗地亚))] + HR = 191 + + , + + /// + /// 斯洛文尼亚 + /// + [Country(CallingCode = 386, Alpha3 = "SVN", ShortName = "Slovenia", LongName = "The Republic of Slovenia", CurrencyCode = "EUR", Languages = "sl" + , UnofficialNames = "Slovenia|Slowenien|Slovénie|Eslovenia|スロベニア|Slovenië|斯洛文尼亚")] + [ResourceDescription(nameof(Ln.斯洛文尼亚))] + SI = 705 + + , + + /// + /// 波黑 + /// + [Country(CallingCode = 387, Alpha3 = "BIH", ShortName = "Bosnia and Herzegovina", LongName = "Bosnia and Herzegovina", CurrencyCode = "BAM" + , Languages = "bs|hr|sr" + , UnofficialNames + = "Bosnia and Herzegovina|Bosnien und Herzegowina|Bosnie et Herzégovine|Bosnia y Herzegovina|ボスニア・ヘルツェゴビナ|Bosnië en Herzegovina|Bosnia Herzegovina|波黑")] + [ResourceDescription(nameof(Ln.波黑))] + BA = 070 + + , + + /// + /// 北马其顿 + /// + [Country(CallingCode = 389, Alpha3 = "MKD", ShortName = "North Macedonia", LongName = "The Republic of North Macedonia", CurrencyCode = "MKD" + , Languages = "mk" + , UnofficialNames + = "Macedonia|Mazedonien|Macédoine|F.Y.R.O.M (Macedonia)|マケドニア旧ユーゴスラビア共和国|Macedonië [FYROM]|Macedonia (The Former Yugoslav Republic of)|North Macedonia|Macedonia (FYROM)|北马其顿")] + [ResourceDescription(nameof(Ln.北马其顿))] + MK = 807 + + , + + /// + /// 捷克 + /// + [Country(CallingCode = 420, Alpha3 = "CZE", ShortName = "Czechia", LongName = "The Czech Republic", CurrencyCode = "CZK", Languages = "cs" + , UnofficialNames = "Czech Republic|Tschechische Republik|République Tchèque|República Checa|チェコ|Tsjechië|Czechia|Česká republika|捷克")] + [ResourceDescription(nameof(Ln.捷克))] + CZ = 203 + + , + + /// + /// 斯洛伐克 + /// + [Country(CallingCode = 421, Alpha3 = "SVK", ShortName = "Slovakia", LongName = "The Slovak Republic", CurrencyCode = "EUR", Languages = "sk" + , UnofficialNames = "Slovakia|Slowakei|Slovaquie|República Eslovaca|スロバキア|Slowakije|斯洛伐克")] + [ResourceDescription(nameof(Ln.斯洛伐克))] + SK = 703 + + , + + /// + /// 列支敦士登 + /// + [Country(CallingCode = 423, Alpha3 = "LIE", ShortName = "Liechtenstein", LongName = "The Principality of Liechtenstein", CurrencyCode = "CHF" + , Languages = "de", UnofficialNames = "Liechtenstein|リヒテンシュタイン|列支敦士登")] + [ResourceDescription(nameof(Ln.列支敦士登))] + LI = 438 + + , + + /// + /// 福克兰群岛 + /// + [Country(CallingCode = 500, Alpha3 = "FLK", ShortName = "Falkland Islands (Malvinas)", LongName = "The Falkland Islands", CurrencyCode = "FKP" + , Languages = "en" + , UnofficialNames + = "Falkland Islands|Falklandinseln|Îles Malouines|Islas Malvinas|フォークランド（マルビナス）諸島|Falklandeilanden [Islas Malvinas]|福克兰群岛" + , IsPreferred = true)] + [ResourceDescription(nameof(Ln.福克兰群岛))] + FK = 238 + + , + + /// + /// 南乔治亚和南桑威奇群岛 + /// + [Country(CallingCode = 500, Alpha3 = "SGS", ShortName = "South Georgia and the South Sandwich Islands" + , LongName = "South Georgia and the South Sandwich Islands", CurrencyCode = "GBP", Languages = "en" + , UnofficialNames + = "South Georgia|South Georgia and the South Sandwich Islands|Südgeorgien und die Südlichen Sandwichinseln|サウスジョージア・サウスサンドウィッチ諸島|Zuid-Georgia en Zuidelijke Sandwicheilanden|南乔治亚和南桑威奇群岛")] + [ResourceDescription(nameof(Ln.南乔治亚和南桑威奇群岛))] + GS = 239 + + , + + /// + /// 伯利兹 + /// + [Country(CallingCode = 501, Alpha3 = "BLZ", ShortName = "Belize", LongName = "Belize", CurrencyCode = "BZD", Languages = "en|es" + , UnofficialNames = "Belize|Belice|ベリーズ|伯利兹")] + [ResourceDescription(nameof(Ln.伯利兹))] + BZ = 084 + + , + + /// + /// 危地马拉 + /// + [Country(CallingCode = 502, Alpha3 = "GTM", ShortName = "Guatemala", LongName = "The Republic of Guatemala", CurrencyCode = "GTQ" + , Languages = "es", UnofficialNames = "Guatemala|グアテマラ|危地马拉")] + [ResourceDescription(nameof(Ln.危地马拉))] + GT = 320 + + , + + /// + /// 萨尔瓦多 + /// + [Country(CallingCode = 503, Alpha3 = "SLV", ShortName = "El Salvador", LongName = "The Republic of El Salvador", CurrencyCode = "USD" + , Languages = "es", UnofficialNames = "El Salvador|Salvador|エルサルバドル|萨尔瓦多")] + [ResourceDescription(nameof(Ln.萨尔瓦多))] + SV = 222 + + , + + /// + /// 洪都拉斯 + /// + [Country(CallingCode = 504, Alpha3 = "HND", ShortName = "Honduras", LongName = "The Republic of Honduras", CurrencyCode = "HNL", Languages = "es" + , UnofficialNames = "Honduras|ホンジュラス|洪都拉斯")] + [ResourceDescription(nameof(Ln.洪都拉斯))] + HN = 340 + + , + + /// + /// 尼加拉瓜 + /// + [Country(CallingCode = 505, Alpha3 = "NIC", ShortName = "Nicaragua", LongName = "The Republic of Nicaragua", CurrencyCode = "NIO" + , Languages = "es", UnofficialNames = "Nicaragua|ニカラグア|尼加拉瓜")] + [ResourceDescription(nameof(Ln.尼加拉瓜))] + NI = 558 + + , + + /// + /// 哥斯达黎加 + /// + [Country(CallingCode = 506, Alpha3 = "CRI", ShortName = "Costa Rica", LongName = "The Republic of Costa Rica", CurrencyCode = "CRC" + , Languages = "es", UnofficialNames = "Costa Rica|コスタリカ|哥斯达黎加")] + [ResourceDescription(nameof(Ln.哥斯达黎加))] + CR = 188 + + , + + /// + /// 巴拿马 + /// + [Country(CallingCode = 507, Alpha3 = "PAN", ShortName = "Panama", LongName = "The Republic of Panamá", CurrencyCode = "PAB", Languages = "es" + , UnofficialNames = "Panama|Panamá|パナマ|巴拿马")] + [ResourceDescription(nameof(Ln.巴拿马))] + PA = 591 + + , + + /// + /// 圣皮埃尔和密克隆 + /// + [Country(CallingCode = 508, Alpha3 = "SPM", ShortName = "Saint Pierre and Miquelon" + , LongName = "The Overseas Collectivity of Saint-Pierre and Miquelon", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames + = "Saint Pierre and Miquelon|Saint-Pierre und Miquelon|Saint-Pierre-et-Miquelon|San Pedro y Miquelón|サンピエール島・ミクロン島|Saint Pierre en Miquelon|圣皮埃尔和密克隆")] + [ResourceDescription(nameof(Ln.圣皮埃尔和密克隆))] + PM = 666 + + , + + /// + /// 海地 + /// + [Country(CallingCode = 509, Alpha3 = "HTI", ShortName = "Haiti", LongName = "The Republic of Haiti", CurrencyCode = "HTG", Languages = "fr|ht" + , UnofficialNames = "Haiti|ハイチ|Haïti|海地")] + [ResourceDescription(nameof(Ln.海地))] + HT = 332 + + , + + /// + /// 圣巴泰勒米 + /// + [Country(CallingCode = 590, Alpha3 = "BLM", ShortName = "Saint Barthélemy", LongName = "The Collectivity of Saint-Barthélemy" + , CurrencyCode = "EUR", Languages = "fr", UnofficialNames = "Saint Barthélemy|Saint-Barthélemy|サン・バルテルミー|圣巴泰勒米")] + [ResourceDescription(nameof(Ln.圣巴泰勒米))] + BL = 652 + + , + + /// + /// 瓜德罗普 + /// + [Country(CallingCode = 590, Alpha3 = "GLP", ShortName = "Guadeloupe", LongName = "Guadeloupe", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "Guadeloupe|Guadalupe|グアドループ|瓜德罗普", IsPreferred = true)] + [ResourceDescription(nameof(Ln.瓜德罗普))] + GP = 312 + + , + + /// + /// 法属圣马丁 + /// + [Country(CallingCode = 590, Alpha3 = "MAF", ShortName = "Saint Martin (French part)", LongName = "The Collectivity of Saint-Martin" + , CurrencyCode = "EUR", Languages = "en|fr|nl", UnofficialNames = "Saint Martin|サン・マルタン（フランス領）|Saint-Martin|法属圣马丁")] + [ResourceDescription(nameof(Ln.法属圣马丁))] + MF = 663 + + , + + /// + /// 玻利维亚 + /// + [Country(CallingCode = 591, Alpha3 = "BOL", ShortName = "Bolivia (Plurinational State of)", LongName = "The Plurinational State of Bolivia" + , CurrencyCode = "BOB", Languages = "es|ay|qu", UnofficialNames = "Bolivia|Bolivien|Bolivie|ボリビア多民族国|玻利维亚")] + [ResourceDescription(nameof(Ln.玻利维亚))] + BO = 068 + + , + + /// + /// 圭亚那 + /// + [Country(CallingCode = 592, Alpha3 = "GUY", ShortName = "Guyana", LongName = "The Co-operative Republic of Guyana", CurrencyCode = "GYD" + , Languages = "en", UnofficialNames = "Guyana|ガイアナ|圭亚那")] + [ResourceDescription(nameof(Ln.圭亚那))] + GY = 328 + + , + + /// + /// 厄瓜多尔 + /// + [Country(CallingCode = 593, Alpha3 = "ECU", ShortName = "Ecuador", LongName = "The Republic of Ecuador", CurrencyCode = "USD", Languages = "es" + , UnofficialNames = "Ecuador|Équateur|エクアドル|厄瓜多尔")] + [ResourceDescription(nameof(Ln.厄瓜多尔))] + EC = 218 + + , + + /// + /// 法属圭亚那 + /// + [Country(CallingCode = 594, Alpha3 = "GUF", ShortName = "French Guiana", LongName = "Guyane", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "French Guiana|Französisch Guyana|Guayana Francesa|フランス領ギアナ|Frans-Guyana|法属圭亚那")] + [ResourceDescription(nameof(Ln.法属圭亚那))] + GF = 254 + + , + + /// + /// 巴拉圭 + /// + [Country(CallingCode = 595, Alpha3 = "PRY", ShortName = "Paraguay", LongName = "The Republic of Paraguay", CurrencyCode = "PYG" + , Languages = "es|gn", UnofficialNames = "Paraguay|パラグアイ|巴拉圭")] + [ResourceDescription(nameof(Ln.巴拉圭))] + PY = 600 + + , + + /// + /// 马提尼克 + /// + [Country(CallingCode = 596, Alpha3 = "MTQ", ShortName = "Martinique", LongName = "Martinique", CurrencyCode = "EUR", Languages = "fr" + , UnofficialNames = "Martinique|Martinica|マルティニーク|马提尼克")] + [ResourceDescription(nameof(Ln.马提尼克))] + MQ = 474 + + , + + /// + /// 苏里南 + /// + [Country(CallingCode = 597, Alpha3 = "SUR", ShortName = "Suriname", LongName = "The Republic of Suriname", CurrencyCode = "SRD", Languages = "nl" + , UnofficialNames = "Suriname|Surinam|スリナム|苏里南")] + [ResourceDescription(nameof(Ln.苏里南))] + SR = 740 + + , + + /// + /// 乌拉圭 + /// + [Country(CallingCode = 598, Alpha3 = "URY", ShortName = "Uruguay", LongName = "The Oriental Republic of Uruguay", CurrencyCode = "UYU" + , Languages = "es", UnofficialNames = "Uruguay|ウルグアイ|乌拉圭")] + [ResourceDescription(nameof(Ln.乌拉圭))] + UY = 858 + + , + + /// + /// 库拉索 + /// + [Country(CallingCode = 599, CallingSubCode = "9", Alpha3 = "CUW", ShortName = "Curaçao", LongName = "The Country of Curaçao", CurrencyCode = "ANG" + , Languages = "nl", UnofficialNames = "Curaçao|キュラソー島|库拉索")] + [ResourceDescription(nameof(Ln.库拉索))] + CW = 531 + + , + + /// + /// 荷兰加勒比区 + /// + [Country(CallingCode = 599, Alpha3 = "BES", ShortName = "Bonaire, Sint Eustatius and Saba", LongName = "Bonaire, Sint Eustatius and Saba" + , CurrencyCode = "USD", Languages = "nl|en" + , UnofficialNames = "Bonaire, Sint Eustatius and Saba|Caribbean Netherlands|Caribisch Nederland|ボネール、シント・ユースタティウスおよびサバ|荷兰加勒比区" + , IsPreferred = true)] + [ResourceDescription(nameof(Ln.荷兰加勒比区))] + BQ = 535 + + , + + /// + /// 东帝汶 + /// + [Country(CallingCode = 670, Alpha3 = "TLS", ShortName = "Timor-Leste", LongName = "The Democratic Republic of Timor-Leste", CurrencyCode = "IDR" + , Languages = "pt", UnofficialNames = "East Timor|Timor-Leste|Timor oriental|Timor Oriental|東ティモール|Oost-Timor|东帝汶")] + [ResourceDescription(nameof(Ln.东帝汶))] + TL = 626 + + , + + /// + /// 南极洲 + /// + [Country(CallingCode = 672, Alpha3 = "ATA", ShortName = "Antarctica", LongName = "Antarctica", CurrencyCode = "USD", Languages = "" + , UnofficialNames = "Antarctica|Antarktis|Antarctique|Antártida|南極|南极洲", IsPreferred = true)] + [ResourceDescription(nameof(Ln.南极洲))] + AQ = 010 + + , + + /// + /// 诺福克岛 + /// + [Country(CallingCode = 672, CallingSubCode = "3", Alpha3 = "NFK", ShortName = "Norfolk Island", LongName = "The Territory of Norfolk Island" + , CurrencyCode = "AUD", Languages = "en" + , UnofficialNames = "Norfolk Island|Norfolkinsel|Île de Norfolk|Isla de Norfolk|ノーフォーク島|Norfolkeiland|诺福克岛")] + [ResourceDescription(nameof(Ln.诺福克岛))] + NF = 574 + + , + + /// + /// 文莱 + /// + [Country(CallingCode = 673, Alpha3 = "BRN", ShortName = "Brunei Darussalam", LongName = "The Nation of Brunei, the Abode of Peace" + , CurrencyCode = "BND", Languages = "ms", UnofficialNames = "Brunei|ブルネイ・ダルサラーム|文莱")] + [ResourceDescription(nameof(Ln.文莱))] + BN = 096 + + , + + /// + /// 瑙鲁 + /// + [Country(CallingCode = 674, Alpha3 = "NRU", ShortName = "Nauru", LongName = "The Republic of Nauru", CurrencyCode = "AUD", Languages = "en|na" + , UnofficialNames = "Nauru|ナウル|瑙鲁")] + [ResourceDescription(nameof(Ln.瑙鲁))] + NR = 520 + + , + + /// + /// 巴布亚新几内亚 + /// + [Country(CallingCode = 675, Alpha3 = "PNG", ShortName = "Papua New Guinea", LongName = "The Independent State of Papua New Guinea" + , CurrencyCode = "PGK", Languages = "en" + , UnofficialNames = "Papua New Guinea|Papua-Neuguinea|Papouasie Nouvelle-Guinée|Papúa Nueva Guinea|パプアニューギニア|Papoea-Nieuw-Guinea|巴布亚新几内亚")] + [ResourceDescription(nameof(Ln.巴布亚新几内亚))] + PG = 598 + + , + + /// + /// 汤加 + /// + [Country(CallingCode = 676, Alpha3 = "TON", ShortName = "Tonga", LongName = "The Kingdom of Tonga", CurrencyCode = "TOP", Languages = "en|to" + , UnofficialNames = "Tonga|トンガ|汤加")] + [ResourceDescription(nameof(Ln.汤加))] + TO = 776 + + , + + /// + /// 所罗门群岛 + /// + [Country(CallingCode = 677, Alpha3 = "SLB", ShortName = "Solomon Islands", LongName = "The Solomon Islands", CurrencyCode = "SBD" + , Languages = "en", UnofficialNames = "Solomon Islands|Salomonen|Îles Salomon|Islas Salomón|ソロモン諸島|Salomonseilanden|所罗门群岛")] + [ResourceDescription(nameof(Ln.所罗门群岛))] + SB = 090 + + , + + /// + /// 瓦努阿图 + /// + [Country(CallingCode = 678, Alpha3 = "VUT", ShortName = "Vanuatu", LongName = "The Republic of Vanuatu", CurrencyCode = "VUV" + , Languages = "bi|en|fr", UnofficialNames = "Vanuatu|バヌアツ|瓦努阿图")] + [ResourceDescription(nameof(Ln.瓦努阿图))] + VU = 548 + + , + + /// + /// 斐济 + /// + [Country(CallingCode = 679, Alpha3 = "FJI", ShortName = "Fiji", LongName = "The Republic of Fiji", CurrencyCode = "FJD", Languages = "en|fj|hi|ur" + , UnofficialNames = "Fiji|Fidschi|Fidji|フィジー|斐济")] + [ResourceDescription(nameof(Ln.斐济))] + FJ = 242 + + , + + /// + /// 帕劳 + /// + [Country(CallingCode = 680, Alpha3 = "PLW", ShortName = "Palau", LongName = "The Republic of Palau", CurrencyCode = "USD", Languages = "en" + , UnofficialNames = "Palau|パラオ|帕劳")] + [ResourceDescription(nameof(Ln.帕劳))] + PW = 585 + + , + + /// + /// 瓦利斯和富图纳 + /// + [Country(CallingCode = 681, Alpha3 = "WLF", ShortName = "Wallis and Futuna", LongName = "The Territory of the Wallis and Futuna Islands" + , CurrencyCode = "XPF", Languages = "fr" + , UnofficialNames = "Wallis and Futuna|Wallis und Futuna|Wallis et Futuna|Wallis y Futuna|ウォリス・フツナ|Wallis en Futuna|瓦利斯和富图纳")] + [ResourceDescription(nameof(Ln.瓦利斯和富图纳))] + WF = 876 + + , + + /// + /// 库克群岛 + /// + [Country(CallingCode = 682, Alpha3 = "COK", ShortName = "Cook Islands", LongName = "The Cook Islands", CurrencyCode = "NZD", Languages = "en" + , UnofficialNames = "Cook Islands|Cookinseln|Îles Cook|Islas Cook|クック諸島|Cookeilanden|库克群岛")] + [ResourceDescription(nameof(Ln.库克群岛))] + CK = 184 + + , + + /// + /// 纽埃 + /// + [Country(CallingCode = 683, Alpha3 = "NIU", ShortName = "Niue", LongName = "Niue", CurrencyCode = "NZD", Languages = "en" + , UnofficialNames = "Niue|ニウエ|纽埃")] + [ResourceDescription(nameof(Ln.纽埃))] + NU = 570 + + , + + /// + /// 萨摩亚 + /// + [Country(CallingCode = 685, Alpha3 = "WSM", ShortName = "Samoa", LongName = "The Independent State of Samoa", CurrencyCode = "WST" + , Languages = "sm|en", UnofficialNames = "Samoa|サモア|萨摩亚")] + [ResourceDescription(nameof(Ln.萨摩亚))] + WS = 882 + + , + + /// + /// 基里巴斯 + /// + [Country(CallingCode = 686, Alpha3 = "KIR", ShortName = "Kiribati", LongName = "The Republic of Kiribati", CurrencyCode = "AUD", Languages = "en" + , UnofficialNames = "Kiribati|キリバス|基里巴斯")] + [ResourceDescription(nameof(Ln.基里巴斯))] + KI = 296 + + , + + /// + /// 新喀里多尼亚 + /// + [Country(CallingCode = 687, Alpha3 = "NCL", ShortName = "New Caledonia", LongName = "New Caledonia", CurrencyCode = "XPF", Languages = "fr" + , UnofficialNames = "New Caledonia|Neukaledonien|Nouvelle-Calédonie|Nueva Caledonia|ニューカレドニア|Nieuw-Caledonië|新喀里多尼亚")] + [ResourceDescription(nameof(Ln.新喀里多尼亚))] + NC = 540 + + , + + /// + /// 图瓦卢 + /// + [Country(CallingCode = 688, Alpha3 = "TUV", ShortName = "Tuvalu", LongName = "Tuvalu", CurrencyCode = "AUD", Languages = "en" + , UnofficialNames = "Tuvalu|ツバル|图瓦卢")] + [ResourceDescription(nameof(Ln.图瓦卢))] + TV = 798 + + , + + /// + /// 法属波利尼西亚 + /// + [Country(CallingCode = 689, Alpha3 = "PYF", ShortName = "French Polynesia", LongName = "French Polynesia", CurrencyCode = "XPF", Languages = "fr" + , UnofficialNames = "French Polynesia|Französisch-Polynesien|Polynésie Française|Polinesia Francesa|フランス領ポリネシア|Frans-Polynesië|法属波利尼西亚")] + [ResourceDescription(nameof(Ln.法属波利尼西亚))] + PF = 258 + + , + + /// + /// 托克劳 + /// + [Country(CallingCode = 690, Alpha3 = "TKL", ShortName = "Tokelau", LongName = "Tokelau", CurrencyCode = "NZD", Languages = "en" + , UnofficialNames = "Tokelau|Îles Tokelau|Islas Tokelau|トケラウ|托克劳")] + [ResourceDescription(nameof(Ln.托克劳))] + TK = 772 + + , + + /// + /// 密克罗尼西亚联邦 + /// + [Country(CallingCode = 691, Alpha3 = "FSM", ShortName = "Micronesia (Federated States of)", LongName = "The Federated States of Micronesia" + , CurrencyCode = "USD", Languages = "en", UnofficialNames = "Micronesia|Mikronesien|Micronésie|ミクロネシア連邦|Micronesië|密克罗尼西亚联邦")] + [ResourceDescription(nameof(Ln.密克罗尼西亚联邦))] + FM = 583 + + , + + /// + /// 马绍尔群岛 + /// + [Country(CallingCode = 692, Alpha3 = "MHL", ShortName = "Marshall Islands", LongName = "The Republic of the Marshall Islands" + , CurrencyCode = "USD", Languages = "en|mh" + , UnofficialNames = "Marshall Islands|Marshallinseln|Îles Marshall|Islas Marshall|マーシャル諸島|Marshalleilanden|马绍尔群岛")] + [ResourceDescription(nameof(Ln.马绍尔群岛))] + MH = 584 + + , + + /// + /// 朝鲜 + /// + [Country(CallingCode = 850, Alpha3 = "PRK", ShortName = "Korea (Democratic People's Republic of)" + , LongName = "The Democratic People's Republic of Korea", CurrencyCode = "KPW", Languages = "ko" + , UnofficialNames + = "Korea (North)|North Korea|Nordkorea|Corée du Nord|Corea del Norte|朝鮮民主主義人民共和国|Noord-Korea|Korea Democratic People's Republic|Korea (Democratic People s Republic of)|朝鲜")] + [ResourceDescription(nameof(Ln.朝鲜))] + KP = 408 + + , + + /// + /// 香港 + /// + [Country(CallingCode = 852, Alpha3 = "HKG", ShortName = "Hong Kong", LongName = "The Hong Kong Special Administrative Region of China" + , CurrencyCode = "HKD", Languages = "en|zh", UnofficialNames = "Hong Kong|香港|Hongkong")] + [ResourceDescription(nameof(Ln.香港))] + HK = 344 + + , + + /// + /// 澳门 + /// + [Country(CallingCode = 853, Alpha3 = "MAC", ShortName = "Macao", LongName = "The Macao Special Administrative Region of China" + , CurrencyCode = "MOP", Languages = "zh|pt", UnofficialNames = "Macao|Macau|マカオ|澳门")] + [ResourceDescription(nameof(Ln.澳门))] + MO = 446 + + , + + /// + /// 柬埔寨 + /// + [Country(CallingCode = 855, Alpha3 = "KHM", ShortName = "Cambodia", LongName = "The Kingdom of Cambodia", CurrencyCode = "KHR", Languages = "km" + , UnofficialNames = "Cambodia|Kambodscha|Cambodge|Camboya|カンボジア|Cambodja|柬埔寨")] + [ResourceDescription(nameof(Ln.柬埔寨))] + KH = 116 + + , + + /// + /// 老挝 + /// + [Country(CallingCode = 856, Alpha3 = "LAO", ShortName = "Lao People's Democratic Republic", LongName = "The Lao People's Democratic Republic" + , CurrencyCode = "LAK", Languages = "lo", UnofficialNames = "Laos|ラオス人民民主共和国|Lao People s Democratic Republic|老挝")] + [ResourceDescription(nameof(Ln.老挝))] + LA = 418 + + , + + /// + /// 孟加拉国 + /// + [Country(CallingCode = 880, Alpha3 = "BGD", ShortName = "Bangladesh", LongName = "The People's Republic of Bangladesh", CurrencyCode = "BDT" + , Languages = "bn", UnofficialNames = "Bangladesh|Bangladesch|バングラデシュ|孟加拉国")] + [ResourceDescription(nameof(Ln.孟加拉国))] + BD = 050 + + , + + /// + /// 台湾 + /// + [Country(CallingCode = 886, Alpha3 = "TWN", ShortName = "Taiwan, Province of China", LongName = "Taiwan, Province of China", CurrencyCode = "TWD" + , Languages = "zh", UnofficialNames = "Taiwan|Taiwán|台灣|臺灣|台湾")] + [ResourceDescription(nameof(Ln.台湾))] + TW = 158 + + , + + /// + /// 马尔代夫 + /// + [Country(CallingCode = 960, Alpha3 = "MDV", ShortName = "Maldives", LongName = "The Republic of Maldives", CurrencyCode = "MVR", Languages = "dv" + , UnofficialNames = "Maldives|Malediven|Maldivas|モルディブ|Maldiven|马尔代夫")] + [ResourceDescription(nameof(Ln.马尔代夫))] + MV = 462 + + , + + /// + /// 黎巴嫩 + /// + [Country(CallingCode = 961, Alpha3 = "LBN", ShortName = "Lebanon", LongName = "The Lebanese Republic", CurrencyCode = "LBP", Languages = "ar|fr" + , UnofficialNames = "Lebanon|لبنان|Libanon|Liban|Líbano|レバノン|黎巴嫩")] + [ResourceDescription(nameof(Ln.黎巴嫩))] + LB = 422 + + , + + /// + /// 约旦 + /// + [Country(CallingCode = 962, Alpha3 = "JOR", ShortName = "Jordan", LongName = "The Hashemite Kingdom of Jordan", CurrencyCode = "JOD" + , Languages = "ar", UnofficialNames = "Jordan|الأردن|Jordanien|Jordanie|Jordania|ヨルダン|Jordanië|约旦")] + [ResourceDescription(nameof(Ln.约旦))] + JO = 400 + + , + + /// + /// 叙利亚 + /// + [Country(CallingCode = 963, Alpha3 = "SYR", ShortName = "Syrian Arab Republic", LongName = "The Syrian Arab Republic", CurrencyCode = "SYP" + , Languages = "ar", UnofficialNames = "Syria|سوريا|سورية|Syrien|Syrie|Siria|シリア・アラブ共和国|Syrië|叙利亚")] + [ResourceDescription(nameof(Ln.叙利亚))] + SY = 760 + + , + + /// + /// 伊拉克 + /// + [Country(CallingCode = 964, Alpha3 = "IRQ", ShortName = "Iraq", LongName = "The Republic of Iraq", CurrencyCode = "IQD", Languages = "ar" + , UnofficialNames = "Iraq|العراق|Irak|イラク|伊拉克")] + [ResourceDescription(nameof(Ln.伊拉克))] + IQ = 368 + + , + + /// + /// 科威特 + /// + [Country(CallingCode = 965, Alpha3 = "KWT", ShortName = "Kuwait", LongName = "The State of Kuwait", CurrencyCode = "KWD", Languages = "ar" + , UnofficialNames = "Kuwait|الكويت|Koweït|クウェート|Koeweit|科威特")] + [ResourceDescription(nameof(Ln.科威特))] + KW = 414 + + , + + /// + /// 沙特阿拉伯 + /// + [Country(CallingCode = 966, Alpha3 = "SAU", ShortName = "Saudi Arabia", LongName = "The Kingdom of Saudi Arabia", CurrencyCode = "SAR" + , Languages = "ar" + , UnofficialNames + = "Saudi Arabia|Kingdom of Saudi Arabia|السعودية|Saudi-Arabien|Arabie Saoudite|Arabia Saudí|サウジアラビア|Saoedi-Arabië|沙特阿拉伯")] + [ResourceDescription(nameof(Ln.沙特阿拉伯))] + SA = 682 + + , + + /// + /// 也门 + /// + [Country(CallingCode = 967, Alpha3 = "YEM", ShortName = "Yemen", LongName = "The Republic of Yemen", CurrencyCode = "YER", Languages = "ar" + , UnofficialNames = "Yemen|اليمن|Jemen|Yémen|イエメン|也门")] + [ResourceDescription(nameof(Ln.也门))] + YE = 887 + + , + + /// + /// 阿曼 + /// + [Country(CallingCode = 968, Alpha3 = "OMN", ShortName = "Oman", LongName = "The Sultanate of Oman", CurrencyCode = "OMR", Languages = "ar" + , UnofficialNames = "Oman|عمان|Omán|オマーン|阿曼")] + [ResourceDescription(nameof(Ln.阿曼))] + OM = 512 + + , + + /// + /// 巴勒斯坦 + /// + [Country(CallingCode = 970, Alpha3 = "PSE", ShortName = "Palestine, State of", LongName = "The State of Palestine", CurrencyCode = "ILS" + , Languages = "ar|he|en" + , UnofficialNames + = "Palestine|فلسطين|Palästina|Palestina|the Occupied Palestinian Territory|パレスチナ|Palestijnse gebieden|Palestinian Territory Occupied|Palestinian Authority|巴勒斯坦")] + [ResourceDescription(nameof(Ln.巴勒斯坦))] + PS = 275 + + , + + /// + /// 阿联酋 + /// + [Country(CallingCode = 971, Alpha3 = "ARE", ShortName = "United Arab Emirates", LongName = "The United Arab Emirates", CurrencyCode = "AED" + , Languages = "ar" + , UnofficialNames + = "United Arab Emirates|الإمارات العربية المتحدة|Vereinigte Arabische Emirate|Émirats Arabes Unis|Emiratos Árabes Unidos|アラブ首長国連邦|Verenigde Arabische Emiraten|阿联酋")] + [ResourceDescription(nameof(Ln.阿联酋))] + AE = 784 + + , + + /// + /// 以色列 + /// + [Country(CallingCode = 972, Alpha3 = "ISR", ShortName = "Israel", LongName = "The State of Israel", CurrencyCode = "ILS", Languages = "he|ar" + , UnofficialNames = "Israel|Israël|イスラエル|以色列")] + [ResourceDescription(nameof(Ln.以色列))] + IL = 376 + + , + + /// + /// 巴林 + /// + [Country(CallingCode = 973, Alpha3 = "BHR", ShortName = "Bahrain", LongName = "The Kingdom of Bahrain", CurrencyCode = "BHD", Languages = "ar" + , UnofficialNames = "Bahrain|البحرين|Bahreïn|Bahrein|バーレーン|巴林")] + [ResourceDescription(nameof(Ln.巴林))] + BH = 048 + + , + + /// + /// 卡塔尔 + /// + [Country(CallingCode = 974, Alpha3 = "QAT", ShortName = "Qatar", LongName = "The State of Qatar", CurrencyCode = "QAR", Languages = "ar" + , UnofficialNames = "Qatar|قطر|Katar|カタール|卡塔尔")] + [ResourceDescription(nameof(Ln.卡塔尔))] + QA = 634 + + , + + /// + /// 不丹 + /// + [Country(CallingCode = 975, Alpha3 = "BTN", ShortName = "Bhutan", LongName = "The Kingdom of Bhutan", CurrencyCode = "BTN", Languages = "dz" + , UnofficialNames = "Bhutan|Bhoutan|Bután|ブータン|不丹")] + [ResourceDescription(nameof(Ln.不丹))] + BT = 064 + + , + + /// + /// 蒙古 + /// + [Country(CallingCode = 976, Alpha3 = "MNG", ShortName = "Mongolia", LongName = "Mongolia", CurrencyCode = "MNT", Languages = "mn" + , UnofficialNames = "Mongolia|Mongolei|Mongolie|モンゴル|Mongolië|蒙古")] + [ResourceDescription(nameof(Ln.蒙古))] + MN = 496 + + , + + /// + /// 尼泊尔 + /// + [Country(CallingCode = 977, Alpha3 = "NPL", ShortName = "Nepal", LongName = "The Federal Democratic Republic of Nepal", CurrencyCode = "NPR" + , Languages = "ne|mai|bho|new|urd", UnofficialNames = "Nepal|Népal|the Federal Democratic Republic of Nepal|ネパール|尼泊尔")] + [ResourceDescription(nameof(Ln.尼泊尔))] + NP = 524 + + , + + /// + /// 塔吉克斯坦 + /// + [Country(CallingCode = 992, Alpha3 = "TJK", ShortName = "Tajikistan", LongName = "The Republic of Tajikistan", CurrencyCode = "TJS" + , Languages = "tg|ru", UnofficialNames = "Tajikistan|Tadschikistan|Tayikistán|タジキスタン|Tadzjikistan|Tajikstan|塔吉克斯坦")] + [ResourceDescription(nameof(Ln.塔吉克斯坦))] + TJ = 762 + + , + + /// + /// 土库曼斯坦 + /// + [Country(CallingCode = 993, Alpha3 = "TKM", ShortName = "Turkmenistan", LongName = "Turkmenistan", CurrencyCode = "TMT", Languages = "tk|ru" + , UnofficialNames = "Turkmenistan|Turkménistan|Turkmenistán|トルクメニスタン|Turkmenia|土库曼斯坦")] + [ResourceDescription(nameof(Ln.土库曼斯坦))] + TM = 795 + + , + + /// + /// 阿塞拜疆 + /// + [Country(CallingCode = 994, Alpha3 = "AZE", ShortName = "Azerbaijan", LongName = "The Republic of Azerbaijan", CurrencyCode = "AZN" + , Languages = "az|hy", UnofficialNames = "Azerbaijan|Aserbaidschan|Azerbaïdjan|Azerbaiyán|アゼルバイジャン|Azerbeidzjan|阿塞拜疆")] + [ResourceDescription(nameof(Ln.阿塞拜疆))] + AZ = 031 + + , + + /// + /// 格鲁吉亚 + /// + [Country(CallingCode = 995, Alpha3 = "GEO", ShortName = "Georgia", LongName = "Georgia", CurrencyCode = "GEL", Languages = "ka" + , UnofficialNames = "Georgia|Georgien|Géorgie|グルジア|Georgië|格鲁吉亚")] + [ResourceDescription(nameof(Ln.格鲁吉亚))] + GE = 268 + + , + + /// + /// 吉尔吉斯斯坦 + /// + [Country(CallingCode = 996, Alpha3 = "KGZ", ShortName = "Kyrgyzstan", LongName = "The Kyrgyz Republic", CurrencyCode = "KGS", Languages = "ky|ru" + , UnofficialNames = "Kyrgyzstan|Kirgisistan|Kirghizistan|Kirguizistán|キルギス|Kirgizië|Kyrgzstan|吉尔吉斯斯坦")] + [ResourceDescription(nameof(Ln.吉尔吉斯斯坦))] + KG = 417 + + , + + /// + /// 乌兹别克斯坦 + /// + [Country(CallingCode = 998, Alpha3 = "UZB", ShortName = "Uzbekistan", LongName = "The Republic of Uzbekistan", CurrencyCode = "UZS" + , Languages = "uz|ru", UnofficialNames = "Uzbekistan|Usbekistan|Ouzbékistan|Uzbekistán|ウズベキスタン|Oezbekistan|乌兹别克斯坦")] + [ResourceDescription(nameof(Ln.乌兹别克斯坦))] + UZ = 860 +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Enums/Nations.cs b/src/backend/NetAdmin.Infrastructure/Enums/Nations.cs index d1e5feda..9f794bb1 100644 --- a/src/backend/NetAdmin.Infrastructure/Enums/Nations.cs +++ b/src/backend/NetAdmin.Infrastructure/Enums/Nations.cs @@ -1,4 +1,5 @@ // ReSharper disable IdentifierTypo +// ReSharper disable UnusedMember.Global namespace NetAdmin.Infrastructure.Enums; diff --git a/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs b/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs index f6fe8c99..7fe706db 100644 --- a/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs +++ b/src/backend/NetAdmin.Infrastructure/GlobalStatic.cs @@ -35,11 +35,6 @@ public static class GlobalStatic /// public static DateTime LatestLogTime => LogCounterOff ? DateTime.MinValue : Volatile.Read(ref _latestLogTime).Time(); - /// - /// 日志记录器忽略的API编号 - /// - public static string[] LoggerIgnoreApiIds => ["api/adm/tools/query.es.log", "api/probe/health.check", "api/probe/is.system.safety.stopped"]; - /// /// 系统内部密钥 /// diff --git a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 5bc6f942..b5f971ee 100644 --- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -5,16 +5,36 @@ - - - + + + + + Languages/NetAdmin.Statements.ln + + + Languages/Nations.ln + + + Languages/NetAdmin.Fields.ln + + + Languages/CountryCodes.ln + + + Languages/Ln.resx + PublicResXFileCodeGenerator + + + Languages/Ln.Designer.cs + + PreserveNewest diff --git a/src/backend/NetAdmin.Infrastructure/commonSettings.Test.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json similarity index 61% rename from src/backend/NetAdmin.Infrastructure/commonSettings.Test.json rename to src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json index ec5e6a8c..b5cc14fa 100644 --- a/src/backend/NetAdmin.Infrastructure/commonSettings.Test.json +++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json @@ -3,13 +3,5 @@ "AppSettings": { "InjectSpecificationDocument": true, "InjectMiniProfiler": true - }, - "JWTSettings": { - "ExpiredTime": 20000 - }, - "Logging": { - "LogLevel": { - "Default": "Debug", - }, } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/commonSettings.Development.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json similarity index 59% rename from src/backend/NetAdmin.Infrastructure/commonSettings.Development.json rename to src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json index d1d84842..b5cc14fa 100644 --- a/src/backend/NetAdmin.Infrastructure/commonSettings.Development.json +++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json @@ -3,13 +3,5 @@ "AppSettings": { "InjectSpecificationDocument": true, "InjectMiniProfiler": true - }, - "JWTSettings": { - "ExpiredTime": 20000 - }, - "Logging": { - "LogLevel": { - "Default": "Debug", - }, - }, + } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json new file mode 100644 index 00000000..b5cc14fa --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + "AppSettings": { + "InjectSpecificationDocument": true, + "InjectMiniProfiler": true + } +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json new file mode 100644 index 00000000..9a1d2e84 --- /dev/null +++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json @@ -0,0 +1,143 @@ +{ + "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", + // App基本配置 + "AppSettings": { + "InjectSpecificationDocument": false, + "InjectMiniProfiler": false + }, + // Swagger文档配置 ------------------------------------------------------------------------------ + "SpecificationDocumentSettings": { + "EnableEnumSchemaFilter": false, + "EnableAuthorized": false, + "RoutePrefix": "swagger", + "SecurityDefinitions": [ + { + "Id": "Bearer", + "Type": "ApiKey", + "Name": "Authorization", + "Description": "JWT Authorization header using the Bearer scheme.", + "BearerFormat": "JWT", + "Scheme": "bearer", + "In": "Header", + "Requirement": { + "Scheme": { + "Reference": { + "Id": "Bearer", + "Type": "SecurityScheme" + }, + "Accesses": [] + } + } + } + ], + }, + // 验证码配置 -------------------------------------------------------------------------------------------------------- + "Captcha": { + "ImageRelativePath": ".data/captcha", + "SecretKey": "1Z?f(2)%v?:X5NYRl+]PSi.rDf7Ip#lB" + }, + // 跨域配置 ---------------------------------------------------------------------------------------------------------- + "CorsAccessorSettings": { + "WithExposedHeaders": [ + "access-token", + "x-access-token", + "content-disposition" + ] + }, + // 动态webapi配置 ---------------------------------------------------------------------------------------------------- + "DynamicApiControllerSettings": { + "VerbToHttpMethods": [ + [ + "post", + "POST" + ], + [ + "add", + "POST" + ], + [ + "create", + "POST" + ], + [ + "insert", + "POST" + ], + [ + "submit", + "POST" + ], + [ + "get", + "POST" + ], + [ + "find", + "POST" + ], + [ + "fetch", + "POST" + ], + [ + "query", + "POST" + ], + [ + "getlist", + "POST" + ], + [ + "getall", + "POST" + ], + [ + "put", + "POST" + ], + [ + "update", + "POST" + ], + [ + "delete", + "POST" + ], + [ + "remove", + "POST" + ], + [ + "clear", + "POST" + ], + [ + "patch", + "POST" + ] + ], + "CamelCaseSeparator": ".", + "UrlParameterization": true, + "KeepVerb": true, + "AbandonControllerAffixes": [ + "Controller" + ] + }, + // 友好异常配置 ------------------------------------------------------------------------------------------------------- + "FriendlyExceptionSettings": { + "LogError": false + }, + // 日志配置 ---------------------------------------------------------------------------------------------------------- + "Logging": { + "Monitor": { + "GlobalEnabled": false, + "ReturnValueThreshold": 1000 + } + }, + // UnifyResultSettings 规范化配置 ------------------------------------------------------------------------------------ + "UnifyResultSettings": { + "Return200StatusCodes": [ + 999 + ] + }, +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/ProjectUsings.cs b/src/backend/NetAdmin.Infrastructure/ProjectUsings.cs index 245f9f9f..5137640f 100644 --- a/src/backend/NetAdmin.Infrastructure/ProjectUsings.cs +++ b/src/backend/NetAdmin.Infrastructure/ProjectUsings.cs @@ -1 +1 @@ -global using Furion.RemoteRequest; \ No newline at end of file +global using Gurion.RemoteRequest; \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs index 8605bc89..470a92b3 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs @@ -1,3 +1,6 @@ +#if DBTYPE_SQLSERVER +using Microsoft.Data.SqlClient; +#endif using Newtonsoft.Json; using DataType = FreeSql.DataType; @@ -13,10 +16,16 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) /// public IFreeSql Build(FreeSqlInitMethods initMethods) { - var freeSql = new FreeSql.FreeSqlBuilder().UseConnectionString(databaseOptions.DbType, databaseOptions.ConnStr) - .UseGenerateCommandParameterWithLambda(true) - .UseAutoSyncStructure(initMethods.HasFlag(FreeSqlInitMethods.SyncStructure)) - .Build(); + var freeSql = new FreeSql.FreeSqlBuilder() + #if DBTYPE_SQLSERVER + .UseConnectionFactory(databaseOptions.DbType, () => new SqlConnection(databaseOptions.ConnStr)) + .UseAdoConnectionPool(true) + #else + .UseConnectionString(databaseOptions.DbType, databaseOptions.ConnStr) + #endif + .UseGenerateCommandParameterWithLambda(true) + .UseAutoSyncStructure(initMethods.HasFlag(FreeSqlInitMethods.SyncStructure)) + .Build(); _ = InitDbAsync(freeSql, initMethods); // 初始化数据库 ，异步 return freeSql; } diff --git a/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs b/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs index 45545da0..1b0a3d7b 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/XmlCommentReader.cs @@ -19,7 +19,7 @@ public sealed class XmlCommentReader : ISingleton var xmlComments = specificationDocumentSettings.Value.XmlComments // ?? App.GetConfig(nameof(SpecificationDocumentSettingsOptions).TrimSuffixOptions()) .XmlComments; - foreach (var commentFile in xmlComments.Where(x => x.Contains(nameof(NetAdmin)))) { + foreach (var commentFile in xmlComments) { var xmlDoc = new XmlDocument(); var xmlFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, commentFile); if (!File.Exists(xmlFilePath)) { diff --git a/src/backend/NetAdmin.Infrastructure/commonSettings.json b/src/backend/NetAdmin.Infrastructure/commonSettings.json deleted file mode 100644 index bc42a27a..00000000 --- a/src/backend/NetAdmin.Infrastructure/commonSettings.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", - // App基本配置 - "AppSettings": { - // AppSettings：配置根节点 - // InjectMiniProfiler：是否注入 MiniProfiler，bool 类型，默认 true，关闭 Swagger 左上角监听 - // InjectSpecificationDocument：是否启用 Swagger 文档，bool 类型，默认 true，生产环境可关闭 - // EnabledReferenceAssemblyScan：是否启用通过 dll 方式添加的引用程序集扫描，bool 类型，默认 false - // ExternalAssemblies：配置外部程序集完整路径，支持动态加载，string[] 类型，默认 [] - // PrintDbConnectionInfo：是否打印数据库连接信息到 MiniProfiler 中，bool 类型，默认 true - // SupportPackageNamePrefixs：配置支持的包前缀名，string[] 类型，默认 [] - // OutputOriginalSqlExecuteLog：是否输出原始 Sql 执行日志（ADO.NET），默认 true - // VirtualPath：配置虚拟目录，必须以 / 开头 - "InjectSpecificationDocument": false, - "InjectMiniProfiler": false - }, - // Swagger文档配置 ------------------------------------------------------------------------------ - "SpecificationDocumentSettings": { - // DocumentTitle：文档标题，string，默认 Specification Api Document - // DefaultGroupName：默认分组名，string，默认 Default - // EnableAuthorized：是否启用权限控制，bool，默认 true - // FormatAsV2：采用 Swagger 2.0 版本，bool，默认 false 已弃用 - // RoutePrefix：规范化文档地址，string，默认 api，如果希望在首页，改为空字符串即可。 - // DocExpansionState：文档显示方式，DocExpansion，默认 List，取值： - // List：列表式（展开子类），默认值 - // Full：完全展开 - // None：列表式（不展开子类） - // XmlComments：程序集注释描述文件名（可带 .xml，string，默认 Furion.Application, Furion.Web.Entry, Furion.Web.Core - // GroupOpenApiInfos：分组信息配置，SpecificationOpenApiInfo[]，默认 { 'Group': 'Default'} - // SecurityDefinitions：安全策略定义配置，SpecificationOpenApiSecurityScheme[]，默认 [] - // Servers：配置 Server 下拉列表，OpenApiServer[] 类型，默认 []，如：{Servers:[ { Url:"地址", Description:"描述"} ]} - // HideServers：是否隐藏 Server 下拉列表，bool 类型，默认 true - // RouteTemplate：配置文档 swagger.json 路由模板，默认模板：swagger/{documentName}/swagger.json, {documentName} 代表分组名，必须保留原样 - // PackagesGroups：配置模块化内置分组名称，string[] 类型，默认 [] - // EnableEnumSchemaFilter：启用枚举 Schema 筛选器，bool 类型，默认 true - // EnableTagsOrderDocumentFilter：启用标签排序筛选器，bool 类型，默认 true - // ServerDir：配置 IIS 添加 Application 部署名，string 类型，默认空，仅在 Furion v3.2.0+` 有效 - // LoginInfo：配置 Swagger 是否需要登录才能访问，SpecificationLoginInfo 类型，默认 null，仅在 Furion v3.3.3+` 有效 - // Enabled：是否启用登录授权，默认 false - // CheckUrl：检查登录状态的 Url 地址，该地址必须是 POST 请求，已授权返回 200，否则返回 401 - // SubmitUrl：提交登录的 Url 地址，该地址必须是 POST 请求且只有一个 SpecificationAuth 类型参数，成功登录返回 200，否则返回 401，支持相对地址，以 / 开头 - // EnableAllGroups：启用 Swagger 总分组功能，自动将所有分组的接口合并到 All Groups 中，bool 类型，默认 false，仅在 Furion v3.3.4+` 有效 - // 另外 SpecificationOpenApiInfo 内置配置如下： - // - // Group：分组唯一标识，string 类型，必填 - // Order：分组排序，int 类型，数字越大排前面，默认 0 - // Visible：配置分组是否可见，bool 类型，默认 true - // Title：配置分组标题，string 类型 - // Description：配置分组描述，string 类型 - // Version：配置分组版本，默认 1.0 - // TermsOfService：配置相关链接地址，Uri 类型 - // Contact：配置联系方式，OpenApiContact 类型 - // License：配置协议，OpenApiLicense 类型 - "EnableEnumSchemaFilter": false, - "EnableAuthorized": false, - "RoutePrefix": "swagger", - "XmlComments": [ - "FreeSql.xml", - "NetAdmin.AdmServer.Application.xml", - "NetAdmin.AdmServer.Cache.xml", - "NetAdmin.AdmServer.Host.xml", - "NetAdmin.Application.xml", - "NetAdmin.Cache.xml", - "NetAdmin.Domain.xml", - "NetAdmin.Host.xml", - "NetAdmin.Infrastructure.xml", - "NetAdmin.ScheduledService.xml", - "NetAdmin.SysComponent.Application.xml", - "NetAdmin.SysComponent.Cache.xml", - "NetAdmin.SysComponent.Host.xml", - ] - }, - // 验证码配置 -------------------------------------------------------------------------------------------------------- - "Captcha": { - "ImageRelativePath": ".data/captcha", - "SecretKey": "1Z?f(2)%v?:X5NYRl+]PSi.rDf7Ip#lB" - }, - // 跨域配置 ---------------------------------------------------------------------------------------------------------- - "CorsAccessorSettings": { - // CorsAccessorSettings - // PolicyName：跨域策略名，string 类型，必填，默认 App.Cors.Policy - // WithOrigins：允许跨域的域名列表，string[] 类型，默认 * - // WithHeaders：请求表头，没有配置则允许所有表头，string[] 类型 - // WithExposedHeaders：设置客户端可获取的响应标头，string[] 类型，默认 ["access-token", "x-access-token"] - // WithMethods：设置跨域允许请求谓词，没有配置则允许所有，string[] 类型 - // AllowCredentials：是否允许跨域请求中的凭据，bool 类型，默认值 true - // SetPreflightMaxAge：设置预检过期时间，int 类型，默认值 24小时 - // FixedClientToken：是否默认配置 WithExposedHeaders，bool 类型，默认 true - // SignalRSupport：是否启用 SignalR 跨域支持，bool 类型，默认 false - "WithExposedHeaders": [ - "access-token", - "x-access-token", - "content-disposition" - ] - }, - // 数据库配置 -------------------------------------------------------------------------------------------------------- - "Database": { - "DbType": "Sqlite", - "ConnStr": "data source=NetAdmin.db", - "SeedDataRelativePath": "SeedData" - }, - // 动态webapi配置 ---------------------------------------------------------------------------------------------------- - "DynamicApiControllerSettings": { - // 5.1.10 DynamicApiControllerSettings 配置 - // Furion 还提供动态 WebAPI 接口一些全局配置选项，如： - // - // DefaultRoutePrefix：默认路由前缀，string，默认 api - // DefaultHttpMethod：默认请求谓词，string，默认：POST - // DefaultModule：默认模块名称（区域），可用作接口版本，string，默认：v1 - // LowercaseRoute：小写路由格式，bool，默认：true - // AsLowerCamelCase：启用小驼峰命名（首字母小写），默认 false - // KeepVerb：是否保留动作谓词，bool，默认：false - // KeepName：是否保留默认名称，bool，默认：fasle - // CamelCaseSeparator：骆驼(驼峰)/帕斯卡命名分隔符，string，默认：- - // VersionSeparator：版本分隔符，string，默认：@ - // ModelToQuery：GET/HEAD 请求将 类类型参数转查询参数，bool，默认 false - // SupportedMvcController：是否支持 Mvc Controller 动态配置，bool，默认 false - // UrlParameterization：路由参数采用 [FromQuery] 化，默认 false（[FromRoute] 方式） - // DefaultArea：配置默认区域，默认 null - // ForceWithRoutePrefix：配置是否强制添加 DefaultRoutePrefix，当控制器自定义了 [Route] 有效，仅限 v3.4.1+版本有效 - // AbandonControllerAffixes：默认去除控制器名称前后缀列表名，string[]，默认： - // AppServices - // AppService - // ApiController - // Controller - // Services - // Service - // AbandonActionAffixes：默认去除动作方法名称前后缀列表名，string[]，默认： - // Async - // VerbToHttpMethods：复写默认方法名转 [HttpMethod] 规则，string[][] 二维数组类型，内置匹配规则为： - // ["post"] = "POST", - // ["add"] = "POST", - // ["create"] = "POST", - // ["insert"] = "POST", - // ["submit"] = "POST", - // ["get"] = "GET", - // ["find"] = "GET", - // ["fetch"] = "GET", - // ["query"] = "GET", - // ["getlist"] = "GET", - // ["getall"] = "GET", - // ["put"] = "PUT", - // ["update"] = "PUT", - // ["delete"] = "DELETE", - // ["remove"] = "DELETE", - // ["clear"] = "DELETE", - // ["patch"] = "PATCH" - // - // 复写示例 - // "DynamicApiControllerSettings": { - // "VerbToHttpMethods": [ - // [ "getall", "HEAD" ], // => getall 会被复写为 `[HttpHead]` - // [ "other", "PUT" ] // => 新增一条新规则，比如，一 `[other]` 开头会转换为 `[HttpPut]` 请求 - // ] - // } - // "DefaultRoutePrefix": "rest", - "VerbToHttpMethods": [ - [ - "post", - "POST" - ], - [ - "add", - "POST" - ], - [ - "create", - "POST" - ], - [ - "insert", - "POST" - ], - [ - "submit", - "POST" - ], - [ - "get", - "POST" - ], - [ - "find", - "POST" - ], - [ - "fetch", - "POST" - ], - [ - "query", - "POST" - ], - [ - "getlist", - "POST" - ], - [ - "getall", - "POST" - ], - [ - "put", - "POST" - ], - [ - "update", - "POST" - ], - [ - "delete", - "POST" - ], - [ - "remove", - "POST" - ], - [ - "clear", - "POST" - ], - [ - "patch", - "POST" - ] - ], - "CamelCaseSeparator": ".", - "UrlParameterization": true, - "KeepVerb": true, - "AbandonControllerAffixes": [ - "Controller" - ], - }, - // 友好异常配置 ------------------------------------------------------------------------------------------------------- - "FriendlyExceptionSettings": { - // 7.15 FriendlyExceptionSettings 配置 - // HideErrorCode：隐藏错误码，bool 类型，默认 false - // DefaultErrorCode：默认错误码，string 类型 - // DefaultErrorMessage：默认错误消息，string 类型 - // ThrowBah：是否将 Oops.Oh 默认抛出为业务异常，bool 类型，默认 false，设置 true 之后 Oops.Oh 默认进入 OnValidateFailed 处理，而不是 OnException - // LogError：是否输出异常日志，bool 类型，默认 true - "LogError": false - }, - // JWT鉴权配置 ------------------------------------------------------------------------------------------------------- - "JWTSettings": { - "ValidateIssuerSigningKey": true, - // 是否验证密钥，bool 类型，默认true - "IssuerSigningKey": "bO0BCAGxpxYnm6AE4XpgO25T27NayFzjGgfDqBuzUzD6ROpFiZUi3KjVg93bdGek", - // 密钥，string 类型，必须是复杂密钥，长度大于16 - "ValidateIssuer": true, - // 是否验证签发方，bool 类型，默认true - "ValidIssuer": "签发方", - // 签发方，string 类型 - "ValidateAudience": true, - // 是否验证签收方，bool 类型，默认true - "ValidAudience": "签收方", - // 签收方，string 类型 - "ValidateLifetime": true, - // 是否验证过期时间，bool 类型，默认true，建议true - "ExpiredTime": 20, - // 过期时间，long 类型，单位分钟，默认20分钟 - "ClockSkew": 5, - // 过期时间容错值，long 类型，单位秒，默认 5秒 - "Algorithm": "HS256" - // 加密算法，string 类型，默认 HS256 - }, - // 日志配置 ---------------------------------------------------------------------------------------------------------- - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning", - "System.Logging.EventBusService": "Error" - }, - "Monitor": { - "GlobalEnabled": false, - // 是否启用全局拦截，默认 `false` - // "IncludeOfMethods": [], // 是否指定拦截特定方法，当 GlobalEnabled: false 有效 - // "ExcludeOfMethods": [], // 是否指定排除特定方法，当 GlobalEnabled: true 有效 - // "BahLogLevel": "Information", // 配置 Oops.Oh 和 Oops.Bah 业务日志输出级别，默认 Information - // "WithReturnValue": true, // 配置是否包含返回值，默认 `true`，Furion 4.3.9+ 有效 - "ReturnValueThreshold": 1000 - // 配置返回值字符串阈值，默认 0，全量输出，Furion 4.3.9+ 有效 - // "JsonBehavior": "None", // 配置 LoggingMonitor Json 输出行为，默认 None，Furion 4.5.2+ 有效 - // "MethodsSettings": [ - // // 配置被监视方法更多信息，Furion 4.3.9+ 有效 - // { - // "FullName": "Furion.Application.TestLoggerServices.MethodName", // 方法完全限定名 - // "WithReturnValue": true, // 配置是否包含返回值，默认 `true`，Furion 4.3.9+ 有效 - // "ReturnValueThreshold": 0 // 配置返回值字符串阈值，默认 0，全量输出，Furion 4.3.9+ 有效 - // } - // ] - } - }, - // Redis配置 -------------------------------------------------------------------------------------------------------- - "Redis": { - "Instances": [ - // 数据缓存 - { - "Name": "DataCache", - "ConnStr": "localhost:6379,abortConnect=false", - "DataBase": 0, - } - ] - }, - // UnifyResultSettings 规范化配置 ------------------------------------------------------------------------------------ - "UnifyResultSettings": { - // Return200StatusCodes：配置返回 200 状态码的请求，int[] 类型，只支持 400+(404除外) 状态码篡改 - // AdaptStatusCodes：配置篡改状态码规则，int[][] 类型，只支持 400+(404除外) 状态码篡改 - // SupportMvcController：是否支持 MVC 控制台规范化处理，bool 类型，默认 false - "Return200StatusCodes": [ - 999 - ], - }, - // 文件上传配置 ------------------------------------------------------------------------------------------------------- - "Upload": { - "ContentTypes": [ - "image/jpg", - "image/png", - "image/jpeg", - "image/gif" - ], - "MaxSize": 1073741824, - "Minio": { - "ServerAddress": "vm-ubt-1:9000", - "AccessKey": "nVMM0gSqwyIjM8iZ", - "SecretKey": "F8OZngGrNsZSYn4MP9swwMSf5rfm61EC", - "BucketName": "net-admin", - "AccessUrl": "http://vm-ubt-1:9000", - "Secure": false, - } - }, -} \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs index 72b8d6ba..ec4df342 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs index fa6b6951..e8e755a5 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Cache; +using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs index a37af239..3e15a386 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs index 5b902427..6614f1de 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.SysComponent.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs index 9e2725af..d34043d3 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs index cb3c2092..d8db9483 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dev; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs index 2830c1b7..679eb82d 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs index 2acdc846..c995fa24 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs index 42252a8c..4f57971f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs index 48c54559..1da32e29 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs @@ -1,6 +1,5 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs index 3d37a3fa..91080612 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs index ec9d28d0..00f977cc 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs index 2c069f7e..5e41c58b 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs index 11238892..6a7fe99f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs index 23b4701b..9691eb7f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs @@ -1,5 +1,4 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs index 6b05ed4e..0b1f3284 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs index 69be14a9..1487bc98 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs index 18ab3c25..738b1a1e 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs index 78a73738..7c80c27a 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs index 88e81005..c2093f69 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs index 55c2ae91..f7ac0d6c 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs index d0bbe7ac..912a4ff2 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Tool; +using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs index 24127e05..be2c28fb 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs index f5939a85..59964736 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs index 7cd4e075..7c53f851 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs index 16a7a99e..8527320b 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; // ReSharper disable once CheckNamespace namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj b/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj index ecbae60d..b2e71582 100644 --- a/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj +++ b/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj @@ -1,9 +1,7 @@ - - DBTYPE_SQLITE - + \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Application/ProjectUsings.cs b/src/backend/NetAdmin.SysComponent.Application/ProjectUsings.cs index 4993b6bd..62d5b2cf 100644 --- a/src/backend/NetAdmin.SysComponent.Application/ProjectUsings.cs +++ b/src/backend/NetAdmin.SysComponent.Application/ProjectUsings.cs @@ -1,9 +1,11 @@ -global using NetAdmin.Application.Modules; +global using NetAdmin.Application.Modules; global using NetAdmin.Application.Repositories; global using NetAdmin.Application.Services; -global using NetAdmin.Domain.DbMaps.Sys; global using NetAdmin.Domain.Dto.Dependency; global using NetAdmin.SysComponent.Application.Modules.Sys; global using NetAdmin.SysComponent.Application.Services.Sys.Dependency; +global using NetAdmin.SysComponent.Domain.DbMaps.Sys; +global using NetAdmin.SysComponent.Domain.Dto.Sys; +global using NetAdmin.SysComponent.Domain.Enums.Sys; global using DynamicFilterInfo = NetAdmin.Domain.Dto.DynamicFilterInfo; global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs index f48053ac..c4a59518 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs index 27f65598..9c3c39f5 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using NetAdmin.Domain.Dto.Sys.Cache; +using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; using StackExchange.Redis; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs index dbb3963a..1a6600e3 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; using SixLabors.ImageSharp; using Yitter.IdGenerator; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs index c03cf873..f77ae523 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.SysComponent.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs index cd319bdb..acac3f75 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs index 885c369a..440153ea 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs index 38483235..e49ddb34 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs index b192498b..02beb84e 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs @@ -1,5 +1,4 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs index 2824b894..e3f65f13 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs index dfe64064..dfc8c481 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs index 2912d2bb..6de23d56 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs index 41589204..e77b7219 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs index 24c18878..9026d4c2 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs index 9bc20448..6de64752 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs index b341d6b7..656c5bdd 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.Api; -using NetAdmin.Domain.Dto.Sys.Dev; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -20,33 +20,32 @@ public sealed class DevService(IApiService apiService) : ServiceBase public async Task GenerateCsCodeAsync(GenerateCsCodeReq req) { req.ThrowIfInvalid(); - - // 模块类型（Sys、Adm、等） - var moduleType = Enum.GetName(req.Type)!; - var @namespace = req.Type.ToString(); + int index; + var typeAbbr = req.Type[(index = req.Type.LastIndexOf('.') + 1)..(index + 3)]; // 模板层目录 - var tplHostDir = GetDir("SysComponent.Host"); - var tplCacheDir = GetDir("SysComponent.Cache"); - var tplAppDir = GetDir("SysComponent.Application"); + var tplHostDir = GetDir("NetAdmin.Host"); + var tplCacheDir = GetDir("NetAdmin.Cache"); + var tplDataDir = GetDir("NetAdmin.Domain"); + var tplAppDir = GetDir("NetAdmin.Application"); // 主机层目录 - var hostControllerDir = Path.Combine(GetDir($"{moduleType}.Host"), "Controllers", moduleType[..3]); + var hostControllerDir = Path.Combine(GetDir($"{req.Type}.Host"), "Controllers", typeAbbr); // 缓存层目录 - var cacheDir = Path.Combine(GetDir($"{moduleType}.Cache"), moduleType[..3]); - var cacheDependencyDir = Path.Combine(cacheDir, "Dependency"); + var cacheDir = Path.Combine(GetDir($"{req.Type}.Cache"), typeAbbr); + var cacheDependencyDir = Path.Combine(cacheDir, "Dependency"); // 业务逻辑层目录 - var appDir = GetDir($"{moduleType}.Application"); - var appModulesDir = Path.Combine(appDir, "Modules", moduleType[..3]); - var appServicesDir = Path.Combine(appDir, "Services", moduleType[..3]); + var appDir = GetDir($"{req.Type}.Application"); + var appModulesDir = Path.Combine(appDir, "Modules", typeAbbr); + var appServicesDir = Path.Combine(appDir, "Services", typeAbbr); var appServicesDependencyDir = Path.Combine(appServicesDir, "Dependency"); // 数据契约层目录 - var dataDir = GetDir("NetAdmin.Domain"); - var dtoDir = Path.Combine(dataDir, "Dto", moduleType[..3], req.ModuleName); - var entityDir = Path.Combine(dataDir, "DbMaps", moduleType[..3]); + var dataDir = GetDir($"{req.Type}.Domain"); + var dtoDir = Path.Combine(dataDir, "Dto", typeAbbr, req.ModuleName); + var entityDir = Path.Combine(dataDir, "DbMaps", typeAbbr); // 创建缺少的目录 CreateDir(hostControllerDir, cacheDir, cacheDependencyDir, appDir, appModulesDir, appServicesDir, appServicesDependencyDir, dataDir, dtoDir @@ -54,52 +53,52 @@ public sealed class DevService(IApiService apiService) : ServiceBase // Controller await WriteCodeFileAsync(req, Path.Combine(tplHostDir, "Controllers", "Tpl", "ExampleController.cs") - , Path.Combine(hostControllerDir, $"{req.ModuleName}Controller.cs"), @namespace) + , Path.Combine(hostControllerDir, $"{req.ModuleName}Controller.cs"), typeAbbr) .ConfigureAwait(false); // CreateReq - await WriteCodeFileAsync(req, Path.Combine(dataDir, "Dto", "Tpl", "Example", "CreateExampleReq.cs") - , Path.Combine(dtoDir, $"Create{req.ModuleName}Req.cs"), @namespace) + await WriteCodeFileAsync(req, Path.Combine(tplDataDir, "Dto", "Tpl", "Example", "CreateExampleReq.cs") + , Path.Combine(dtoDir, $"Create{req.ModuleName}Req.cs"), typeAbbr) .ConfigureAwait(false); // QueryReq - await WriteCodeFileAsync(req, Path.Combine(dataDir, "Dto", "Tpl", "Example", "QueryExampleReq.cs") - , Path.Combine(dtoDir, $"Query{req.ModuleName}Req.cs"), @namespace) + await WriteCodeFileAsync(req, Path.Combine(tplDataDir, "Dto", "Tpl", "Example", "QueryExampleReq.cs") + , Path.Combine(dtoDir, $"Query{req.ModuleName}Req.cs"), typeAbbr) .ConfigureAwait(false); // QueryRsp - await WriteCodeFileAsync(req, Path.Combine(dataDir, "Dto", "Tpl", "Example", "QueryExampleRsp.cs") - , Path.Combine(dtoDir, $"Query{req.ModuleName}Rsp.cs"), @namespace) + await WriteCodeFileAsync(req, Path.Combine(tplDataDir, "Dto", "Tpl", "Example", "QueryExampleRsp.cs") + , Path.Combine(dtoDir, $"Query{req.ModuleName}Rsp.cs"), typeAbbr) .ConfigureAwait(false); // ICache await WriteCodeFileAsync(req, Path.Combine(tplCacheDir, "Tpl", "Dependency", "IExampleCache.cs") - , Path.Combine(cacheDependencyDir, $"I{req.ModuleName}Cache.cs"), @namespace) + , Path.Combine(cacheDependencyDir, $"I{req.ModuleName}Cache.cs"), typeAbbr) .ConfigureAwait(false); // Cache await WriteCodeFileAsync(req, Path.Combine(tplCacheDir, "Tpl", "ExampleCache.cs"), Path.Combine(cacheDir, $"{req.ModuleName}Cache.cs") - , @namespace) + , typeAbbr) .ConfigureAwait(false); // IModule await WriteCodeFileAsync(req, Path.Combine(tplAppDir, "Modules", "Tpl", "IExampleModule.cs") - , Path.Combine(appModulesDir, $"I{req.ModuleName}Module.cs"), @namespace) + , Path.Combine(appModulesDir, $"I{req.ModuleName}Module.cs"), typeAbbr) .ConfigureAwait(false); // IService await WriteCodeFileAsync(req, Path.Combine(tplAppDir, "Services", "Tpl", "Dependency", "IExampleService.cs") - , Path.Combine(appServicesDependencyDir, $"I{req.ModuleName}Service.cs"), @namespace) + , Path.Combine(appServicesDependencyDir, $"I{req.ModuleName}Service.cs"), typeAbbr) .ConfigureAwait(false); // Service await WriteCodeFileAsync(req, Path.Combine(tplAppDir, "Services", "Tpl", "ExampleService.cs") - , Path.Combine(appServicesDir, $"{req.ModuleName}Service.cs"), @namespace) + , Path.Combine(appServicesDir, $"{req.ModuleName}Service.cs"), typeAbbr) .ConfigureAwait(false); // Entity - await WriteCodeFileAsync(req, Path.Combine(dataDir, "DbMaps", "Tpl", "Tpl_Example.cs") - , Path.Combine(entityDir, $"{moduleType[..3]}_{req.ModuleName}.cs"), @namespace) + await WriteCodeFileAsync(req, Path.Combine(tplDataDir, "DbMaps", "Tpl", "Tpl_Example.cs") + , Path.Combine(entityDir, $"{typeAbbr}_{req.ModuleName}.cs"), typeAbbr) .ConfigureAwait(false); } @@ -191,13 +190,10 @@ public sealed class DevService(IApiService apiService) : ServiceBase return _projectDirs.First(x => x.EndsWith(key, true, CultureInfo.InvariantCulture)); } - private static async Task WriteCodeFileAsync(GenerateCsCodeReq req, string tplFile, string writeFile, string @namespace = "SysComponent") + private static async Task WriteCodeFileAsync(GenerateCsCodeReq req, string tplFile, string writeFile, string moduleAbbr) { var tplContent = await File.ReadAllTextAsync(tplFile).ConfigureAwait(false); - tplContent = tplContent.Replace("Tpl", Enum.GetName(req.Type)![..3]) - .Replace("示例", req.ModuleRemark) - .Replace("Example", req.ModuleName) - .Replace("NetAdmin.SysComponent", $"NetAdmin.{@namespace}"); + tplContent = tplContent.Replace("Tpl", moduleAbbr).Replace("示例", req.ModuleRemark).Replace("Example", req.ModuleName); await File.WriteAllTextAsync(writeFile, tplContent).ConfigureAwait(false); } diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs index b356804e..c838231f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs index f3395580..bf2603a4 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs index ac6e6c71..e309cb9b 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs index 9083d620..1ab1841b 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs @@ -1,5 +1,4 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs index a1233727..7b8edf0d 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs @@ -1,9 +1,8 @@ using Cronos; using FreeSql.Internal; -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; -using NetAdmin.Domain.Enums.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -299,13 +298,13 @@ public sealed class JobService(BasicRepository rpo, IJobRecordSer { var ret1 = await UpdateAsync( // 运行中，运行时间超过超时设定；置为空闲状态 new Sys_Job { Status = JobStatues.Idle }, [nameof(Sys_Job.Status)], null - , a => a.Status == JobStatues.Running && a.LastExecTime < DateTime.Now.AddSeconds(-Numbers.SECS_TIMEOUT_JOB), null, true) + , a => a.Status == JobStatues.Running && a.LastExecTime < DateTime.Now.AddSeconds(-SysNumbers.SECS_TIMEOUT_JOB), null, true) .ConfigureAwait(false); var ret2 = await UpdateAsync( // 空闲中，下次执行时间在当前时间减去超时时间以前；将下次执行时间调整到现在 new Sys_Job { NextExecTime = DateTime.Now, NextTimeId = DateTime.Now.TimeUnixUtc() } - , [nameof(Sys_Job.NextExecTime), nameof(Sys_Job.NextTimeId)], null - , a => a.Status == JobStatues.Idle && a.NextExecTime < DateTime.Now.AddSeconds(-Numbers.SECS_TIMEOUT_JOB), null, true) + , [nameof(Sys_Job.NextExecTime), nameof(Sys_Job.NextTimeId)], null + , a => a.Status == JobStatues.Idle && a.NextExecTime < DateTime.Now.AddSeconds(-SysNumbers.SECS_TIMEOUT_JOB), null, true) .ConfigureAwait(false); return ret1 + ret2; } diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs index 9d2e3707..8b41f4a1 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs index ea07c612..e43378be 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs index d6d6e724..3ce68689 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs index 6500bf97..c5e5767e 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.LoginLog; -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -40,7 +40,7 @@ public sealed class RequestLogService(BasicRepository rpo, var ret = await Rpo.InsertAsync(req).ConfigureAwait(false); // 插入登录日志 - if (req.ApiPathCrc32 == Chars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD.Crc32()) { + if (req.ApiPathCrc32 == SysChars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD.Crc32()) { _ = await loginLogService.CreateAsync(req.Adapt()).ConfigureAwait(false); } diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs index d0d94831..802b448f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs index ea84a669..4917580c 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs index 9a96f081..d9ccd39b 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs index 2bed2c94..1bca97b8 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs index 8ca08a05..c99ccbef 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs @@ -1,8 +1,7 @@ -using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto.Sys.SiteMsg; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Enums.Sys; +using NetAdmin.SysComponent.Domain.Contexts; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -295,7 +294,7 @@ public sealed class SiteMsgService(BasicRepository rpo, Conte return Rpo.Orm.Select() #if DBTYPE_SQLSERVER - .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) + .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif .LeftJoin((a, b, _, _, _, _) => a.CreatedUserId == b.Id) .LeftJoin((a, _, c, _, _, _) => a.Id == c.SiteMsgId) diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs index 2c95181a..5edf1b8f 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs index 67a117f7..0a8f4ade 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Tool; +using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs index c31786a5..5d607e25 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs @@ -1,6 +1,7 @@ -using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto.Sys.Dic.Content; -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Contexts; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -178,10 +179,11 @@ public sealed class UserProfileService(BasicRepository rp { #pragma warning disable CA1305,IDE0072 var ret = Rpo.Orm.Select() - .LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin((a, _, c, __, ___) => a.CompanyArea.ToString() == c.Value && c.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin((a, _, __, d, ___) => a.HomeArea.ToString() == d.Value && d.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin((a, _, __, ___, e) => a.EmergencyContactArea.ToString() == e.Value && e.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, _, c, __, ___) => a.CompanyArea.ToString() == c.Value && c.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, _, __, d, ___) => a.HomeArea.ToString() == d.Value && d.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin( + (a, _, __, ___, e) => a.EmergencyContactArea.ToString() == e.Value && e.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) .WhereDynamicFilter(req.DynamicFilter); return req.Order switch { diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index 1818efaf..6c8db5bb 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -1,9 +1,9 @@ using NetAdmin.Domain.Attributes.DataValidation; using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Dto.Sys.UserProfile; -using NetAdmin.Domain.Dto.Sys.VerifyCode; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs index 3b1bbc61..67c8c51c 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs @@ -1,6 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; -using NetAdmin.Domain.Enums.Sys; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Tpl/Dependency/IExampleService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Tpl/Dependency/IExampleService.cs deleted file mode 100644 index 5fa9b1e5..00000000 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Tpl/Dependency/IExampleService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using NetAdmin.SysComponent.Application.Modules.Tpl; - -namespace NetAdmin.SysComponent.Application.Services.Tpl.Dependency; - -/// -/// 示例服务 -/// -public interface IExampleService : IService, IExampleModule; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Cache/ProjectUsings.cs b/src/backend/NetAdmin.SysComponent.Cache/ProjectUsings.cs index 625c5806..fb6eb295 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/ProjectUsings.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/ProjectUsings.cs @@ -1,5 +1,6 @@ -global using NetAdmin.Cache; +global using NetAdmin.Cache; global using NetAdmin.Domain.Dto.Dependency; global using NetAdmin.SysComponent.Application.Modules.Sys; global using NetAdmin.SysComponent.Application.Services.Sys.Dependency; -global using NetAdmin.SysComponent.Cache.Sys.Dependency; \ No newline at end of file +global using NetAdmin.SysComponent.Cache.Sys.Dependency; +global using NetAdmin.SysComponent.Infrastructure.Constant; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs index 104e049d..49d404b0 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs index c0855e1d..bc8de36c 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Cache; +using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Cache.Sys; @@ -17,7 +17,7 @@ public sealed class CacheCache(IDistributedCache cache, ICacheService service) / { #if !DEBUG return GetOrCreateAsync( // - GetCacheKey(string.Empty), Service.CacheStatisticsAsync, TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); + GetCacheKey(string.Empty), Service.CacheStatisticsAsync, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); #else return Service.CacheStatisticsAsync(); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs index fba6c76f..0545b9d1 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Cache.Sys; @@ -10,7 +10,8 @@ public sealed class CaptchaCache(IDistributedCache cache, ICaptchaService servic public async Task GetCaptchaImageAsync() { var captchaRsp = await Service.GetCaptchaImageAsync().ConfigureAwait(false); - await CreateAsync(GetCacheKey(captchaRsp.Id, nameof(CaptchaCache)), captchaRsp.SawOffsetX, TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)) + await CreateAsync(GetCacheKey(captchaRsp.Id, nameof(CaptchaCache)), captchaRsp.SawOffsetX +, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)) .ConfigureAwait(false); return captchaRsp; } diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs index 4018f606..1a1a73c3 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.SysComponent.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs index 98dbee46..64b129a1 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs index 93f24a1d..e5bb917d 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs index 3657e651..95dae0e7 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs index 437a7671..207cff51 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/DevCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/DevCache.cs index cf169b0b..922f5d07 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/DevCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/DevCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dev; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCache.cs index 4f3c7f81..246d12a4 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys; @@ -79,7 +79,7 @@ public sealed class DicCache(IDistributedCache cache, IDicService service) // #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetDicValueAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); + , () => Service.GetDicValueAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); #else return Service.GetDicValueAsync(req); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs index 29a7e4be..40c758b5 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs index 2d093489..ab143171 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys; @@ -65,7 +65,8 @@ public sealed class DicContentCache(IDistributedCache cache, IDicContentService { #if !DEBUG return GetOrCreateAsync( // - GetCacheKey(catalogCode), () => Service.QueryByCatalogCodeAsync(catalogCode), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DIC_CATALOG_CODE)); + GetCacheKey(catalogCode), () => Service.QueryByCatalogCodeAsync(catalogCode) +, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DIC_CATALOG_CODE)); #else return Service.QueryByCatalogCodeAsync(catalogCode); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs index 22c1d75d..d514a5d8 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Cache.Sys; @@ -85,7 +85,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordBarChartAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); + , () => Service.GetRecordBarChartAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); #else return Service.GetRecordBarChartAsync(req); #endif @@ -97,8 +97,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordPieChartByHttpStatusCodeAsync(req) - , TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); + , () => Service.GetRecordPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); #else return Service.GetRecordPieChartByHttpStatusCodeAsync(req); #endif @@ -110,7 +109,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordPieChartByNameAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); + , () => Service.GetRecordPieChartByNameAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); #else return Service.GetRecordPieChartByNameAsync(req); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs index 579e6481..31cb8cec 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs index e3687109..a7c35f2a 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs index ce951afe..e848e162 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs index 76cb1aa2..f22e701c 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Cache.Sys; @@ -23,8 +23,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG var ret = await GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , async () => (long?)await Service.CountAsync(req).ConfigureAwait(false) - , TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)) + , async () => (long?)await Service.CountAsync(req).ConfigureAwait(false), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)) .ConfigureAwait(false); return ret ?? 0; #else @@ -68,7 +67,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetBarChartAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); + , () => Service.GetBarChartAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); #else return Service.GetBarChartAsync(req); #endif @@ -80,7 +79,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetPieChartByApiSummaryAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); + , () => Service.GetPieChartByApiSummaryAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); #else return Service.GetPieChartByApiSummaryAsync(req); #endif @@ -92,7 +91,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); + , () => Service.GetPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); #else return Service.GetPieChartByHttpStatusCodeAsync(req); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs index 583d2695..e6d336ed 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs index 16f1f52e..2ca9e783 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs index 55288eac..60901ae5 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs index 0caae89d..53744bed 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs index e7034efb..6c061e00 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs index a5fc3e01..51fb7452 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs index 3bc04b7a..7830b886 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs index ba9fa959..f1fe1d79 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Tool; +using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/UserCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/UserCache.cs index e9cab674..6b1a03b4 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/UserCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/UserCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Cache.Sys; @@ -91,7 +91,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(userId.ToInvString()) // - , () => Service.LoginByUserIdAsync(userId), TimeSpan.FromSeconds(Numbers.SECS_CACHE_LOGIN_BY_USER_ID)); + , () => Service.LoginByUserIdAsync(userId), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_LOGIN_BY_USER_ID)); #else return Service.LoginByUserIdAsync(userId); #endif @@ -109,7 +109,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.QueryAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); + , () => Service.QueryAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); #else return Service.QueryAsync(req); #endif @@ -184,7 +184,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(Service.UserToken.Id.ToString(CultureInfo.InvariantCulture)), Service.UserInfoAsync - , TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); +, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); #else return Service.UserInfoAsync(); #endif diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs index 98a318b4..8f27e606 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs index ad31cb4e..b11444de 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs +++ b/src/backend/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Cache/Tpl/Dependency/IExampleCache.cs b/src/backend/NetAdmin.SysComponent.Cache/Tpl/Dependency/IExampleCache.cs deleted file mode 100644 index 76469ccf..00000000 --- a/src/backend/NetAdmin.SysComponent.Cache/Tpl/Dependency/IExampleCache.cs +++ /dev/null @@ -1,9 +0,0 @@ -using NetAdmin.SysComponent.Application.Modules.Tpl; -using NetAdmin.SysComponent.Application.Services.Tpl.Dependency; - -namespace NetAdmin.SysComponent.Cache.Tpl.Dependency; - -/// -/// 示例缓存 -/// -public interface IExampleCache : ICache, IExampleModule; \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs rename to src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs index ba81edff..b52b179d 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; -namespace NetAdmin.Domain.Attributes.DataValidation; +namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; /// /// 接口编码验证器 diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs rename to src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs index ece91ed9..0f783588 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Attributes.DataValidation; +namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; /// /// 数据范围为特定部门的验证器 diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs rename to src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs index 177a95c3..36229377 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Attributes.DataValidation; +namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; /// /// 用户编号验证器 diff --git a/src/backend/NetAdmin.Domain/Contexts/ContextUserInfo.cs b/src/backend/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Contexts/ContextUserInfo.cs rename to src/backend/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs index 481e2133..b9cfbd33 100644 --- a/src/backend/NetAdmin.Domain/Contexts/ContextUserInfo.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Contexts; +namespace NetAdmin.SysComponent.Domain.Contexts; /// /// 上下文用户信息 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs index 94f4c745..6fbc5e0f 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// Api接口表 @@ -15,7 +15,9 @@ public record Sys_Api : ImmutableEntity, IFieldSummary [Navigate(nameof(ParentId))] public IEnumerable Children { get; init; } - /// + /// + /// 唯一编码 + /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127, IsIdentity = false, IsPrimary = true, Position = 1)] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs similarity index 96% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs index ebf34ba2..06da25f7 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 配置表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs similarity index 95% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs index 7065d858..75533fd9 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 部门表 @@ -63,7 +63,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort public virtual long Sort { get; init; } /// - /// 部门描述 + /// 部门备注 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [CsvIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs similarity index 95% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs index 8f578b95..50f4d592 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 字典目录表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs similarity index 90% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs index f85e2152..a629a2d8 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 字典内容表 @@ -23,7 +23,9 @@ public record Sys_DicContent : VersionEntity, IFieldEnabled, IFieldSummary [JsonIgnore] public virtual long CatalogId { get; init; } - /// + /// + /// 是否启用 + /// [Column] [CsvIgnore] [JsonIgnore] @@ -38,7 +40,7 @@ public record Sys_DicContent : VersionEntity, IFieldEnabled, IFieldSummary public virtual string Key { get; init; } /// - /// 描述 + /// 备注 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [CsvIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs similarity index 98% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs index 23b4e608..f7800e90 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 计划作业表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs similarity index 98% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs index aae15438..72653c9f 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 计划作业执行记录表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs similarity index 90% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs index 9c72d706..2ac76050 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 登录日志表 @@ -9,19 +9,25 @@ namespace NetAdmin.Domain.DbMaps.Sys; [Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_LoginLog))] public record Sys_LoginLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFieldCreatedClientIp, IFieldCreatedClientUserAgent { - /// + /// + /// 创建者客户端IP + /// [Column] [CsvIgnore] [JsonIgnore] public virtual int? CreatedClientIp { get; init; } - /// + /// + /// 创建时间 + /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } - /// + /// + /// 创建者客户端用户代理 + /// #if DBTYPE_SQLSERVER [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_1022)] #else @@ -71,13 +77,17 @@ public record Sys_LoginLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFiel [Navigate(nameof(OwnerId))] public Sys_User Owner { get; init; } - /// + /// + /// 拥有者部门编号 + /// [Column] [CsvIgnore] [JsonIgnore] public virtual long? OwnerDeptId { get; init; } - /// + /// + /// 拥有者用户编号 + /// [Column] [CsvIgnore] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs similarity index 98% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs index e0c23d2b..8b00b05f 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 菜单表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs similarity index 98% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs index 39201060..f0c3b625 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 请求日志表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs index e27d628d..397d22f6 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 请求日志明细表 @@ -7,13 +7,17 @@ namespace NetAdmin.Domain.DbMaps.Sys; [SqlIndex(Chars.FLG_DB_INDEX_PREFIX + nameof(CreatedTime), $"{nameof(CreatedTime)} DESC", false)] public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCreatedClientUserAgent { - /// + /// + /// 创建时间 + /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } - /// + /// + /// 创建者客户端用户代理 + /// #if DBTYPE_SQLSERVER [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_1022)] #else diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs similarity index 97% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs index ca8f1402..1231a3fa 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 角色表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs similarity index 93% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs index ab7f0634..5ec80fb4 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 角色-接口映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs index 44f17fca..eb5c9717 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 角色-部门映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs index 9e4d612c..cff50425 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 角色-菜单映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs similarity index 96% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs index 54417ac9..53d6bdd6 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 站内信表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs index 59595e70..af545896 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 站内信-部门映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs index 1608cbb2..a04de438 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 站内信标记表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs index 26d60810..05d3ee7c 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 站内信-角色映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs similarity index 94% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs index cc1b91c9..26c4feee 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 站内信-用户映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs similarity index 97% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs index 16c320b9..cab3df75 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 用户基本信息表 @@ -100,7 +100,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister public ICollection SiteMsgs { get; init; } /// - /// 描述 + /// 备注 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [CsvIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs similarity index 98% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs index ff9b7969..417ba5b3 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 用户档案表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs similarity index 93% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs index e0b260e8..c251ae87 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 用户-角色映射表 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs similarity index 96% rename from src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs rename to src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs index 3cb692e8..f311303e 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.DbMaps.Sys; +namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; /// /// 验证码表 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs similarity index 66% rename from src/backend/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs index ca86afe8..29383823 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Api; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; /// /// 请求：创建接口 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs index 23f45161..7ea6ebd1 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Api; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; /// /// 响应：导出接口 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs similarity index 66% rename from src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs index 92b07f7b..6d411819 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Api; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; /// /// 请求：查询接口 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs similarity index 96% rename from src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs index 3ada91ac..88db6709 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Api; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; /// /// 响应：查询接口 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs index f7b0eb37..12640e93 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Cache; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; /// /// 响应：缓存统计 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs similarity index 85% rename from src/backend/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs index 106b86a8..e6e9bdef 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Cache; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; /// /// 请求：删除缓存项 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs similarity index 80% rename from src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs index 98d4e2a5..e3ec64d7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Cache; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; /// /// 请求：获取所有缓存项 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs similarity index 79% rename from src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs index 47b986e3..d86b4334 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Cache; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; /// /// 请求：获取缓存项 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs index 08de42d9..bf6fa9e8 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs @@ -1,6 +1,6 @@ using StackExchange.Redis; -namespace NetAdmin.Domain.Dto.Sys.Cache; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; /// /// 响应：获取所有缓存项 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs index 2472c75e..962cab00 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Captcha; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; /// /// 响应：获取人机校验图 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs index cf6f079e..7e47100d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Captcha; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; /// /// 请求：完成人机验证 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs similarity index 93% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs index 134a6d3a..fc5467ea 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 请求：创建配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs similarity index 83% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs index 4d482470..8aeed6f9 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 请求：编辑配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs similarity index 90% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs index 1ac80f88..bc6d75c6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 响应：导出配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs index 96008bb5..bbde4e52 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 请求：查询配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs similarity index 90% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs index 4224a6c0..e2ef1416 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 响应：查询配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs index cf77c779..88660fcd 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Config; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; /// /// 请求：启用/禁用配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs similarity index 84% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs index 5ba80ce9..1e37c2a0 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Infrastructure.Constant; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 请求：创建部门 @@ -20,7 +22,7 @@ public record CreateDeptReq : Sys_Dept /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; + public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs index 664e41e1..df4b915b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 请求：编辑部门 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs index 3a2424c2..f45824e6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 响应：导出部门 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs index 54225d4f..a0c38716 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 请求：查询部门 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs index a3cdb87a..ccf1f43f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Infrastructure.Constant; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 响应：查询部门 @@ -30,7 +32,7 @@ public record QueryDeptRsp : Sys_Dept /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; + public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs index aac2dfe5..2078f026 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; /// /// 请求：启用/禁用部门 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs similarity index 75% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs index 5a256499..6e95b548 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dev; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; /// /// 请求：生成后端代码 @@ -20,5 +20,6 @@ public sealed record GenerateCsCodeReq : DataAbstraction /// /// 模块类型 /// - public ModuleTypes Type { get; init; } + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.模块类型不能为空))] + public string Type { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs index 6d4cd475..e2ac4ab0 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dev; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; /// /// 请求：生成图标代码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs index 870ed501..a47b35da 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dev; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; /// /// IconExportJsInfo diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs similarity index 93% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs index f66af602..13913a8f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：创建字典目录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs index 8fb81ea0..67615fbf 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：编辑字典目录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs similarity index 67% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs index 0d2081a9..d7abee76 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：查询字典目录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs index f538d310..724f42aa 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; /// /// 响应：查询字典目录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs index cc7bafee..3852119b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 请求：创建字典内容 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs index 59ff032a..bb8b8443 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 请求：编辑字典内容 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs similarity index 93% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs index 4edf2f59..3a32f31b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 响应：导出字典内容 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs index 1489eed0..ce05dc5d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 请求：获取字典值 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs similarity index 67% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs index 8e6f3c52..04de6f72 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 请求：查询字典内容 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs index 802fe7e2..29909c48 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 响应：查询字典内容 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs index e5cb5926..ab4246a7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; /// /// 请求：设置字典内容启用状态 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs index 7ebd3522..83e89d5a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys; +namespace NetAdmin.SysComponent.Domain.Dto.Sys; /// /// 响应：获取条形图数据 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs index 85473b85..7477d981 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys; +namespace NetAdmin.SysComponent.Domain.Dto.Sys; /// /// 响应：获取饼图数据 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs similarity index 96% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs index badcab4e..a481716c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Attributes.DataValidation; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 请求：创建计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs similarity index 83% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs index 2a5f49f1..e6526af0 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 请求：编辑计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs index 62f12880..a8818930 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 响应：导出计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs index 21384c0a..b894fe2e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 请求：完成计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs similarity index 83% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs index 6cb1ff1f..ccabc317 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 请求：查询计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs similarity index 98% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs index c63f5bd2..2c3b0464 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs @@ -1,8 +1,8 @@ using CronExpressionDescriptor; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; using Options = CronExpressionDescriptor.Options; -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 响应：查询计划作业 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs index 0ec6f97c..b01e3f5c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Job; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; /// /// 请求：设置计划作业启用状态 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs similarity index 69% rename from src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs index a7ae2dd1..064b1e71 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; /// /// 请求：创建计划作业执行记录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs index 3c2963d1..63bd4193 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -namespace NetAdmin.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; /// /// 响应：导出计划作业执行记录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs index 6c21476f..96eabd6a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; /// /// 请求：查询计划作业执行记录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs index a65e19a2..2564386b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -namespace NetAdmin.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; /// /// 响应：查询计划作业执行记录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs index f5c4ee96..4c6ce4a6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs @@ -1,8 +1,9 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto.Sys.RequestLog; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; /// /// 请求：创建登录日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs index 639ec1a5..39643ec2 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; /// /// 响应：导出登录日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs index 4daf06ee..c1771cc5 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; /// /// 请求：查询登录日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs similarity index 96% rename from src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs index c7cf3f0d..a1e6c803 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; /// /// 响应：查询登录日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs index 89b5f423..9da10698 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Infrastructure.Constant; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; /// /// 请求：创建菜单 @@ -52,7 +54,7 @@ public record CreateMenuReq : Sys_Menu /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; + public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; /// public override string Tag => Meta.Tag; diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs index ef1aed9b..d745504c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Menu; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; /// /// 请求：更新菜单 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs index 949b8054..db0c4ac3 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Menu; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; /// /// 信息：元数据 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs index 4a0c612f..b9485e5f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Menu; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; /// /// 请求：查询菜单 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs index 0a51f482..0dfd238e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Menu; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; /// /// 信息：菜单 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs similarity index 66% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs index 18823b8c..04d6c52d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; -namespace NetAdmin.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; /// /// 请求：创建请求日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs index 50ef6e16..31542243 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs @@ -1,8 +1,8 @@ -using NetAdmin.Domain.Dto.Sys.Api; -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; /// /// 响应：导出请求日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs similarity index 83% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs index 0a2ee62d..3d051737 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; /// /// 请求：查询请求日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs index 2da6dc7b..9dc3aa8c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs @@ -1,8 +1,8 @@ -using NetAdmin.Domain.Dto.Sys.Api; -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; /// /// 响应：查询请求日志 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs similarity index 68% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs index 8d48caad..003ca697 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; /// /// 请求：创建请求日志明细 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs similarity index 81% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs index 6010cf48..d60643e7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; /// /// 请求：查询请求日志明细 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs index eaaf33c4..0ff35620 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; /// /// 响应：查询请求日志明细 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs similarity index 90% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs index 42466496..e2b164fc 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Attributes.DataValidation; +using NetAdmin.SysComponent.Infrastructure.Constant; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：创建角色 @@ -49,7 +52,7 @@ public record CreateRoleReq : Sys_Role, IValidatableObject /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; + public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs index b0b1a37c..86c97c75 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：编辑角色 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs similarity index 96% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs index b01e6157..dd2813c3 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 响应：导出角色 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs index e7ab6c9d..995da42e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 响应： 获取角色菜单 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs index 8d320234..2f437c09 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：角色-菜单映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs index 9010121b..e4aba47f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：查询角色 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs index 634cb90e..445fd027 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Infrastructure.Constant; + +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 响应：查询角色 @@ -57,7 +59,7 @@ public record QueryRoleRsp : Sys_Role /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; + public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs index 56642969..b75a3201 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：设置是否显示仪表板 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs index 02367a3a..13906b84 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：设置是否忽略权限控制 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs index 94b20278..b18a7a1a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Role; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; /// /// 请求：启用/禁用角色 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs similarity index 96% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs index 36be5429..827bbe48 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; /// /// 请求：创建站内信 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs index bf4bf859..af10106c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs @@ -1,8 +1,8 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; /// /// 响应：导出站内信 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs index d53f43b5..f35b5b52 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; /// /// 请求：查询站内信 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs index 006a3a84..a12f50d6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs @@ -1,9 +1,9 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; /// /// 响应：查询站内信 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs similarity index 69% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs index f4f85a14..87dfb17d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; /// /// 请求：创建站内信-部门映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs index 4e722d00..c1282420 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; /// /// 请求：查询站内信-部门映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs index 0674df0a..1401811e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; /// /// 响应：查询站内信-部门映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index b19bda86..67ff6463 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：创建站内信标记 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs similarity index 71% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs index b499a418..b147e38d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：编辑站内信 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs index b3e786b0..2904c280 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：查询站内信标记 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs index 3bdbab37..4f49404f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; /// /// 响应：查询站内信标记 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs similarity index 70% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs index c5e8aab8..c6d6e823 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：设置用户站内信状态 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs similarity index 69% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs index 29c7dfe6..25c2fe30 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; /// /// 请求：创建站内信-角色映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs index 9912642d..45e4d677 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; /// /// 请求：查询站内信-角色映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs index e5b69d21..96a384ae 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; /// /// 响应：查询站内信-角色映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs similarity index 69% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs index 57557bce..ee2b2a98 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; /// /// 请求：创建站内信-用户映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs index d90757c5..32d96c95 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; /// /// 请求：查询站内信-用户映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs index 5620466b..7ed61962 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; /// /// 响应：查询站内信-用户映射 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs similarity index 79% rename from src/backend/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs index cb9dffeb..331993e8 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Tool; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; /// /// 请求：Aes解密 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs similarity index 85% rename from src/backend/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs index a56c86b5..f310ebc5 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Tool; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; /// /// 请求：执行SQL diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs index 094e751b..54b462ca 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.Tool; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; /// /// 响应：获取模块信息 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index 2fe31e7f..123c9136 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：检查手机号码是否可用 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs index 96dd1520..619fc5d7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：检查用户名是否可用 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs index b541f285..fcaa66f3 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：创建编辑用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs similarity index 86% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs index 67a940ec..9781cd6c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：创建用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs index 622c7dc5..325eddaa 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：编辑用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs similarity index 93% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs index 96c62c26..34b263f5 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 响应：导出用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs index 8e40bc57..822b259a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：密码登录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs similarity index 51% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs index 66d04aea..a00ccc5d 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：短信登录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs index 81f99b75..e64566f5 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 响应：密码登录 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs similarity index 90% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs index 987dd5f0..f9b83cc6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：查询用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs similarity index 93% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs index 165825a9..a5c9d15b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 响应：查询用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs index 5f755aef..afdee157 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：注册用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs similarity index 84% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs index c8fa6425..c2c22686 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：重置密码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs index 2792a5fe..7bdb6cff 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：设置用户头像 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs similarity index 69% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs index c63c8125..f4caef17 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：设置邮箱 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs similarity index 77% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs index 90f573de..4cea3e0a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs @@ -1,9 +1,9 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// -/// 请求：设置手机号码 +/// 请求：设置手机号 /// public sealed record SetMobileReq : DataAbstraction { diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs index 275fc461..9a92a9ea 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：设置密码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs index 28932ceb..db0c2eda 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 请求：启用/禁用用户 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs similarity index 81% rename from src/backend/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs index 86897fd7..94a955c8 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dept; -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.Domain.Dto.Sys.User; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; /// /// 响应：当前用户信息 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs index b5c3480e..580a39b4 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 请求：创建用户档案 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs index 96e81a77..68a8be81 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 请求：编辑用户档案 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs similarity index 91% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs index 40c0ce43..961808e9 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 响应：获取当前用户应用配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs index cb9a2d96..07ae5c68 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 请求：查询用户档案 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs similarity index 97% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs index 07ea21ad..701ef790 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 响应：查询用户档案 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs similarity index 84% rename from src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs index 99308fa9..cf97f047 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; /// /// 请求：设置当前用户应用配置 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs similarity index 65% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs index 5ac27f24..c13a50c9 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：创建验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs similarity index 82% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs index 8abd3f58..8d625d56 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：查询验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs index 1180146c..7ae35741 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 响应：查询验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs similarity index 95% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs index 0814b147..3f11a7c7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：发送验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs similarity index 84% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs index 35d11ed9..4c33af26 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 响应：发送验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs similarity index 83% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs index 3c2012b5..7d00ac33 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：设置验证码状态 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs index 0a374ebe..b478868f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs index 51e878de..44459459 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实邮箱验证码 diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs rename to src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs index 51b9f239..1ab17813 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实短信验证码 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/DataScopes.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Enums/Sys/DataScopes.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs index 4f5c9d98..d53ff19f 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/DataScopes.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 角色数据范围 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/JobStatues.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Enums/Sys/JobStatues.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs index 584d9174..9019e1e6 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/JobStatues.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 计划作业状态 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/MenuTypes.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Enums/Sys/MenuTypes.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs index 70f22274..2e70c60e 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/MenuTypes.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 菜单类型 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs similarity index 87% rename from src/backend/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs index 24d7fbc1..6e970372 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 站内信类型 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs similarity index 90% rename from src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs index 839f23f7..498e4a97 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 站内信状态 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs similarity index 88% rename from src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs index 8c4dd2ca..8b6bb799 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 验证码目标设备类型 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs similarity index 92% rename from src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs index c22dba26..b6d8d190 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 验证码状态 diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs similarity index 94% rename from src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs rename to src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs index 90b8195b..83786c1c 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Domain.Enums.Sys; +namespace NetAdmin.SysComponent.Domain.Enums.Sys; /// /// 验证码类型 diff --git a/src/backend/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs rename to src/backend/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs index ca27098a..cf0db030 100644 --- a/src/backend/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs @@ -1,6 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Events; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -namespace NetAdmin.Domain.Events.Sys; +namespace NetAdmin.SysComponent.Domain.Events.Sys; /// /// 请求日志事件 diff --git a/src/backend/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs rename to src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs index 6d505d56..b2953f78 100644 --- a/src/backend/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs @@ -1,6 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Events; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Events.Sys; +namespace NetAdmin.SysComponent.Domain.Events.Sys; /// /// 用户被创建事件 diff --git a/src/backend/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs rename to src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs index 577612d1..ae45dfb9 100644 --- a/src/backend/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs @@ -1,6 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Events; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; -namespace NetAdmin.Domain.Events.Sys; +namespace NetAdmin.SysComponent.Domain.Events.Sys; /// /// 用户被更新事件 diff --git a/src/backend/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs similarity index 89% rename from src/backend/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs rename to src/backend/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs index 5b702add..0e6c4650 100644 --- a/src/backend/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs +++ b/src/backend/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs @@ -1,6 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Events; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.Domain.Events.Sys; +namespace NetAdmin.SysComponent.Domain.Events.Sys; /// /// 验证码创建事件 diff --git a/src/backend/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj b/src/backend/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj new file mode 100644 index 00000000..080c5908 --- /dev/null +++ b/src/backend/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Domain/ProjectUsings.cs b/src/backend/NetAdmin.SysComponent.Domain/ProjectUsings.cs new file mode 100644 index 00000000..dcf84574 --- /dev/null +++ b/src/backend/NetAdmin.SysComponent.Domain/ProjectUsings.cs @@ -0,0 +1,13 @@ +global using NetAdmin.Domain; +global using NetAdmin.Domain.Attributes; +global using NetAdmin.Domain.Attributes.DataValidation; +global using NetAdmin.Domain.DbMaps.Dependency; +global using NetAdmin.Domain.DbMaps.Dependency.Fields; +global using NetAdmin.Domain.Dto.Dependency; +global using NetAdmin.SysComponent.Domain.DbMaps.Sys; +global using NetAdmin.SysComponent.Domain.Enums.Sys; +global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; +global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; +global using CsvName = CsvHelper.Configuration.Attributes.NameAttribute; +global using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; +global using SqlIndex = FreeSql.DataAnnotations.IndexAttribute; \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs index 0ca691da..146481a0 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs index 4290b975..ce540d95 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Cache; +using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs index 6692fd95..bfc255f7 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs index 0915153f..b68e544d 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.SysComponent.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs index 8931125f..5758fdca 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs index e64686ae..dbe4702c 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Dev; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs index 20d30ea9..1ad06fc5 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs index e66a252f..c3688611 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs index 3f94e6ec..dc6052f1 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs index 7b00ff53..cb9450bd 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs index f9a865c0..cd0cb3b0 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs index 2d7b8ad7..69be1de6 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs index 5cadd89d..2e7d2933 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs index 36e300da..04893e94 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.Tool; +using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs index dc03a586..5e1603b6 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs @@ -1,5 +1,5 @@ -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs index a837eb01..cb9f1ce8 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs @@ -1,4 +1,4 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs index 9f84012b..0176da1e 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs @@ -1,5 +1,10 @@ -using Furion.Schedule; +using Gurion.Schedule; +using NetAdmin.Domain.Events; +using NetAdmin.Host.Filters; +using NetAdmin.SysComponent.Domain.Contexts; using NetAdmin.SysComponent.Host.Jobs; +using NetAdmin.SysComponent.Host.Utils; +using FreeSqlBuilder = NetAdmin.Infrastructure.Utils.FreeSqlBuilder; namespace NetAdmin.SysComponent.Host.Extensions; @@ -9,14 +14,60 @@ namespace NetAdmin.SysComponent.Host.Extensions; [SuppressSniffer] public static class ServiceCollectionExtensions { + /// + /// 添加上下文用户信息 + /// + public static IServiceCollection AddContextUserInfo(this IServiceCollection me) + { + return me.AddScoped(typeof(ContextUserInfo), _ => ContextUserInfo.Create()); + } + + /// + /// 添加 freeSql orm工具 + /// + public static IServiceCollection AddFreeSql( // + this IServiceCollection me, FreeSqlInitMethods initMethods = FreeSqlInitMethods.None, Action freeSqlConfig = null) + { + // // 非调试模式下禁止同步数据库 + // #if !DEBUG + // initOptions = FreeSqlInitOptions.None; + // #endif + var dbOptions = App.GetOptions(); + var fSql = new FreeSqlBuilder(dbOptions).Build(initMethods); + _ = me.AddSingleton(fSql); + + fSql.Aop.AuditValue += SqlAuditor.DataAuditHandler; // Insert/Update自动值处理 + var eventPublisher = App.GetService(); + + #pragma warning disable VSTHRD110 + + // AOP事件发布（异步） + fSql.Aop.CommandBefore += (_, e) => eventPublisher.PublishAsync(new SqlCommandBeforeEvent(e)); // 增删查改，执行命令之前触发 + fSql.Aop.CommandAfter += (_, e) => eventPublisher.PublishAsync(new SqlCommandAfterEvent(e)); // 增删查改，执行命令完成后触发 + + fSql.Aop.SyncStructureBefore += (_, e) => eventPublisher.PublishAsync(new SyncStructureBeforeEvent(e)); // CodeFirst迁移，执行之前触发 + + fSql.Aop.SyncStructureAfter += (_, e) => eventPublisher.PublishAsync(new SyncStructureAfterEvent(e)); // CodeFirst迁移，执行完成触发 + #pragma warning restore VSTHRD110 + + // 全局过滤器设置 + freeSqlConfig?.Invoke(fSql); + + return me.AddScoped() // 注入工作单元管理器 + .AddFreeRepository(null, App.Assemblies.ToArray()) // 批量注入 Repository + .AddMvcFilter(); // 注入事务拦截器 + } + /// /// 添加定时任务 /// public static IServiceCollection AddSchedules(this IServiceCollection me) { - return me.AddSchedule( // - builder => builder // - .AddJob(false, Triggers.PeriodSeconds(5).SetRunOnStart(true)) - .AddJob(false, Triggers.PeriodMinutes(1).SetRunOnStart(true))); + return App.WebHostEnvironment.IsProduction() + ? me.AddSchedule( // + builder => builder // + .AddJob(true, Triggers.PeriodSeconds(1).SetRunOnStart(true)) + .AddJob(true, Triggers.PeriodMinutes(1).SetRunOnStart(true))) + : me; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Host/Jobs/FreeScheduledJob.cs b/src/backend/NetAdmin.SysComponent.Host/Jobs/FreeScheduledJob.cs index adbe30b4..61456dd6 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Jobs/FreeScheduledJob.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Jobs/FreeScheduledJob.cs @@ -1,4 +1,4 @@ -using Furion.Schedule; +using Gurion.Schedule; using NetAdmin.Host.BackgroundRunning; using NetAdmin.Host.Middlewares; diff --git a/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs b/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs index a5cb4645..272e7871 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs @@ -1,12 +1,13 @@ using FreeSql.Internal; -using Furion.RemoteRequest; -using Furion.RemoteRequest.Extensions; -using Furion.Schedule; +using Gurion.RemoteRequest; +using Gurion.RemoteRequest.Extensions; +using Gurion.Schedule; using NetAdmin.Application.Extensions; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; using NetAdmin.Host.BackgroundRunning; using NetAdmin.Host.Middlewares; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Host.Jobs; @@ -41,7 +42,7 @@ public sealed class ScheduledJob : WorkBase, IJob } // ReSharper disable once MethodSupportsCancellation - await Parallel.ForAsync(0, Numbers.SCHEDULED_JOB_PARALLEL_NUM, async (_, _) => await WorkflowAsync(stoppingToken).ConfigureAwait(false)) + await Parallel.ForAsync(0, SysNumbers.SCHEDULED_JOB_PARALLEL_NUM, async (_, _) => await WorkflowAsync(stoppingToken).ConfigureAwait(false)) .ConfigureAwait(false); } @@ -128,7 +129,7 @@ public sealed class ScheduledJob : WorkBase, IJob private HttpRequestPart BuildRequest(QueryJobRsp job) { var ret = job.RequestUrl.SetHttpMethod(new HttpMethod(job.HttpMethod.ToString())); - var headers = new Dictionary(); + var headers = new Dictionary(); if (!_accessToken.NullOrEmpty()) { headers.Add( // @@ -142,7 +143,7 @@ public sealed class ScheduledJob : WorkBase, IJob if (!job.RequestHeader.NullOrEmpty()) { // ReSharper disable once UsageOfDefaultStructEquality - ret = ret.SetHeaders(headers.Union(job.RequestHeader.Object>()).ToDictionary(x => x.Key, x => x.Value)); + ret = ret.SetHeaders(headers.Union(job.RequestHeader.Object>()).ToDictionary(x => x.Key, x => x.Value)); } if (!job.RequestBody.NullOrEmpty()) { diff --git a/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs b/src/backend/NetAdmin.SysComponent.Host/Middlewares/RequestAuditMiddleware.cs similarity index 96% rename from src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs rename to src/backend/NetAdmin.SysComponent.Host/Middlewares/RequestAuditMiddleware.cs index eaa5f2e2..b25f0bb6 100644 --- a/src/backend/NetAdmin.Host/Middlewares/RequestAuditMiddleware.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Middlewares/RequestAuditMiddleware.cs @@ -1,6 +1,6 @@ -using NetAdmin.Host.Utils; +using NetAdmin.SysComponent.Host.Utils; -namespace NetAdmin.Host.Middlewares; +namespace NetAdmin.SysComponent.Host.Middlewares; /// /// 请求审计中间件 diff --git a/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj b/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj index a1b80281..500bc68a 100644 --- a/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj +++ b/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj @@ -1,8 +1,8 @@ - - DBTYPE_SQLITE - + + + diff --git a/src/backend/NetAdmin.SysComponent.Host/ProjectUsings.cs b/src/backend/NetAdmin.SysComponent.Host/ProjectUsings.cs index bfacc045..44b39df6 100644 --- a/src/backend/NetAdmin.SysComponent.Host/ProjectUsings.cs +++ b/src/backend/NetAdmin.SysComponent.Host/ProjectUsings.cs @@ -1,4 +1,4 @@ -global using NetAdmin.Domain.Dto.Dependency; +global using NetAdmin.Domain.Dto.Dependency; global using NetAdmin.Host.Attributes; global using NetAdmin.Host.Controllers; global using NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs b/src/backend/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs index 5cc16de1..7c8e0e99 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs @@ -1,5 +1,5 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; @@ -24,7 +24,8 @@ public sealed class CacheCleaner : IEventSubscriber } var cache = App.GetService(); - cache.Service.UserToken = ContextUserToken.Create(userUpdatedEvent.Data); + cache.Service.UserToken = ContextUserToken.Create(userUpdatedEvent.Data.Id, userUpdatedEvent.Data.Token, userUpdatedEvent.Data.UserName + , userUpdatedEvent.Data.DeptId); return cache.RemoveUserInfoAsync(); } } \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs b/src/backend/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs index a2e82ea2..77243cb3 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; -using NetAdmin.Domain.Enums.Sys; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Enums.Sys; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs b/src/backend/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs index a793e751..ee69c291 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs @@ -1,7 +1,9 @@ #if !DEBUG && DBTYPE_SQLSERVER using System.Collections.Concurrent; -using NetAdmin.Domain.Dto.Sys.RequestLog; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.DbMaps.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Host.Subscribers; @@ -22,7 +24,7 @@ public sealed class OperationLogger : IEventSubscriber return; } - if (_requestLogs.Count > Numbers.REQUEST_LOG_BUFF_SIZE) { + if (_requestLogs.Count > SysNumbers.REQUEST_LOG_BUFF_SIZE) { await WriteToDbAsync().ConfigureAwait(false); } else { @@ -32,10 +34,10 @@ public sealed class OperationLogger : IEventSubscriber private static async Task WriteToDbAsync() { - var inserts = new List(Numbers.REQUEST_LOG_BUFF_SIZE); + var inserts = new List(SysNumbers.REQUEST_LOG_BUFF_SIZE); // 批量入库 - for (var i = 0; i != Numbers.REQUEST_LOG_BUFF_SIZE; ++i) { + for (var i = 0; i != SysNumbers.REQUEST_LOG_BUFF_SIZE; ++i) { if (!_requestLogs.TryDequeue(out var log)) { continue; } @@ -61,7 +63,7 @@ public sealed class OperationLogger : IEventSubscriber } } #else -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs b/src/backend/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs index f6a98499..3cfe88bc 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; -using NetAdmin.Domain.Enums.Sys; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Enums.Sys; +using NetAdmin.SysComponent.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs b/src/backend/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs similarity index 90% rename from src/backend/NetAdmin.Host/Utils/RequestLogger.cs rename to src/backend/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs index 5720cb69..a4e760e0 100644 --- a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs @@ -1,17 +1,20 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto.Sys.RequestLog; -using NetAdmin.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.Domain.Events.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.SysComponent.Domain.Events.Sys; using Yitter.IdGenerator; using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; -namespace NetAdmin.Host.Utils; +namespace NetAdmin.SysComponent.Host.Utils; /// /// 请求日志记录器 /// public sealed class RequestLogger(ILogger logger, IEventPublisher eventPublisher) : ISingleton { + private static readonly string[] _loggerIgnoreApiIds + = ["api/adm/tools/query.es.log", "api/probe/health.check", "api/probe/is.system.safety.stopped"]; + private static readonly string[] _textContentTypes = ["text", "json", "xml", "urlencoded"]; /// @@ -59,7 +62,7 @@ public sealed class RequestLogger(ILogger logger, IEventPublisher }; // ReSharper disable once InvertIf - if (!GlobalStatic.LoggerIgnoreApiIds.Contains(apiId)) { + if (!_loggerIgnoreApiIds.Contains(apiId)) { // 打印日志 logger.Info(auditData); diff --git a/src/backend/NetAdmin.Host/Utils/SqlAuditor.cs b/src/backend/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs similarity index 98% rename from src/backend/NetAdmin.Host/Utils/SqlAuditor.cs rename to src/backend/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs index 43c679ec..29ef37cd 100644 --- a/src/backend/NetAdmin.Host/Utils/SqlAuditor.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs @@ -1,9 +1,9 @@ using NetAdmin.Domain.Attributes; -using NetAdmin.Domain.Contexts; using NetAdmin.Domain.DbMaps.Dependency.Fields; +using NetAdmin.SysComponent.Domain.Contexts; using Yitter.IdGenerator; -namespace NetAdmin.Host.Utils; +namespace NetAdmin.SysComponent.Host.Utils; /// /// Sql审核器 diff --git a/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs b/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs new file mode 100644 index 00000000..052dc400 --- /dev/null +++ b/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs @@ -0,0 +1,14 @@ +#pragma warning disable CS1591 + +namespace NetAdmin.SysComponent.Infrastructure.Constant; + +/// +/// 字符串常量表 +/// +/// +/// public类型会通过接口暴露给前端 +/// +public static class SysChars +{ + public const string FLG_PATH_API_SYS_USER_LOGIN_BY_PWD = "api/sys/user/login.by.pwd"; +} \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs b/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs new file mode 100644 index 00000000..9577a037 --- /dev/null +++ b/src/backend/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs @@ -0,0 +1,22 @@ +#pragma warning disable CS1591 + +namespace NetAdmin.SysComponent.Infrastructure.Constant; + +/// +/// 数字常量表 +/// +/// +/// public类型会通过接口暴露给前端 +/// +public static class SysNumbers +{ + public const long DEF_SORT_VAL = 100; // 默认值：排序字段 + public const long ID_DIC_CATALOG_GEO_AREA = 379794295185413; // 唯一编号：字典目录-行政区划字典 + public const int REQUEST_LOG_BUFF_SIZE = 1000; // 请求日志缓冲区大小 + public const int SCHEDULED_JOB_PARALLEL_NUM = 5; // 计划作业并发数 + public const int SECS_CACHE_CHART = 300; // 缓存时间（秒）：仪表 + public const int SECS_CACHE_DEFAULT = 60; // 缓存时间（秒）：默认 + public const int SECS_CACHE_DIC_CATALOG_CODE = 300; // 缓存时间（秒）：字典配置-目录代码 + public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 缓存时间（秒）：通过用户编号登录的用户信息 + public const int SECS_TIMEOUT_JOB = 180; // 超时时间（秒）：作业 +} \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj b/src/backend/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj new file mode 100644 index 00000000..c0f1eca4 --- /dev/null +++ b/src/backend/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj @@ -0,0 +1,14 @@ + + + + + + + + Languages/NetAdmin.SysComponent.Statements.ln + + + Languages/NetAdmin.SysComponent.Fields.ln + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Tests/NetAdmin.SysComponent.Tests.csproj b/src/backend/NetAdmin.SysComponent.Tests/NetAdmin.SysComponent.Tests.csproj deleted file mode 100644 index d4095178..00000000 --- a/src/backend/NetAdmin.SysComponent.Tests/NetAdmin.SysComponent.Tests.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Tests/ProjectUsings.cs b/src/backend/UnitTests/ProjectUsings.cs similarity index 100% rename from src/backend/NetAdmin.SysComponent.Tests/ProjectUsings.cs rename to src/backend/UnitTests/ProjectUsings.cs diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/ApiTests.cs b/src/backend/UnitTests/Sys/ApiTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/ApiTests.cs rename to src/backend/UnitTests/Sys/ApiTests.cs index b5d31240..0a167eb7 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/ApiTests.cs +++ b/src/backend/UnitTests/Sys/ApiTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.SysComponent.Domain.Dto.Sys.Api; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 接口测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/CacheTests.cs b/src/backend/UnitTests/Sys/CacheTests.cs similarity index 95% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/CacheTests.cs rename to src/backend/UnitTests/Sys/CacheTests.cs index af06fc9c..4e47300f 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/CacheTests.cs +++ b/src/backend/UnitTests/Sys/CacheTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Cache; +using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 缓存测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/CaptchaTests.cs b/src/backend/UnitTests/Sys/CaptchaTests.cs similarity index 91% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/CaptchaTests.cs rename to src/backend/UnitTests/Sys/CaptchaTests.cs index a8b20e65..30f9a8f0 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/CaptchaTests.cs +++ b/src/backend/UnitTests/Sys/CaptchaTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 人机验证测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/ConfigTests.cs b/src/backend/UnitTests/Sys/ConfigTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/ConfigTests.cs rename to src/backend/UnitTests/Sys/ConfigTests.cs index ba4bfa25..272bcc4e 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/ConfigTests.cs +++ b/src/backend/UnitTests/Sys/ConfigTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.SysComponent.Domain.Dto.Sys.Config; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 配置测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/ConstantTests.cs b/src/backend/UnitTests/Sys/ConstantTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/ConstantTests.cs rename to src/backend/UnitTests/Sys/ConstantTests.cs index c3388ef3..f2239aa3 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/ConstantTests.cs +++ b/src/backend/UnitTests/Sys/ConstantTests.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 常量测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/DeptTests.cs b/src/backend/UnitTests/Sys/DeptTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/DeptTests.cs rename to src/backend/UnitTests/Sys/DeptTests.cs index 907672c3..7515ffde 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/DeptTests.cs +++ b/src/backend/UnitTests/Sys/DeptTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 部门测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/DevTests.cs b/src/backend/UnitTests/Sys/DevTests.cs similarity index 93% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/DevTests.cs rename to src/backend/UnitTests/Sys/DevTests.cs index 650a9b07..d27d8b1c 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/DevTests.cs +++ b/src/backend/UnitTests/Sys/DevTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Dev; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 开发测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/DicTests.cs b/src/backend/UnitTests/Sys/DicTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/DicTests.cs rename to src/backend/UnitTests/Sys/DicTests.cs index 51cd1304..c8fdca63 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/DicTests.cs +++ b/src/backend/UnitTests/Sys/DicTests.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 字典测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/FileTests.cs b/src/backend/UnitTests/Sys/FileTests.cs similarity index 93% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/FileTests.cs rename to src/backend/UnitTests/Sys/FileTests.cs index b599fcce..78c7e200 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/FileTests.cs +++ b/src/backend/UnitTests/Sys/FileTests.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 文件测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/JobTests.cs b/src/backend/UnitTests/Sys/JobTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/JobTests.cs rename to src/backend/UnitTests/Sys/JobTests.cs index 267f9126..01384cef 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/JobTests.cs +++ b/src/backend/UnitTests/Sys/JobTests.cs @@ -1,8 +1,8 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.Job; -using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 计划作业测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/LoginLogTests.cs b/src/backend/UnitTests/Sys/LoginLogTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/LoginLogTests.cs rename to src/backend/UnitTests/Sys/LoginLogTests.cs index 462fdce0..0cef2916 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/LoginLogTests.cs +++ b/src/backend/UnitTests/Sys/LoginLogTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 登录日志测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/MenuTests.cs b/src/backend/UnitTests/Sys/MenuTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/MenuTests.cs rename to src/backend/UnitTests/Sys/MenuTests.cs index c88a0dc6..91a9bf81 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/MenuTests.cs +++ b/src/backend/UnitTests/Sys/MenuTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 菜单测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/RequestLogTests.cs b/src/backend/UnitTests/Sys/RequestLogTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/RequestLogTests.cs rename to src/backend/UnitTests/Sys/RequestLogTests.cs index f548f046..7d62c8a2 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/RequestLogTests.cs +++ b/src/backend/UnitTests/Sys/RequestLogTests.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys; -using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.SysComponent.Domain.Dto.Sys; +using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 请求日志测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/RoleTests.cs b/src/backend/UnitTests/Sys/RoleTests.cs similarity index 98% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/RoleTests.cs rename to src/backend/UnitTests/Sys/RoleTests.cs index 46ebce6e..a6b4c8f0 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/RoleTests.cs +++ b/src/backend/UnitTests/Sys/RoleTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 角色测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/SiteMsgTests.cs b/src/backend/UnitTests/Sys/SiteMsgTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/SiteMsgTests.cs rename to src/backend/UnitTests/Sys/SiteMsgTests.cs index 8e501079..498f66c6 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/SiteMsgTests.cs +++ b/src/backend/UnitTests/Sys/SiteMsgTests.cs @@ -1,7 +1,7 @@ -using NetAdmin.Domain.Dto.Sys.SiteMsg; -using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 站内信测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/ToolsTests.cs b/src/backend/UnitTests/Sys/ToolsTests.cs similarity index 96% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/ToolsTests.cs rename to src/backend/UnitTests/Sys/ToolsTests.cs index 1a6c5f93..559c5fa4 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/ToolsTests.cs +++ b/src/backend/UnitTests/Sys/ToolsTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.Tool; +using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 工具测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/UserTests.cs b/src/backend/UnitTests/Sys/UserTests.cs similarity index 98% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/UserTests.cs rename to src/backend/UnitTests/Sys/UserTests.cs index e8e42b3a..395cbd52 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/UserTests.cs +++ b/src/backend/UnitTests/Sys/UserTests.cs @@ -1,8 +1,8 @@ -using NetAdmin.Domain.Dto.Sys.User; -using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; using NetAdmin.Tests.Attributes; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 用户测试 diff --git a/src/backend/NetAdmin.SysComponent.Tests/Sys/VerifyCodeTests.cs b/src/backend/UnitTests/Sys/VerifyCodeTests.cs similarity index 97% rename from src/backend/NetAdmin.SysComponent.Tests/Sys/VerifyCodeTests.cs rename to src/backend/UnitTests/Sys/VerifyCodeTests.cs index 85d19578..5903061b 100644 --- a/src/backend/NetAdmin.SysComponent.Tests/Sys/VerifyCodeTests.cs +++ b/src/backend/UnitTests/Sys/VerifyCodeTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Tests.Sys; +namespace UnitTests.Sys; /// /// 验证码测试 diff --git a/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj b/src/backend/UnitTests/UnitTests.csproj similarity index 100% rename from src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj rename to src/backend/UnitTests/UnitTests.csproj index 1f1b39b4..40fdabcf 100644 --- a/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj +++ b/src/backend/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@ - + diff --git a/src/backend/NetAdmin.Tests/WebApiTestBase.cs b/src/backend/UnitTests/WebApiTestBase.cs similarity index 92% rename from src/backend/NetAdmin.Tests/WebApiTestBase.cs rename to src/backend/UnitTests/WebApiTestBase.cs index ef17f20c..990441ba 100644 --- a/src/backend/NetAdmin.Tests/WebApiTestBase.cs +++ b/src/backend/UnitTests/WebApiTestBase.cs @@ -2,12 +2,11 @@ using System.Net.Http.Headers; using System.Net.Http.Json; using System.Runtime.CompilerServices; using NetAdmin.Domain.Dto; -using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Host.Extensions; -using Xunit; -using Xunit.Abstractions; +using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.SysComponent.Infrastructure.Constant; -namespace NetAdmin.Tests; +namespace UnitTests; /// /// WebApi 测试用例基类 @@ -61,7 +60,7 @@ public abstract class WebApiTestBase(WebTestApplicationFactory factory, IT }; var loginAccount = JsonContent.Create(req); var rspMsg = await client.PostAsync( // - Chars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD, loginAccount) + SysChars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD, loginAccount) .ConfigureAwait(false); var rspObj = (await rspMsg.Content.ReadAsStringAsync().ConfigureAwait(false)).ToObject>(); _accessToken = rspObj.Data.AccessToken; diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index 174eca73..08c85439 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -11,14 +11,14 @@ "dependencies": { "@element-plus/icons-vue": "2.3.1", "ace-builds": "1.36.3", - "aieditor": "1.2.3", + "aieditor": "1.2.5", "axios": "1.7.7", "clipboard": "2.0.11", - "core-js": "3.38.1", + "core-js": "3.39.0", "cropperjs": "1.6.2", "crypto-js": "4.2.0", "echarts": "5.5.1", - "element-plus": "2.8.6", + "element-plus": "2.8.7", "json-bigint": "1.0.0", "json5-to-table": "0.1.8", "markdown-it": "14.1.0", @@ -40,7 +40,7 @@ "@vitejs/plugin-vue": "5.1.4", "prettier": "3.3.3", "prettier-plugin-organize-attributes": "1.0.0", - "sass": "1.80.5", + "sass": "1.80.6", "terser": "5.36.0", "vite": "5.4.10" }, diff --git a/src/frontend/admin/src/views/sys/job/all/save.vue b/src/frontend/admin/src/views/sys/job/all/save.vue index af97ddf0..eb2f73f5 100644 --- a/src/frontend/admin/src/views/sys/job/all/save.vue +++ b/src/frontend/admin/src/views/sys/job/all/save.vue @@ -45,7 +45,7 @@ :theme="this.$TOOL.data.get('APP_SET_DARK') || this.$CONFIG.APP_SET_DARK ? 'github_dark' : 'github'" lang="json" style="height: 10rem; width: 100%" /> - {{ $t('JSON格式化') }} + {{ $t('JSON 格式化') }} - {{ $t('JSON格式化') }} + {{ $t('JSON 格式化') }}