From 75f2cdbcc8dcd731d2e8338f1854081b4b422ac0 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 15:50:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?put=20delete=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9B=B4=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 143 ++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 57 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 7de9ad4cb..3382d9074 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,74 +1,103 @@ -import axios from 'axios' -import Cookies from 'js-cookie' -import router from '@/router' -import qs from 'qs' -import { clearLoginInfo } from '@/utils' -import isPlainObject from 'lodash/isPlainObject' +import axios from "axios"; +import Cookies from "js-cookie"; +import router from "@/router"; +import qs from "qs"; +import { clearLoginInfo } from "@/utils"; +import isPlainObject from "lodash/isPlainObject"; const http = axios.create({ - baseURL: window.SITE_CONFIG['apiURL'], + baseURL: window.SITE_CONFIG["apiURL"], timeout: 1000 * 900, - withCredentials: true -}) + withCredentials: true, +}); /** * 请求拦截 */ -http.interceptors.request.use(config => { - config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN' - config.headers['token'] = localStorage.getItem('token') || '' - config.headers['Authorization'] = localStorage.getItem('token') || '' - // 默认参数 - var defaults = {} - // 防止缓存，GET请求默认带_t参数 - if (config.method == 'get') { - config.params = { - ...config.params, - ...{ '_t': new Date().getTime() } +http.interceptors.request.use( + (config) => { + config.headers["Accept-Language"] = + localStorage.getItem("language") || "zh-CN"; + config.headers["token"] = localStorage.getItem("token") || ""; + config.headers["Authorization"] = localStorage.getItem("token") || ""; + // 默认参数 + var defaults = {}; + // 防止缓存，GET请求默认带_t参数 + if (config.method == "get") { + config.params = { + ...config.params, + ...{ _t: new Date().getTime() }, + }; } - } - if (isPlainObject(config.params)) { - config.params = { - ...defaults, - ...config.params - } - } - if (isPlainObject(config.data)) { - config.data = { - ...defaults, - ...config.data + if (isPlainObject(config.params)) { + config.params = { + ...defaults, + ...config.params, + }; } - if (/^application\/x-www-form-urlencoded/.test(config.headers['content-type'])) { - config.data = qs.stringify(config.data) + if (isPlainObject(config.data)) { + config.data = { + ...defaults, + ...config.data, + }; + if ( + /^application\/x-www-form-urlencoded/.test( + config.headers["content-type"] + ) + ) { + config.data = qs.stringify(config.data); + } } + return config; + }, + (error) => { + return Promise.reject(error); } - return config -}, error => { - return Promise.reject(error) -}) +); /** * 响应拦截 */ -http.interceptors.response.use(response => { - const code = [10007, 401, 10001, 10005] - if (code.includes(response.data.code)) { - clearLoginInfo() - // localStorage.setItem('userType', 'work') - // let userType = localStorage.getItem("userType"); - // if (userType === 'work'){ - // router.replace({ name: 'loginWork' }) - // }else { - // router.replace({ name: 'login' }) - // } - router.replace({ name: 'login' }) - - return Promise.reject(response.data.msg) +http.interceptors.response.use( + (response) => { + const code = [10007, 401, 10001, 10005]; + if (code.includes(response.data.code)) { + clearLoginInfo(); + // localStorage.setItem('userType', 'work') + // let userType = localStorage.getItem("userType"); + // if (userType === 'work'){ + // router.replace({ name: 'loginWork' }) + // }else { + // router.replace({ name: 'login' }) + // } + router.replace({ name: "login" }); + + return Promise.reject(response.data.msg); + } + return response; + }, + (error) => { + console.error(error); + return Promise.reject(error); } - return response -}, error => { - console.error(error) - return Promise.reject(error) -}) +); + +// http.put = function (url, data, config) { +// http.post(url, data, { +// ...config, +// headers: { +// "X-HTTP-Method-Override": "PUT", +// }, +// }); +// }; + +// http.delete = function (url, config) { +// http.post(url, config.data || {}, { +// ...config, +// headers: { +// "X-HTTP-Method-Override": "DELETE", +// }, +// }); +// }; -export default http +export default http; From a026a2bb8a45a767e011eb84cb1d6715d08aef82 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 16:54:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?put=20delete=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9B=B4=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 143 +++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 86 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 3382d9074..7de9ad4cb 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,103 +1,74 @@ -import axios from "axios"; -import Cookies from "js-cookie"; -import router from "@/router"; -import qs from "qs"; -import { clearLoginInfo } from "@/utils"; -import isPlainObject from "lodash/isPlainObject"; +import axios from 'axios' +import Cookies from 'js-cookie' +import router from '@/router' +import qs from 'qs' +import { clearLoginInfo } from '@/utils' +import isPlainObject from 'lodash/isPlainObject' const http = axios.create({ - baseURL: window.SITE_CONFIG["apiURL"], + baseURL: window.SITE_CONFIG['apiURL'], timeout: 1000 * 900, - withCredentials: true, -}); + withCredentials: true +}) /** * 请求拦截 */ -http.interceptors.request.use( - (config) => { - config.headers["Accept-Language"] = - localStorage.getItem("language") || "zh-CN"; - config.headers["token"] = localStorage.getItem("token") || ""; - config.headers["Authorization"] = localStorage.getItem("token") || ""; - // 默认参数 - var defaults = {}; - // 防止缓存，GET请求默认带_t参数 - if (config.method == "get") { - config.params = { - ...config.params, - ...{ _t: new Date().getTime() }, - }; +http.interceptors.request.use(config => { + config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN' + config.headers['token'] = localStorage.getItem('token') || '' + config.headers['Authorization'] = localStorage.getItem('token') || '' + // 默认参数 + var defaults = {} + // 防止缓存，GET请求默认带_t参数 + if (config.method == 'get') { + config.params = { + ...config.params, + ...{ '_t': new Date().getTime() } } - if (isPlainObject(config.params)) { - config.params = { - ...defaults, - ...config.params, - }; + } + if (isPlainObject(config.params)) { + config.params = { + ...defaults, + ...config.params + } + } + if (isPlainObject(config.data)) { + config.data = { + ...defaults, + ...config.data } - if (isPlainObject(config.data)) { - config.data = { - ...defaults, - ...config.data, - }; - if ( - /^application\/x-www-form-urlencoded/.test( - config.headers["content-type"] - ) - ) { - config.data = qs.stringify(config.data); - } + if (/^application\/x-www-form-urlencoded/.test(config.headers['content-type'])) { + config.data = qs.stringify(config.data) } - return config; - }, - (error) => { - return Promise.reject(error); } -); + return config +}, error => { + return Promise.reject(error) +}) /** * 响应拦截 */ -http.interceptors.response.use( - (response) => { - const code = [10007, 401, 10001, 10005]; - if (code.includes(response.data.code)) { - clearLoginInfo(); - // localStorage.setItem('userType', 'work') - // let userType = localStorage.getItem("userType"); - // if (userType === 'work'){ - // router.replace({ name: 'loginWork' }) - // }else { - // router.replace({ name: 'login' }) - // } - router.replace({ name: "login" }); - - return Promise.reject(response.data.msg); - } - return response; - }, - (error) => { - console.error(error); - return Promise.reject(error); +http.interceptors.response.use(response => { + const code = [10007, 401, 10001, 10005] + if (code.includes(response.data.code)) { + clearLoginInfo() + // localStorage.setItem('userType', 'work') + // let userType = localStorage.getItem("userType"); + // if (userType === 'work'){ + // router.replace({ name: 'loginWork' }) + // }else { + // router.replace({ name: 'login' }) + // } + router.replace({ name: 'login' }) + + return Promise.reject(response.data.msg) } -); - -// http.put = function (url, data, config) { -// http.post(url, data, { -// ...config, -// headers: { -// "X-HTTP-Method-Override": "PUT", -// }, -// }); -// }; - -// http.delete = function (url, config) { -// http.post(url, config.data || {}, { -// ...config, -// headers: { -// "X-HTTP-Method-Override": "DELETE", -// }, -// }); -// }; + return response +}, error => { + console.error(error) + return Promise.reject(error) +}) -export default http; +export default http