From 97122d14676b76bab7ba2446f080f1a6c749bb04 Mon Sep 17 00:00:00 2001 From: hooray <304327508@qq.com> Date: Thu, 9 Sep 2021 10:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20axios=20baseURL=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 111 ++++++++++++++++++++++++++++++++++++++--------- src/api/index.js | 2 +- 3 files changed, 92 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index d481a3d9..9bc9f4ea 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@tinymce/tinymce-vue": "^4.0.4", - "axios": "^0.21.1", + "axios": "^0.21.4", "dayjs": "^1.10.6", "element-plus": "^1.1.0-beta.8", "hotkeys-js": "^3.8.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05bbb445..1d237d20 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ specifiers: '@tinymce/tinymce-vue': ^4.0.4 '@vitejs/plugin-vue': ^1.6.0 '@vue/compiler-sfc': ^3.2.8 - axios: ^0.21.1 + axios: ^0.21.4 dayjs: ^1.10.6 element-plus: ^1.1.0-beta.8 eslint: ^7.32.0 @@ -44,7 +44,7 @@ specifiers: dependencies: '@tinymce/tinymce-vue': registry.nlark.com/@tinymce/tinymce-vue/4.0.4_vue@3.2.8 - axios: 0.21.1 + axios: registry.nlark.com/axios/0.21.4 dayjs: registry.nlark.com/dayjs/1.10.6 element-plus: registry.nlark.com/element-plus/1.1.0-beta.8_vue@3.2.8 hotkeys-js: registry.nlark.com/hotkeys-js/3.8.7 @@ -97,6 +97,8 @@ packages: '@babel/core': registry.nlark.com/@babel/core/7.15.4 postcss: registry.nlark.com/postcss/7.0.36 postcss-syntax: 0.36.2_postcss@7.0.36 + transitivePeerDependencies: + - supports-color dev: true /@stylelint/postcss-markdown/0.36.2_2b33a41d320e3e2012e5b3b0fadc703b: @@ -109,6 +111,8 @@ packages: postcss-syntax: 0.36.2_postcss@7.0.36 remark: registry.nlark.com/remark/13.0.0 unist-util-find-all-after: registry.nlark.com/unist-util-find-all-after/3.0.2 + transitivePeerDependencies: + - supports-color dev: true /aggregate-error/3.1.0: @@ -226,12 +230,6 @@ packages: resolution: {integrity: sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=, tarball: aws4/download/aws4-1.11.0.tgz} dev: true - /axios/0.21.1: - resolution: {integrity: sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=, tarball: axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1608623177223&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz} - dependencies: - follow-redirects: registry.nlark.com/follow-redirects/1.14.3 - dev: false - /balanced-match/1.0.2: resolution: {integrity: sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=, tarball: balanced-match/download/balanced-match-1.0.2.tgz} dev: true @@ -977,12 +975,6 @@ packages: resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=, tarball: fs.realpath/download/fs.realpath-1.0.0.tgz} dev: true - /fsevents/2.3.2: - resolution: {integrity: sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=, tarball: fsevents/download/fsevents-2.3.2.tgz?cache=0&sync_timestamp=1612537044236&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.3.2.tgz} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - dev: true - optional: true - /function-bind/1.1.1: resolution: {integrity: sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=, tarball: function-bind/download/function-bind-1.1.1.tgz} dev: true @@ -1100,7 +1092,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.nlark.com/uglify-js/3.14.1 + uglify-js: registry.nlark.com/uglify-js/3.14.2 dev: true /har-schema/2.0.0: @@ -1208,6 +1200,8 @@ packages: eventemitter3: 4.0.7 follow-redirects: registry.nlark.com/follow-redirects/1.14.3 requires-port: 1.0.0 + transitivePeerDependencies: + - debug dev: true /icss-replace-symbols/1.1.0: @@ -3284,6 +3278,8 @@ packages: json5: 2.2.0 semver: 6.3.0 source-map: 0.5.7 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@babel/generator/7.15.4: @@ -3374,6 +3370,8 @@ packages: '@babel/template': registry.nlark.com/@babel/template/7.15.4 '@babel/traverse': registry.nlark.com/@babel/traverse/7.15.4 '@babel/types': registry.nlark.com/@babel/types/7.15.4 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@babel/helper-optimise-call-expression/7.15.4: @@ -3395,6 +3393,8 @@ packages: '@babel/helper-optimise-call-expression': registry.nlark.com/@babel/helper-optimise-call-expression/7.15.4 '@babel/traverse': registry.nlark.com/@babel/traverse/7.15.4 '@babel/types': registry.nlark.com/@babel/types/7.15.4 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@babel/helper-simple-access/7.15.4: @@ -3437,6 +3437,8 @@ packages: '@babel/template': registry.nlark.com/@babel/template/7.15.4 '@babel/traverse': registry.nlark.com/@babel/traverse/7.15.4 '@babel/types': registry.nlark.com/@babel/types/7.15.4 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@babel/highlight/7.14.5: @@ -3493,6 +3495,8 @@ packages: '@babel/types': registry.nlark.com/@babel/types/7.15.4 debug: registry.nlark.com/debug/4.3.2 globals: registry.nlark.com/globals/11.12.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@babel/types/7.15.4: @@ -3525,6 +3529,8 @@ packages: js-yaml: 3.14.1 minimatch: 3.0.4 strip-json-comments: registry.nlark.com/strip-json-comments/3.1.1 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@humanwhocodes/config-array/0.5.0: @@ -3536,6 +3542,8 @@ packages: '@humanwhocodes/object-schema': registry.nlark.com/@humanwhocodes/object-schema/1.2.0 debug: registry.nlark.com/debug/4.3.2 minimatch: 3.0.4 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/@humanwhocodes/object-schema/1.2.0: @@ -3997,6 +4005,16 @@ packages: version: 0.7.0 dev: true + registry.nlark.com/axios/0.21.4: + resolution: {integrity: sha1-xnuQ3AVo5cHPKwuFjEO6KOLtpXU=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/axios/download/axios-0.21.4.tgz?cache=0&sync_timestamp=1630942582656&other_urls=https%3A%2F%2Fregistry.nlark.com%2Faxios%2Fdownload%2Faxios-0.21.4.tgz} + name: axios + version: 0.21.4 + dependencies: + follow-redirects: registry.nlark.com/follow-redirects/1.14.3 + transitivePeerDependencies: + - debug + dev: false + registry.nlark.com/bail/1.0.5: resolution: {integrity: sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/bail/download/bail-1.0.5.tgz} name: bail @@ -4125,7 +4143,7 @@ packages: normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: - fsevents: 2.3.2 + fsevents: registry.nlark.com/fsevents/2.3.2 dev: true registry.nlark.com/clean-css/4.2.3: @@ -4334,6 +4352,11 @@ packages: name: debug version: 4.3.2 engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true dependencies: ms: registry.nlark.com/ms/2.1.2 dev: true @@ -4467,6 +4490,8 @@ packages: natural-compare: 1.4.0 semver: 6.3.0 vue-eslint-parser: registry.nlark.com/vue-eslint-parser/7.10.0_eslint@7.32.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/eslint-scope/5.1.1: @@ -4549,6 +4574,8 @@ packages: table: registry.nlark.com/table/6.7.1 text-table: 0.2.0 v8-compile-cache: 2.3.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/espree/6.2.1: @@ -4660,6 +4687,11 @@ packages: name: follow-redirects version: 1.14.3 engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true registry.nlark.com/fs-extra/10.0.0: resolution: {integrity: sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz} @@ -4672,6 +4704,14 @@ packages: universalify: 2.0.0 dev: true + registry.nlark.com/fsevents/2.3.2: + resolution: {integrity: sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/fsevents/download/fsevents-2.3.2.tgz} + name: fsevents + version: 2.3.2 + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + dev: true + optional: true + registry.nlark.com/get-pixels/3.3.3: resolution: {integrity: sha1-ceLf1L77gQtUeKYcY1SACXbOAcc=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/get-pixels/download/get-pixels-3.3.3.tgz} name: get-pixels @@ -4886,6 +4926,8 @@ packages: secure-compare: registry.nlark.com/secure-compare/3.0.1 union: 0.5.0 url-join: 2.0.5 + transitivePeerDependencies: + - debug dev: true registry.nlark.com/http-signature/1.2.0: @@ -5085,6 +5127,8 @@ packages: please-upgrade-node: 3.2.0 string-argv: 0.3.1 stringify-object: registry.nlark.com/stringify-object/3.3.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/listr2/3.11.1_enquirer@2.3.6: @@ -5125,6 +5169,8 @@ packages: micromark: registry.nlark.com/micromark/2.11.4 parse-entities: 2.0.0 unist-util-stringify-position: 2.0.3 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/mdast-util-to-markdown/0.6.5: @@ -5179,6 +5225,8 @@ packages: dependencies: debug: registry.nlark.com/debug/4.3.2 parse-entities: 2.0.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/mime-db/1.49.0: @@ -5616,6 +5664,8 @@ packages: version: 9.0.0 dependencies: mdast-util-from-markdown: registry.nlark.com/mdast-util-from-markdown/0.8.5 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/remark-stringify/9.0.1: @@ -5634,6 +5684,8 @@ packages: remark-parse: registry.nlark.com/remark-parse/9.0.0 remark-stringify: registry.nlark.com/remark-stringify/9.0.1 unified: registry.nlark.com/unified/9.2.2 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/resolve-dir/1.0.1: @@ -5673,7 +5725,7 @@ packages: engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: registry.nlark.com/fsevents/2.3.2 dev: true registry.nlark.com/rxjs/6.6.7: @@ -5933,6 +5985,8 @@ packages: table: registry.nlark.com/table/6.7.1 v8-compile-cache: 2.3.0 write-file-atomic: 3.0.3 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/sugarss/2.0.0: @@ -6106,10 +6160,10 @@ packages: version: 0.0.6 dev: true - registry.nlark.com/uglify-js/3.14.1: - resolution: {integrity: sha1-4suf4025y0z3410dJt/qKOCafQY=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/uglify-js/download/uglify-js-3.14.1.tgz} + registry.nlark.com/uglify-js/3.14.2: + resolution: {integrity: sha1-191qRspXIU9UotCkPK0PNduCrJk=, registry: https://registry.npm.taobao.org/, tarball: https://registry.nlark.com/uglify-js/download/uglify-js-3.14.2.tgz?cache=0&sync_timestamp=1631026519465&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fuglify-js%2Fdownload%2Fuglify-js-3.14.2.tgz} name: uglify-js - version: 3.14.1 + version: 3.14.2 engines: {node: '>=0.8.0'} hasBin: true dev: true @@ -6167,6 +6221,7 @@ packages: vue: registry.nlark.com/vue/3.2.8 transitivePeerDependencies: - rollup + - supports-color - vite - webpack dev: true @@ -6180,6 +6235,13 @@ packages: rollup: ^2.50.0 vite: ^2.3.0 webpack: ^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + vite: + optional: true + webpack: + optional: true dependencies: upath: 2.0.1 vite: registry.nlark.com/vite/2.5.3 @@ -6244,6 +6306,8 @@ packages: debug: registry.nlark.com/debug/4.3.2 fs-extra: registry.nlark.com/fs-extra/10.0.0 vite: registry.nlark.com/vite/2.5.3 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/vite-plugin-html/2.1.0_vite@2.5.3: @@ -6286,6 +6350,7 @@ packages: vite: registry.nlark.com/vite/2.5.3 transitivePeerDependencies: - rollup + - supports-color dev: true registry.nlark.com/vite-plugin-restart/0.0.2_vite@2.5.3: @@ -6330,6 +6395,8 @@ packages: svg-baker: 1.7.0 svgo: registry.nlark.com/svgo/2.5.0 vite: registry.nlark.com/vite/2.5.3 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/vite/2.5.3: @@ -6344,7 +6411,7 @@ packages: resolve: 1.20.0 rollup: registry.nlark.com/rollup/2.56.3 optionalDependencies: - fsevents: 2.3.2 + fsevents: registry.nlark.com/fsevents/2.3.2 dev: true registry.nlark.com/vue-eslint-parser/7.10.0_eslint@7.32.0: @@ -6364,6 +6431,8 @@ packages: esquery: 1.4.0 lodash: 4.17.21 semver: 6.3.0 + transitivePeerDependencies: + - supports-color dev: true registry.nlark.com/vue-router/4.0.11_vue@3.2.8: diff --git a/src/api/index.js b/src/api/index.js index 65bcbfb0..292af310 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -14,7 +14,7 @@ const toLogin = () => { } const api = axios.create({ - baseURL: import.meta.env.DEV ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, + baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 10000, responseType: 'json' })