From 6069db929de3bb74e281006a804b759c55901a89 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Fri, 24 Mar 2023 19:52:17 +0800 Subject: [PATCH] Upgrade abp framework to 7.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(user): If the user information request fails, go to the login page. * feat(migrations): Add Backend-Admin、Identity、Webhooks migrations. * fix(elsa): fix endpoints version of the integrated Elsa.Server.Api project. * refactor(openiddict): refactor openiddict extension grant. * feat(saas): Add EntityVersions to Editions and Tenants entity. * fix(text-templating): fixed invalid page lookup for templates. * fix(text-templating): the cache is not refreshed after template changes. * feat(webhooks): added webhooks custom interface. * feat(webhooks): webhooks send job Sets the maximum number of failed retry attempts. * feat(account): add the user extension field. * feat(common): Update common.props file. * feat(build): Update Dicrectory.Build.props file. * feat(ui): implements the template definitions. --- .github/workflows/release.yml | 4 +- apps/vue/src/api/sys/user.ts | 15 + .../api/text-templating/definitions/index.ts | 6 +- .../definitions/model/index.ts | 4 +- apps/vue/src/locales/lang/en/sys.ts | 6 +- apps/vue/src/locales/lang/zh-CN/sys.ts | 3 +- apps/vue/src/utils/http/axios/checkStatus.ts | 20 +- .../components/TemplateDefinitionModal.vue | 99 + .../components/TemplateDefinitionTable.vue | 33 +- .../templates/datas/ModalData.ts | 145 +- aspnet-core/Directory.Build.props | 6 +- ...INGYUN.MicroService.WebhooksManagement.sln | 39 + aspnet-core/LINGYUN.MicroService.Workflow.sln | 20 +- aspnet-core/common.props | 2 +- ...rverMigrationsEntityFrameworkCoreModule.cs | 2 + ...Upgrade-Abp-Framework-To-7.1.0.Designer.cs | 1118 +++++++++++ ...23062929_Upgrade-Abp-Framework-To-7.1.0.cs | 51 + ...hServerMigrationsDbContextModelSnapshot.cs | 11 +- ...Upgrade-Abp-Framework-To-7.1.0.Designer.cs | 587 ++++++ ...23070528_Upgrade-Abp-Framework-To-7.1.0.cs | 40 + ...ndAdminMigrationsDbContextModelSnapshot.cs | 6 + ...Upgrade-Abp-Framework-To-7.1.0.Designer.cs | 1786 +++++++++++++++++ ...23065507_Upgrade-Abp-Framework-To-7.1.0.cs | 51 + ...yServerMigrationsDbContextModelSnapshot.cs | 11 +- ...dd-Description-To-Subscription.Designer.cs | 261 +++ ...4095512_Add-Description-To-Subscription.cs | 42 + ...agementMigrationsDbContextModelSnapshot.cs | 11 + .../Abp/AuditLogging/AbpAuditLoggingModule.cs | 12 +- .../LINGYUN.Abp.Elsa.Server.csproj | 1 + .../Abp/Elsa/AbpElsaAutoMapperProfile.cs | 29 + .../LINGYUN/Abp/Elsa/AbpElsaServerModule.cs | 14 +- .../Mvc/Localization/TextAppService.cs | 6 +- .../Abp/LocalizationManagement/LanguageEto.cs | 9 + .../Abp/LocalizationManagement/ResourceEto.cs | 10 + .../ILocalizationStoreCache.cs | 8 + .../LocalizationCacheInvalidator.cs | 124 ++ ...calizationManagementDomainMapperProfile.cs | 2 + .../LocalizationStoreInMemoryCache.cs | 22 +- .../Abp/AspNetCore/Mvc/HttpResponseWrapper.cs | 5 +- .../LinkUser/AbpOpenIddictLinkUserModule.cs | 5 +- ...User.cs => LinkUserTokenExtensionGrant.cs} | 109 +- .../OpenIddict/Sms/AbpOpenIddictSmsModule.cs | 2 +- ...oller.Sms.cs => SmsTokenExtensionGrant.cs} | 119 +- .../WeChat/AbpOpenIddictWeChatModule.cs | 5 +- .../TokenController.WeChat.MiniProgram.cs | 33 - .../TokenController.WeChat.Official.cs | 32 - .../WeChatMiniProgramTokenExtensionGrant.cs | 41 + .../WeChatOffcialTokenExtensionGrant.cs | 41 + ...WeChat.cs => WeChatTokenExtensionGrant.cs} | 147 +- .../LINGYUN.Abp.Saas.Domain.Shared.csproj | 1 + .../Abp/Saas/AbpSaasDomainSharedModule.cs | 5 +- .../LINGYUN/Abp/Saas/Editions/EditionEto.cs | 5 +- .../LINGYUN/Abp/Saas/Tenants/TenantEto.cs | 5 +- .../LINGYUN/Abp/Saas/Editions/Edition.cs | 5 +- .../LINGYUN/Abp/Saas/Tenants/Tenant.cs | 6 +- .../Abp/BackgroundTasks/JobTypeSelector.cs | 27 +- .../BackgroundTasks/BackgroundJobManager.cs | 10 +- .../BackgroundWorkerManager.cs | 10 +- .../TextTemplateDefinitionDto.cs | 2 + .../TextTemplateDefinitionGetListInput.cs | 2 + ...tTemplatingApplicationAutoMapperProfile.cs | 4 +- .../TextTemplateDefinitionAppService.cs | 37 +- .../Localization/Resources/en.json | 1 + .../Localization/Resources/zh-Hans.json | 1 + .../TextTemplateDefinitionEto.cs | 16 + .../Abp/TextTemplating/TextTemplateEto.cs | 13 + .../LINGYUN.Abp.TextTemplating.Domain.csproj | 7 +- .../AbpTextTemplatingDomainModule.cs | 16 + ...TemplateDefinitionStoreCacheInvalidator.cs | 78 + .../TextTemplateCacheItemInvalidator.cs | 6 +- ...tem.cs => TextTemplateContentCacheItem.cs} | 6 +- .../TextTemplateContentContributor.cs | 10 +- .../TextTemplateMapperProfile.cs | 11 + .../IDynamicWebhookDefinitionStore.cs | 2 + .../Webhooks/IStaticWebhookDefinitionStore.cs | 2 + .../Abp/Webhooks/IWebhookDefinitionManager.cs | 15 +- .../NullDynamicWebhookDefinitionStore.cs | 7 + .../Webhooks/StaticWebhookDefinitionStore.cs | 9 +- .../LINGYUN/Abp/Webhooks/WebhookDefinition.cs | 5 + .../Abp/Webhooks/WebhookDefinitionManager.cs | 19 + .../Abp/Webhooks/WebhookGroupDefinition.cs | 7 +- .../Abp/Webhooks/DefaultWebhookSender.cs | 30 +- ...sManagementPermissionDefinitionProvider.cs | 34 + .../WebhooksManagementPermissions.cs | 16 + .../Dto/WebhookDefinitionCreateDto.cs | 16 + .../Dto/WebhookDefinitionCreateOrUpdateDto.cs | 22 + .../Definitions/Dto/WebhookDefinitionDto.cs | 26 + .../Dto/WebhookDefinitionGetListInput.cs | 8 + .../Dto/WebhookDefinitionUpdateDto.cs | 10 + .../Dto/WebhookGroupDefinitionCreateDto.cs | 10 + ...WebhookGroupDefinitionCreateOrUpdateDto.cs | 13 + .../Dto/WebhookGroupDefinitionDto.cs | 16 + .../Dto/WebhookGroupDefinitionGetListInput.cs | 8 + .../Dto/WebhookGroupDefinitionUpdateDto.cs | 10 + .../IWebhookDefinitionAppService.cs | 19 + .../IWebhookGroupDefinitionAppService.cs | 18 + .../IWebhookSendRecordAppService.cs | 4 + .../IWebhookSubscriptionAppService.cs | 2 + .../WebhookSendRecordDeleteManyInput.cs | 8 + .../WebhookSendRecordResendManyInput.cs | 8 + .../WebhookSubscriptionCreateOrUpdateInput.cs | 9 +- .../WebhookSubscriptionDeleteManyInput.cs | 8 + .../WebhookSubscriptionDto.cs | 5 +- .../WebhookDefinitionAppService.cs | 255 +++ .../WebhookGroupDefinitionAppService.cs | 213 ++ .../WebhookSendRecordAppService.cs | 17 + .../WebhookSubscriptionAppService.cs | 17 + .../Localization/Resources/en.json | 7 + .../Localization/Resources/zh-Hans.json | 7 + .../WebhookSubscriptionConsts.cs | 1 + .../WebhooksManagementErrorCodes.cs | 15 + .../DynamicWebhookDefinitionStore.cs | 28 +- ...amicWebhookDefinitionStoreInMemoryCache.cs | 10 +- .../IDynamicWebhookDefinitionStoreCache.cs | 4 +- ...IWebhookGroupDefinitionRecordRepository.cs | 3 + .../WebhookDefinitionStoreCacheInvalidator.cs | 65 + .../WebhooksManagement/WebhookSubscription.cs | 6 +- ...eWebhookGroupDefinitionRecordRepository.cs | 13 + ...agementDbContextModelCreatingExtensions.cs | 3 + .../WebhookDefinitionController.cs | 59 + .../WebhookGroupDefinitionController.cs | 58 + .../WebhookSendRecordController.cs | 17 + .../WebhookSubscriptionController.cs | 8 + .../AuthServerModule.Configure.cs | 2 +- .../Localization/Resources/en.json | 2 + .../Localization/Resources/zh-Hans.json | 2 + .../PersonalInfo/Default.cshtml | 51 +- .../Account/TwoFactorSupportedLoginModel.cs | 22 + .../appsettings.Development.json | 8 +- .../Distributed/TenantSynchronizer.cs | 31 +- .../MultiTenancy/ITenantConfigurationCache.cs | 2 + .../MultiTenancy/TenantConfigurationCache.cs | 14 +- ...ltimeMessageHttpApiHostModule.Configure.cs | 8 + ...ksManagementHttpApiHostModule.Configure.cs | 9 +- .../WebhooksManagementHttpApiHostModule.cs | 2 +- .../.gitignore | 1 + ...ice.WorkflowManagement.HttpApi.Host.csproj | 5 + ...owManagementHttpApiHostModule.Configure.cs | 18 +- .../WorkflowManagementHttpApiHostModule.cs | 4 +- .../Localization/Resources/en.json | 2 + .../Localization/Resources/zh-Hans.json | 2 + .../PersonalInfo/Default.cshtml | 47 + .../Account/TwoFactorSupportedLoginModel.cs | 22 + common.props | 2 +- gateways/Directory.Build.props | 4 +- gateways/common.props | 2 +- 146 files changed, 6536 insertions(+), 337 deletions(-) create mode 100644 apps/vue/src/views/text-templating/templates/components/TemplateDefinitionModal.vue create mode 100644 aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20230323062929_Upgrade-Abp-Framework-To-7.1.0.Designer.cs create mode 100644 aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20230323062929_Upgrade-Abp-Framework-To-7.1.0.cs create mode 100644 aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20230323070528_Upgrade-Abp-Framework-To-7.1.0.Designer.cs create mode 100644 aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20230323070528_Upgrade-Abp-Framework-To-7.1.0.cs create mode 100644 aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/Migrations/20230323065507_Upgrade-Abp-Framework-To-7.1.0.Designer.cs create mode 100644 aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/Migrations/20230323065507_Upgrade-Abp-Framework-To-7.1.0.cs create mode 100644 aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/Migrations/20230324095512_Add-Description-To-Subscription.Designer.cs create mode 100644 aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/Migrations/20230324095512_Add-Description-To-Subscription.cs create mode 100644 aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaAutoMapperProfile.cs create mode 100644 aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/LanguageEto.cs create mode 100644 aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/ResourceEto.cs create mode 100644 aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN/Abp/LocalizationManagement/LocalizationCacheInvalidator.cs rename aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN/Abp/OpenIddict/LinkUser/{Controllers/TokenController.LinkUser.cs => LinkUserTokenExtensionGrant.cs} (62%) rename aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/{Controllers/TokenController.Sms.cs => SmsTokenExtensionGrant.cs} (53%) delete mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/Controllers/TokenController.WeChat.MiniProgram.cs delete mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/Controllers/TokenController.WeChat.Official.cs create mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatMiniProgramTokenExtensionGrant.cs create mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatOffcialTokenExtensionGrant.cs rename aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/{Controllers/TokenController.WeChat.cs => WeChatTokenExtensionGrant.cs} (52%) create mode 100644 aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/TextTemplateDefinitionEto.cs create mode 100644 aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/TextTemplateEto.cs create mode 100644 aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN/Abp/TextTemplating/TemplateDefinitionStoreCacheInvalidator.cs rename aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN/Abp/TextTemplating/{TemplateContentCacheItem.cs => TextTemplateContentCacheItem.cs} (80%) create mode 100644 aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN/Abp/TextTemplating/TextTemplateMapperProfile.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookDefinitionCreateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookDefinitionCreateOrUpdateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookDefinitionDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookDefinitionGetListInput.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookDefinitionUpdateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookGroupDefinitionCreateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookGroupDefinitionCreateOrUpdateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookGroupDefinitionDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookGroupDefinitionGetListInput.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/Dto/WebhookGroupDefinitionUpdateDto.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/IWebhookDefinitionAppService.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/Definitions/IWebhookGroupDefinitionAppService.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordDeleteManyInput.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSendRecordResendManyInput.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN/Abp/WebhooksManagement/WebhookSubscriptionDeleteManyInput.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Definitions/WebhookDefinitionAppService.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN/Abp/WebhooksManagement/Definitions/WebhookGroupDefinitionAppService.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN/Abp/WebhooksManagement/WebhookDefinitionStoreCacheInvalidator.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN/Abp/WebhooksManagement/Definitions/WebhookDefinitionController.cs create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN/Abp/WebhooksManagement/Definitions/WebhookGroupDefinitionController.cs create mode 100644 aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/.gitignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4bccf654..e1d983984 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.0.3 ] + branches: [ rel-7.1.0 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.0.3" + automatic_release_tag: "7.1.0" diff --git a/apps/vue/src/api/sys/user.ts b/apps/vue/src/api/sys/user.ts index 7b4c4ae05..067358799 100644 --- a/apps/vue/src/api/sys/user.ts +++ b/apps/vue/src/api/sys/user.ts @@ -9,6 +9,11 @@ import { useGlobSetting } from '/@/hooks/setting'; import { ContentTypeEnum } from '/@/enums/httpEnum'; import { ErrorMessageMode } from '/#/axios'; +import { t } from '/@/hooks/web/useI18n'; +import { useMessage } from '/@/hooks/web/useMessage'; +import { useUserStoreWithOut } from '/@/store/modules/user'; + +const { createErrorModal } = useMessage(); enum Api { Login = '/connect/token', @@ -87,6 +92,16 @@ export function getUserInfo() { { errorMessageMode: 'none', apiUrl: '/connect', + }).catch(() => { + const userStore = useUserStoreWithOut(); + createErrorModal({ + title: t('sys.api.errorTip'), + content: t('sys.api.getUserInfoErrorMessage'), + onOk: () => { + userStore.setToken(undefined); + userStore.logout(true); + } + }); }); } diff --git a/apps/vue/src/api/text-templating/definitions/index.ts b/apps/vue/src/api/text-templating/definitions/index.ts index 86c3b6352..e50cb98df 100644 --- a/apps/vue/src/api/text-templating/definitions/index.ts +++ b/apps/vue/src/api/text-templating/definitions/index.ts @@ -15,7 +15,7 @@ export const CreateAsyncByInput = (input: TextTemplateDefinitionCreateDto) => { controller: controllerName, action: 'CreateAsync', uniqueName: 'CreateAsyncByInput', - params: input, + data: input, }); }; @@ -49,7 +49,9 @@ export const GetListAsyncByInput = (input: TextTemplateDefinitionGetListInput) = controller: controllerName, action: 'GetListAsync', uniqueName: 'GetListAsyncByInput', - params: input, + params: { + input: input, + }, }); }; diff --git a/apps/vue/src/api/text-templating/definitions/model/index.ts b/apps/vue/src/api/text-templating/definitions/model/index.ts index afd0aba0d..4f51c5ff8 100644 --- a/apps/vue/src/api/text-templating/definitions/model/index.ts +++ b/apps/vue/src/api/text-templating/definitions/model/index.ts @@ -1,10 +1,12 @@ export interface TextTemplateDefinitionDto { name: string; displayName: string; + formatedDisplayName?: string; defaultCultureName?: string; isInlineLocalized: boolean; isLayout: boolean; - layout: string; + layout?: string; + layoutName?: string; isStatic: boolean; renderEngine?: string; } diff --git a/apps/vue/src/locales/lang/en/sys.ts b/apps/vue/src/locales/lang/en/sys.ts index 71e5c5d89..c0104f6ea 100644 --- a/apps/vue/src/locales/lang/en/sys.ts +++ b/apps/vue/src/locales/lang/en/sys.ts @@ -7,10 +7,10 @@ export default { apiTimeoutMessage: 'The interface request timed out, please refresh the page and try again!', apiRequestFailed: 'The interface request failed, please try again later!', networkException: 'network anomaly', - networkExceptionMsg: - 'Please check if your network connection is normal! The network is abnormal', + networkExceptionMsg: 'Please check if your network connection is normal! The network is abnormal', + getUserInfoErrorMessage: 'Failed to obtain user information. Please log in again!', - errMsg401: 'The user does not have permission (token, user name, password error)!', + errMsg401: 'The request interface requires authentication. You failed authentication or the session timed out. Please log in again!', errMsg403: 'The user is authorized, but access is forbidden!', errMsg404: 'Network request error, the resource was not found!', errMsg405: 'Network request error, request method not allowed!', diff --git a/apps/vue/src/locales/lang/zh-CN/sys.ts b/apps/vue/src/locales/lang/zh-CN/sys.ts index eda0e0c5b..94af3aa2a 100644 --- a/apps/vue/src/locales/lang/zh-CN/sys.ts +++ b/apps/vue/src/locales/lang/zh-CN/sys.ts @@ -8,8 +8,9 @@ export default { apiRequestFailed: '请求出错，请稍候重试', networkException: '网络异常', networkExceptionMsg: '网络异常，请检查您的网络连接是否正常!', + getUserInfoErrorMessage: '获取用户信息失败, 请重新登录!', - errMsg401: '用户没有权限（令牌、用户名、密码错误）!', + errMsg401: '请求接口需要验证身份,您未通过认证或会话已超时, 请重新登录!', errMsg403: '用户得到授权，但是访问是被禁止的。!', errMsg404: '网络请求错误,未找到该资源!', errMsg405: '网络请求错误,请求方法未允许!', diff --git a/apps/vue/src/utils/http/axios/checkStatus.ts b/apps/vue/src/utils/http/axios/checkStatus.ts index c1de5b9cb..18d997dfd 100644 --- a/apps/vue/src/utils/http/axios/checkStatus.ts +++ b/apps/vue/src/utils/http/axios/checkStatus.ts @@ -68,6 +68,8 @@ export function checkStatus( errMessage = t('sys.api.errMsg505'); break; default: + errMessage = t('sys.api.apiRequestFailed'); + break; } if (errMessage) { @@ -80,16 +82,6 @@ export function checkStatus( } export function checkResponse(response: any): string | undefined { - if (!response?.data) { - // 都没捕获到则提示默认错误信息 - const { t } = useI18n(); - const message = t('sys.api.apiRequestFailed'); - checkStatus(response.status, message); - return message; - } - - let errorJson = response.data.error; - // 会话超时 if (response.status === 401) { const userStore = useUserStoreWithOut(); @@ -98,6 +90,14 @@ export function checkResponse(response: any): string | undefined { const { t } = useI18n(); return t('sys.api.errMsg401'); } + + if (!response?.data) { + // 都没捕获到则提示默认错误信息 + checkStatus(response, ''); + return undefined; + } + + let errorJson = response.data.error; // abp框架抛出异常信息 if (response.headers['_abperrorformat'] === 'true') { diff --git a/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionModal.vue b/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionModal.vue new file mode 100644 index 000000000..36b77101e --- /dev/null +++ b/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionModal.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionTable.vue b/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionTable.vue index 03eb34b09..2ff886d98 100644 --- a/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionTable.vue +++ b/apps/vue/src/views/text-templating/templates/components/TemplateDefinitionTable.vue @@ -1,6 +1,14 @@