diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index d8bdfc9a6..263a59e24 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -156,10 +156,11 @@ export function createAxiosService({ logger }: { logger: ILogger }) { config.retry = merge( { - status: [421], + status: [421, 524], count: 0, max: 3, - delay: 1000, + delay: 2000, + includes: ["[524]"], }, config.retry ); @@ -278,7 +279,19 @@ export function createAxiosService({ logger }: { logger: ILogger }) { const originalRequest = error.config || {}; // logger.info(`config`, originalRequest); const retry = originalRequest.retry || {}; - if (retry.status && retry.status.includes(status)) { + + const isRetryStatus = retry.status && retry.status.includes(status); + let isRetryMessage = false; + if (retry.includes) { + for (const item of retry.includes) { + if (error.message?.includes(item)) { + isRetryMessage = true; + break; + } + } + } + + if (isRetryStatus || isRetryMessage) { if (retry.max > 0 && retry.count < retry.max) { // 重试次数增加 retry.count++; diff --git a/packages/core/pipeline/src/dt/pipeline.ts b/packages/core/pipeline/src/dt/pipeline.ts index 839b6990e..1f11a0e92 100644 --- a/packages/core/pipeline/src/dt/pipeline.ts +++ b/packages/core/pipeline/src/dt/pipeline.ts @@ -87,6 +87,7 @@ export type Notification = { options?: EmailOptions; notificationId: number; title: string; + id: string; }; export type Pipeline = Runnable & { diff --git a/packages/ui/certd-client/src/components/vip-button/api.ts b/packages/ui/certd-client/src/components/vip-button/api.ts index f76bf7379..fa27d1ea2 100644 --- a/packages/ui/certd-client/src/components/vip-button/api.ts +++ b/packages/ui/certd-client/src/components/vip-button/api.ts @@ -20,5 +20,6 @@ export async function getTodayVipOrderCount() { return await request({ url: "/sys/plus/getTodayVipOrderCount", method: "post", + showErrorNotify: false, }); } diff --git a/packages/ui/certd-client/src/components/vip-button/vip-modal-content.vue b/packages/ui/certd-client/src/components/vip-button/vip-modal-content.vue index 1cb9af347..bffffc9ca 100644 --- a/packages/ui/certd-client/src/components/vip-button/vip-modal-content.vue +++ b/packages/ui/certd-client/src/components/vip-button/vip-modal-content.vue @@ -1,31 +1,5 @@