From 3ea848ea65e06111bddaad36ffe9b6080ca0dd13 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 18 Oct 2024 01:11:19 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BF=AE=E5=A4=8Dapp?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20http.upload=20=E8=A2=AB=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8B=A6=E5=87=BB=20=202=E3=80=81=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/package.json | 4 ++-- App/pnpm-lock.yaml | 38 +++++++++++++++++++------------------- App/utils/request.js | 17 +++++++++++++---- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/App/package.json b/App/package.json index 9d3c8aa3..066f0bd0 100644 --- a/App/package.json +++ b/App/package.json @@ -1,9 +1,9 @@ { "dependencies": { "base-64": "^1.0.0", - "dayjs": "^1.11.11", + "dayjs": "^1.11.13", "jsbn": "^1.1.0", "sm-crypto": "^0.3.13", - "uview-plus": "^3.2.21" + "uview-plus": "^3.3.36" } } \ No newline at end of file diff --git a/App/pnpm-lock.yaml b/App/pnpm-lock.yaml index 5c1bbab2..54924fa6 100644 --- a/App/pnpm-lock.yaml +++ b/App/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 dayjs: - specifier: ^1.11.11 - version: 1.11.11 + specifier: ^1.11.13 + version: 1.11.13 jsbn: specifier: ^1.1.0 version: 1.1.0 @@ -21,40 +21,40 @@ importers: specifier: ^0.3.13 version: 0.3.13 uview-plus: - specifier: ^3.2.21 - version: 3.2.23 + specifier: ^3.3.36 + version: 3.3.36 packages: base-64@1.0.0: - resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==, tarball: https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz} + resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==} clipboard@2.0.11: - resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==, tarball: https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz} + resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==} - dayjs@1.11.11: - resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz} + dayjs@1.11.13: + resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==} delegate@3.2.0: - resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==, tarball: https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz} + resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==} good-listener@1.2.2: - resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==, tarball: https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz} + resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==} jsbn@1.1.0: - resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==, tarball: https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz} + resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==} select@1.1.2: - resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==, tarball: https://registry.npmmirror.com/select/-/select-1.1.2.tgz} + resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==} sm-crypto@0.3.13: - resolution: {integrity: sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==, tarball: https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.13.tgz} + resolution: {integrity: sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==} tiny-emitter@2.1.0: - resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==, tarball: https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz} + resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} - uview-plus@3.2.23: - resolution: {integrity: sha512-o038gH3DSi0DxvmWu40zqThH2ACmLOUtFRpLFhTSW3rXx6UucQyuiCWvjnqXyzHddjqaQgbv/GLr7N47dyUh9Q==, tarball: https://registry.npmmirror.com/uview-plus/-/uview-plus-3.2.23.tgz} + uview-plus@3.3.36: + resolution: {integrity: sha512-yiIIt3OkCDkBzflrr6by8qvYibvCzsFZ/Mn+Fdx9TDaTQAltWFBj7UNVN/wOeb3lou2T5S1QFy2rxw3OcAYi5g==} engines: {HBuilderX: ^3.1.0} snapshots: @@ -67,7 +67,7 @@ snapshots: select: 1.1.2 tiny-emitter: 2.1.0 - dayjs@1.11.11: {} + dayjs@1.11.13: {} delegate@3.2.0: {} @@ -85,7 +85,7 @@ snapshots: tiny-emitter@2.1.0: {} - uview-plus@3.2.23: + uview-plus@3.3.36: dependencies: clipboard: 2.0.11 - dayjs: 1.11.11 + dayjs: 1.11.13 diff --git a/App/utils/request.js b/App/utils/request.js index b3bf5aee..c1a40943 100644 --- a/App/utils/request.js +++ b/App/utils/request.js @@ -1,6 +1,11 @@ -import { http, toast } from 'uview-plus' +import { + http, + toast +} from 'uview-plus' import Base64 from 'base-64' -import { env } from '.env'; +import { + env +} from '.env'; // token 键定义 export const accessTokenKey = 'access-token'; @@ -107,8 +112,12 @@ const responseInterceptors = (vm) => { return data || {} }, (response) => { /* 对响应错误做点什么 （statusCode !== 200）*/ - clearAccessTokens(); - return Promise.reject(response) + if (response.statusCode !== 200) { + clearAccessTokens(); + return Promise.reject(response) + } else { + return response.data || {} + } }) }