|
@@ -1,4 +1,4 @@
|
|
|
-import axios from "axios";
|
|
|
+import axios, { AxiosRequestConfig } from "axios";
|
|
|
import { loadProgressBar } from "axios-progress-bar";
|
|
|
import { notifyInvalidTokenThrottled } from "./axiosNotice";
|
|
|
import axiosRetry from "axios-retry";
|
|
@@ -30,11 +30,25 @@ _axiosApp.interceptors.request.use(
|
|
|
return config;
|
|
|
},
|
|
|
function (error) {
|
|
|
- if (error.config.setGlobalMask) {
|
|
|
+ const config: AxiosRequestConfig = error.config;
|
|
|
+ if (config.setGlobalMask) {
|
|
|
store.decreaseGlobalMaskCount("axios");
|
|
|
}
|
|
|
$message.error(JSON.stringify(error));
|
|
|
- console.log(error);
|
|
|
+ logger({
|
|
|
+ key: "网络请求request error",
|
|
|
+ cnl: ["console", "local", "server"],
|
|
|
+ pgu: "AUTO",
|
|
|
+ aul: config?.url,
|
|
|
+ });
|
|
|
+ logger({
|
|
|
+ key: "网络请求request error",
|
|
|
+ cnl: ["console", "local", "server"],
|
|
|
+ pgu: "AUTO",
|
|
|
+ aul: config?.url,
|
|
|
+ level: "debug",
|
|
|
+ ejn: JSON.stringify(error),
|
|
|
+ });
|
|
|
return Promise.reject(error);
|
|
|
}
|
|
|
);
|
|
@@ -50,19 +64,35 @@ _axiosApp.interceptors.response.use(
|
|
|
return response;
|
|
|
},
|
|
|
(error) => {
|
|
|
- if (error.config?.setGlobalMask) {
|
|
|
+ const config: AxiosRequestConfig = error.config;
|
|
|
+ logger({
|
|
|
+ key: "网络请求response error",
|
|
|
+ cnl: ["console", "local", "server"],
|
|
|
+ pgu: "AUTO",
|
|
|
+ aul: config?.url,
|
|
|
+ aus: error.response?.status,
|
|
|
+ });
|
|
|
+ logger({
|
|
|
+ key: "网络请求response error",
|
|
|
+ cnl: ["console", "local", "server"],
|
|
|
+ pgu: "AUTO",
|
|
|
+ aul: config?.url,
|
|
|
+ aus: error.response?.status,
|
|
|
+ level: "debug",
|
|
|
+ ejn: JSON.stringify(error),
|
|
|
+ });
|
|
|
+ if (config?.setGlobalMask) {
|
|
|
store.decreaseGlobalMaskCount("axios");
|
|
|
}
|
|
|
- // console.log(error.config, error.config["axios-retry"].retryCount);
|
|
|
- if (error.config?.["axios-retry"]) {
|
|
|
- const thisTime = error.config["axios-retry"].lastRequestTime;
|
|
|
+ if (config?.["axios-retry"]) {
|
|
|
+ const thisTime = config["axios-retry"].lastRequestTime;
|
|
|
if (lastRequestTimeForRetry === thisTime) {
|
|
|
return Promise.reject(error);
|
|
|
} else {
|
|
|
lastRequestTimeForRetry = thisTime;
|
|
|
}
|
|
|
}
|
|
|
- const showErrorMessage = !error.config?.noErrorMessage;
|
|
|
+ const showErrorMessage = !config?.noErrorMessage;
|
|
|
if (!error.response) {
|
|
|
if (showErrorMessage) {
|
|
|
// "Network Error" 网络不通,直接返回
|