From a322dd4415b3cfc8cf35699e130663b13025e238 Mon Sep 17 00:00:00 2001 From: hooray <304327508@qq.com> Date: Wed, 17 Nov 2021 14:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 102 ++++++++++++++++++----------------------------- src/api/index.js | 36 +++++------------ 3 files changed, 50 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index d931a698..2aa5216f 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.0", + "qs": "^6.10.1", "screenfull": "^6.0.0", "tinymce": "^5.10.1", "vue": "^3.2.22", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4096242b..e90e9c71 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,6 +24,7 @@ specifiers: plop: ^2.7.6 postcss-html: ^1.2.0 postcss-scss: ^4.0.2 + qs: ^6.10.1 sass: ^1.43.4 screenfull: ^6.0.0 stylelint: ^14.1.0 @@ -65,6 +66,7 @@ dependencies: nprogress: 0.2.0 path-browserify: 1.0.1 path-to-regexp: 6.2.0 + qs: 6.10.1 screenfull: 6.0.0 tinymce: 5.10.1 vue: 3.2.22 @@ -767,6 +769,12 @@ packages: unset-value: 1.0.0 dev: true + /call-bind/1.0.2: + resolution: {integrity: sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw=, tarball: call-bind/download/call-bind-1.0.2.tgz} + dependencies: + function-bind: 1.1.1 + get-intrinsic: 1.1.1 + /callsites/3.1.0: resolution: {integrity: sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=, tarball: callsites/download/callsites-3.1.0.tgz} engines: {node: '>=6'} @@ -2036,7 +2044,6 @@ packages: /function-bind/1.1.1: resolution: {integrity: sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=, tarball: function-bind/download/function-bind-1.1.1.tgz} - dev: true /functional-red-black-tree/1.0.1: resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=, tarball: functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz} @@ -2049,6 +2056,13 @@ packages: globule: 1.3.3 dev: true + /get-intrinsic/1.1.1: + resolution: {integrity: sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y=, tarball: get-intrinsic/download/get-intrinsic-1.1.1.tgz} + dependencies: + function-bind: 1.1.1 + has: 1.0.3 + has-symbols: 1.0.2 + /get-pixels/3.3.3: resolution: {integrity: sha1-ceLf1L77gQtUeKYcY1SACXbOAcc=, tarball: get-pixels/download/get-pixels-3.3.3.tgz} dependencies: @@ -2279,6 +2293,10 @@ packages: engines: {node: '>=12'} dev: true + /has-symbols/1.0.2: + resolution: {integrity: sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM=, tarball: has-symbols/download/has-symbols-1.0.2.tgz} + engines: {node: '>= 0.4'} + /has-value/0.3.1: resolution: {integrity: sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=, tarball: has-value/download/has-value-0.3.1.tgz} engines: {node: '>=0.10.0'} @@ -2315,7 +2333,6 @@ packages: engines: {node: '>= 0.4.0'} dependencies: function-bind: 1.1.1 - dev: true /he/1.2.0: resolution: {integrity: sha1-hK5l+n6vsWX922FWauFLrwVmTw8=, tarball: he/download/he-1.2.0.tgz} @@ -3416,7 +3433,6 @@ packages: /object-inspect/1.11.0: resolution: {integrity: sha1-nc6xRs7dQUig2eUauI00z1CZIrE=, tarball: object-inspect/download/object-inspect-1.11.0.tgz} - dev: true /object-visit/1.0.1: resolution: {integrity: sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=, tarball: object-visit/download/object-visit-1.0.1.tgz} @@ -3866,6 +3882,17 @@ packages: engines: {node: '>=6'} dev: true + /qs/6.10.1: + resolution: {integrity: sha1-STFIL6jWR6Wqt5nFJx0hM7mB+2o=, tarball: qs/download/qs-6.10.1.tgz} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.4 + + /qs/6.5.2: + resolution: {integrity: sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=, tarball: qs/download/qs-6.5.2.tgz} + engines: {node: '>=0.6'} + dev: true + /query-string/4.3.4: resolution: {integrity: sha1-u7aTucqRXCMlFbIosaArYJBD2+s=, tarball: query-string/download/query-string-4.3.4.tgz} engines: {node: '>=0.10.0'} @@ -4031,7 +4058,7 @@ packages: mime-types: 2.1.33 oauth-sign: 0.9.0 performance-now: 2.1.0 - qs: registry.nlark.com/qs/6.5.2 + qs: 6.5.2 safe-buffer: registry.nlark.com/safe-buffer/5.2.1 tough-cookie: 2.5.0 tunnel-agent: 0.6.0 @@ -4220,6 +4247,13 @@ packages: engines: {node: '>=8'} dev: true + /side-channel/1.0.4: + resolution: {integrity: sha1-785cj9wQTudRslxY1CkAEfpeos8=, tarball: side-channel/download/side-channel-1.0.4.tgz} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.1.1 + object-inspect: 1.11.0 + /signal-exit/3.0.5: resolution: {integrity: sha1-nj6MwMdamUcrRDIQM6dwLnc4JS8=, tarball: signal-exit/download/signal-exit-3.0.5.tgz} dev: true @@ -5422,15 +5456,6 @@ packages: safe-buffer: registry.nlark.com/safe-buffer/5.1.2 dev: true - registry.nlark.com/call-bind/1.0.2: - resolution: {integrity: sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/call-bind/download/call-bind-1.0.2.tgz} - name: call-bind - version: 1.0.2 - dependencies: - function-bind: 1.1.1 - get-intrinsic: registry.nlark.com/get-intrinsic/1.1.1 - dev: true - registry.nlark.com/colors/1.4.0: resolution: {integrity: sha1-xQSRR51MG9rtLJztMs98fcI2D3g=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/colors/download/colors-1.4.0.tgz} name: colors @@ -5470,23 +5495,6 @@ packages: debug: optional: true - registry.nlark.com/get-intrinsic/1.1.1: - resolution: {integrity: sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz} - name: get-intrinsic - version: 1.1.1 - dependencies: - function-bind: 1.1.1 - has: 1.0.3 - has-symbols: registry.nlark.com/has-symbols/1.0.2 - dev: true - - registry.nlark.com/has-symbols/1.0.2: - resolution: {integrity: sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/has-symbols/download/has-symbols-1.0.2.tgz} - name: has-symbols - version: 1.0.2 - engines: {node: '>= 0.4'} - dev: true - registry.nlark.com/he/1.2.0: resolution: {integrity: sha1-hK5l+n6vsWX922FWauFLrwVmTw8=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/he/download/he-1.2.0.tgz} name: he @@ -5563,12 +5571,6 @@ packages: minimist: registry.nlark.com/minimist/1.2.5 dev: true - registry.nlark.com/object-inspect/1.11.0: - resolution: {integrity: sha1-nc6xRs7dQUig2eUauI00z1CZIrE=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz} - name: object-inspect - version: 1.11.0 - dev: true - registry.nlark.com/opener/1.5.2: resolution: {integrity: sha1-XTfh81B3udysQwE3InGv3rKhNZg=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/opener/download/opener-1.5.2.tgz} name: opener @@ -5615,22 +5617,6 @@ packages: version: 4.1.0 dev: true - registry.nlark.com/qs/6.10.1: - resolution: {integrity: sha1-STFIL6jWR6Wqt5nFJx0hM7mB+2o=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/qs/download/qs-6.10.1.tgz} - name: qs - version: 6.10.1 - engines: {node: '>=0.6'} - dependencies: - side-channel: registry.nlark.com/side-channel/1.0.4 - dev: true - - registry.nlark.com/qs/6.5.2: - resolution: {integrity: sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/qs/download/qs-6.5.2.tgz} - name: qs - version: 6.5.2 - engines: {node: '>=0.6'} - dev: true - registry.nlark.com/requires-port/1.0.0: resolution: {integrity: sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz} name: requires-port @@ -5655,23 +5641,13 @@ packages: version: 2.1.2 dev: true - registry.nlark.com/side-channel/1.0.4: - resolution: {integrity: sha1-785cj9wQTudRslxY1CkAEfpeos8=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/side-channel/download/side-channel-1.0.4.tgz} - name: side-channel - version: 1.0.4 - dependencies: - call-bind: registry.nlark.com/call-bind/1.0.2 - get-intrinsic: registry.nlark.com/get-intrinsic/1.1.1 - object-inspect: registry.nlark.com/object-inspect/1.11.0 - dev: true - registry.nlark.com/union/0.5.0: resolution: {integrity: sha1-ssEb6E9gU4U3uEbtuboma6AJAHU=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/union/download/union-0.5.0.tgz} name: union version: 0.5.0 engines: {node: '>= 0.8.0'} dependencies: - qs: registry.nlark.com/qs/6.10.1 + qs: 6.10.1 dev: true registry.nlark.com/url-join/4.0.1: diff --git a/src/api/index.js b/src/api/index.js index afb7309b..cd79040b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,5 +1,5 @@ import axios from 'axios' -// import Qs from 'qs' +// import qs from 'qs' import router from '@/router/index' import store from '@/store/index' import { ElMessage } from 'element-plus' @@ -23,32 +23,16 @@ api.interceptors.request.use( request => { /** * 全局拦截请求发送前提交的参数 - * 以下代码为示例，在登录状态下，分别对 post 和 get 请求加上 token 参数 + * 以下代码为示例，在请求头里带上 token 信息 */ - if (request.method == 'post') { - if (request.data instanceof FormData) { - if (store.getters['user/isLogin']) { - // 如果是 FormData 类型（上传图片） - request.data.append('token', store.state.user.token) - } - } else { - // 带上 token - if (request.data == undefined) { - request.data = {} - } - if (store.getters['user/isLogin']) { - request.data.token = store.state.user.token - } - // request.data = Qs.stringify(request.data) - } - } else { - // 带上 token - if (request.params == undefined) { - request.params = {} - } - if (store.getters['user/isLogin']) { - request.params.token = store.state.user.token - } + if (store.getters['user/isLogin']) { + request.headers['Token'] = store.state.user.token + } + // 是否将 POST 请求参数进行字符串化处理 + if (request.method === 'post') { + // request.data = qs.stringify(request.data, { + // arrayFormat: 'brackets' + // }) } return request }