|
@@ -6,10 +6,7 @@ import { loadProgressBar } from "axios-progress-bar";
|
|
import cachingGet from "./axiosCache";
|
|
import cachingGet from "./axiosCache";
|
|
import { notifyInvalidTokenThrottled } from "./axiosNotice";
|
|
import { notifyInvalidTokenThrottled } from "./axiosNotice";
|
|
import axiosRetry from "axios-retry";
|
|
import axiosRetry from "axios-retry";
|
|
-// import { Notification } from "element-ui";
|
|
|
|
-const Notification = (...args: any) => {
|
|
|
|
- console.log(args);
|
|
|
|
-};
|
|
|
|
|
|
+import { message } from "ant-design-vue";
|
|
|
|
|
|
const config = {
|
|
const config = {
|
|
// baseURL: process.env.baseURL || process.env.apiUrl || ""
|
|
// baseURL: process.env.baseURL || process.env.apiUrl || ""
|
|
@@ -26,12 +23,7 @@ _axiosApp.interceptors.request.use(
|
|
return config;
|
|
return config;
|
|
},
|
|
},
|
|
function (error) {
|
|
function (error) {
|
|
- // Do something with request error
|
|
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: error,
|
|
|
|
- type: "error",
|
|
|
|
- });
|
|
|
|
|
|
+ message.error({ content: error, duration: 10 });
|
|
console.log(error);
|
|
console.log(error);
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
}
|
|
}
|
|
@@ -47,10 +39,9 @@ _axiosApp.interceptors.response.use(
|
|
if (!error.response) {
|
|
if (!error.response) {
|
|
if (showErrorMessage) {
|
|
if (showErrorMessage) {
|
|
// "Network Error" 网络不通,直接返回
|
|
// "Network Error" 网络不通,直接返回
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: "网络连接异常,请检查网络设置。",
|
|
|
|
- type: "error",
|
|
|
|
|
|
+ message.error({
|
|
|
|
+ content: "网络连接异常,请检查网络设置。",
|
|
|
|
+ duration: 10,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
@@ -64,20 +55,12 @@ _axiosApp.interceptors.response.use(
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
} else if (status == 405) {
|
|
} else if (status == 405) {
|
|
if (showErrorMessage) {
|
|
if (showErrorMessage) {
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: "没有权限!",
|
|
|
|
- type: "error",
|
|
|
|
- });
|
|
|
|
|
|
+ message.error({ content: "没有权限!", duration: 10 });
|
|
}
|
|
}
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
} else if (status == 502) {
|
|
} else if (status == 502) {
|
|
if (showErrorMessage) {
|
|
if (showErrorMessage) {
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: "服务器异常(502)!",
|
|
|
|
- type: "error",
|
|
|
|
- });
|
|
|
|
|
|
+ message.error({ content: "服务器异常(502)!", duration: 10 });
|
|
}
|
|
}
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
}
|
|
}
|
|
@@ -86,18 +69,13 @@ _axiosApp.interceptors.response.use(
|
|
const data = error.response.data;
|
|
const data = error.response.data;
|
|
if (data && data.message) {
|
|
if (data && data.message) {
|
|
if (showErrorMessage) {
|
|
if (showErrorMessage) {
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: data.message,
|
|
|
|
- type: "error",
|
|
|
|
- });
|
|
|
|
|
|
+ message.error({ content: data.message, duration: 10 });
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (showErrorMessage) {
|
|
if (showErrorMessage) {
|
|
- Notification({
|
|
|
|
- showClose: true,
|
|
|
|
- message: "未定义异常: " + JSON.stringify(data, null, 2),
|
|
|
|
- type: "error",
|
|
|
|
|
|
+ message.error({
|
|
|
|
+ content: "未定义异常: " + JSON.stringify(data, null, 2),
|
|
|
|
+ duration: 10,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -109,18 +87,4 @@ _axiosApp.interceptors.response.use(
|
|
_axiosApp.get = cachingGet(_axiosApp, cacheGetUrls);
|
|
_axiosApp.get = cachingGet(_axiosApp, cacheGetUrls);
|
|
loadProgressBar(null, _axiosApp);
|
|
loadProgressBar(null, _axiosApp);
|
|
|
|
|
|
-// Plugin.install = function (Vue) {
|
|
|
|
-// Object.defineProperties(Vue.prototype, {
|
|
|
|
-// $http: {
|
|
|
|
-// get() {
|
|
|
|
-// return _axiosApp;
|
|
|
|
-// },
|
|
|
|
-// },
|
|
|
|
-// });
|
|
|
|
-// };
|
|
|
|
-
|
|
|
|
-// Vue.use(Plugin);
|
|
|
|
-
|
|
|
|
-// export default Plugin;
|
|
|
|
-
|
|
|
|
export const httpApp = _axiosApp;
|
|
export const httpApp = _axiosApp;
|