Explorar o código

chore: update `axios` latest

xiaoxian521 %!s(int64=2) %!d(string=hai) anos
pai
achega
a455072d7a
Modificáronse 3 ficheiros con 83 adicións e 61 borrados
  1. 7 7
      package.json
  2. 65 49
      pnpm-lock.yaml
  3. 11 5
      src/utils/http/index.ts

+ 7 - 7
package.json

@@ -36,13 +36,13 @@
     "@pureadmin/descriptions": "^1.1.0",
     "@pureadmin/table": "^1.2.0",
     "@pureadmin/utils": "^1.1.5",
-    "@vueuse/core": "^9.3.0",
+    "@vueuse/core": "^9.4.0",
     "@vueuse/motion": "^2.0.0-beta.12",
-    "@vueuse/shared": "^9.3.0",
+    "@vueuse/shared": "^9.4.0",
     "@wangeditor/editor": "^5.1.21",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "animate.css": "^4.1.1",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
     "china-area-data": "^5.0.1",
     "cropperjs": "^1.5.12",
     "dayjs": "^1.11.5",
@@ -66,7 +66,7 @@
     "resize-observer-polyfill": "^1.5.1",
     "responsive-storage": "^2.1.0",
     "sortablejs": "^1.15.0",
-    "swiper": "^8.4.3",
+    "swiper": "^8.4.4",
     "typeit": "^8.7.0",
     "v-contextmenu": "3.0.0",
     "vue": "^3.2.40",
@@ -74,13 +74,13 @@
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "^2.2.2",
     "vue-pdf-embed": "^1.1.4",
-    "vue-router": "^4.1.5",
+    "vue-router": "^4.1.6",
     "vue-types": "^4.2.1",
     "vue-virtual-scroller": "^2.0.0-alpha.1",
     "vuedraggable": "^4.1.0",
     "vxe-table": "^4.3.5",
     "xe-utils": "^3.5.7",
-    "xgplayer": "^2.32.0",
+    "xgplayer": "^2.32.1",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
@@ -142,7 +142,7 @@
     "stylelint-config-recommended": "^6.0.0",
     "stylelint-config-standard": "^24.0.0",
     "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.2.1",
     "terser": "^5.15.0",
     "typescript": "^4.7.4",
     "unplugin-vue-define-options": "0.7.3",

+ 65 - 49
pnpm-lock.yaml

@@ -41,14 +41,14 @@ specifiers:
   "@vue/eslint-config-prettier": ^7.0.0
   "@vue/eslint-config-typescript": ^10.0.0
   "@vue/runtime-core": ^3.2.40
-  "@vueuse/core": ^9.3.0
+  "@vueuse/core": ^9.4.0
   "@vueuse/motion": ^2.0.0-beta.12
-  "@vueuse/shared": ^9.3.0
+  "@vueuse/shared": ^9.4.0
   "@wangeditor/editor": ^5.1.21
   "@wangeditor/editor-for-vue": ^5.1.12
   animate.css: ^4.1.1
   autoprefixer: ^10.4.12
-  axios: ^0.27.2
+  axios: ^1.1.3
   china-area-data: ^5.0.1
   cloc: ^2.10.0
   cropperjs: ^1.5.12
@@ -97,8 +97,8 @@ specifiers:
   stylelint-config-recommended: ^6.0.0
   stylelint-config-standard: ^24.0.0
   stylelint-order: ^5.0.0
-  swiper: ^8.4.3
-  tailwindcss: ^3.1.8
+  swiper: ^8.4.4
+  tailwindcss: ^3.2.1
   terser: ^5.15.0
   typeit: ^8.7.0
   typescript: ^4.7.4
@@ -114,14 +114,14 @@ specifiers:
   vue-i18n: ^9.2.2
   vue-json-pretty: ^2.2.2
   vue-pdf-embed: ^1.1.4
-  vue-router: ^4.1.5
+  vue-router: ^4.1.6
   vue-tsc: ^0.40.13
   vue-types: ^4.2.1
   vue-virtual-scroller: ^2.0.0-alpha.1
   vuedraggable: ^4.1.0
   vxe-table: ^4.3.5
   xe-utils: ^3.5.7
-  xgplayer: ^2.32.0
+  xgplayer: ^2.32.1
   xlsx: ^0.18.5
 
 dependencies:
@@ -133,13 +133,13 @@ dependencies:
   "@pureadmin/descriptions": 1.1.0
   "@pureadmin/table": 1.2.0
   "@pureadmin/utils": 1.1.5_888d42e6b1d4aaf209a7326195b5949d
-  "@vueuse/core": 9.3.0_vue@3.2.40
+  "@vueuse/core": 9.4.0_vue@3.2.40
   "@vueuse/motion": 2.0.0-beta.12_vue@3.2.40
-  "@vueuse/shared": 9.3.0_vue@3.2.40
+  "@vueuse/shared": 9.4.0_vue@3.2.40
   "@wangeditor/editor": 5.1.21
   "@wangeditor/editor-for-vue": 5.1.12_671b67f2147af6cd32d57e9d16d7b064
   animate.css: 4.1.1
-  axios: 0.27.2
+  axios: 1.1.3
   china-area-data: 5.0.1
   cropperjs: 1.5.12
   dayjs: 1.11.5
@@ -163,7 +163,7 @@ dependencies:
   resize-observer-polyfill: 1.5.1
   responsive-storage: 2.1.0
   sortablejs: 1.15.0
-  swiper: 8.4.3
+  swiper: 8.4.4
   typeit: 8.7.0
   v-contextmenu: 3.0.0_vue@3.2.40
   vue: 3.2.40
@@ -171,13 +171,13 @@ dependencies:
   vue-i18n: 9.2.2_vue@3.2.40
   vue-json-pretty: 2.2.2_vue@3.2.40
   vue-pdf-embed: 1.1.4_vue@3.2.40
-  vue-router: 4.1.5_vue@3.2.40
+  vue-router: 4.1.6_vue@3.2.40
   vue-types: 4.2.1_vue@3.2.40
   vue-virtual-scroller: 2.0.0-alpha.1_vue@3.2.40
   vuedraggable: 4.1.0_vue@3.2.40
   vxe-table: 4.3.5_vue@3.2.40+xe-utils@3.5.7
   xe-utils: 3.5.7
-  xgplayer: 2.32.0
+  xgplayer: 2.32.1
   xlsx: 0.18.5
 
 devDependencies:
@@ -239,7 +239,7 @@ devDependencies:
   stylelint-config-recommended: 6.0.0_stylelint@14.13.0
   stylelint-config-standard: 24.0.0_stylelint@14.13.0
   stylelint-order: 5.0.0_stylelint@14.13.0
-  tailwindcss: 3.1.8
+  tailwindcss: 3.2.1
   terser: 5.15.1
   typescript: 4.8.4
   unplugin-vue-define-options: 0.7.3_vite@3.1.8+vue@3.2.40
@@ -1681,10 +1681,10 @@ packages:
       }
     dev: false
 
-  /@types/web-bluetooth/0.0.15:
+  /@types/web-bluetooth/0.0.16:
     resolution:
       {
-        integrity: sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA==
+        integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
       }
     dev: false
 
@@ -2080,6 +2080,13 @@ packages:
       }
     dev: false
 
+  /@vue/devtools-api/6.4.5:
+    resolution:
+      {
+        integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
+      }
+    dev: false
+
   /@vue/eslint-config-prettier/7.0.0_eslint@8.25.0+prettier@2.7.1:
     resolution:
       {
@@ -2215,15 +2222,15 @@ packages:
       vue-demi: 0.13.11_vue@3.2.40
     dev: false
 
-  /@vueuse/core/9.3.0_vue@3.2.40:
+  /@vueuse/core/9.4.0_vue@3.2.40:
     resolution:
       {
-        integrity: sha512-64Rna8IQDWpdrJxgitDg7yv1yTp41ZmvV8zlLEylK4QQLWAhz1OFGZDPZ8bU4lwcGgbEJ2sGi2jrdNh4LttUSQ==
+        integrity: sha512-JzgenGj1ZF2BHOen5rsFiAyyI9sXAv7aKhNLlm9b7SwYQeKTcxTWdhudonURCSP3Egl9NQaRBzes2lv/1JUt/Q==
       }
     dependencies:
-      "@types/web-bluetooth": 0.0.15
-      "@vueuse/metadata": 9.3.0
-      "@vueuse/shared": 9.3.0_vue@3.2.40
+      "@types/web-bluetooth": 0.0.16
+      "@vueuse/metadata": 9.4.0
+      "@vueuse/shared": 9.4.0_vue@3.2.40
       vue-demi: 0.13.11_vue@3.2.40
     transitivePeerDependencies:
       - "@vue/composition-api"
@@ -2237,10 +2244,10 @@ packages:
       }
     dev: false
 
-  /@vueuse/metadata/9.3.0:
+  /@vueuse/metadata/9.4.0:
     resolution:
       {
-        integrity: sha512-GnnfjbzIPJIh9ngL9s9oGU1+Hx/h5/KFqTfJykzh/1xjaHkedV9g0MASpdmPZIP+ynNhKAcEfA6g5i8KXwtoMA==
+        integrity: sha512-7GKMdGAsJyQJl35MYOz/RDpP0FxuiZBRDSN79QIPbdqYx4Sd0sVTnIC68KJ6Oln0t0SouvSUMvRHuno216Ud2Q==
       }
     dev: false
 
@@ -2283,10 +2290,10 @@ packages:
       vue-demi: 0.13.11_vue@3.2.40
     dev: false
 
-  /@vueuse/shared/9.3.0_vue@3.2.40:
+  /@vueuse/shared/9.4.0_vue@3.2.40:
     resolution:
       {
-        integrity: sha512-caGUWLY0DpPC6l31KxeUy6vPVNA0yKxx81jFYLoMpyP6cF84FG5Dkf69DfSUqL57wX8JcUkJDMnQaQIZPWFEQQ==
+        integrity: sha512-fTuem51KwMCnqUKkI8B57qAIMcFovtGgsCtAeqxIzH3i6nE9VYge+gVfneNHAAy7lj8twbkNfqQSygOPJTm4tQ==
       }
     dependencies:
       vue-demi: 0.13.11_vue@3.2.40
@@ -2852,14 +2859,15 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /axios/0.27.2:
+  /axios/1.1.3:
     resolution:
       {
-        integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+        integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
       }
     dependencies:
       follow-redirects: 1.15.2
       form-data: 4.0.0
+      proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
@@ -3579,10 +3587,10 @@ packages:
       type: 1.2.0
     dev: false
 
-  /danmu.js/1.1.1:
+  /danmu.js/1.1.2:
     resolution:
       {
-        integrity: sha512-UmnwBCMbedOw8p6Xrl2HZECOmtCOJ3wL709IBQti+u1tHpDyt/rTjbu3I+NUZ8JzBMf3nscf4fAaWXV/mpKx5g==
+        integrity: sha512-QbJYDP7qJ70fZgq+2bm2xj4jLNymC1wYKfb8cM8Y89w3GRdbCgxV39Znoj45AWU3WYzK/CVN7papo+BmoJ7RjQ==
       }
     dependencies:
       event-emitter: 0.3.5
@@ -3673,10 +3681,10 @@ packages:
     engines: { node: ">=8" }
     dev: true
 
-  /defined/1.0.0:
+  /defined/1.0.1:
     resolution:
       {
-        integrity: sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==
+        integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
       }
     dev: true
 
@@ -3697,8 +3705,8 @@ packages:
     hasBin: true
     dependencies:
       acorn-node: 1.8.2
-      defined: 1.0.0
-      minimist: 1.2.6
+      defined: 1.0.1
+      minimist: 1.2.7
     dev: true
 
   /didyoumean/1.2.2:
@@ -3935,7 +3943,7 @@ packages:
       "@popperjs/core": /@sxzz/popperjs-es/2.11.7
       "@types/lodash": 4.14.186
       "@types/lodash-es": 4.17.6
-      "@vueuse/core": 9.3.0_vue@3.2.40
+      "@vueuse/core": 9.4.0_vue@3.2.40
       async-validator: 4.2.5
       dayjs: 1.11.5
       escape-html: 1.0.3
@@ -6170,10 +6178,10 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /minimist/1.2.6:
+  /minimist/1.2.7:
     resolution:
       {
-        integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+        integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
       }
     dev: true
 
@@ -6920,10 +6928,10 @@ packages:
       postcss-selector-parser: 6.0.10
     dev: true
 
-  /postcss-nested/5.0.6_postcss@8.4.17:
+  /postcss-nested/6.0.0_postcss@8.4.17:
     resolution:
       {
-        integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+        integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
       }
     engines: { node: ">=12.0" }
     peerDependencies:
@@ -7259,6 +7267,13 @@ packages:
     engines: { node: ">= 0.6.0" }
     dev: false
 
+  /proxy-from-env/1.1.0:
+    resolution:
+      {
+        integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+      }
+    dev: false
+
   /pump/3.0.0:
     resolution:
       {
@@ -8235,10 +8250,10 @@ packages:
       stable: 0.1.8
     dev: true
 
-  /swiper/8.4.3:
+  /swiper/8.4.4:
     resolution:
       {
-        integrity: sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==
+        integrity: sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==
       }
     engines: { node: ">= 4.7.0" }
     requiresBuild: true
@@ -8268,10 +8283,10 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /tailwindcss/3.1.8:
+  /tailwindcss/3.2.1:
     resolution:
       {
-        integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==
+        integrity: sha512-Uw+GVSxp5CM48krnjHObqoOwlCt5Qo6nw1jlCRwfGy68dSYb/LwS9ZFidYGRiM+w6rMawkZiu1mEMAsHYAfoLg==
       }
     engines: { node: ">=12.13.0" }
     hasBin: true
@@ -8286,6 +8301,7 @@ packages:
       glob-parent: 6.0.2
       is-glob: 4.0.3
       lilconfig: 2.0.6
+      micromatch: 4.0.5
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.0
@@ -8293,7 +8309,7 @@ packages:
       postcss-import: 14.1.0_postcss@8.4.17
       postcss-js: 4.0.0_postcss@8.4.17
       postcss-load-config: 3.1.4_postcss@8.4.17
-      postcss-nested: 5.0.6_postcss@8.4.17
+      postcss-nested: 6.0.0_postcss@8.4.17
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
       quick-lru: 5.1.1
@@ -8875,15 +8891,15 @@ packages:
       vue: 3.2.40
     dev: false
 
-  /vue-router/4.1.5_vue@3.2.40:
+  /vue-router/4.1.6_vue@3.2.40:
     resolution:
       {
-        integrity: sha512-IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ==
+        integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==
       }
     peerDependencies:
       vue: ^3.2.0
     dependencies:
-      "@vue/devtools-api": 6.4.4
+      "@vue/devtools-api": 6.4.5
       vue: 3.2.40
     dev: false
 
@@ -9131,16 +9147,16 @@ packages:
       generate-source-map: 0.0.5
     dev: false
 
-  /xgplayer/2.32.0:
+  /xgplayer/2.32.1:
     resolution:
       {
-        integrity: sha512-OT5VKU2j4729+bJhrR1BPLIrEF1JYeoDyPe9gLoFodh8XS+i26LbWaM2dOFy7uh+9ZiGUioHkSPDeM1jDrWfdw==
+        integrity: sha512-jUs6108INqnzEn3DTGre6pHW3KroM2w0VKuJNEvOIkoD2oUB+MW5ZZ0PsIwijX/oQRpmvq422CUgo4uqXVidEQ==
       }
     hasBin: true
     dependencies:
       chalk: 2.4.2
       commander: 2.20.3
-      danmu.js: 1.1.1
+      danmu.js: 1.1.2
       downloadjs: 1.4.7
       draggabilly: 2.4.1
       event-emitter: 0.3.5

+ 11 - 5
src/utils/http/index.ts

@@ -1,11 +1,15 @@
-import Axios, { AxiosInstance, AxiosRequestConfig } from "axios";
+import Axios, {
+  AxiosInstance,
+  AxiosRequestConfig,
+  CustomParamsSerializer
+} from "axios";
 import {
   PureHttpError,
   RequestMethods,
   PureHttpResponse,
   PureHttpRequestConfig
 } from "./types.d";
-import qs from "qs";
+import { stringify } from "qs";
 import NProgress from "../progress";
 // import { loadEnv } from "@build/index";
 import { getToken } from "/@/utils/auth";
@@ -20,7 +24,7 @@ const defaultConfig: AxiosRequestConfig = {
   //   process.env.NODE_ENV === "production"
   //     ? VITE_PROXY_DOMAIN_REAL
   //     : VITE_PROXY_DOMAIN,
-  // 当前使用mock模拟请求,将baseURL制空,如果你的环境用到了http请求,请删除下面的baseURL启用上面的baseURL,并将第10行、15行代码注释取消
+  // 当前使用mock模拟请求,将baseURL制空,如果你的环境用到了http请求,请删除下面的baseURL启用上面的baseURL,并将第14行、19行代码注释取消
   baseURL: "",
   timeout: 10000,
   headers: {
@@ -28,8 +32,10 @@ const defaultConfig: AxiosRequestConfig = {
     "Content-Type": "application/json",
     "X-Requested-With": "XMLHttpRequest"
   },
-  // 数组格式参数序列化
-  paramsSerializer: params => qs.stringify(params, { indices: false })
+  // 数组格式参数序列化(https://github.com/axios/axios/issues/5142)
+  paramsSerializer: {
+    serialize: stringify as unknown as CustomParamsSerializer
+  }
 };
 
 class PureHttp {