From 88078aa63c669cffc2d91e1269d460436427d09d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:21:01 +0800
Subject: [PATCH] gb18186
---
src/scripts/httpRequest.ts | 100 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/src/scripts/httpRequest.ts b/src/scripts/httpRequest.ts
index 194dfe6..4a82703 100644
--- a/src/scripts/httpRequest.ts
+++ b/src/scripts/httpRequest.ts
@@ -12,27 +12,42 @@
/* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
Axios.interceptors.request.use(
config => {
- // config.data = JSON.stringify(config.data)
- // let Public = {};
- // if (
- // config.method === "post" ||
- // config.method === "put" ||
- // config.method === "delete"
- // ) {
- // // 搴忓垪鍖�
- // // config.data = qs.stringify(config.data);
- // // config.data = qs.stringify(Object.assign(Public, config.data));
- // } else {
- // config.method = "get";
- // config.params = Object.assign(Public, config.data);
- // }
- // config.headers = {
- // "X-Requested-With": "XMLHttpRequest",
- // Accept: "application/json",
- // "Content-Type": "application/json; charset=UTF-8"
- // };
+ console.log(9898);
+ console.log(config);
+
+
+ if (
+ config.method === "post" &&
+ sessionStorage.getItem('clusterId') ||
+ sessionStorage.getItem('devId')
+ ) {
+ if( !config.data ) {
+ config.data = {}
+ }
+
+ if(typeof config.data == 'object' ) {
+ config.data.clusterId = sessionStorage.getItem('clusterId')
+ config.data.devId = sessionStorage.getItem('devId')
+ }
+
+ if(config.url === '/saas/api-s/camera/rule/getLinkRulesByCameraIds') {
+ config.data.devId = sessionStorage.getItem('cameraDevId')
+ }
+
+ //鍚庨棬
+ if(config.url === '/saas/api-d/device/userClusterInfo') {
+ config.data.clusterId = ''
+ }
+
+ if(config.url === '/saas/api-s/es/saveEsConfig') {
+ delete config.data.clusterId
+ delete config.data.devId
+ }
+
+ }
// 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
+
let token =
sessionStorage.getItem('loginedInfo') &&
JSON.parse(sessionStorage.getItem('loginedInfo')).access_token
@@ -42,6 +57,10 @@
return config
},
error => {
+ console.log('璇锋眰閿欒');
+ console.log(error);
+
+
/* Message({
showClose: true,
message: "鎻愪氦鍑洪敊锛岃鑱旂郴绠＄悊鍛橈紒",
@@ -78,6 +97,16 @@
// window.sessionStorage.setItem('policeCameravideoIsLoginTimeout', JSON.stringify(true))
// }
+ var disposition = res.headers["content-disposition"];
+ if(disposition) {
+ var fileName = disposition.substring(disposition.indexOf("=") + 1);
+ console.log(res);
+
+ return {
+ fileName:fileName,
+ body:res
+ }
+ }
return res.data ? res.data : {}
@@ -86,8 +115,13 @@
/* //return res.data ? res.data : {}; */
},
error => {
+ console.log('鍝嶅簲閿欒');
+ console.log(error);
let errJson: any = {
success: false
+ }
+ if(error && error.response&&error.response.status == 404) {
+ return
}
// 涓嬮潰鏄帴鍙ｅ洖璋冪殑satus ,鍥犱负鎴戝仛浜嗕竴浜涢敊璇〉闈�,鎵�浠ラ兘浼氭寚鍚戝搴旂殑鎶ラ敊椤甸潰
if (error && error.response) {
@@ -132,26 +166,7 @@
case 500:
errJson = error.response.data
break
- // case 501:
- // errJson.status = error.response.status;
- // errJson.message = "鏈嶅姟鏈疄鐜�(501)";
- // break;
- // case 502:
- // errJson.status = error.response.status;
- // errJson.message = "缃戠粶閿欒(502)";
- // break;
- // case 503:
- // errJson.status = error.response.status;
- // errJson.message = "鏈嶅姟涓嶅彲鐢�(503)";
- // break;
- // case 504:
- // errJson.status = error.response.status;
- // errJson.message = "缃戠粶瓒呮椂(504)";
- // break;
- // case 505:
- // errJson.status = error.response.status;
- // errJson.message = "HTTP鐗堟湰涓嶅彈鏀寔(505)";
- // break;
+
default:
errJson.status = error.response.status
errJson.message = `杩炴帴鍑洪敊(${error.response.status})!`
@@ -164,10 +179,13 @@
// path: '/login'
// });
}
- console.log(error.response);
if(error.response&&error.response.data&&!error.response.data.success ) {
errJson.message =error.response.data.msg
+ }
+
+ if(error.response.status == 401) {
+ return
}
Notification({
@@ -180,4 +198,6 @@
return Promise.reject(errJson)
}
)
+
+Axios.defaults.timeout = 10000
export default Axios
--
Gitblit v1.8.0