From dd0a3e0ed394983c4fbacdab64cad6f8de5b4884 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 06 八月 2025 18:03:56 +0800
Subject: [PATCH] fix: 对接字典
---
apps/cMiniApp/src/utils/request/index.ts | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/apps/cMiniApp/src/utils/request/index.ts b/apps/cMiniApp/src/utils/request/index.ts
index 326b6a5..339d938 100644
--- a/apps/cMiniApp/src/utils/request/index.ts
+++ b/apps/cMiniApp/src/utils/request/index.ts
@@ -3,8 +3,7 @@
import qs from 'qs';
import Taro from '@tarojs/taro';
import { getToken } from '@/utils';
-import { tokenIsExpired, Message, SensitiveManage, LocationUtils } from '@12333/utils';
-import * as accountServices from '@12333/services/api/Account';
+import { tokenIsExpired, Message, SensitiveManage } from '@12333/utils';
import { useUserStoreWithOut } from '@/stores/modules/user';
const RefreshTokenUrl = '/gettokenbyrefreshtoken';
@@ -51,9 +50,13 @@
success: boolean;
data: any;
/**
+ * http鐘舵�佸悧
+ */
+ code?: number;
+ /**
* 閿欒鐮�
*/
- error?: number;
+ errorCode?: string;
/**
* 閿欒淇℃伅
*/
@@ -150,7 +153,7 @@
// 閿欒鎶涘嚭
errorThrower: (res) => {
- const { success, data, error: errorCode, msg, showType } = res;
+ const { success, data, errorCode, msg, showType } = res;
if (!success) {
const error: any = new Error(msg);
error.name = 'BizError';
@@ -190,34 +193,9 @@
return new Promise((resolve, reject) => {
if (userInfo && token && $config.withCredentials) {
- if (tokenIsExpired(userInfo)) {
- if (!Request.refreshTokenPending) {
- Request.refreshTokenPending = true;
- // token杩囨湡鍒锋柊
- useUserStoreWithOut()
- .getTokenByRefreshToken({
- refreshToken: userInfo.refreshToken,
- clientId: userStore.accountInfo?.client_id,
- })
- .then((res) => {
- $config.headers['Authorization'] = 'Bearer ' + res.accessToken;
- Request.requests.forEach((cb) => cb(res.accessToken));
- Request.requests = [];
- })
- .catch((err) => {
- Request.requests.forEach((cb) => cb());
- Request.requests = [];
- reject(err);
- })
- .finally(() => {
- Request.refreshTokenPending = false;
- });
- }
- resolve(Request.retryOriginalRequest($config));
- } else {
- $config.headers['Authorization'] = 'Bearer ' + token;
- resolve($config);
- }
+ $config.headers['Authorization'] = 'Bearer ' + userInfo.accessToken;
+ $config.headers['X-Authorization'] = 'Bearer ' + userInfo.refreshToken;
+ resolve($config);
} else {
resolve($config);
}
@@ -228,14 +206,6 @@
return Promise.reject(error);
},
],
- [
- (config) => {
- return LocationUtils.getBaseUrlByLocation().then((res) => {
- config.baseURL = res;
- return config;
- });
- },
- ],
],
responseInterceptors: [
[
@@ -244,11 +214,20 @@
const { needNProcess, getResponse = false } = $config;
+ const userStore = useUserStoreWithOut();
+
+ if (response.headers['x-access-token']) {
+ const tokenInfo: API.PasswordLoginCommandCallback = {
+ accessToken: response.headers['access-token'],
+ refreshToken: response.headers['x-access-token'],
+ };
+ userStore.setTokenAction(tokenInfo);
+ userStore.setUserInfoAction(tokenInfo);
+ }
+
endLoading();
- return getResponse
- ? response
- : SensitiveManage.filterSensitiveWord((response.data as any).result);
+ return getResponse ? response : SensitiveManage.filterSensitiveWord(response.data.data);
},
(error) => {
endLoading();
--
Gitblit v1.9.1