Browse Source
Merge pull request #927 from colinin/perf-api-request-timeout
perf: Improved request timeout prompts.
pull/930/head
yx lin
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
8 additions and
1 deletions
-
apps/vue/src/locales/lang/zh-CN/sys.ts
-
apps/vue/src/utils/http/axios/index.ts
|
|
|
@ -4,7 +4,7 @@ export default { |
|
|
|
errorTip: '错误提示', |
|
|
|
errorMessage: '操作失败,系统异常!', |
|
|
|
timeoutMessage: '登录超时,请重新登录!', |
|
|
|
apiTimeoutMessage: '接口请求超时,请刷新页面重试!', |
|
|
|
apiTimeoutMessage: '接口请求超时,请稍候重试!', |
|
|
|
apiRequestFailed: '请求出错,请稍候重试', |
|
|
|
networkException: '网络异常', |
|
|
|
networkExceptionMsg: '网络异常,请检查您的网络连接是否正常!', |
|
|
|
|
|
|
|
@ -161,6 +161,13 @@ const transform: AxiosTransform = { |
|
|
|
if (axios.isCancel(error)) { |
|
|
|
return Promise.reject(error); |
|
|
|
} |
|
|
|
|
|
|
|
if (error.code && ['ECONNABORTED', 'ETIMEDOUT'].includes(error.code)) { |
|
|
|
const { t } = useI18n(); |
|
|
|
const timeout = t('sys.api.apiTimeoutMessage'); |
|
|
|
createMessage.error(timeout); |
|
|
|
return Promise.reject(timeout); |
|
|
|
} |
|
|
|
|
|
|
|
const resMessage = checkResponse(error.response); |
|
|
|
return Promise.reject(resMessage ?? error); |
|
|
|
|